# HG changeset patch # User Martin Geisler # Date 1277069829 -7200 # Node ID b4467a7d5c75aadbad2e8de3763f3df5a9fef17b # Parent fff28d436489054f889687d7308b3cfa5806e775# Parent 6f1d1ed3e19aaf4bfc14741956e0e6ff06fbe9d2 Merge with mpm diff -r 6f1d1ed3e19a -r b4467a7d5c75 hgext/acl.py --- a/hgext/acl.py Sun Jun 20 14:21:56 2010 -0500 +++ b/hgext/acl.py Sun Jun 20 23:37:09 2010 +0200 @@ -74,7 +74,7 @@ # Use this if you want to check access restrictions at commit time pretxncommit.acl = python:hgext.acl.hook - + # Use this if you want to check access restrictions for pull, push, # bundle and serve. pretxnchangegroup.acl = python:hgext.acl.hook @@ -87,27 +87,27 @@ # Default: serve sources = serve - [acl.deny.branches] - - # Everyone is denied to the frozen branch: - frozen-branch = * - - # A bad user is denied on all branches: - * = bad-user - - [acl.allow.branches] - - # A few users are allowed on branch-a: - branch-a = user-1, user-2, user-3 - - # Only one user is allowed on branch-b: - branch-b = user-1 - - # The super user is allowed on any branch: - * = super-user - - # Everyone is allowed on branch-for-tests: - branch-for-tests = * + [acl.deny.branches] + + # Everyone is denied to the frozen branch: + frozen-branch = * + + # A bad user is denied on all branches: + * = bad-user + + [acl.allow.branches] + + # A few users are allowed on branch-a: + branch-a = user-1, user-2, user-3 + + # Only one user is allowed on branch-b: + branch-b = user-1 + + # The super user is allowed on any branch: + * = super-user + + # Everyone is allowed on branch-for-tests: + branch-for-tests = * [acl.deny] # This list is checked first. If a match is found, acl.allow is not diff -r 6f1d1ed3e19a -r b4467a7d5c75 i18n/da.po --- a/i18n/da.po Sun Jun 20 14:21:56 2010 -0500 +++ b/i18n/da.po Sun Jun 20 23:37:09 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: \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 20:01+0200\n" "Last-Translator: \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 " [hooks]" + +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 " .hgtags = release_engineer" + +#, 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 "" @@ -143,6 +290,8 @@ " [bookmarks]\n" " track.current = True" msgstr "" +" [bookmarks]\n" +" track.current = True" msgid "" "This will cause Mercurial to track the bookmark that you are currently\n" @@ -153,12 +302,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 +335,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 "REV" + 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" @@ -349,6 +542,8 @@ " [extensions]\n" " bugzilla =" msgstr "" +" [extensions]\n" +" bugzilla =" msgid "" " [hooks]\n" @@ -377,16 +572,30 @@ " {desc}\\n\n" " strip=5" msgstr "" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" +" strip=5" msgid "" " [web]\n" " baseurl=http://dev.domain.com/hg" msgstr "" +" [web]\n" +" baseurl=http://dev.domain.com/hg" msgid "" " [usermap]\n" " user@emaildomain.com=user.name@bugzilladomain.com" msgstr "" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com" msgid "Commits add a comment to the Bugzilla bug record of the form::" msgstr "" @@ -570,8 +779,8 @@ " Det er muligt at afbilde alternative e-mail-adresser til\n" " hoved-adresser ved at bruge en fil med følgende format::" -msgid " " -msgstr " " +msgid " = " +msgstr " = " msgid "" " Such a file may be specified with the --aliases option, otherwise\n" @@ -585,12 +794,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 +821,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 +834,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 +926,37 @@ " 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 "" +" [color]\n" +" mode = ansi" + +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 "TYPE" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "importer revisioner fra fremmede VCS depoter ind i Mercurial" @@ -737,6 +977,15 @@ " - Bazaar [bzr]\n" " - Perforce [p4]" msgstr "" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +" - Perforce [p4]" msgid " Accepted destination formats [identifiers]:" msgstr "" @@ -1011,7 +1260,7 @@ msgstr "" msgid " " -msgstr "" +msgstr " " msgid "create changeset information from CVS" msgstr "" @@ -1095,7 +1344,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 +1407,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 +1460,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 +1474,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 +1489,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 +1512,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 +1543,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 +1573,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 +1601,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 +1631,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 +1640,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 +1648,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 +1670,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 +1690,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 +1745,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 +1764,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 +1780,123 @@ 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 "" +" [patterns]\n" +" **.py = native\n" +" **.vcproj = CRLF\n" +" **.txt = native\n" +" Makefile = LF\n" +" **.jpg = BIN" + +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 +1910,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 +1940,40 @@ " 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 "" +" [diff-tools]\n" +" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" + +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 +2014,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 +2072,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 +2093,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 +2197,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 +2216,15 @@ msgid "do not commit the sigfile after signing" msgstr "deponer ikke signaturfilen efter underskrivning" +msgid "ID" +msgstr "ID" + 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 +2281,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 +2369,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 "" @@ -1888,6 +2388,8 @@ " [hgk]\n" " vdiff=vdiff" msgstr "" +" [hgk]\n" +" vdiff=vdiff" msgid "" "Revisions context menu will now display additional entries to fire\n" @@ -1975,89 +2477,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 = \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 = \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 = \n" -"\n" -"Standardstilen er 'colorful'.\n" -"\n" - -#, fuzzy +msgstr "Der er en enkelt konfigurationsmulighed::" + msgid "" " [web]\n" " pygments_style =