Mercurial > hg
changeset 11422:9191585f2604
i18n-da: synchronize with 42408cd43f55
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 20 Jun 2010 17:38:57 +0200 |
| parents | 42408cd43f55 |
| children | 776f9784b34b |
| files | i18n/da.po |
| diffstat | 1 files changed, 2676 insertions(+), 730 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Sat Jun 19 13:00:08 2010 -0500 +++ b/i18n/da.po Sun Jun 20 17:38:57 2010 +0200 @@ -1,9 +1,9 @@ # Danish translations for Mercurial # Danske oversættelser for Mercurial # Copyright (C) 2009, 2010 Matt Mackall and others -# +# # Translation dictionary: -# +# # changeset ændring # commit deponere # merge sammenføje @@ -12,13 +12,13 @@ # revision revision # tag mærkat # working directory arbejdskatalog -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-04-05 01:22+0200\n" -"PO-Revision-Date: 2010-06-18 00:44+0200\n" +"POT-Creation-Date: 2010-06-20 16:37+0200\n" +"PO-Revision-Date: 2010-06-20 17:37+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -47,8 +47,9 @@ msgstr "" msgid "" -"This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets." +"This hook makes it possible to allow or deny write access to given\n" +"branches and paths of a repository when receiving incoming changesets\n" +"via pretxnchangegroup and pretxncommit." msgstr "" msgid "" @@ -59,59 +60,205 @@ msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" -"preventing authenticating users from doing anything other than\n" -"pushing or pulling. The hook is not safe to use if users have\n" -"interactive shell access, as they can then disable the hook.\n" -"Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them." -msgstr "" - -msgid "To use this hook, configure the acl extension in your hgrc like this::" -msgstr "" - -msgid "" -" [extensions]\n" -" acl =" -msgstr "" - -msgid "" -" [hooks]\n" +"preventing authenticating users from doing anything other than pushing\n" +"or pulling. The hook is not safe to use if users have interactive\n" +"shell access, as they can then disable the hook. Nor is it safe if\n" +"remote users share an account, because then there is no way to\n" +"distinguish them." +msgstr "" + +msgid "The order in which access checks are performed is:" +msgstr "" + +msgid "" +"1) Deny list for branches (section ``acl.deny.branches``)\n" +"2) Allow list for branches (section ``acl.allow.branches``)\n" +"3) Deny list for paths (section ``acl.deny``)\n" +"4) Allow list for paths (section ``acl.allow``)" +msgstr "" + +msgid "The allow and deny sections take key-value pairs." +msgstr "" + +msgid "" +"Branch-based Access Control\n" +"---------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" +"have branch-based access control. Keys in these sections can be\n" +"either:" +msgstr "" + +msgid "" +"- a branch name, or\n" +"- an asterisk, to match any branch;" +msgstr "" + +msgid "The corresponding values can be either:" +msgstr "" + +msgid "" +"- a comma-separated list containing users and groups, or\n" +"- an asterisk, to match anyone;" +msgstr "" + +msgid "" +"Path-based Access Control\n" +"-------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" +"access control. Keys in these sections accept a subtree pattern (with\n" +"a glob syntax by default). The corresponding values follow the same\n" +"syntax as the other sections above." +msgstr "" + +msgid "" +"Groups\n" +"------" +msgstr "" + +msgid "" +"Group names must be prefixed with an ``@`` symbol. Specifying a group\n" +"name has the same effect as specifying all the users in that group." +msgstr "" + +msgid "" +"You can define group members in the ``acl.groups`` section.\n" +"If a group name is not defined there, and Mercurial is running under\n" +"a Unix-like system, the list of users will be taken from the OS.\n" +"Otherwise, an exception will be raised." +msgstr "" + +msgid "" +"Example Configuration\n" +"---------------------" +msgstr "" + +msgid "::" +msgstr "" + +msgid " [hooks]" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions at commit time\n" +" pretxncommit.acl = python:hgext.acl.hook\n" +" \n" +" # Use this if you want to check access restrictions for pull, push,\n" +" # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" msgid "" " [acl]\n" -" # Check whether the source of incoming changes is in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" # Allow or deny access for incoming changes only if their source is\n" +" # listed here, let them pass otherwise. Source is \"serve\" for all\n" +" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" +" # related commands are run locally.\n" +" # Default: serve\n" " sources = serve" msgstr "" msgid "" -"The allow and deny sections take a subtree pattern as key (with a glob\n" -"syntax by default), and a comma separated list of users as the\n" -"corresponding value. The deny list is checked before the allow list\n" -"is. ::" +" [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 = * " +msgstr "" + +msgid "" +" [acl.deny]\n" +" # This list is checked first. If a match is found, acl.allow is not\n" +" # checked. All users are granted access if acl.deny is not present.\n" +" # Format for both lists: glob pattern = user, ..., @group, ..." +msgstr "" + +msgid "" +" # To match everyone, use an asterisk for the user:\n" +" # my/glob/pattern = *" +msgstr "" + +msgid "" +" # user6 will not have write access to any file:\n" +" ** = user6" +msgstr "" + +msgid "" +" # Group \"hg-denied\" will not have write access to any file:\n" +" ** = @hg-denied" +msgstr "" + +msgid "" +" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" +" # everyone being able to change all other files. See below.\n" +" src/main/resources/DONT-TOUCH-THIS.txt = *" msgstr "" msgid "" " [acl.allow]\n" -" # If acl.allow is not present, all users are allowed by default.\n" -" # An empty acl.allow section means no users allowed.\n" -" docs/** = doc_writer\n" -" .hgtags = release_engineer" -msgstr "" - -msgid "" -" [acl.deny]\n" -" # If acl.deny is not present, no users are refused by default.\n" -" # An empty acl.deny section means all users allowed.\n" -" glob pattern = user4, user5\n" -" ** = user6\n" -msgstr "" - -#, python-format -msgid "config error - hook type \"%s\" cannot stop incoming changesets" -msgstr "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" +" # if acl.allow is not present, all users are allowed by default\n" +" # empty acl.allow = no users allowed" +msgstr "" + +msgid "" +" # User \"doc_writer\" has write access to any file under the \"docs\"\n" +" # folder:\n" +" docs/** = doc_writer" +msgstr "" + +msgid "" +" # User \"jack\" and group \"designers\" have write access to any file\n" +" # under the \"images\" folder:\n" +" images/** = jack, @designers" +msgstr "" + +msgid "" +" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" +" # access to any file under the \"resources\" folder (except for 1\n" +" # file. See acl.deny):\n" +" src/main/resources/** = *" +msgstr "" + +msgid " .hgtags = release_engineer" +msgstr "" + +#, python-format +msgid "group '%s' is undefined" +msgstr "" + +#, 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" + +#, python-format +msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" +msgstr "" + +#, python-format +msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" +msgstr "" #, python-format msgid "acl: access denied for changeset %s" @@ -128,8 +275,8 @@ msgstr "" msgid "" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update)." +"It is possible to use bookmark names in every revision lookup (e.g.\n" +":hg:`merge`, :hg:`update`)." msgstr "" msgid "" @@ -153,12 +300,12 @@ msgid "" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark." -msgstr "" - -msgid "" -" You can use 'hg bookmark NAME' to set a bookmark on the working\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" +" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" " the bookmark is assigned to that revision.\n" @@ -186,15 +333,59 @@ msgid "no bookmarks set\n" msgstr "der er ingen bogmærker\n" +#, python-format +msgid "updating bookmark %s\n" +msgstr "opdaterer bogmærke %s\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "" + +#, python-format +msgid "failed to update bookmark %s!\n" +msgstr "kunne ikke opdatere bogmærke %s!\n" + +#, python-format +msgid "remote bookmark %s not found!" +msgstr "fjern-bogmærke %s blev ikke fundet!" + +#, python-format +msgid "importing bookmark %s\n" +msgstr "importerer bogmærke %s\n" + +#, python-format +msgid "exporting bookmark %s\n" +msgstr "eksporterer bogmærke %s\n" + +#, python-format +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 "bookmark to import" +msgstr "bogmærke der skal importeres" + +msgid "bookmark to export" +msgstr "bogmærke der skal eksporteres" + msgid "force" msgstr "gennemtving" +msgid "REV" +msgstr "" + msgid "revision" msgstr "revision" msgid "delete a given bookmark" msgstr "slet et givent bogmærke" +msgid "NAME" +msgstr "NAVN" + msgid "rename a given bookmark" msgstr "omdøb et givet bogmærke" @@ -570,8 +761,8 @@ " Det er muligt at afbilde alternative e-mail-adresser til\n" " hoved-adresser ved at bruge en fil med følgende format::" -msgid " <alias email> <actual email>" -msgstr " <alias email> <faktisk email>" +msgid " <alias email> = <actual email>" +msgstr " <alias email> = <faktisk email>" msgid "" " Such a file may be specified with the --aliases option, otherwise\n" @@ -585,12 +776,21 @@ msgid "count rate for the specified revision or range" msgstr "lav statistik for de specificerede revisioner" +msgid "DATE" +msgstr "" + msgid "count rate for revisions matching date spec" msgstr "lav statistik for revisioner som matcher dato specifikationen" +msgid "TEMPLATE" +msgstr "" + msgid "template to group changesets" msgstr "skabelon for gruppering af ændringer" +msgid "FORMAT" +msgstr "" + msgid "strftime-compatible format for grouping by date" msgstr "strftime-kompatibelt format til gruppering efter dato" @@ -603,6 +803,9 @@ msgid "display added/removed lines separately" msgstr "vil tilføjede/fjernede linier separat" +msgid "FILE" +msgstr "FIL" + msgid "file with email aliases" msgstr "fil med email-aliaser" @@ -613,7 +816,8 @@ msgstr "farvelæg output for nogle kommandoer" msgid "" -"This extension modifies the status and resolve commands to add color to their\n" +"This extension modifies the status and resolve commands to add color to " +"their\n" "output to reflect file status, the qseries command to add color to reflect\n" "patch status (applied, unapplied, missing), and to diff-related\n" "commands to highlight additions, removals, diff headers, and trailing\n" @@ -704,19 +908,35 @@ " resolve.unresolved = red bold\n" " resolve.resolved = green bold" -msgid " bookmarks.current = green\n" -msgstr " bookmarks.current = green\n" - -msgid "when to colorize (always, auto, or never)" -msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" - -msgid "don't colorize output (DEPRECATED)" -msgstr "farvelæg ikke output (FORÆLDET)" +msgid " bookmarks.current = green" +msgstr " bookmarks.current = green" + +msgid "" +"The color extension will try to detect whether to use ANSI codes or\n" +"Win32 console APIs, unless it is made explicit::" +msgstr "" + +msgid "" +" [color]\n" +" mode = ansi" +msgstr "" + +msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color." +msgstr "" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n" +msgid "win32console not found, please install pywin32\n" +msgstr "" + +msgid "when to colorize (always, auto, or never)" +msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" + +msgid "TYPE" +msgstr "" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "importer revisioner fra fremmede VCS depoter ind i Mercurial" @@ -1095,7 +1315,16 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [TILVALG]... [STI]..." -msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" +#, 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" msgstr "" msgid "bzr source type could not be determined\n" @@ -1149,6 +1378,15 @@ msgid "%s: unknown repository type" msgstr "%s: ukendt depottype" +msgid "retrieving file" +msgstr "henter fil" + +msgid "revisions" +msgstr "revisioner" + +msgid "scanning" +msgstr "" + #, python-format msgid "unknown sort mode: %s" msgstr "ukendt sortering: %s" @@ -1193,6 +1431,9 @@ msgid "source: %s\n" msgstr "kilde: %s\n" +msgid "converting" +msgstr "konverterer" + #, python-format msgid "assuming destination %s\n" msgstr "antager mål %s\n" @@ -1204,6 +1445,10 @@ 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 checkout" + +#, python-format msgid "revision %s is not a patchset number" msgstr "" @@ -1215,8 +1460,10 @@ msgstr "CVS pserver godkendelse fejlede" #, python-format -msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" -msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "" +"uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" #, python-format msgid "%d bytes missing from remote file" @@ -1236,6 +1483,9 @@ 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" @@ -1264,6 +1514,9 @@ 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" @@ -1291,6 +1544,10 @@ 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)" @@ -1315,7 +1572,26 @@ 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 "" + +#, python-format +msgid "cannot read %r object at %s" +msgstr "" + +#, python-format +msgid "cannot read changes in %s" +msgstr "" + +#, python-format +msgid "cannot read tags from %s" +msgstr "" + +#, 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" @@ -1326,7 +1602,8 @@ msgstr "analyserer træ version %s...\n" #, python-format -msgid "tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1334,7 +1611,7 @@ 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 @@ -1342,6 +1619,10 @@ msgstr "initialiserer mål %s depot\n" #, python-format +msgid "could not create hg repository %s as sink" +msgstr "" + +#, python-format msgid "pulling from %s into %s\n" msgstr "hiver fra %s ind i %s\n" @@ -1360,13 +1641,17 @@ 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" @@ -1376,8 +1661,14 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "Mercurial kunne ikke køre sig selv, kontroller om hg er i PATH" -msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" -msgstr "" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"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" @@ -1425,13 +1716,12 @@ msgstr "svn: fandt ingen revisioner efter startrevision %d" #, python-format -msgid "no tags found at revision %d\n" -msgstr "ingen mærkater fundet ved revision %d\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s blev ikke fundet op til revision %d" +msgid "scanning paths" +msgstr "skanner stier" + #, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "fandt forælder til gren %s ved %d: %s\n" @@ -1445,11 +1735,11 @@ 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" @@ -1461,6 +1751,117 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "XXX MÆRKATER ER IKKE IMPLEMENTERET ENDNU\n" +msgid "automatically manage newlines in repository files" +msgstr "" + +msgid "" +"This extension allows you to manage the type of line endings (CRLF or\n" +"LF) that are used in the repository and in the local working\n" +"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 "" + +msgid "" +"The extension reads its configuration from a versioned ``.hgeol``\n" +"configuration file every time you run an ``hg`` command. The\n" +"``.hgeol`` file use the same syntax as all other Mercurial\n" +"configuration files. It uses two sections, ``[patterns]`` and\n" +"``[repository]``." +msgstr "" + +msgid "" +"The ``[patterns]`` section specifies the line endings used in the\n" +"working directory. The format is specified by a file pattern. The\n" +"first match is used, so put more specific patterns first. The\n" +"available line endings are ``LF``, ``CRLF``, and ``BIN``." +msgstr "" + +msgid "" +"Files with the declared format of ``CRLF`` or ``LF`` are always\n" +"checked out in that format and files declared to be binary (``BIN``)\n" +"are left unchanged. Additionally, ``native`` is an alias for the\n" +"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" +"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" +"endings) is Mercurial's default behaviour; it is only needed if you\n" +"need to override a later, more general pattern." +msgstr "" + +msgid "" +"The optional ``[repository]`` section specifies the line endings to\n" +"use for files stored in the repository. It has a single setting,\n" +"``native``, which determines the storage line endings for files\n" +"declared as ``native`` in the ``[patterns]`` section. It can be set to\n" +"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" +"that on Windows, files configured as ``native`` (``CRLF`` by default)\n" +"will be converted to ``LF`` when stored in the repository. Files\n" +"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" +"are always stored as-is in the repository." +msgstr "" + +msgid "Example versioned ``.hgeol`` file::" +msgstr "" + +msgid "" +" [patterns]\n" +" **.py = native\n" +" **.vcproj = CRLF\n" +" **.txt = native\n" +" Makefile = LF\n" +" **.jpg = BIN" +msgstr "" + +msgid "" +" [repository]\n" +" native = LF" +msgstr "" +" [repository]\n" +" native = LF" + +msgid "" +"The extension uses an optional ``[eol]`` section in your hgrc file\n" +"(not the ``.hgeol`` file) for settings that control the overall\n" +"behavior. There are two settings:" +msgstr "" + +msgid "" +"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" +" ``CRLF`` override the default interpretation of ``native`` for\n" +" checkout. This can be used with :hg:`archive` on Unix, say, to\n" +" generate an archive where files have line endings for Windows." +msgstr "" + +msgid "" +"- ``eol.only-consistent`` (default True) can be set to False to make\n" +" the extension convert files with inconsistent EOLs. Inconsistent\n" +" means that there is both ``CRLF`` and ``LF`` present in the file.\n" +" Such files are normally not touched under the assumption that they\n" +" have mixed EOLs on purpose." +msgstr "" + +msgid "" +"See :hg:`help patterns` for more information about the glob patterns\n" +"used.\n" +msgstr "" + +#, python-format +msgid "%s should not have CRLF line endings" +msgstr "" + +#, python-format +msgid "%s should not have LF line endings" +msgstr "" + +msgid "the eol extension is incompatible with the win32text extension" +msgstr "" + +#, python-format +msgid "ignoring unknown EOL style '%s' from %s\n" +msgstr "" + +#, python-format +msgid "inconsistent newline style in %s\n" +msgstr "" + msgid "command to allow external programs to compare revisions" msgstr "" @@ -1474,7 +1875,7 @@ msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +"you do not need to type :hg:`extdiff -p kdiff3` always. ::" msgstr "" msgid "" @@ -1504,11 +1905,38 @@ " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" msgstr "" -msgid "" -"You can use -I/-X and list of file or directory names like normal \"hg\n" -"diff\" command. The extdiff extension makes snapshots of only needed\n" -"files, so running the external diff program will actually be pretty\n" -"fast (at least faster than having to compare the entire tree).\n" +msgid "Tool arguments can include variables that are expanded at runtime::" +msgstr "" + +msgid "" +" $parent1, $plabel1 - filename, descriptive label of first parent\n" +" $child, $clabel - filename, descriptive label of child revision\n" +" $parent2, $plabel2 - filename, descriptive label of second parent\n" +" $parent is an alias for $parent1." +msgstr "" + +msgid "" +"The extdiff extension will look in your [diff-tools] and [merge-tools]\n" +"sections for diff tool arguments, when none are specified in [extdiff]." +msgstr "" + +msgid "" +" [extdiff]\n" +" kdiff3 =" +msgstr "" +" [extdiff]\n" +" kdiff3 =" + +msgid "" +" [diff-tools]\n" +" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" +msgstr "" + +msgid "" +"You can use -I/-X and list of file or directory names like normal\n" +":hg:`diff` command. The extdiff extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" msgstr "" #, python-format @@ -1549,9 +1977,15 @@ " to its parent." msgstr "" +msgid "CMD" +msgstr "" + msgid "comparison program to run" msgstr "sammenligningsprogram der skal køres" +msgid "OPT" +msgstr "" + msgid "pass option to comparison program" msgstr "videregiv argument til sammenligningsprogram" @@ -1601,12 +2035,17 @@ msgstr "" msgid "" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" " " -msgstr "" - -msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" -msgstr "arbejdskataloget er ikke ved gren-spidsen (brug \"hg update\" for at hente gren-spidsen)" + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" +"arbejdskataloget er ikke ved gren-spidsen (brug \"hg update\" for at hente " +"gren-spidsen)" msgid "outstanding uncommitted merge" msgstr "udestående udeponeret sammenføjning" @@ -1617,19 +2056,30 @@ msgid "working directory is missing some files" msgstr "arbejdskataloget mangler nogle filer" -msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" -msgstr "flere hoveder i denne gren (brug \"hg heads .\" og \"hg merge\" for at sammenføje)" +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" +"flere hoveder i denne gren (brug \"hg heads .\" og \"hg merge\" for at " +"sammenføje)" #, python-format msgid "pulling from %s\n" msgstr "hiver fra %s\n" -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." - -#, python-format -msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" -msgstr "sammenføjer ikke med %d andre nye gren-hoveder (brug \"hg heads .\" og \"hg merge\" for at sammenføje dem)\n" +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." + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" +"sammenføjer ikke med %d andre nye gren-hoveder (brug \"hg heads .\" og \"hg " +"merge\" for at sammenføje dem)\n" #, python-format msgid "updating to %d:%s\n" @@ -1710,8 +2160,12 @@ msgid "Error while signing" msgstr "Fejl ved underskrivning" -msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" -msgstr "arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller brug --force)" +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" +"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller " +"brug --force)" msgid "unknown signature version" msgstr "ukendt underskrift-version" @@ -1725,9 +2179,15 @@ msgid "do not commit the sigfile after signing" msgstr "deponer ikke signaturfilen efter underskrivning" +msgid "ID" +msgstr "" + msgid "the key id to sign with" msgstr "nøgle ID der skal underskrives med" +msgid "TEXT" +msgstr "" + msgid "commit message" msgstr "deponeringsbesked" @@ -1784,6 +2244,9 @@ msgid "show the revision DAG" msgstr "vis revisionsgrafen" +msgid "NUM" +msgstr "" + msgid "limit number of changes displayed" msgstr "begræns antaln viste ændringer" @@ -1869,7 +2332,7 @@ msgstr "" msgid "" -"The hg view command will launch the hgk Tcl script. For this command\n" +"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::" msgstr "" @@ -1975,89 +2438,28 @@ msgid "hg debug-rev-list [OPTION]... REV..." msgstr "hg debug-rev-list [TILVALG]... REV..." -#, fuzzy msgid "syntax highlighting for hgweb (requires Pygments)" -msgstr "" -"syntaksfarvelægning til hgweb (kræver Pygments)\n" -"\n" -"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" -"http://pygments.org/\n" -"\n" -"Der er en enkelt konfigurationsmulighed::\n" -"\n" -" [web]\n" -" pygments_style = <stil>\n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" - -#, fuzzy +msgstr "syntaksfarvelægning til hgweb (kræver Pygments)" + msgid "" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/" msgstr "" -"syntaksfarvelægning til hgweb (kræver Pygments)\n" -"\n" "Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" -"http://pygments.org/\n" -"\n" -"Der er en enkelt konfigurationsmulighed::\n" -"\n" -" [web]\n" -" pygments_style = <stil>\n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" - -#, fuzzy +"http://pygments.org/" + msgid "There is a single configuration option::" -msgstr "" -"syntaksfarvelægning til hgweb (kræver Pygments)\n" -"\n" -"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" -"http://pygments.org/\n" -"\n" -"Der er en enkelt konfigurationsmulighed::\n" -"\n" -" [web]\n" -" pygments_style = <stil>\n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" - -#, fuzzy +msgstr "Der er en enkelt konfigurationsmulighed::" + msgid "" " [web]\n" " pygments_style = <style>" msgstr "" -"syntaksfarvelægning til hgweb (kræver Pygments)\n" -"\n" -"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" -"http://pygments.org/\n" -"\n" -"Der er en enkelt konfigurationsmulighed::\n" -"\n" " [web]\n" -" pygments_style = <stil>\n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" - -#, fuzzy +" pygments_style = <stil>" + msgid "The default is 'colorful'.\n" -msgstr "" -"syntaksfarvelægning til hgweb (kræver Pygments)\n" -"\n" -"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" -"http://pygments.org/\n" -"\n" -"Der er en enkelt konfigurationsmulighed::\n" -"\n" -" [web]\n" -" pygments_style = <stil>\n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" +msgstr "Standardstilen er 'colorful'.\n" msgid "accelerate status report using Linux's inotify service" msgstr "accelerer statusreporter ved brug af Linux's inotify service" @@ -2125,10 +2527,14 @@ #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" -msgstr "*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %s\n" +msgstr "" +"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %" +"s\n" msgid "*** this limit is too low to watch every directory in this repository\n" -msgstr "*** denne grænse er for lille til at overvåge alle biblioteker i dette depot\n" +msgstr "" +"*** denne grænse er for lille til at overvåge alle biblioteker i dette " +"depot\n" msgid "*** counting directories: " msgstr "*** tæller kataloger: " @@ -2206,7 +2612,9 @@ msgid "cannot start: socket is already bound" msgstr "" -msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists" +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" msgstr "" #, python-format @@ -2243,12 +2651,14 @@ msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" #, python-format @@ -2274,8 +2684,8 @@ msgstr "" msgid "" -"Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files." +"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" +"sections of hgrc files." msgstr "" msgid "Example::" @@ -2289,43 +2699,46 @@ msgstr "" msgid "" +" [keywordset]\n" +" # prefer svn- over cvs-like default keywordmaps\n" +" svn = True" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" "lose speed in huge repositories." msgstr "" msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" "available templates and filters." msgstr "" -msgid "" -"An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\"." -msgstr "" - -msgid "" -"The default template mappings (view with \"hg kwdemo -d\") can be\n" -"replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes." -msgstr "" - -msgid "" -"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +msgid "Three additional date template filters are provided::" +msgstr "" + +msgid "" +" 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)\"" +msgstr "" + +msgid "" +"The default template mappings (view with :hg:`kwdemo -d`) can be\n" +"replaced with customized keywords and templates. Again, run\n" +":hg:`kwdemo` to control the results of your config changes." +msgstr "" + +msgid "" +"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" "history." msgstr "" msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\"." -msgstr "" - -msgid "" -"Also, when committing with the record extension or using mq's qrecord,\n" -"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" -"the files in question to update keyword expansions after all changes\n" -"have been checked in." +":hg:`kwexpand`." msgstr "" msgid "" @@ -2365,7 +2778,7 @@ msgstr "" msgid "" -" See \"hg help templates\" for information on templates and filters.\n" +" See :hg:`help templates` for information on templates and filters.\n" " " msgstr "" @@ -2431,7 +2844,8 @@ " kwexpand refuses to run if given files contain local changes.\n" " " msgstr "" -" kwexpand nægter at køre hvis de angivne filer indeholder lokale ændringer.\n" +" kwexpand nægter at køre hvis de angivne filer indeholder lokale " +"ændringer.\n" " " msgid "show files configured for keyword expansion" @@ -2449,7 +2863,7 @@ msgstr "" msgid "" -" See \"hg help keyword\" on how to construct patterns both for\n" +" See :hg:`help keyword` on how to construct patterns both for\n" " inclusion and exclusion of files." msgstr "" @@ -2471,10 +2885,10 @@ msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\"." +" problems with :hg:`import` or :hg:`merge`." msgstr "" " Brug denne kommando før du ændrer/deaktiverer nøgleord eller hvis\n" -" du oplever problemer med \"hg import\" eller \"hg merge\"." +" du oplever problemer med :hg:`import` eller :hg:`merge`." msgid "" " kwshrink refuses to run if given files contain local changes.\n" @@ -2532,8 +2946,8 @@ "biblioteket. Anvendte rettelser er både rettelse-filer og Mercurial\n" "ændringer." -msgid "Common tasks (use \"hg help command\" for more details)::" -msgstr "Almindelige opgaver (brug \"hg help kommado\" for flere detaljer)::" +msgid "Common tasks (use :hg:`help command` for more details)::" +msgstr "Almindelige opgaver (brug :hg:`help kommado` for flere detaljer)::" msgid "" " create new patch qnew\n" @@ -2579,13 +2993,18 @@ "If set to 'keep', mq will obey the [diff] section configuration while\n" "preserving existing git patches upon qrefresh. If set to 'yes' or\n" "'no', mq will override the [diff] section and always generate git or\n" -"regular patches, possibly losing data in the second case.\n" +"regular patches, possibly losing data in the second case." msgstr "" "Hvis tilvalget er sat til 'keep', så vil mq adlyde [diff] sektionen\n" "samtidig med at den bevarer eksisterende git rettelser ved qrefresh.\n" "Hvis det sættes til 'yes' eller 'no', så vil mq ignorere [diff]\n" "sektionen og altid generere git eller normale rettelser, med mulighed\n" -"for tab af data i det sidste tilfælde.\n" +"for tab af data i det sidste tilfælde." + +msgid "" +"You will by default be managing a patch queue named \"patches\". You can\n" +"create other, independent patch queues with the :hg:`qqueue` command.\n" +msgstr "" #, python-format msgid "mq.git option can be auto/keep/yes/no got %s" @@ -2775,6 +3194,10 @@ msgid "patch series already fully applied\n" msgstr "serien af rettelser er allerede anvendt fuldt ud\n" +#, python-format +msgid "patch '%s' not found" +msgstr "gren '%s' blev ikke fundet" + msgid "cleaning up working directory..." msgstr "rydder op i arbejdskataloget..." @@ -2820,7 +3243,9 @@ msgid "cannot refresh a revision with children" msgstr "kan ikke genopfriske en revision som har børn" -msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2918,13 +3343,14 @@ msgstr "" msgid "" -" The patches must not be applied, and at least one patch is required. With\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" " -k/--keep, the patch files are preserved in the patch directory." msgstr "" msgid "" " To stop managing a patch and move it into permanent history,\n" -" use the qfinish command." +" use the :hg:`qfinish` command." msgstr "" msgid "print the patches already applied" @@ -3016,10 +3442,10 @@ msgid "" " This command is deprecated. Without -c, it's implied by other relevant\n" -" commands. With -c, use hg init --mq instead." +" commands. With -c, use :hg:`init --mq` instead." msgstr "" " Denne kommando er forældet. Uden -c er kommandoen ikke nødvendig,\n" -" med -c bør hg init --mq bruges i stedet." +" med -c bør :hg:`init --mq` bruges i stedet." msgid "clone main and patch repository at same time" msgstr "" @@ -3039,7 +3465,7 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by init --mq.\n" +" would be created by :hg:`init --mq`.\n" " " msgstr "" @@ -3061,8 +3487,8 @@ msgid "commit changes in the queue repository (DEPRECATED)" msgstr "" -msgid " This command is deprecated; use hg commit --mq instead." -msgstr "" +msgid " This command is deprecated; use :hg:`commit --mq` instead." +msgstr " Denne kommando er forældet. Brug :hg:`init --mq` i stedet." msgid "print the entire series file" msgstr "udskriver hele series filen" @@ -3158,16 +3584,16 @@ " qrefresh)" msgid "" -" Use 'hg diff' if you only want to see the changes made since the\n" -" last qrefresh, or 'hg export qtip' if you want to see changes made\n" -" by the current patch without including changes made since the\n" +" Use :hg:`diff` if you only want to see the changes made since the\n" +" last qrefresh, or :hg:`export qtip` if you want to see changes\n" +" made by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" -" Brug 'hg diff' hvis du kun vil se ændringer lavet siden den sidste\n" -" qrefresh, eller 'hg export qtip' hvis du vil se ændringer lavet af\n" -" den nuværende patch uden at inkludere ændringer lavet siden\n" -" qrefresh.\n" +" Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\n" +" sidste qrefresh, eller :hg:`export qtip` hvis du vil se ændringer\n" +" lavet af den nuværende patch uden at inkludere ændringer lavet\n" +" siden qrefresh.\n" " " msgid "fold the named patches into the current patch" @@ -3206,7 +3632,9 @@ msgstr "Fejl ved foldning af rettelse %s" msgid "push or pop patches until named patch is at top of stack" -msgstr "tilføj eller fjern rettelser indtil den navngivne rettelser er på toppen af stakken" +msgstr "" +"tilføj eller fjern rettelser indtil den navngivne rettelser er på toppen af " +"stakken" msgid "set or print guards for a patch" msgstr "sæt eller vis filtre for en rettelse" @@ -3214,16 +3642,17 @@ msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" -" pushed only if the qselect command has activated it. A patch with\n" -" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" pushed only if the :hg:`qselect` command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " +"command\n" " has activated it." msgstr "" " Filtre kontrollerer hvorvidt en rettelse kan blive skubbet på\n" " stakken. En rettelse uden filtre kan altid skubbes. En rettelse\n" " med et positivt filter (\"+foo\") bliver kun skubbet hvis\n" -" qselect-kommandoen har aktiveret det. En rettelse med et negativt\n" -" filter (\"-foo\") bliver aldrig skubbet hvis qselect-kommandoen har\n" -" aktiveret det." +" :hg:`qselect`-kommandoen har aktiveret den. En rettelse med et\n" +" negativt filter (\"-foo\") bliver aldrig skubbet hvis\n" +" :hg:`qselect`-kommandoen har aktiveret den." msgid "" " With no arguments, print the currently active guards.\n" @@ -3337,31 +3766,53 @@ msgid "copy %s to %s\n" msgstr "kopier %s til %s\n" -msgid "strip a revision and all its descendants from the repository" -msgstr "strip en revision og alle dens efterkommere fra depotet" - -msgid "" -" 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" -" " +msgid "strip a changeset and all its descendants from the repository" +msgstr "strip en ændring og alle dens efterkommere fra depotet" + +msgid "" +" 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." +msgstr "" + +msgid "" +" 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." msgstr "" " Hvis en af arbejdskatalogets forælder-revisioner bliver strippet,\n" -" så vil arbejdskataloget blive opdateret til forældren af den\n" -" strippede revision.\n" +" så vil arbejdskataloget automatisk blive opdateret til den nyeste\n" +" tilgængelige forfader efter operation er færdig." + +msgid "" +" 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." +msgstr "" + +msgid "" +" Use the --nobackup option to discard the backup bundle once the\n" +" operation completes.\n" " " +msgstr "" msgid "set or print guarded patches to push" msgstr "sæt eller vis filtrerede rettelser der skal skubbes" msgid "" -" Use the qguard command to set or print guards on patch, then use\n" +" Use the :hg:`qguard` command to set or print guards on patch, then use\n" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" " match the current guard. For example::" msgstr "" -" Brug qguard-kommandoen til at sætte eller vise filtre for en\n" +" Brug :hg:`qguard`-kommandoen til at sætte eller vise filtre for en\n" " rettelse og brug så qselect til at fortælle mq hvilke filtre der\n" " skal bruges. En rettelse vil blive skubbet på stakken hvis den\n" " ikke har er nogen filtre tilknyttet eller hvis et positivt filter\n" @@ -3431,11 +3882,14 @@ #, python-format msgid "number of unguarded, unapplied patches has changed from %d to %d\n" -msgstr "antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %d til %d\n" +msgstr "" +"antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %d til " +"%d\n" #, python-format msgid "number of guarded, applied patches has changed from %d to %d\n" -msgstr "antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" +msgstr "" +"antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" msgid "guards in series file:\n" msgstr "filtre i seriefilen:\n" @@ -3481,6 +3935,58 @@ msgid "no revisions specified" msgstr "ingen revisioner specificeret" +msgid "manage multiple patch queues" +msgstr "håndter flere stakke af rettelser" + +msgid "" +" Supports switching between different patch queues, as well as creating\n" +" new patch queues and deleting existing ones." +msgstr "" + +msgid "" +" Omitting a queue name or specifying -l/--list will show you the " +"registered\n" +" queues - by default the \"normal\" patches queue is registered. The " +"currently\n" +" active queue will be marked with \"(active)\"." +msgstr "" + +msgid "" +" To create a new queue, use -c/--create. The queue is automatically made\n" +" active, except in the case where there are applied patches from the\n" +" currently active queue in the repository. Then the queue will only be\n" +" created and switching will fail." +msgstr "" + +msgid "" +" To delete an existing queue, use --delete. You cannot delete the " +"currently\n" +" active queue.\n" +" " +msgstr "" + +msgid "patches applied - cannot set new queue active" +msgstr "" + +msgid " (active)\n" +msgstr " (aktiv)\n" + +msgid "invalid queue name, may not contain the characters \":\\/.\"" +msgstr "" + +#, python-format +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" +msgstr "" + +msgid "use --create to create a new queue" +msgstr "" + msgid "cannot commit over an applied mq patch" msgstr "kan ikke deponere henover en anvendt mq rettelse" @@ -3504,6 +4010,20 @@ 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 "" + +#, python-format +msgid "%d applied" +msgstr "%d anvendte" + +#, python-format +msgid "%d unapplied" +msgstr "%d ikke-anvendte" + +msgid "mq: (empty queue)\n" +msgstr "" + msgid "operate on patch repository" msgstr "arbejd på rettelsesdepot" @@ -3525,6 +4045,9 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "brug ukomprimeret overførsel (hurtig over LAN)" +msgid "REPO" +msgstr "" + msgid "location of source patch repository" msgstr "placering af kilde rettelse-depotet" @@ -3606,17 +4129,20 @@ msgid "add \"From: <current user>\" to patch" msgstr "tilføj \"From: <aktuel bruger>\" til rettelsen" -msgid "add \"From: <given user>\" to patch" -msgstr "tilføj \"From: <given bruger>\" til rettelsen" +msgid "USER" +msgstr "" + +msgid "add \"From: <USER>\" to patch" +msgstr "tilføj \"From: <BRUGER>\" til rettelsen" msgid "add \"Date: <current date>\" to patch" msgstr "tilføj \"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 "add \"Date: <DATE>\" to patch" +msgstr "tilføj \"Date: <DATO>\" til rettelsen" + +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]" @@ -3651,8 +4177,11 @@ msgid "merge queue name (DEPRECATED)" msgstr "sammenføj med navngiven kø (FORÆLDET)" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [RETTELSE | INDEKS]" +msgid "reorder patch series and apply only the patch" +msgstr "" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [--move] [RETTELSE | INDEKS]" msgid "refresh only files already in the patch and specified files" msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer" @@ -3720,17 +4249,21 @@ 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" msgstr "ingen backupper" -msgid "hg strip [-f] [-b] [-n] REV" -msgstr "hg strip [-f] [-b] [-n] REV" +msgid "hg strip [-f] [-n] REV" +msgstr "hg strip [-f] [-n] REV" msgid "hg qtop [-s]" msgstr "hg qtop [-s]" @@ -3747,6 +4280,18 @@ msgid "hg qfinish [-a] [REV]..." msgstr "hg qfinish [-a] [REV]..." +msgid "list all available queues" +msgstr "" + +msgid "create new queue" +msgstr "opret en ny kø" + +msgid "delete reference to queue" +msgstr "" + +msgid "[OPTION] [QUEUE]" +msgstr "[TILVALG] [KØ]" + msgid "hooks for sending email notifications at commit/push time" msgstr "" @@ -3798,7 +4343,8 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this list\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" @@ -3813,9 +4359,6 @@ "handier for you." msgstr "" -msgid "::" -msgstr "" - msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" @@ -3919,8 +4462,8 @@ msgstr "" msgid "" -"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" -"specify them in the global .hgrc\n" +"To ignore global commands like :hg:`version` or :hg:`help`, you have\n" +"to specify them in the global .hgrc\n" msgstr "" msgid "interpret suffixes to refer to ancestor revisions" @@ -3977,7 +4520,7 @@ msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\"." +"- The patch itself, as generated by :hg:`export`." msgstr "" msgid "" @@ -4002,7 +4545,8 @@ " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ..." +" bcc = bcc1, bcc2, ...\n" +" reply-to = address1, address2, ..." msgstr "" msgid "" @@ -4011,13 +4555,13 @@ msgstr "" msgid "" -"Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb." +"Then you can use the :hg:`email` command to mail a series of\n" +"changesets as a patchbomb." msgstr "" msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" +"the :hg:`email` command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" @@ -4073,9 +4617,9 @@ msgstr "" msgid "" -" By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole." +" By default, diffs are sent in the format generated by\n" +" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" +" of N]\" introduction, which describes the series as a whole." msgstr "" msgid "" @@ -4085,7 +4629,7 @@ " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\"." +" :hg:`export`." msgstr "" msgid "" @@ -4124,7 +4668,8 @@ msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" msgstr "" @@ -4138,7 +4683,9 @@ msgstr "angiv mindst en ændring med -r eller -o" msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" -msgstr "--outgoing tilvalget er altid aktivt med --bundle; undlad at angive --outgoing igen" +msgstr "" +"--outgoing tilvalget er altid aktivt med --bundle; undlad at angive --" +"outgoing igen" msgid "too many destinations" msgstr "for mange destinationer" @@ -4199,6 +4746,9 @@ msgid "write messages to mbox file instead of sending them" msgstr "skriv beskeder til mbox-fil i stedet for at sende dem" +msgid "email addresses replies should be sent to" +msgstr "adresser som svar skal sendes til" + msgid "subject of first message (intro or single patch)" msgstr "emne for den første besked (intro eller en enkelt rettelse)" @@ -4286,7 +4836,7 @@ msgstr "" msgid "" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Unknown files: files marked with \"?\" by :hg:`status`\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management" msgstr "" @@ -4297,7 +4847,7 @@ msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")" +" - New files added to the repository (with :hg:`add`)" msgstr "" msgid "" @@ -4367,11 +4917,18 @@ msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" " history (the source) onto another (the destination). This can be\n" -" useful for linearizing local changes relative to a master\n" +" useful for linearizing *local* changes relative to a master\n" " development tree." msgstr "" msgid "" +" You should not rebase changesets that have already been shared\n" +" with others. Doing so will force everybody else to perform the\n" +" same rebase or they will end up with duplicated changesets after\n" +" pulling in your rebased changesets." +msgstr "" + +msgid "" " If you don't specify a destination changeset (``-d/--dest``),\n" " rebase uses the tipmost head of the current named branch as the\n" " destination. (The destination changeset is not modified by\n" @@ -4411,7 +4968,11 @@ msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" -" continued with --continue/-c or aborted with --abort/-a.\n" +" continued with --continue/-c or aborted with --abort/-a." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if nothing to rebase.\n" " " msgstr "" @@ -4472,7 +5033,7 @@ msgid "no rebase in progress" msgstr "" -msgid "warning: new changesets detected on target branch, not stripping\n" +msgid "warning: new changesets detected on target branch, can't abort\n" msgstr "" msgid "rebase aborted\n" @@ -4493,7 +5054,9 @@ msgid "rebase from the specified changeset" msgstr "" -msgid "rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)" +msgid "" +"rebase from the base of the specified changeset (up to greatest common " +"ancestor of base and dest)" msgstr "" msgid "rebase onto the specified changeset" @@ -4564,9 +5127,6 @@ msgid "&?" msgstr "&?" -msgid "y - record this change" -msgstr "j - optag denne ændring" - msgid "user quit" msgstr "brugeren afbrød" @@ -4589,14 +5149,14 @@ msgstr "vælg ændringer interaktivt til deponering" msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be candidates for recording." msgstr "" " Hvis en liste af filer er udeladt, så vil alle ændringer\n" -" 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." +" 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." msgid "" " You will be prompted for whether to record changes to each\n" @@ -4634,12 +5194,18 @@ msgid " ? - display help" msgstr " ? - vis hjælp" +msgid " This command is not available when committing a merge." +msgstr "" + msgid "'mq' extension not loaded" msgstr "'mq' udvidelsen er ikke indlæst" msgid "running non-interactively, use commit instead" msgstr "kører ikke interaktivt, brug commit i stedet" +msgid "cannot partially commit a merge (use hg commit instead)" +msgstr "kan ikke deponere en sammenføjning partielt (brug i stedet hg commit)" + msgid "no changes to record\n" msgstr "ingen ændringer at optage\n" @@ -4701,6 +5267,16 @@ msgstr "kæder %s og %s sammen igen\n" #, python-format +msgid "tip has %d files, estimated total number of files: %s\n" +msgstr "" + +msgid "collecting" +msgstr "opsamler" + +msgid "files" +msgstr "filer" + +#, python-format msgid "collected %d candidate storage files\n" msgstr "opsamlede %d kandidatfiler\n" @@ -4711,13 +5287,16 @@ msgid "not linkable: %s\n" msgstr "kan ikke sammenkædes: %s\n" +msgid " files" +msgstr " filer" + +msgid "pruning" +msgstr "beskærer" + #, python-format msgid "pruned down to %d probably relinkable files\n" msgstr "beskåret til %d filer der potentielt kan sammenkædes\n" -msgid " files" -msgstr " filer" - msgid "relinking" msgstr "sammenkæder" @@ -4914,7 +5493,7 @@ msgstr "" msgid "" -" hg transplant --branch REVISION --all will rebase the selected\n" +" :hg:`transplant --branch REVISION --all` will rebase the selected\n" " branch (up to the named revision) onto your current working\n" " directory." msgstr "" @@ -4927,14 +5506,14 @@ msgstr "" msgid "" -" If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser." +" If no merges or revisions are provided, :hg:`transplant` will\n" +" start an interactive changeset browser." msgstr "" msgid "" " If a changeset application fails, you can fix the merge by hand\n" -" and then resume where you left off by calling hg transplant\n" -" --continue/-c.\n" +" and then resume where you left off by calling :hg:`transplant\n" +" --continue/-c`.\n" " " msgstr "" @@ -4959,9 +5538,12 @@ msgid "outstanding local changes" msgstr "udestående lokale ændringer" -msgid "pull patches from REPOSITORY" +msgid "pull patches from REPO" msgstr "hiv rettelser fra DEPOT" +msgid "BRANCH" +msgstr "GREN" + msgid "pull patches from branch BRANCH" msgstr "hiv rettelser fra gren GREN" @@ -4980,10 +5562,10 @@ msgid "continue last transplant session after repair" msgstr "fortsæt sidste transplantation efter reparation" -msgid "filter changesets through FILTER" -msgstr "filtrer ændringer igennem FILTER" - -msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "filter changesets through command" +msgstr "filtrer ændringer igennem kommando" + +msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "hg transplant [-s DEPOT] [-b GREN [-a]] [-p REV] [-m REV] [REV]..." msgid "allow the use of MBCS paths with problematic encodings" @@ -5046,6 +5628,18 @@ msgid "perform automatic newline conversion" msgstr "" +msgid "" +" Deprecation: The win32text extension requires each user to configure\n" +" the extension again and again for each clone since the configuration\n" +" is not copied when cloning." +msgstr "" + +msgid "" +" We have therefore made the ``eol`` as an alternative. The ``eol``\n" +" uses a version controlled file for its configuration and each clone\n" +" will therefore use the right settings from the start." +msgstr "" + msgid "To perform automatic newline conversion, use::" msgstr "" @@ -5063,7 +5657,8 @@ " # or ** = macdecode:" msgstr "" -msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgid "" +"If not doing conversion, to make sure you do not commit CRLF/CR by accident::" msgstr "" msgid "" @@ -5093,7 +5688,8 @@ #, python-format msgid "Attempt to commit or push text file(s) using %s line endings\n" -msgstr "Forsøg på at deponere eller skubbe tekstfiler som bruge %s linieskift\n" +msgstr "" +"Forsøg på at deponere eller skubbe tekstfiler som bruge %s linieskift\n" #, python-format msgid "in %s: %s\n" @@ -5145,7 +5741,8 @@ " $ hg serve" msgstr "" -msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgid "" +"You can discover zeroconf enabled repositories by running \"hg paths\"::" msgstr "" msgid "" @@ -5223,9 +5820,6 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" -msgid "searching" -msgstr "søger" - #, python-format msgid "adding %s\n" msgstr "tilføjer %s\n" @@ -5255,6 +5849,14 @@ msgstr "%s: overskriver ikke - filen eksisterer\n" #, python-format +msgid "%s: not recording move - %s does not exist\n" +msgstr "" + +#, python-format +msgid "%s: not recording copy - %s does not exist\n" +msgstr "" + +#, python-format msgid "%s: deleted in working copy\n" msgstr "%s: slettet i arbejdskopien\n" @@ -5272,7 +5874,9 @@ #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" -msgstr "%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %s.\n" +msgstr "" +"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %" +"s.\n" msgid "no source or destination specified" msgstr "ingen kilde eller destination angivet" @@ -5281,7 +5885,8 @@ msgstr "ingen destination angivet" msgid "with multiple sources, destination must be an existing directory" -msgstr "destinationen skal være en eksisterende mappe når der angivet flere kilder" +msgstr "" +"destinationen skal være en eksisterende mappe når der angivet flere kilder" #, python-format msgid "destination %s is not a directory" @@ -5357,10 +5962,6 @@ msgstr "" #, python-format -msgid "%s: %s" -msgstr "%s: %s" - -#, python-format msgid "Found revision %s from %s\n" msgstr "Fandt revision %s fra %s\n" @@ -5375,7 +5976,8 @@ msgstr "kan kun følge kopier/omdøbninger for eksplicitte filnavne" msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." +msgstr "" +"HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." msgid "HG: Leave message empty to abort commit." msgstr "HG: Efterlad beskeden tom for at afbryde deponeringen." @@ -5423,10 +6025,10 @@ msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget." +" undo an add before that, see :hg:`forget`." msgstr "" " Filerne vil bliver tilføjet til depotet ved næste deponering. For\n" -" at omgøre en tilføjelse før det, se hg forget." +" at omgøre en tilføjelse før det, se :hg:`forget`." msgid " If no names are given, add all files to the repository." msgstr "" @@ -5438,10 +6040,10 @@ msgid "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::" +" automatically by :hg:`add`::" msgstr "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::" +" automatically by :hg:`add`::" msgid "" " $ ls\n" @@ -5487,16 +6089,19 @@ " every added file and records those similar enough as renames. This\n" " option takes a percentage between 0 (disabled) and 100 (files must\n" " be identical) as its parameter. Detecting renamed files this way\n" -" can be expensive.\n" -" " +" can be expensive." msgstr "" " Brug -s/--similarity tilvalget for at opdage omdøbte filer. Med en\n" " parameter større end 0 bliver hver fjernet fil sammenlignet med\n" " enhver tilføjet fil og filer der er tilstrækkelig ens bliver\n" " opført som omdøbte. Dette tilvalg tager et procenttal mellem 0\n" " (slået fra) og 100 (filer skal være identiske) som parameter. At\n" -" opdage omdøbninger på denne måde kan være dyrt.\n" +" opdage omdøbninger på denne måde kan være dyrt." + +msgid "" +" Returns 0 if all files are successfully added.\n" " " +msgstr "" msgid "similarity must be a number" msgstr "lighedsgrad skal være et tal" @@ -5525,14 +6130,17 @@ " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" -" nor desirable.\n" -" " +" nor desirable." msgstr "" " Uden -a/--text tilvalget vil annotate undgå at behandle filer som\n" " den detekterer som binære. Med -a vil annotate generere en\n" " annotering alligevel, selvom resultatet sandsynligvis vil være\n" -" hverken brugbart eller ønskværdigt.\n" +" hverken brugbart eller ønskværdigt." + +msgid "" +" Returns 0 on success.\n" " " +msgstr "" msgid "at least one filename or pattern is required" msgstr "kræver mindst et filnavn eller mønster" @@ -5571,15 +6179,14 @@ msgid "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details." +" using a format string; see :hg:`help export` for details." msgstr "" msgid "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " +" removed." msgstr "" msgid "no working directory: please specify a revision" @@ -5683,8 +6290,7 @@ " Its exit status will be used to mark revisions as good or bad:\n" " status 0 means good, 125 means to skip the revision, 127\n" " (command not found) will abort the bisection, and any other\n" -" non-zero exit status means the revision is bad.\n" -" " +" non-zero exit status means the revision is bad." msgstr "" msgid "The first good revision is:\n" @@ -5694,10 +6300,14 @@ msgstr "Den første dårlige revision er:\n" 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 hvilken som helst af:\n" +msgstr "" +"På grund af oversprungne revisioner kan den første gode revision være en " +"hvilken som helst af:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "På grund af oversprungne revisioner kan den første dårlige revision være en hvilken som helst af:\n" +msgstr "" +"På grund af oversprungne revisioner kan den første dårlige revision være en " +"hvilken som helst af:\n" msgid "cannot bisect (no known good revisions)" msgstr "kan ikke halvere (kender ingen gode revisioner)" @@ -5758,21 +6368,22 @@ " gren dets forældre-ændring og derved negere end tidligere ændring." msgid "" -" Use the command 'hg update' to switch to an existing branch. Use\n" -" 'hg commit --close-branch' to mark this branch as closed.\n" -" " +" Use the command :hg:`update` to switch to an existing branch. Use\n" +" :hg:`commit --close-branch` to mark this branch as closed." msgstr "" " Brug kommandoen 'hg update' for at skifte til en eksisterende\n" " gren. Brug 'hg commit --close-branch' for at markere denne gren\n" -" som lukket.\n" -" " +" som lukket." #, python-format msgid "reset working directory to branch %s\n" msgstr "nulstil arbejdskataloget til gren %s\n" -msgid "a branch of the same name already exists (use 'hg update' to switch to it)" -msgstr "en gren af samme navn eksisterer allerede (brug 'hg update' for at skifte til den)" +msgid "" +"a branch of the same name already exists (use 'hg update' to switch to it)" +msgstr "" +"en gren af samme navn eksisterer allerede (brug 'hg update' for at skifte " +"til den)" #, python-format msgid "marked working directory as branch %s\n" @@ -5784,11 +6395,11 @@ msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch)." +" been marked closed (see :hg:`commit --close-branch`)." msgstr "" " Viser depotets navngivne grene og indikerer hvilke der er\n" " inaktive. Hvis -c/--closed er angivet, så vises lukkede grene også\n" -" (se hg commit --close-branch)." +" (se :hg:`commit --close-branch`)." msgid "" " If -a/--active is specified, only show active branches. A branch\n" @@ -5797,13 +6408,15 @@ " Hvis -a/--active er angivet, da vises kun aktive grene. En gren er\n" " anses for at være aktiv hvis den indeholder depothoveder." -msgid "" -" Use the command 'hg update' to switch to an existing branch.\n" +msgid " Use the command :hg:`update` to switch to an existing branch." +msgstr "" +" Brug kommandoen :hg:`update` for at skifte til en eksisterende\n" +" gren." + +msgid "" +" Returns 0.\n" " " msgstr "" -" Brug kommandoen 'hg update' for at skifte til en eksisterende\n" -" gren.\n" -" " msgid " (closed)" msgstr " (lukket)" @@ -5841,7 +6454,11 @@ msgid "" " Applying bundles preserves all changeset contents including\n" -" permissions, copy/rename information, and revision history.\n" +" permissions, copy/rename information, and revision history." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if no changes found.\n" " " msgstr "" @@ -5876,14 +6493,12 @@ msgid "" " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" -" :``%p``: root-relative path name of file being printed\n" -" " +" :``%p``: root-relative path name of file being printed" msgstr "" " :``%s``: grundnavn for filen som udskrives\n" " :``%d``: katalognavn for filen som blvier udskrevet\n" " eller '.' hvis filen er i katalogets rod\n" -" :``%p``: rod-relativ sti for filen som bliver udkrevet\n" -" " +" :``%p``: rod-relativ sti for filen som bliver udskrevet" msgid "make a copy of an existing repository" msgstr "lav en kopi af et eksisterende depot" @@ -5905,17 +6520,17 @@ " Placeringen af kilden tilføjes til det nye depots .hg/hgrc fil som\n" " den nye standard for fremtidige kald til 'hg pull'." -msgid " See 'hg help urls' for valid source format details." -msgstr " Se 'hg help urls' for detaljer om gyldige formatter for kilden." +msgid " See :hg:`help urls` for valid source format details." +msgstr " Se :hg:`help urls` for detaljer om gyldige formatter for kilden." msgid "" " It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ``ssh://`` URLs." +" Please see :hg:`help urls` for important details about ``ssh://`` URLs." msgstr "" " Det er muligt at specificere en ``ssh://`` URL som destination,\n" " men der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" -" arbejdskatalog på den anden side. Se venligst 'hg help urls' for\n" +" arbejdskatalog på den anden side. Se venligst :hg:`help urls` for\n" " vigtige detaljer om ``ssh://`` URLer." msgid "" @@ -6002,8 +6617,7 @@ " e) the tipmost head specified with -b\n" " f) the tipmost head specified with the url#branch source syntax\n" " g) the tipmost head of the default branch\n" -" h) tip\n" -" " +" h) tip" msgstr "" " a) null, hvis -U tilvalget er brugt eller hvis kildedepotet ikke\n" " indeholder nogen ændringer\n" @@ -6016,8 +6630,7 @@ " f) hovedet med størst revisionsnummer angivet med url#gren\n" " syntaksen\n" " g) hovedet med størst revisionsnummer på default grenen\n" -" h) revisionen med størst revisionsnummer\n" -" " +" h) revisionen med størst revisionsnummer" msgid "cannot specify both --noupdate and --updaterev" msgstr "man kan ikke angive både --noupdate og --updaterev" @@ -6027,19 +6640,19 @@ msgid "" " Commit changes to the given files into the repository. Unlike a\n" -" centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes." +" centralized RCS, this operation is a local operation. See\n" +" :hg:`push` for a way to actively distribute your changes." msgstr "" " Deponerer ændringer i de angivne filer ind i depotet. Dette er en\n" -" lokal operation, i modsætning til et centraliseret RCS. Se hg push\n" -" for en måde til aktivt distribuere dine ændringer." - -msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" lokal operation, i modsætning til et centraliseret RCS. Se\n" +" :hg:`push` for en måde til aktivt distribuere dine ændringer." + +msgid "" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be committed." msgstr "" " Hvis en liste af filer udelades vil alle ændringer rapporteret af\n" -" \"hg status\" blive deponeret." +" :hg:`status` blive deponeret." msgid "" " If you are committing the result of a merge, do not provide any\n" @@ -6055,6 +6668,14 @@ " Hvis der ikke angives en deponeringsbesked, så starten den\n" " konfigurerede editor for at bede dig om en besked." +msgid "" +" Returns 0 on success, 1 if nothing changed.\n" +" " +msgstr "" + +msgid "can only close branch heads" +msgstr "kan kun lukke grenhoveder" + msgid "nothing changed\n" msgstr "ingen ændringer\n" @@ -6062,6 +6683,10 @@ msgstr "lavede et nyt hoved\n" #, python-format +msgid "reopening closed branch head %d\n" +msgstr "genåbner lukket grenhovede %d\n" + +#, python-format msgid "committed changeset %d:%s\n" msgstr "deponerede ændring %d:%s\n" @@ -6082,9 +6707,17 @@ msgid "" " This command takes effect with the next commit. To undo a copy\n" -" before that, see hg revert.\n" +" before that, see :hg:`revert`." +msgstr "" +" 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 "" +" Returns 0 on success, 1 if errors are encountered.\n" " " msgstr "" +" Returnerer 0 ved succes, 1 hvis opstod fejl.\n" +" " msgid "find the ancestor revision of two revisions in a given index" msgstr "find forfader-revisionen til to revisioner i det angivne indeks" @@ -6092,9 +6725,73 @@ msgid "either two or three arguments required" msgstr "kræver enten to eller tre argumenter" +msgid "builds a repo with a given dag from scratch in the current empty repo" +msgstr "" + +msgid " Elements:" +msgstr "" + +msgid "" +" - \"+n\" is a linear run of n nodes based on the current default " +"parent\n" +" - \".\" is a single node based on the current default parent\n" +" - \"$\" resets the default parent to null (implied at the start);\n" +" otherwise the default parent is always the last node created\n" +" - \"<p\" sets the default parent to the backref p\n" +" - \"*p\" is a fork at parent p, which is a backref\n" +" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" +" - \"/p2\" is a merge of the preceding node and p2\n" +" - \":tag\" defines a local tag for the preceding node\n" +" - \"@branch\" sets the named branch for subsequent nodes\n" +" - \"!command\" runs the command using your shell\n" +" - \"!!my command\\n\" is like \"!\", but to the end of the line\n" +" - \"#...\\n\" is a comment up to the end of the line" +msgstr "" + +msgid " Whitespace between the above elements is ignored." +msgstr "" + +msgid " A backref is either" +msgstr "" + +msgid "" +" - a number n, which references the node curr-n, where curr is the " +"current\n" +" node, or\n" +" - the name of a local tag you placed earlier using \":tag\", or\n" +" - empty to denote the default parent." +msgstr "" + +msgid "" +" All string valued-elements are either strictly alphanumeric, or must\n" +" be enclosed in double quotes (\"...\"), with \"\" as escape character." +msgstr "" + +msgid "" +" Note that the --overwritten-file and --appended-file options imply the\n" +" use of \"HGMERGE=internal:local\" during DAG buildup.\n" +" " +msgstr "" + +msgid "need at least one of -m, -a, -o, -n" +msgstr "" + +msgid "repository is not empty" +msgstr "depotet er ikke tomt" + +#, python-format +msgid "%s command %s" +msgstr "%s kommando %s" + +msgid "list all available commands and options" +msgstr "list alle tilgængelige kommandoer og tilvalg" + msgid "returns the completion list associated with the given command" msgstr "" +msgid "show information detected about current filesystem" +msgstr "" + msgid "rebuild the dirstate as it would look like for the given revision" msgstr "genopbygger dirstate som den ville se ud for den angivne revision" @@ -6118,7 +6815,8 @@ msgstr "" msgid ".hg/dirstate inconsistent with current parent's manifest" -msgstr ".hg/dirstate er inkonsistent i forhold til den nuværende forælders manifest" +msgstr "" +".hg/dirstate er inkonsistent i forhold til den nuværende forælders manifest" msgid "show combined config settings from all hgrc files" msgstr "" @@ -6138,20 +6836,37 @@ msgid "" " With --debug, the source (filename and line number) is printed\n" -" for each config item.\n" -" " +" for each config item." +msgstr "" + +#, python-format +msgid "read config from: %s\n" msgstr "" msgid "only one config item permitted" msgstr "" +msgid "access the pushkey key/value protocol" +msgstr "" + +msgid " With two args, list the keys in the given namespace." +msgstr "" + +msgid "" +" With five args, set a key to new if it currently is set to old.\n" +" Reports success or failure.\n" +" " +msgstr "" + +msgid "parse and apply a revision specification" +msgstr "" + msgid "manually set the parents of the current working directory" msgstr "" msgid "" " This is useful for writing repository conversion tools, but should\n" -" be used with care.\n" -" " +" be used with care." msgstr "" msgid "show the contents of the current dirstate" @@ -6161,6 +6876,22 @@ msgid "copy: %s -> %s\n" msgstr "kopi: %s -> %s\n" +msgid "format the changelog or an index DAG as a concise textual description" +msgstr "" + +msgid "" +" If you pass a revlog index, the revlog's DAG is emitted. If you list\n" +" revision numbers, they get labelled in the output as rN." +msgstr "" + +msgid "" +" Otherwise, the changelog DAG of the current repo is emitted.\n" +" " +msgstr "" + +msgid "need repo for changelog dag" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "" @@ -6214,10 +6945,14 @@ msgid " patch test failed!\n" msgstr "" -msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" -msgstr "" - -msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -6297,12 +7032,10 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. For more information, read 'hg help diffs'.\n" -" " +" format. For more information, read :hg:`help diffs`." msgstr "" " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" -" git diff-format. For mere information, læs hg help diffs.\n" -" " +" git diff-format. For mere information, læs :hg:`help diffs`." msgid "dump the header and diffs for one or more changesets" msgstr "dump hovedet og ændringerne for en eller flere ændringer" @@ -6367,20 +7100,18 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information." +" format. See :hg:`help diffs` for more information." msgstr "" " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" -" git diff-format. Se 'hg help diffs' for mere information." +" git diff-format. Se :hg:`help diffs` for mere information." msgid "" " With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " +" second parent. It can be useful to review a merge." msgstr "" " Med --switch-parent tilvalget vil ændringerne blive beregnet i\n" " forhold til den anden forælder. Dette kan være nyttigt til at\n" -" gennemse en sammenføjning.\n" -" " +" gennemse en sammenføjning." msgid "export requires at least one changeset" msgstr "" @@ -6410,12 +7141,8 @@ " projektets historie, og det sletter dem heller ikke fra\n" " arbejdskataloget." -msgid "" -" To undo a forget before the next commit, see hg add.\n" -" " -msgstr "" -" For at omgøre forget før næste deponering, se hg add.\n" -" " +msgid " To undo a forget before the next commit, see :hg:`add`." +msgstr " For at omgøre forget før næste deponering, se :hg:`add`." msgid "no files specified" msgstr "ingen filer angivet" @@ -6442,7 +7169,11 @@ " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" -" use the --all flag.\n" +" use the --all flag." +msgstr "" + +msgid "" +" Returns 0 if a match is found, 1 otherwise.\n" " " msgstr "" @@ -6470,8 +7201,11 @@ msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch)." -msgstr "" +" (see :hg:`commit --close-branch`)." +msgstr "" +" Viser depotets navngivne grene og indikerer hvilke der er\n" +" inaktive. Hvis -c/--closed er angivet, så vises lukkede grene også\n" +" (se :hg:`commit --close-branch`)." msgid "" " If STARTREV is specified, only those heads that are descendants of\n" @@ -6479,8 +7213,13 @@ msgstr "" msgid "" -" If -t/--topo is specified, named branch mechanics will be ignored and only\n" -" changesets without children will be shown.\n" +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" +" changesets without children will be shown." +msgstr "" + +msgid "" +" Returns 0 if matching heads are found, 1 if not.\n" " " msgstr "" @@ -6495,7 +7234,8 @@ msgid "show help for a given topic or a help overview" msgstr "" -msgid " With no arguments, print a list of commands with short help messages." +msgid "" +" With no arguments, print a list of commands with short help messages." msgstr "" msgid "" @@ -6503,6 +7243,11 @@ " topic." msgstr "" +msgid "" +" Returns 0 if successful.\n" +" " +msgstr "" + msgid "global options:" msgstr "globale indstillinger:" @@ -6510,7 +7255,9 @@ msgstr "brug \"hg help\" for den fulde liste af kommandoer" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "brug \"hg help\" for den fulde liste af kommandoer eller \"hg -v\" for detaljer" +msgstr "" +"brug \"hg help\" for den fulde liste af kommandoer eller \"hg -v\" for " +"detaljer" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -6579,11 +7326,19 @@ msgid "enabled extensions:" msgstr "aktiverede udvidelser:" +msgid "VALUE" +msgstr "" + msgid "DEPRECATED" msgstr "" msgid "" "\n" +"[+] marked option can be specified multiple times" +msgstr "" + +msgid "" +"\n" "additional help topics:" msgstr "" "\n" @@ -6606,8 +7361,7 @@ " This summary identifies the repository state using one or two\n" " parent hash identifiers, followed by a \"+\" if there are\n" " uncommitted changes in the working directory, a list of tags for\n" -" this revision and a branch name for non-default branches.\n" -" " +" this revision and a branch name for non-default branches." msgstr "" msgid "import an ordered set of patches" @@ -6633,7 +7387,7 @@ msgstr "" msgid "" -" If the imported patch was generated by hg export, user and\n" +" If the imported patch was generated by :hg:`export`, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" " override these." @@ -6655,8 +7409,7 @@ msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" msgid "to working directory" @@ -6692,8 +7445,11 @@ " changesets twice if the incoming is followed by a pull." msgstr "" -msgid "" -" See pull for valid source format details.\n" +msgid " See pull for valid source format details." +msgstr "" + +msgid "" +" Returns 0 if there are incoming changes, 1 otherwise.\n" " " msgstr "" @@ -6714,12 +7470,10 @@ msgid "" " It is possible to specify an ``ssh://`` URL as the destination.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Det er muligt at angive en ``ssh://`` URL som destination.\n" -" Se 'hg help urls' for mere information.\n" -" " +" Se :hg:`help urls` for mere information." msgid "locate files matching specific patterns" msgstr "" @@ -6744,8 +7498,7 @@ " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" -" contain whitespace as multiple filenames.\n" -" " +" contain whitespace as multiple filenames." msgstr "" msgid "show revision history of entire repository or files" @@ -6774,11 +7527,14 @@ msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision." +" used as the starting revision. You can specify a revision set for\n" +" log, see :hg:`help revsets` for more information." msgstr "" " Hvis der ikke angives et revisionsinterval, da bruges tip:0 som\n" " standard, med mindre --follow er brugt, i hvilket tilfælde\n" -" arbejdskatalogets forælder bruges som startrevision." +" arbejdskatalogets forælder bruges som startrevision. Du kan\n" +" specificere en mængde af ændringer til log, se :hg:`help revsets`\n" +" for mere information." msgid "" " By default this command prints revision number and changeset id,\n" @@ -6795,14 +7551,12 @@ " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" -" will appear in files:.\n" -" " +" will appear in files:." msgstr "" " BEMÆRK: log -p/--patch kan generere uventet diff output for\n" " sammenføjningsændringer idet den kun sammenligner ændringen med\n" " dennes første forælder. Ydermere vises kun filer som er\n" -" forskellige fra BEGGE forældre i files:.\n" -" " +" forskellige fra BEGGE forældre i files:." msgid "output the current or given revision of the project manifest" msgstr "" @@ -6815,8 +7569,7 @@ msgid "" " With -v, print file permissions, symlink and executable bits.\n" -" With --debug, print file revision hashes.\n" -" " +" With --debug, print file revision hashes." msgstr "" msgid "merge working directory with another revision" @@ -6844,28 +7597,33 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" -" " +" explicit revision with which to merge with must be provided." msgstr "" " Hvis ingen revision angives og arbejdskatalogets forælder er en\n" " hovedrevision og den nuværende gren indeholder præcis et andet\n" " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" -" skal en eksplicit revision angives.\n" +" skal en eksplicit revision angives." + +msgid "" +" Returns 0 on success, 1 if there are unresolved files.\n" " " - -#, python-format -msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision\n" - -msgid "(run 'hg heads .' to see heads)\n" -msgstr "(kør 'hg heads .' for at se hoveder)\n" - -#, python-format -msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" -msgstr "afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit revision\n" - -msgid "(run 'hg heads' to see all heads)\n" -msgstr "(kør 'hg heads' for at se alle hoveder)\n" +msgstr "" + +#, python-format +msgid "" +"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" +"(kør 'hg heads .' for se hovederne)" + +#, python-format +msgid "" +"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" +"(kør 'hg heads' for at se alle hoveder)" msgid "there is nothing to merge" msgstr "der er ikke noget at sammenføje" @@ -6874,8 +7632,12 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - brug \"hg update\" istedet" -msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" -msgstr "arbejdskataloget er ikke ved en hovedrevision - brug \"hg update\" eller sammenføj med en eksplicit revision" +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" +"arbejdskataloget er ikke ved en hovedrevision - brug \"hg update\" eller " +"sammenføj med en eksplicit revision" msgid "show changesets not found in the destination" msgstr "" @@ -6886,8 +7648,11 @@ " be pushed if a push was requested." msgstr "" -msgid "" -" See pull for details of valid destination formats.\n" +msgid " See pull for details of valid destination formats." +msgstr "" + +msgid "" +" Returns 0 if there are outgoing changes, 1 otherwise.\n" " " msgstr "" @@ -6899,15 +7664,13 @@ " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" " last changed (before the working directory revision or the\n" -" argument to --rev if given) is printed.\n" -" " +" argument to --rev if given) is printed." msgstr "" " Udskriv arbejdskatalogets forældrerevisioner. Hvis en revision\n" " angivet med -r/--rev, så udskrives forældren til denne revision.\n" " Hvis en fil er angivet, udskrives revisionen i hvilken filen sidst\n" " blev ændret (før arbejdskatalogets revision eller argumentet til\n" -" --rev, hvis givet).\n" -" " +" --rev, hvis givet)." msgid "can only specify an explicit filename" msgstr "" @@ -6925,14 +7688,30 @@ msgstr "" 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." -msgstr "" - -msgid "" -" See 'hg help urls' for more information.\n" +" Path names are defined in the [paths] section of\n" +" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" repository, ``.hg/hgrc`` is used, too." +msgstr "" + +msgid "" +" 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.\n" +" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" +" :hg:`bundle`) operations." +msgstr "" + +msgid "" +" See :hg:`help urls` for more information.\n" " " msgstr "" +" Se :hg:`help urls` for mere information.\n" +" " msgid "not found!\n" msgstr "ikke fundet!\n" @@ -6964,69 +7743,79 @@ " ikke." msgid "" -" Use hg incoming if you want to see what would have been added by a\n" -" pull at the time you issued this command. If you then decide to\n" -" added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming." -msgstr "" -" Brug hg incoming for at se hvad der ville være blevet tilføjet på\n" -" det tidspunkt du udførte kommandoen. Hvis du derefter beslutter at\n" -" tilføje disse ændringer til depotet, så bør du bruge pull -r X\n" -" hvor X er den sidste ændring nævnt af hg incoming." +" Use :hg:`incoming` if you want to see what would have been added\n" +" by a pull at the time you issued this command. If you then decide\n" +" to add those changes to the repository, you should use :hg:`pull\n" +" -r X` where ``X`` is the last changeset listed by :hg:`incoming`." +msgstr "" +" Brug :hg:`incoming` for at se hvad der ville være blevet tilføjet\n" +" på det tidspunkt du udførte kommandoen. Hvis du derefter beslutter\n" +" at tilføje disse ændringer til depotet, så bør du bruge pull -r X\n" +" hvor X er den sidste ændring nævnt af :hg:`incoming`." msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Hvis KILDE udelades, så bruges 'default' stien.\n" -" Se 'hg help urls' for mere information.\n" +" Se :hg:`help urls` for mere information." + +msgid "" +" Returns 0 on success, 1 if an update had unresolved files.\n" " " +msgstr "" msgid "push changes to the specified destination" msgstr "skub ændringer til den angivne destination" -msgid " Push changes from the local repository to the specified destination." +msgid "" +" Push changesets from the local repository to the specified\n" +" destination." msgstr "" " Skubber ændringer fra det lokale depot til den angivne\n" " destination." msgid "" -" This is the symmetrical operation for pull. It moves changes from\n" -" the current repository to a different one. If the destination is\n" -" local this is identical to a pull in that directory from the\n" -" current one." -msgstr "" -" Dette er den symmetriske operation for pull. Den flytter ændringer\n" -" fra det nuværende depot til et andet. Hvis destinationen er lokal,\n" -" så er dette identisk til et pull i destinationen af det nuværende\n" -" depot." - -msgid "" -" By default, push will refuse to run if it detects the result would\n" -" increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing." -msgstr "" -" Som standard vil push nægte af køre hvis den detekterer at den vil\n" -" øge antallet af hoveder i destinationen. Dette indikerer normalt\n" -" at brugeren har glemt at hente og sammenføje ændringerne før\n" -" skubningen." - -msgid "" -" If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository." -msgstr "" -" Hvis -r/--rev bruges, så vil den navngivne revision og alle dets\n" +" This operation is symmetrical to pull: it is identical to a pull\n" +" in the destination repository from the current one." +msgstr "" + +msgid "" +" By default, push will not allow creation of new heads at the\n" +" destination, since multiple heads would make it unclear which head\n" +" to use. In this situation, it is recommended to pull and merge\n" +" before pushing." +msgstr "" + +msgid "" +" Use --new-branch if you want to allow push to create a new named\n" +" branch that is not present at the destination. This allows you to\n" +" only create a new branch without forcing other changes." +msgstr "" + +msgid "" +" Use -f/--force to override the default behavior and push all\n" +" changesets on all branches." +msgstr "" + +msgid "" +" If -r/--rev is used, the specified revision and all its ancestors\n" +" will be pushed to the remote repository." +msgstr "" +" Hvis -r/--rev bruges, så vil den navngivne revision og alle dens\n" " forfædre bliver skubbet til det andet depot." msgid "" -" Please see 'hg help urls' for important details about ``ssh://``\n" -" URLs. If DESTINATION is omitted, a default path will be used.\n" +" Please see :hg:`help urls` for important details about ``ssh://``\n" +" URLs. If DESTINATION is omitted, a default path will be used." +msgstr "" +" Se venligst :hg:`help urls` for vigtige detaljer om ``ssh://``\n" +" URL'er. Hvis DESTINATION udelades vil en standard sti blive brugt." + +msgid "" +" Returns 0 if push was successful, 1 if nothing to push.\n" " " msgstr "" -" Se venligst 'hg help urls' for vigtige detaljer om ``ssh://``\n" -" URL'er. Hvis DESTINATION udelades vil en standard sti blive brugt.\n" -" " #, python-format msgid "pushing to %s\n" @@ -7041,7 +7830,11 @@ msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" -" suggests it.\n" +" suggests it." +msgstr "" + +msgid "" +" Returns 0 if successful, 1 if nothing to recover or verify fails.\n" " " msgstr "" @@ -7068,14 +7861,14 @@ " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" -" reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::" +" reported by :hg:`status`). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk)::" msgstr "" " Den følgende tabel viser opførslen af remove for forskellige\n" " filtilstande (søjler) og kombinationer af tilvalg (rækker). Mulige\n" " filtilstande er tilføjet [A], ren [C], ændret [M] og manglende [!]\n" -" (som rapporteret af hg status). Handlingerne er Warn, Remove (fra\n" -" gren) og Delete (fra disk)::" +" (som rapporteret af :hg:`status`). Handlingerne er Warn, Remove\n" +" (fra gren) og Delete (fra disk)::" msgid "" " A C M !\n" @@ -7092,13 +7885,17 @@ msgid "" " This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " +" To undo a remove before that, see :hg:`revert`." msgstr "" " 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.\n" +" deponering. For at omgøre en fjernelse før det, se :hg:`revert`.\n" " " +msgid "" +" Returns 0 on success, 1 if any warnings encountered.\n" +" " +msgstr "" + #, python-format msgid "not removing %s: file is untracked\n" msgstr "fjerner ikke %s: filen følges ikke\n" @@ -7127,9 +7924,10 @@ msgid "" " This command takes effect at the next commit. To undo a rename\n" -" before that, see hg revert.\n" -" " -msgstr "" +" before that, see :hg:`revert`." +msgstr "" +" 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 "" @@ -7162,7 +7960,11 @@ 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.\n" +" after a conflicting merge." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if any files fail a resolve attempt.\n" " " msgstr "" @@ -7173,7 +7975,9 @@ msgstr "kan ikke angive --all og mønstre" msgid "no files or directories specified; use --all to remerge all files" -msgstr "ingen filer eller mapper specificeret; brug --all for at gen-sammenføje alle filerne" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at gen-sammenføje alle " +"filerne" msgid "restore individual files or directories to an earlier state" msgstr "" @@ -7195,8 +7999,8 @@ msgid "" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" -" to \"roll back\" some or all of an earlier change. See 'hg help\n" -" dates' for a list of formats valid for -d/--date." +" to \"roll back\" some or all of an earlier change. See :hg:`help\n" +" dates` for a list of formats valid for -d/--date." msgstr "" msgid "" @@ -7219,15 +8023,16 @@ msgid "" " Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " +" To disable these backups, use --no-backup." msgstr "" msgid "you can't specify a revision and a date" msgstr "du kan ikke specificeret en revision og en dato" msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "ingen filer eller mapper specificeret; brug --all for at føre hele repo'et tilbage" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at føre hele repo'et " +"tilbage" #, python-format msgid "forgetting %s\n" @@ -7253,8 +8058,8 @@ msgid "no changes needed to %s\n" msgstr "%s behøver ingen ændringer\n" -msgid "roll back the last transaction" -msgstr "" +msgid "roll back the last transaction (dangerous)" +msgstr "ruller sidste transaktion tilbage (farligt)" msgid "" " This command should be used with care. There is only one level of\n" @@ -7285,23 +8090,37 @@ " back locally is ineffective (someone else may already have pulled\n" " the changes). Furthermore, a race is possible with readers of the\n" " repository; for example an in-progress pull from the repository\n" -" may fail if a rollback is performed.\n" +" may fail if a rollback is performed." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if no rollback data is available.\n" " " msgstr "" msgid "print the root (top) of the current working directory" msgstr "" -msgid "" -" Print the root directory of the current repository.\n" -" " -msgstr "" - -msgid "export the repository via HTTP" -msgstr "eksporter depotet via HTTP" - -msgid " Start a local HTTP repository browser and pull server." -msgstr " Start en lokal HTTP depotbrowser og pull-server." +msgid " Print the root directory of the current repository." +msgstr "" + +msgid "start stand-alone webserver" +msgstr "" + +msgid "" +" 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." +msgstr "" + +msgid "" +" 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." +msgstr "" msgid "" " By default, the server logs accesses to stdout and errors to\n" @@ -7315,13 +8134,11 @@ msgid "" " To have the server choose a free port number to listen on, specify\n" " a port number of 0; in this case, the server will print the port\n" -" number it uses.\n" -" " +" number it uses." msgstr "" " For at få serveren til at vælge et frit portnummer at lytte til,\n" " angiv da portnummer 0; så vil serveren skrive det portnummer den\n" -" bruger.\n" -" " +" bruger." #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" @@ -7387,8 +8204,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = origin of the previous file listed as A (added)\n" -" " +" = origin of the previous file listed as A (added)" msgstr "" " M = ændret\n" " A = tilføjet\n" @@ -7397,8 +8213,7 @@ " ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n" " ? = følges ikke\n" " I = ignoreret\n" -" = den foregående fil markeret som A (tilføjet) stammer herfra\n" -" " +" = den foregående fil markeret som A (tilføjet) stammer herfra" msgid "summarize working directory state" msgstr "" @@ -7410,9 +8225,12 @@ msgid "" " With the --remote option, this will check the default paths for\n" -" incoming and outgoing changes. This can be time-consuming.\n" -" " -msgstr "" +" incoming and outgoing changes. This can be time-consuming." +msgstr "" + +#, python-format +msgid "parent: %d:%s " +msgstr "forælder: %d:%s " msgid " (empty repository)" msgstr "(tomt depot)" @@ -7421,47 +8239,58 @@ msgstr "(ingen revision hentet frem)" #, python-format -msgid "parent: %d:%s %s\n" -msgstr "forælder: %d:%s %s\n" - -#, python-format msgid "branch: %s\n" msgstr "gren: %s\n" #, python-format -msgid "%d added" -msgstr "%d tilføjet" - -#, python-format msgid "%d modified" msgstr "%d ændret" #, python-format +msgid "%d added" +msgstr "%d tilføjet" + +#, python-format msgid "%d removed" msgstr "%d fjernet" #, python-format +msgid "%d renamed" +msgstr "%d omdøbt" + +#, python-format +msgid "%d copied" +msgstr "%d kopieret" + +#, python-format msgid "%d deleted" msgstr "%d slettet" #, python-format +msgid "%d unknown" +msgstr "%d ukendt" + +#, python-format msgid "%d ignored" msgstr "%d ignoreret" #, python-format -msgid "%d unknown" -msgstr "%d ukendt" - -#, python-format msgid "%d unresolved" msgstr "%d uløst" +#, python-format +msgid "%d subrepos" +msgstr "%d underdepoter" + msgid " (merge)" msgstr " (sammenføj)" msgid " (new branch)" msgstr " (ny gren)" +msgid " (head closed)" +msgstr " (lukkede hoved)" + msgid " (clean)" msgstr " (ren)" @@ -7522,6 +8351,11 @@ " shared among repositories)." msgstr "" +msgid "" +" Since tag names have priority over branch names during revision\n" +" lookup, using an existing branch name as a tag name is discouraged." +msgstr "" + msgid "tag names must be unique" msgstr "mærkatnavne skal være unikke" @@ -7549,12 +8383,10 @@ msgid "" " This lists both regular and local tags. When the -v/--verbose\n" -" switch is used, a third column \"local\" is printed for local tags.\n" -" " +" switch is used, a third column \"local\" is printed for local tags." msgstr "" " Viser både normale og lokale mærkater. Når -v/--verbose flaget\n" -" bruges, udskrives en tredje kolonne \"local\" for lokale mærkater.\n" -" " +" bruges, udskrives en tredje kolonne \"local\" for lokale mærkater." msgid "show the tip revision" msgstr "" @@ -7569,8 +8401,7 @@ " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" -" and cannot be renamed or assigned to a different changeset.\n" -" " +" and cannot be renamed or assigned to a different changeset." msgstr "" msgid "apply one or more changegroup files" @@ -7578,12 +8409,16 @@ msgid "" " Apply one or more compressed changegroup files generated by the\n" -" bundle command.\n" +" bundle command." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if an update has unresolved files.\n" " " msgstr "" -msgid "update working directory" -msgstr "opdater arbejdskataloget" +msgid "update working directory (or switch revisions)" +msgstr "opdater arbejdskataloget (eller skift til en anden revision)" msgid "" " Update the repository's working directory to the specified\n" @@ -7641,16 +8476,18 @@ " og arbejdskataloget bliver opdateret til den ønskede ændring." msgid "" -" Use null as the changeset to remove the working directory (like 'hg\n" -" clone -U')." -msgstr "" -" Brug null som ændring for at fjerne arbejdskataloget (ligesom 'hg\n" -" clone -U')." - -msgid " If you want to update just one file to an older changeset, use 'hg revert'." +" Use null as the changeset to remove the working directory (like\n" +" :hg:`clone -U`)." +msgstr "" +" Brug null som ændring for at fjerne arbejdskataloget (ligesom\n" +" :hg:`clone -U`)." + +msgid "" +" If you want to update just one file to an older changeset, use :hg:" +"`revert`." msgstr "" " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" -" brug da revert." +" brug da :hg:`revert`." msgid "cannot specify both -c/--check and -C/--clean" msgstr "man kan ikke angive både -c/--check og -C/--clean" @@ -7668,8 +8505,7 @@ " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" -" integrity of their crosslinks and indices.\n" -" " +" integrity of their crosslinks and indices." msgstr "" " Dette vil lave en udførlig kontrol af depotets integritet.\n" " Hashværdier og tjeksummer valideres for hver indgang i\n" @@ -7698,6 +8534,9 @@ msgid "repository root directory or name of overlay bundle file" msgstr "" +msgid "DIR" +msgstr "" + msgid "change working directory" msgstr "skift arbejdskatalog" @@ -7713,6 +8552,9 @@ msgid "set/override config option (use 'section.name=value')" msgstr "angiv eller overskriv tilvalg (brug 'sektion.navn=værdi')" +msgid "CONFIG" +msgstr "" + msgid "enable debugging output" msgstr "aktiver fejlsøgningsinformation" @@ -7722,6 +8564,12 @@ msgid "set the charset encoding" msgstr "angiv tegnkodningen" +msgid "ENCODE" +msgstr "" + +msgid "MODE" +msgstr "" + msgid "set the charset encoding mode" msgstr "angiv tegnkodningstilstand" @@ -7749,17 +8597,20 @@ msgid "specify hg command to run on the remote side" msgstr "angiv hg kommando som skal udføres på fjernsystemet" +msgid "PATTERN" +msgstr "" + msgid "include names matching the given patterns" msgstr "inkluder navne som matcher det givne mønster" msgid "exclude names matching the given patterns" msgstr "ekskluder navne som matcher det givne mønster" -msgid "use <text> as commit message" -msgstr "brug <tekst> som deponeringsbesked" - -msgid "read commit message from <file>" -msgstr "læs deponeringsbeskeden fra <fil>" +msgid "use text as commit message" +msgstr "brug tekst som deponeringsbesked" + +msgid "read commit message from file" +msgstr "læs deponeringsbeskeden fra fil" msgid "record datecode as commit date" msgstr "noter dato som integrationsdato" @@ -7767,6 +8618,9 @@ msgid "record the specified user as committer" msgstr "" +msgid "STYLE" +msgstr "" + msgid "display using template map file" msgstr "vis med skabelon-fil" @@ -7776,6 +8630,9 @@ msgid "do not show merges" msgstr "vis ikke sammenføjninger" +msgid "output diffstat-style summary of changes" +msgstr "" + msgid "treat all files as text" msgstr "behandl alle filer som tekst" @@ -7800,7 +8657,7 @@ msgid "number of lines of context to show" msgstr "antal linier kontekst der skal vises" -msgid "output diffstat-style summary of changes" +msgid "SIMILARITY" msgstr "" msgid "guess renamed files by similarity (0<=s<=100)" @@ -7842,6 +8699,9 @@ msgid "do not pass files through decoders" msgstr "kør ikke filerne igennem dekodere" +msgid "PREFIX" +msgstr "" + msgid "directory prefix for files in archive" msgstr "katalogpræfiks for filerne i arkivet" @@ -7971,6 +8831,21 @@ msgid "[INDEX] REV1 REV2" msgstr "[INDEKS] REV1 REV2" +msgid "add single file mergeable changes" +msgstr "" + +msgid "add single file all revs append to" +msgstr "" + +msgid "add single file all revs overwrite" +msgstr "" + +msgid "add new file at each rev" +msgstr "" + +msgid "[OPTION]... TEXT" +msgstr "[TILVALG]... TEKST" + msgid "[COMMAND]" msgstr "[KOMMANDO]" @@ -7980,6 +8855,21 @@ msgid "[-o] CMD" msgstr "[-o] KOMMANDO" +msgid "use tags as labels" +msgstr "" + +msgid "annotate with branch names" +msgstr "" + +msgid "use dots for runs" +msgstr "" + +msgid "separate elements by spaces" +msgstr "" + +msgid "[OPTION]... [FILE [REV]...]" +msgstr "[TILVALG]... [FIL [REV]...]" + msgid "try extended date formats" msgstr "prøv udvidede datoformater" @@ -7992,8 +8882,8 @@ msgid "[PATH]" msgstr "[STI]" -msgid "FILE" -msgstr "FIL" +msgid "REPO NAMESPACE [KEY OLD NEW]" +msgstr "" msgid "revision to rebuild to" msgstr "revision til hvilken der skal gendannes til" @@ -8049,8 +8939,8 @@ 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]..." @@ -8067,8 +8957,8 @@ msgid "show normal and closed branch heads" msgstr "vis normale og lukkede grenhoveder" -msgid "[-ac] [-r STARTREV] [REV]..." -msgstr "[-ac] [-r STARTREV] [REV]..." +msgid "[-ac] [-r REV] [REV]..." +msgstr "[-ac] [-r REV] [REV]..." msgid "[TOPIC]" msgstr "[EMNE]" @@ -8091,8 +8981,13 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [KILDE]" -msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" -msgstr "" +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" +msgstr "" + +msgid "PATH" +msgstr "STI" msgid "base path" msgstr "" @@ -8154,7 +9049,7 @@ msgid "show copied files" msgstr "vis kopierede filer" -msgid "do case-insensitive search for a keyword" +msgid "do case-insensitive search for a given text" msgstr "lav søgning efter nøgleord uden forskel på små/store bogstaver" msgid "include revisions where files were removed" @@ -8166,8 +9061,11 @@ msgid "revisions committed by user" msgstr "revisioner deponeret af bruger" -msgid "show only changesets within the given named branch" -msgstr "vis kun ændringer på den angivne navngivne gren" +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "vis kun ændringer på den angivne navngivne gren (FORÆLDET)" + +msgid "show changesets within the given named branch" +msgstr "vis ændringer på den angivne navngivne gren" msgid "do not display revision or any of its ancestors" msgstr "vis ikke revision eller nogen af den forfædre" @@ -8223,6 +9121,9 @@ msgid "force push" msgstr "gennemtving skubning" +msgid "allow pushing a new branch" +msgstr "" + msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [MÅL]" @@ -8274,9 +9175,15 @@ msgid "name of error log file to write to" msgstr "navn på fejlllog fil der skrives til" -msgid "port to listen on (default: 8000" +msgid "PORT" +msgstr "" + +msgid "port to listen on (default: 8000)" msgstr "port der skal lyttes på (standard: 8000)" +msgid "ADDR" +msgstr "" + msgid "address to listen on (default: all interfaces)" msgstr "adresse der skal lyttes til (standard: alle grænseflader)" @@ -8286,8 +9193,11 @@ msgid "name to show in web pages (default: working directory)" msgstr "navn der skal vises på websider (standard: arbejdskatalog)" -msgid "name of the webdir config file (serve more than one repository)" -msgstr "navn på webdir konfigurationsfil (serve mere end et depot)" +msgid "name of the hgweb config file (serve more than one repository)" +msgstr "navn på hgweb konfigurationsfil (serve mere end et depot)" + +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "navn på hgweb konfigurationsfilen (FORÆLDET)" msgid "for remote clients" msgstr "for fjernklienter" @@ -8358,6 +9268,9 @@ msgid "remove a tag" msgstr "fjern en mærkat" +msgid "use <text> as commit message" +msgstr "brug <tekst> som deponeringsbesked" + msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "[-f] [-l] [-m TEKST] [-d DATO] [-u BRUGER] [-r REV] NAVN..." @@ -8380,12 +9293,8 @@ msgstr "[-c] [-C] [-d DATO] [[-r] REV]" #, python-format -msgid "config error at %s:%d: cannot include %s (%s)" -msgstr "konfigurationsfejl på %s:%d: kan ikke inkludere %s (%s)" - -#, python-format -msgid "config error at %s:%d: '%s'" -msgstr "konfigurationsfejl på %s:%d: '%s'" +msgid "cannot include %s (%s)" +msgstr "kan ikke inkludere %s (%s)" msgid "not found in manifest" msgstr "blev ikke fundet i manifest" @@ -8393,6 +9302,49 @@ msgid "branch name not in UTF-8!" msgstr "grennavn er ikke i UTF-8!" +#, python-format +msgid "%s does not exist!\n" +msgstr "%s eksisterer ikke!\n" + +#, python-format +msgid "" +"%s: up to %d MB of RAM may be required to manage this file\n" +"(use 'hg revert %s' to cancel the pending addition)\n" +msgstr "" + +#, python-format +msgid "%s not added: only files and symlinks supported currently\n" +msgstr "" +"%s ikke tilføjet: i øjeblikket understøttes kun filer og symbolske lænker\n" + +#, python-format +msgid "%s already tracked!\n" +msgstr "%s følges allerede!\n" + +#, python-format +msgid "%s not added!\n" +msgstr "%s ikke tilføjet!\n" + +#, python-format +msgid "%s still exists!\n" +msgstr "%s eksisterer stadig!\n" + +#, python-format +msgid "%s not tracked!\n" +msgstr "%s følges ikke\n" + +#, python-format +msgid "%s not removed!\n" +msgstr "%s ikke fjernet!\n" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "kopiering fejlede: %s er ikke en fil eller en symbolsk længe\n" + +#, python-format +msgid "invalid event type in dag: %s" +msgstr "" + msgid "working directory state appears damaged!" msgstr "arbejdskatalogtilstand virker beskadiget!" @@ -8409,6 +9361,10 @@ msgstr "" #, python-format +msgid "setting %r to other parent only allowed in merges" +msgstr "" + +#, python-format msgid "not in dirstate: %s\n" msgstr "ikke i dirstate: %s\n" @@ -8434,13 +9390,58 @@ 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 "" + +msgid "searching" +msgstr "søger" + +msgid "already have changeset " +msgstr "har allerede ændringen " + +msgid "warning: repository is unrelated\n" +msgstr "advarsel: depotet er urelateret\n" + +msgid "repository is unrelated" +msgstr "depotet er urelateret" + +#, python-format +msgid "abort: push creates new remote heads on branch '%s'!\n" +msgstr "afbrudt: skub laver nye hoveder på 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" + +#, python-format +msgid "abort: push creates new remote branches: %s!\n" +msgstr "afbrudt: skub laver nye grene i fjerndepotet: %s!\n" + +msgid "(use 'hg push --new-branch' to create new remote branches)\n" +msgstr "(brug 'hg push --new-branch' for at lave nye grene i fjerndepotet)\n" + +msgid "note: unsynced remote changes!\n" +msgstr "bemærk: usynkroniserede ændringer i fjernsystemet!\n" + #, python-format msgid "abort: %s\n" msgstr "afbrudt: %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" +msgid "hg: parse error at %s: %s\n" +msgstr "hg: konfigurationsfejl på %s: %s\n" + +#, python-format +msgid "hg: parse error: %s\n" +msgstr "hg: parse fejl: %s\n" #, python-format msgid "" @@ -8471,6 +9472,10 @@ msgstr "hg %s: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "abort: %s!\n" msgstr "afbrudt: %s!\n" @@ -8488,10 +9493,6 @@ 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" @@ -8528,6 +9529,10 @@ msgstr "** eller mercurial@selenic.com\n" #, python-format +msgid "** Python %s\n" +msgstr "" + +#, python-format msgid "** Mercurial Distributed SCM (version %s)\n" msgstr "** Mercurial Distributed SCM (version %s)\n" @@ -8561,8 +9566,12 @@ 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 --repository may only be abbreviated as --repo!" -msgstr "Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository må kun forkortes som --repo!" +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" +"Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository " +"må kun forkortes som --repo!" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" @@ -8579,8 +9588,12 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "profileringsformat '%s' ikke genkendt - Ignoreret\n" -msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" -msgstr "lsprof er ikke tilgængelig - installer fra http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" +"lsprof er ikke tilgængelig - installer fra http://codespeak.net/svn/user/" +"arigo/hack/misc/lsprof/" #, python-format msgid "*** failed to import extension %s from %s: %s\n" @@ -8627,9 +9640,11 @@ msgstr "sammenføjer %s\n" #, python-format -msgid "" -" output file %s appears unchanged\n" -"was merge successful (yn)?" +msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" +msgstr "" + +#, python-format +msgid "was merge of '%s' successful (yn)?" msgstr "" msgid "&No" @@ -8639,6 +9654,12 @@ msgstr "" #, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +#, python-format msgid "merging %s failed!\n" msgstr "sammenføjning af %s fejlede!\n" @@ -8671,6 +9692,9 @@ msgid "Specifying Multiple Revisions" msgstr "Angivning af flere revisioner" +msgid "Specifying Revision Sets" +msgstr "Angivning af af mængder af revisioner" + msgid "Diff Formats" msgstr "" @@ -8683,6 +9707,12 @@ msgid "Using additional features" msgstr "Brug af yderligere funktioner" +msgid "Configuring hgweb" +msgstr "Konfigurering af hgweb" + +msgid "Glossary" +msgstr "" + msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "Below we list the most specific file first." @@ -8697,20 +9727,25 @@ msgid "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<install-dir>\\Mercurial.ini``" +"- ``%HOME%\\mercurial.ini``\n" +"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." +"ini found)\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." +"ini found)\n" +"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" +"- ``<hg.exe-dir>\\mercurial.ini``" msgstr "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" "- ``%USERPROFILE%\\Mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" "- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" +"- ``C:\\Mercurial\\Mercurial.ini`` (med mindre regkey eller hgrc.d\\\n" +" eller mercurial.ini blev fundet)\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (med mindre hgrc.d\\ eller\n" +" mercurial.ini blev fundet)\n" "- ``<install-dir>\\Mercurial.ini``" msgid "On Unix, these files are read:" @@ -8750,7 +9785,7 @@ " verbose = True" msgid "" -"This above entries will be referred to as ``ui.username`` and\n" +"The above entries will be referred to as ``ui.username`` and\n" "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" "description of the possible configuration values:" msgstr "" @@ -8865,7 +9900,7 @@ msgid "" "This means that when generating diffs from a Mercurial repository\n" -"(e.g. with \"hg export\"), you should be careful about things like file\n" +"(e.g. with :hg:`export`), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" @@ -9071,6 +10106,588 @@ " baz = !\n" msgid "" +"Ancestor\n" +" Any changeset that can be reached by an unbroken chain of parent\n" +" changesets from a given changeset. More precisely, the ancestors\n" +" of a changeset can be defined by two properties: a parent of a\n" +" changeset is an ancestor, and a parent of an ancestor is an\n" +" ancestor. See also: 'Descendant'." +msgstr "" + +msgid "" +"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" +" a named branch. If a topological branch is not named, it becomes\n" +" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." +msgstr "" + +msgid "" +" Branches may be created when changes are pulled from or pushed to\n" +" a remote repository, since new heads may be created by these\n" +" operations. Note that the term branch can also be used informally\n" +" to describe a development process in which certain development is\n" +" done independently of other development.This is sometimes done\n" +" explicitly with a named branch, but it can also be done locally,\n" +" using bookmarks or clones and anonymous branches." +msgstr "" + +msgid " Example: \"The experimental branch\"." +msgstr "" + +msgid "" +" (Verb) The action of creating a child changeset which results in\n" +" its parent having more than one child." +msgstr "" + +msgid " Example: \"I'm going to branch at X\"." +msgstr "" + +msgid "" +"Branch, anonymous\n" +" Every time a new child changeset is created from a parent that is not\n" +" a head and the name of the branch is not changed, a new anonymous\n" +" branch is created." +msgstr "" + +msgid "" +"Branch, closed\n" +" A named branch whose branch heads have all been closed." +msgstr "" + +msgid "" +"Branch, default\n" +" The branch assigned to a changeset when no name has previously been\n" +" assigned." +msgstr "" + +msgid "" +"Branch head\n" +" See 'Head, branch'." +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" +" same named branch. A child can be explicitly assigned to a\n" +" different branch. See :hg:`help branch`, :hg:`help branches` and\n" +" :hg:`commit --close-branch` for more information on managing\n" +" branches." +msgstr "" + +msgid "" +" Named branches can be thought of as a kind of namespace, dividing\n" +" the collection of changesets that comprise the repository into a\n" +" 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." +msgstr "" + +msgid "" +"Branch tip\n" +" See 'Tip, branch'." +msgstr "" + +msgid "" +"Branch, topological\n" +" Every time a new child changeset is created from a parent that is\n" +" not a head, a new topological branch is created. If a topological\n" +" branch is named, it becomes a named branch. If a topological\n" +" branch is not named, it becomes an anonymous branch of the\n" +" current, possibly default, branch." +msgstr "" + +msgid "" +"Changelog\n" +" A record of the changesets in the order in which they were added\n" +" to the repository. This includes details such as changeset id,\n" +" author, commit message, date, and list of changed files." +msgstr "" + +msgid "" +"Changeset\n" +" A snapshot of the state of the repository used to record a change." +msgstr "" + +msgid "" +"Changeset, child\n" +" The converse of parent changeset: if P is a parent of C, then C is\n" +" a child of P. There is no limit to the number of children that a\n" +" changeset may have." +msgstr "" + +msgid "" +"Changeset id\n" +" A SHA-1 hash that uniquely identifies a changeset. It may be\n" +" represented as either a \"long\" 40-byte hexadecimal string, or a\n" +" \"short\" 12-byte hexadecimal string." +msgstr "" + +msgid "" +"Changeset, merge\n" +" A changeset with two parents. This occurs when a merge is\n" +" committed." +msgstr "" + +msgid "" +"Changeset, parent\n" +" A revision upon which a child changeset is based. Specifically, a\n" +" parent changeset of a changeset C is a changeset whose node\n" +" immediately precedes C in the DAG. Changesets have at most two\n" +" parents." +msgstr "" + +msgid "" +"Checkout\n" +" (Noun) The working directory being updated to a specific\n" +" revision. This use should probably be avoided where possible, as\n" +" changeset is much more appropriate than checkout in this context." +msgstr "" + +msgid " Example: \"I'm using checkout X.\"" +msgstr "" + +msgid "" +" (Verb) Updating the working directory to a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"I'm going to check out changeset X.\"" +msgstr "" + +msgid "" +"Child changeset\n" +" See 'Changeset, child'." +msgstr "" + +msgid "" +"Close changeset\n" +" See 'Changeset, close'." +msgstr "" + +msgid "" +"Closed branch\n" +" See 'Branch, closed'." +msgstr "" + +msgid "" +"Clone\n" +" (Noun) An entire or partial copy of a repository. The partial\n" +" clone must be in the form of a revision and its ancestors." +msgstr "" + +msgid " Example: \"Is your clone up to date?\"." +msgstr "" + +msgid " (Verb) The process of creating a clone, using :hg:`clone`." +msgstr "" + +msgid " Example: \"I'm going to clone the repository\"." +msgstr "" + +msgid "" +"Closed branch head\n" +" See 'Head, closed branch'." +msgstr "" + +msgid "" +"Commit\n" +" (Noun) A synonym for changeset." +msgstr "" + +msgid " Example: \"Is the bug fixed in your recent commit?\"" +msgstr "" + +msgid "" +" (Verb) The act of recording changes to a repository. When files\n" +" are committed in a working directory, Mercurial finds the\n" +" differences between the committed files and their parent\n" +" changeset, creating a new changeset in the repository." +msgstr "" + +msgid " Example: \"You should commit those changes now.\"" +msgstr "" + +msgid "" +"Cset\n" +" A common abbreviation of the term changeset." +msgstr "" + +msgid "" +"DAG\n" +" The repository of changesets of a distributed version control\n" +" system (DVCS) can be described as a directed acyclic graph (DAG),\n" +" 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" +" for children to have at most two parents." +msgstr "" + +msgid "" +"Default branch\n" +" See 'Branch, default'." +msgstr "" + +msgid "" +"Descendant\n" +" Any changeset that can be reached by a chain of child changesets\n" +" from a given changeset. More precisely, the descendants of a\n" +" changeset can be defined by two properties: the child of a\n" +" changeset is a descendant, and the child of a descendant is a\n" +" descendant. See also: 'Ancestor'." +msgstr "" + +msgid "" +"Diff\n" +" (Noun) The difference between the contents and attributes of files\n" +" in two changesets or a changeset and the current working\n" +" directory. The difference is usually represented in a standard\n" +" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" +" when the changes include copies, renames, or changes to file\n" +" attributes, none of which can be represented/handled by classic\n" +" \"diff\" and \"patch\"." +msgstr "" + +msgid " Example: \"Did you see my correction in the diff?\"" +msgstr "" + +msgid "" +" (Verb) Diffing two changesets is the action of creating a diff or\n" +" patch." +msgstr "" + +msgid "" +" Example: \"If you diff with changeset X, you will see what I mean.\"" +msgstr "" + +msgid "" +"Directory, working\n" +" The working directory represents the state of the files tracked by\n" +" Mercurial, that will be recorded in the next commit. The working\n" +" directory initially corresponds to the snapshot at an existing\n" +" changeset, known as the parent of the working directory. See\n" +" 'Parents, working directory'. The state may be modified by changes\n" +" to the files introduced manually or by a merge. The repository\n" +" metadata exists in the .hg directory inside the working directory." +msgstr "" + +msgid "" +"Graph\n" +" See DAG and :hg:`help graphlog`." +msgstr "" + +msgid "" +"Head\n" +" The term 'head' may be used to refer to both a branch head or a\n" +" repository head, depending on the context. See 'Head, branch' and\n" +" 'Head, repository' for specific definitions." +msgstr "" + +msgid "" +" Heads are where development generally takes place and are the\n" +" usual targets for update and merge operations." +msgstr "" + +msgid "" +"Head, branch\n" +" A changeset with no descendants on the same named branch." +msgstr "" + +msgid "" +"Head, closed branch\n" +" A changeset that marks a head as no longer interesting. The closed\n" +" head is no longer listed by :hg:`heads`. A branch is considered\n" +" closed when all its heads are closed and consequently is not\n" +" listed by :hg:`branches`." +msgstr "" + +msgid "" +"Head, repository\n" +" A topological head which has not been closed." +msgstr "" + +msgid "" +"Head, topological\n" +" A changeset with no children in the repository." +msgstr "" + +msgid "" +"History, immutable\n" +" Once committed, changesets cannot be altered. Extensions which\n" +" appear to change history actually create new changesets that\n" +" replace existing ones, and then destroy the old changesets. Doing\n" +" so in public repositories can result in old changesets being\n" +" reintroduced to the repository." +msgstr "" + +msgid "" +"History, rewriting\n" +" The changesets in a repository are immutable. However, extensions\n" +" to Mercurial can be used to alter the repository, usually in such\n" +" a way as to preserve changeset contents." +msgstr "" + +msgid "" +"Immutable history\n" +" See 'History, immutable'." +msgstr "" + +msgid "" +"Merge changeset\n" +" See 'Changeset, merge'." +msgstr "" + +msgid "" +"Manifest\n" +" Each changeset has a manifest, which is the list of files that are\n" +" tracked by the changeset." +msgstr "" + +msgid "" +"Merge\n" +" Used to bring together divergent branches of work. When you update\n" +" to a changeset and then merge another changeset, you bring the\n" +" history of the latter changeset into your working directory. Once\n" +" conflicts are resolved (and marked), this merge may be committed\n" +" as a merge changeset, bringing two branches together in the DAG." +msgstr "" + +msgid "" +"Named branch\n" +" See 'Branch, named'." +msgstr "" + +msgid "" +"Null changeset\n" +" The empty changeset. It is the parent state of newly-initialized\n" +" repositories and repositories with no checked out revision. It is\n" +" thus the parent of root changesets and the effective ancestor when\n" +" merging unrelated changesets. Can be specified by the alias 'null'\n" +" or by the changeset ID '000000000000'." +msgstr "" + +msgid "" +"Parent\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent changeset\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent, working directory\n" +" The working directory parent reflects a virtual revision which is\n" +" the child of the changeset (or two changesets with an uncommitted\n" +" merge) shown by :hg:`parents`. This is changed with\n" +" :hg:`update`. Other commands to see the working directory parent\n" +" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." +msgstr "" + +msgid "" +"Patch\n" +" (Noun) The product of a diff operation." +msgstr "" + +msgid " Example: \"I've sent you my patch.\"" +msgstr "" + +msgid "" +" (Verb) The process of using a patch file to transform one\n" +" changeset into another." +msgstr "" + +msgid " Example: \"You will need to patch that revision.\"" +msgstr "" + +msgid "" +"Pull\n" +" An operation in which changesets in a remote repository which are\n" +" not in the local repository are brought into the local\n" +" repository. Note that this operation without special arguments\n" +" only updates the repository, it does not update the files in the\n" +" working directory. See :hg:`help pull`." +msgstr "" + +msgid "" +"Push\n" +" An operation in which changesets in a local repository which are\n" +" not in a remote repository are sent to the remote repository. Note\n" +" that this operation only adds changesets which have been committed\n" +" locally to the remote repository. Uncommitted changes are not\n" +" sent. See :hg:`help push`." +msgstr "" + +msgid "" +"Repository\n" +" The metadata describing all recorded states of a collection of\n" +" files. Each recorded state is represented by a changeset. A\n" +" repository is usually (but not always) found in the ``.hg``\n" +" subdirectory of a working directory. Any recorded state can be\n" +" recreated by \"updating\" a working directory to a specific\n" +" changeset." +msgstr "" + +msgid "" +"Repository head\n" +" See 'Head, repository'." +msgstr "" + +msgid "" +"Revision\n" +" A state of the repository at some point in time. Earlier revisions\n" +" can be updated to by using :hg:`update`. See also 'Revision\n" +" number'; See also 'Changeset'." +msgstr "" + +msgid "" +"Revision number\n" +" This integer uniquely identifies a changeset in a specific\n" +" repository. It represents the order in which changesets were added\n" +" to a repository, starting with revision number 0. Note that the\n" +" revision number may be different in each clone of a repository. To\n" +" identify changesets uniquely between different clones, see\n" +" 'Changeset id'." +msgstr "" + +msgid "" +"Revlog\n" +" History storage mechanism used by Mercurial. It is a form of delta\n" +" encoding, with occasional full revision of data followed by delta\n" +" of each successive revision. It includes data and an index\n" +" pointing to the data." +msgstr "" + +msgid "" +"Rewriting history\n" +" See 'History, rewriting'." +msgstr "" + +msgid "" +"Root\n" +" A changeset that has only the null changeset as its parent. Most\n" +" repositories have only a single root changeset." +msgstr "" + +msgid "" +"Tip\n" +" The changeset with the highest revision number. It is the changeset\n" +" most recently added in a repository." +msgstr "" + +msgid "" +"Tip, branch\n" +" The head of a given branch with the highest revision number. When\n" +" a branch name is used as a revision identifier, it refers to the\n" +" branch tip. See also 'Branch, head'. Note that because revision\n" +" numbers may be different in different repository clones, the\n" +" branch tip may be different in different cloned repositories." +msgstr "" + +msgid "" +"Update\n" +" (Noun) Another synonym of changeset." +msgstr "" + +msgid " Example: \"I've pushed an update\"." +msgstr "" + +msgid "" +" (Verb) This term is usually used to describe updating the state of\n" +" the working directory to that of a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"You should update\"." +msgstr "" + +msgid "" +"Working directory\n" +" See 'Directory, working'." +msgstr "" + +msgid "" +"Working directory parent\n" +" See 'Parent, working directory'.\n" +msgstr "" + +msgid "" +"Mercurial's internal web server, hgweb, can serve either a single\n" +"repository, or a collection of them. In the latter case, a special\n" +"configuration file can be used to specify the repository paths to use\n" +"and global web configuration options." +msgstr "" + +msgid "" +"This file uses the same syntax as hgrc configuration files, but only\n" +"the following sections are recognized:" +msgstr "" + +msgid "" +" - web\n" +" - paths\n" +" - collections" +msgstr "" + +msgid "" +"The ``web`` section can specify all the settings described in the web\n" +"section of the hgrc documentation." +msgstr "" + +msgid "" +"The ``paths`` section provides mappings of physical repository\n" +"paths to virtual ones. For instance::" +msgstr "" + +msgid "" +" [paths]\n" +" projects/a = /foo/bar\n" +" projects/b = /baz/quux\n" +" web/root = /real/root/*\n" +" / = /real/root2/*\n" +" virtual/root2 = /real/root2/**" +msgstr "" + +msgid "" +"- The first two entries make two repositories in different directories\n" +" appear under the same directory in the web interface\n" +"- The third entry maps every Mercurial repository found in '/real/root'\n" +" into 'web/root'. This format is preferred over the [collections] one,\n" +" since using absolute paths as configuration keys is not supported on " +"every\n" +" platform (especially on Windows).\n" +"- The fourth entry is a special case mapping all repositories in\n" +" '/real/root2' in the root of the virtual directory.\n" +"- The fifth entry recursively finds all repositories under the real\n" +" root, and maps their relative paths under the virtual root." +msgstr "" + +msgid "" +"The ``collections`` section provides mappings of trees of physical\n" +"repositories paths to virtual ones, though the paths syntax is generally\n" +"preferred. For instance::" +msgstr "" + +msgid "" +" [collections]\n" +" /foo = /foo" +msgstr "" +" [collections]\n" +" /foo = /foo" + +msgid "" +"Here, the left side will be stripped off all repositories found in the\n" +"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" +"``bar`` and ``quux/baz`` respectively.\n" +msgstr "" + +msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" "separated by the \":\" character." @@ -9163,7 +10780,8 @@ msgid "Regexp examples::" msgstr "" -msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgid "" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" msgstr "" msgid "Mercurial supports several ways to specify individual revisions." @@ -9212,6 +10830,266 @@ msgstr "" msgid "" +"Mercurial supports a functional language for selecting a set of\n" +"revisions." +msgstr "" + +msgid "" +"The language supports a number of predicates which are joined by infix\n" +"operators. Parenthesis can be used for grouping." +msgstr "" + +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." +msgstr "" + +msgid "There is a single prefix operator:" +msgstr "" + +msgid "" +"``not x``\n" +" Changesets not in x. Short form is ``! x``." +msgstr "" + +msgid "These are the supported infix operators:" +msgstr "" + +msgid "" +"``x::y``\n" +" 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)``." +msgstr "" + +msgid " An alternative syntax is ``x..y``." +msgstr "" + +msgid "" +"``x:y``\n" +" All changesets with revision numbers between x and y, both\n" +" inclusive. Either endpoint can be left out, they default to 0 and\n" +" tip." +msgstr "" + +msgid "" +"``x and y``\n" +" The intersection of changesets in x and y. Short form is ``x & y``." +msgstr "" + +msgid "" +"``x or y``\n" +" The union of changesets in x and y. There are two alternative short\n" +" forms: ``x | y`` and ``x + y``." +msgstr "" + +msgid "" +"``x - y``\n" +" Changesets in x but not in y." +msgstr "" + +msgid "The following predicates are supported:" +msgstr "" + +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +msgid "" +"``ancestor(single, single)``\n" +" Greatest common ancestor of the two changesets." +msgstr "" + +msgid "" +"``ancestors(set)``\n" +" Changesets that are ancestors of a changeset in set." +msgstr "" + +msgid "" +"``author(string)``\n" +" Alias for ``user(string)``." +msgstr "" + +msgid "" +"``branch(set)``\n" +" The branch names are found for changesets in set, and the result is\n" +" all changesets belonging to one those branches." +msgstr "" + +msgid "" +"``children(set)``\n" +" Child changesets of changesets in set." +msgstr "" + +msgid "" +"``closed()``\n" +" Changeset is closed." +msgstr "" + +msgid "" +"``contains(pattern)``\n" +" Revision contains pattern." +msgstr "" + +msgid "" +"``date(interval)``\n" +" Changesets within the interval, see :hg:`help dates`." +msgstr "" + +msgid "" +"``descendants(set)``\n" +" Changesets which are decendants of changesets in set." +msgstr "" + +msgid "" +"``file(pattern)``\n" +" Changesets which manually affected files matching pattern." +msgstr "" + +msgid "" +"``follow()``\n" +" An alias for ``::.`` (ancestors of the working copy's first parent)." +msgstr "" + +msgid "" +"``grep(regex)``\n" +" Like ``keyword(string)`` but accepts a regex." +msgstr "" + +msgid "" +"``head()``\n" +" Changeset is a head." +msgstr "" + +msgid "" +"``heads(set)``\n" +" Members of set with no children in set." +msgstr "" + +msgid "" +"``keyword(string)``\n" +" Search commit message, user name, and names of changed files for\n" +" string." +msgstr "" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +msgid "" +"``max(set)``\n" +" Changeset with highest revision number in set." +msgstr "" + +msgid "" +"``merge()``\n" +" Changeset is a merge changeset." +msgstr "" + +msgid "" +"``modifies(pattern)``\n" +" Changesets which modify files matching pattern." +msgstr "" + +msgid "" +"``outgoing([path])``\n" +" Changesets missing in path." +msgstr "" + +msgid "" +"``p1(set)``\n" +" First parent of changesets in set." +msgstr "" + +msgid "" +"``p2(set)``\n" +" Second parent of changesets in set." +msgstr "" + +msgid "" +"``parents(set)``\n" +" The set of all parents for all changesets in set." +msgstr "" + +msgid "" +"``removes(pattern)``\n" +" Changesets which remove files matching pattern." +msgstr "" + +msgid "" +"``reverse(set)``\n" +" Reverse order of set." +msgstr "" + +msgid "" +"``roots(set)``\n" +" Changesets with no parent changeset in set." +msgstr "" + +msgid "" +"``sort(set[, [-]key...])``\n" +" Sort set by keys. The default sort order is ascending, specify a key\n" +" as ``-key`` to sort in descending order." +msgstr "" + +msgid " The keys can be:" +msgstr "" + +msgid "" +" - ``rev`` for the revision number,\n" +" - ``branch`` for the branch name,\n" +" - ``desc`` for the commit message (description),\n" +" - ``user`` for user name (``author`` can be used as an alias),\n" +" - ``date`` for the commit date" +msgstr "" + +msgid "" +"``tagged()``\n" +" Changeset is tagged." +msgstr "" + +msgid "" +"``user(string)``\n" +" User name is string." +msgstr "" + +msgid "Command line equivalents for :hg:`log`::" +msgstr "" + +msgid "" +" -f -> ::.\n" +" -d x -> date(x)\n" +" -k x -> keyword(x)\n" +" -m -> merge()\n" +" -u x -> user(x)\n" +" -b x -> branch(x)\n" +" -P x -> !::x\n" +" -l x -> limit(expr, x)" +msgstr "" + +msgid "Some sample queries::" +msgstr "" + +msgid "" +" hg log -r 'branch(default)'\n" +" hg log -r 'branch(default) and 1.5:: and not merge()'\n" +" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" +" hg log -r 'sort(date(\"May 2008\"), user)'\n" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgstr "" + +msgid "" "Mercurial allows you to customize output of commands through\n" "templates. You can either pass in a template from the command\n" "line, via the --template option, or select an existing\n" @@ -9224,8 +11102,9 @@ msgstr "" msgid "" -"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::" msgstr "" @@ -9460,14 +11339,14 @@ msgid "" "Paths in the local filesystem can either point to Mercurial\n" -"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle')." +"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" +"incoming --bundle`)." msgstr "" msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" -"changeset to use from the remote repository. See also 'hg help\n" -"revisions'." +"changeset to use from the remote repository. See also :hg:`help\n" +"revisions`." msgstr "" msgid "" @@ -9520,7 +11399,7 @@ msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' will be treated as 'hg pull URL1')." +"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." msgstr "" msgid "" @@ -9542,9 +11421,16 @@ " prefer it over 'default' if both are defined.\n" msgstr "" +msgid "remote branch lookup not supported" +msgstr "" + msgid "dirstate branch not accessible" msgstr "" +#, python-format +msgid "unknown branch '%s'" +msgstr "ukendt gren '%s'" + msgid "can only share local repositories" msgstr "kan kun dele lokale depoter" @@ -9566,7 +11452,9 @@ msgid "destination '%s' is not empty" msgstr "målet '%s' er ikke tomt" -msgid "src repository does not support revision lookup and so doesn't support clone by revision" +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" msgstr "" msgid "clone from remote to remote not supported" @@ -9577,14 +11465,19 @@ msgstr "opdaterer til gren %s\n" #, python-format -msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" msgstr "" msgid "use 'hg resolve' to retry unresolved file merges\n" 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 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" +msgid "" +"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" msgid "(branch merge, don't forget to commit)\n" msgstr "(grensammenføjning, glem ikke at deponere)\n" @@ -9750,6 +11643,10 @@ msgid "%r cannot be used in a tag name" msgstr "%r kan ikke bruges i et mærkatnavnet" +#, python-format +msgid "warning: tag %s conflicts with existing branch name\n" +msgstr "advarsel: mærkat %s konflikter med et eksisterende grennavn\n" + msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "arbejdskopien af .hgtags er ændret (deponer venligst .hgtags manuelt)" @@ -9770,12 +11667,21 @@ msgid "no interrupted transaction available\n" msgstr "ingen afbrudt transaktion tilgængelig\n" -msgid "rolling back last transaction\n" -msgstr "ruller sidste transaktion tilbage\n" +#, python-format +msgid "rolling back to revision %s (undo %s: %s)\n" +msgstr "" + +#, python-format +msgid "rolling back to revision %s (undo %s)\n" +msgstr "ruller tilbage til revision %s (omgør %s)\n" + +msgid "rolling back unknown transaction\n" +msgstr "ruller ukendt transaktion tilbage\n" #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" -msgstr "Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" +msgstr "" +"Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" msgid "no rollback information available\n" msgstr "ingen tilbagerulningsinformation til stede\n" @@ -9793,7 +11699,9 @@ msgstr "arbejdskatalog for %s" msgid "cannot partially commit a merge (do not specify files or patterns)" -msgstr "kan ikke deponere en sammenføjning partielt (undgå at specificere filer eller mønstre)" +msgstr "" +"kan ikke deponere en sammenføjning partielt (undgå at specificere filer " +"eller mønstre)" msgid "file not found!" msgstr "filen blev ikke fundet!" @@ -9819,87 +11727,13 @@ msgid "trouble committing %s!\n" msgstr "problem ved deponering %s!\n" -#, python-format -msgid "%s does not exist!\n" -msgstr "%s eksisterer ikke!\n" - -#, python-format -msgid "" -"%s: up to %d MB of RAM may be required to manage this file\n" -"(use 'hg revert %s' to cancel the pending addition)\n" -msgstr "" - -#, python-format -msgid "%s not added: only files and symlinks supported currently\n" -msgstr "%s ikke tilføjet: i øjeblikket understøttes kun filer og symbolske lænker\n" - -#, python-format -msgid "%s already tracked!\n" -msgstr "%s følges allerede!\n" - -#, python-format -msgid "%s not added!\n" -msgstr "%s ikke tilføjet!\n" - -#, python-format -msgid "%s still exists!\n" -msgstr "%s eksisterer stadig!\n" - -#, python-format -msgid "%s not tracked!\n" -msgstr "%s følges ikke\n" - -#, python-format -msgid "%s not removed!\n" -msgstr "%s ikke fjernet!\n" - -#, python-format -msgid "copy failed: %s is not a file or a symbolic link\n" -msgstr "kopiering fejlede: %s er ikke en fil eller en symbolsk længe\n" - -msgid "searching for changes\n" -msgstr "leder efter ændringer\n" - -msgid "queries" -msgstr "" - -msgid "already have changeset " -msgstr "har allerede ændringen " - -msgid "warning: repository is unrelated\n" -msgstr "advarsel: depotet er urelateret\n" - -msgid "repository is unrelated" -msgstr "depotet er urelateret" - msgid "requesting all changes\n" msgstr "anmoder om alle ændringer\n" -msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." -msgstr "" - -#, python-format -msgid "abort: push creates new remote heads on branch '%s'!\n" -msgstr "afbrudt: skub laver nye hoveder på grenen '%s'!\n" - -msgid "abort: push creates new remote heads!\n" -msgstr "afbrudt: skub laver nye fjern-hoveder!\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" - -msgid "(use 'hg push -f' to force)\n" -msgstr "(brug push -f for at gennemtvinge)\n" - -msgid "note: unsynced remote changes!\n" -msgstr "bemærk: usynkroniserede ændringer i fjernsystemet!\n" +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "" #, python-format msgid "%d changesets found\n" @@ -9942,9 +11776,6 @@ msgid "received file revlog group is empty" msgstr "" -msgid "files" -msgstr "filer" - #, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "" @@ -10029,7 +11860,9 @@ msgstr "" #, python-format -msgid "untracked file in working directory differs from file in requested revision: '%s'" +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "" #, python-format @@ -10102,10 +11935,15 @@ msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')" msgid "outstanding uncommitted changes (use 'hg status' to list changes)" -msgstr "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" - -msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" -msgstr "krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at kassere ændringerne)" +msgstr "" +"udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" + +msgid "" +"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " +"changes)" +msgstr "" +"krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at " +"kassere ændringerne)" msgid "crosses branches (use 'hg merge' or use 'hg update -c')" msgstr "krydser grene (brug 'hg merge' eller 'hg update -c')" @@ -10166,8 +12004,8 @@ msgstr "binær rettelse er %d byte, ikke %d" #, python-format -msgid "unable to strip away %d dirs from %s" -msgstr "kan ikke strippe %d kataloger fra %s" +msgid "unable to strip away %d of %d dirs from %s" +msgstr "kan ikke strippe %d ud af %d kataloger fra %s" msgid "undefined source and destination files" msgstr "" @@ -10210,8 +12048,8 @@ msgstr "dræbt af signal %d" #, python-format -msgid "saving bundle to %s\n" -msgstr "gemmer bundt i %s\n" +msgid "saved backup bundle to %s\n" +msgstr "gemmer backup-bundt i %s\n" msgid "adding branch\n" msgstr "tilføjer gren\n" @@ -10266,6 +12104,114 @@ msgid "consistency error adding group" msgstr "konsistensfejl ved tilføjelse af gruppe" +msgid "unterminated string" +msgstr "" + +msgid "syntax error" +msgstr "syntaksfejl" + +msgid "missing argument" +msgstr "manglende parameter" + +msgid "can't negate that" +msgstr "" + +#, python-format +msgid "can't use %s here" +msgstr "" + +msgid "can't use a list in this context" +msgstr "" + +#, python-format +msgid "not a function: %s" +msgstr "ikke en funktion: %s" + +msgid "limit wants two arguments" +msgstr "" + +msgid "limit wants a number" +msgstr "" + +msgid "limit expects a number" +msgstr "" + +msgid "ancestor wants two arguments" +msgstr "" + +msgid "ancestor arguments must be single revisions" +msgstr "" + +msgid "follow takes no arguments" +msgstr "" + +msgid "date wants a string" +msgstr "" + +msgid "keyword wants a string" +msgstr "" + +msgid "grep wants a string" +msgstr "" + +msgid "author wants a string" +msgstr "" + +msgid "file wants a pattern" +msgstr "" + +msgid "contains wants a pattern" +msgstr "" + +msgid "modifies wants a pattern" +msgstr "" + +msgid "adds wants a pattern" +msgstr "" + +msgid "removes wants a pattern" +msgstr "" + +msgid "merge takes no arguments" +msgstr "" + +msgid "closed takes no arguments" +msgstr "" + +msgid "head takes no arguments" +msgstr "" + +msgid "sort wants one or two arguments" +msgstr "" + +msgid "sort spec must be a string" +msgstr "" + +#, python-format +msgid "unknown sort key %r" +msgstr "ukendt sorteringsnøgle %r" + +msgid "all takes no arguments" +msgstr "" + +msgid "outgoing wants a repository path" +msgstr "" + +msgid "tagged takes no arguments" +msgstr "" + +msgid "not a symbol" +msgstr "" + +msgid "empty query" +msgstr "tomt forespørgsel" + +msgid "searching for exact renames" +msgstr "leder efter eksakte omdøbninger" + +msgid "searching for similar files" +msgstr "leder efter lignende filer" + #, python-format msgid "%s looks like a binary file." msgstr "%s ser ud som en binær fil." @@ -10348,8 +12294,8 @@ msgstr "hiver underdepot %s fra %s\n" #, python-format -msgid "pushing subrepo %s\n" -msgstr "skubber til underdepot %s\n" +msgid "pushing subrepo %s to %s\n" +msgstr "skubber underdepot %s til %s\n" msgid "cannot commit svn externals" msgstr "kan ikke deponere svn externals" @@ -10620,9 +12566,6 @@ msgid "checking changesets\n" msgstr "kontrollerer ændringer\n" -msgid "checking" -msgstr "kontrollerer" - #, python-format msgid "unpacking changeset %s" msgstr "udpakker ændring %s" @@ -10664,6 +12607,9 @@ msgid "cannot decode filename '%s'" msgstr "kan ikke dekode filnavn '%s'" +msgid "checking" +msgstr "kontrollerer" + #, python-format msgid "broken revlog! (%s)" msgstr "beskadiget revlog! (%s)"