diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-21 19:16+0200\n" -"PO-Revision-Date: 2009-06-21 19:26+0200\n" +"POT-Creation-Date: 2009-06-24 17:38+0200\n" +"PO-Revision-Date: 2009-06-24 17:44+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -49,19 +49,23 @@ msgstr "" "\n" msgid "" -"provide simple hooks for access control\n" -"\n" -"Authorization is against local user name on system where hook is run, not\n" -"committer of original changeset (since that is easy to spoof).\n" -"\n" -"The acl hook is best to use if you use hgsh to set up restricted shells for\n" -"authenticated users to only push to / pull from. It's not safe if user has\n" -"interactive shell access, because they can disable the hook. It's also not\n" -"safe if remote users share one local account, because then there's no way " -"to\n" -"tell remote users apart.\n" -"\n" -"To use, configure the acl extension in hgrc like this:\n" +"control access to a repository using simple hooks\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"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.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this:\n" "\n" " [extensions]\n" " hgext.acl =\n" @@ -70,23 +74,24 @@ msgid "" " pretxnchangegroup.acl = python:hgext.acl.hook\n" "\n" " [acl]\n" -" sources = serve # check if source of incoming changes in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", " -"\"bundle\")\n" -"\n" -"Allow and deny lists have a subtree pattern (default syntax is glob) on the\n" -"left and user names on right. The deny list is checked before the allow " -"list.\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a\n" +"glob syntax by default), and a comma separated list of users as\n" +"the corresponding value. The deny list is checked before the allow\n" +"list is.\n" "\n" " [acl.allow]\n" -" # if acl.allow not present, all users allowed by default\n" -" # empty acl.allow = no users allowed\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\n" "\n" " [acl.deny]\n" -" # if acl.deny not present, no users denied by default\n" -" # empty acl.deny = all users allowed\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 "" @@ -125,32 +130,34 @@ msgid "acl: allowing changeset %s\n" msgstr "acl: tillader ændring %s\n" msgid "" -"Mercurial bookmarks\n" -"\n" -"Mercurial bookmarks are local moveable pointers to changesets. Every\n" -"bookmark points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark is forwarded to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" -"The bookmark extension offers the possiblity to have a more git-like\n" -"experience by adding the following configuration option to your .hgrc:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"This will cause bookmarks to track the bookmark that you are currently\n" -"on, and just updates it. This is similar to git's approach to\n" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it,\n" +"the bookmark shifts to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup\n" +"(e.g. hg merge, hg update).\n" +"\n" +"By default, when several bookmarks point to the same changeset, they\n" +"will all move forward together. It is possible to obtain a more\n" +"git-like experience by adding the following configuration option to\n" +"your .hgrc:\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"Mercurial bookmarks\n" +"track a line of development with movable markers\n" "\n" " Bookmarks are pointers to certain commits that move when\n" -" commiting. Bookmarks are local. They can be renamed, copied and\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.\n" "\n" @@ -195,7 +202,7 @@ msgid "hg bookmarks [-f] [-d] [-m NAME] msgstr "" msgid "" -"Bugzilla integration\n" +"integrate Mercurial with a Bugzilla bug tracker\n" "\n" "This hook extension adds comments on bugs in Bugzilla when changesets\n" "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" @@ -379,8 +386,8 @@ msgstr "" msgid "database error: %s" msgstr "databasefejl: %s" -msgid "provides children command to show children changesets" -msgstr "" +msgid "display children changesets" +msgstr "vis børne-ændringer" msgid "" "show the children of the given or working directory revision\n" @@ -407,8 +414,8 @@ msgstr "vis børn af den givne revision" msgid "hg children [-r REV] [FILE]" msgstr "" -msgid "command to show certain statistics about revision history" -msgstr "kommando til at vise statestikker om revisionshistorikken" +msgid "display statistics about repository history" +msgstr "vis statistikker om revisionshistorikken" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -521,7 +528,7 @@ msgid "hg churn [-d DATE] [-r REV] [--al msgstr "hg churn [-d DATO] [-r REVISIONER] [--aliases FIL] [--progress] [FIL]" msgid "" -"add color output to status, qseries, and diff-related commands\n" +"colorize output from some commands\n" "\n" "This extension modifies the status command to add color to its output\n" "to reflect file status, the qseries command to add color to reflect\n" @@ -569,7 +576,7 @@ msgstr "" msgid "don't colorize output" msgstr "" -msgid "converting foreign VCS repositories to Mercurial" +msgid "import from foreign VCS repositories into Mercurial" msgstr "" msgid "" @@ -1260,18 +1267,7 @@ msgid "gone from %s\n" msgstr "" #, python-format -msgid "found parent directory %s\n" -msgstr "" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "" - -msgid "munge-o-matic\n" -msgstr "" - -#, python-format -msgid "info: %s %s %s %s\n" +msgid "entry %s\n" msgstr "" #, python-format @@ -1298,10 +1294,6 @@ msgid "fetching revision log for \"%s\" msgstr "" #, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "" - -#, python-format msgid "revision %d has no entries\n" msgstr "" @@ -1425,7 +1417,7 @@ msgstr "" msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pulling, updating and merging in one command" +msgid "pull, update and merge in one command" msgstr "" msgid "" @@ -1511,8 +1503,8 @@ msgstr "" msgid "hg fetch [SOURCE]" msgstr "" -msgid "GnuPG signing extension for Mercurial" -msgstr "" +msgid "sign and verify changesets" +msgstr "underskriv og verificer ændringer" msgid "error while verifying signature" msgstr "" @@ -1596,7 +1588,7 @@ msgid "hg sigs" msgstr "" msgid "" -"show revision graphs in terminal windows\n" +"show revision graphs in terminals\n" "\n" "This extension adds a --graph option to the incoming, outgoing and log\n" "commands. When this options is given, an ASCII representation of the\n" @@ -1641,7 +1633,7 @@ msgid "hg glog [OPTION]... [FILE]" msgstr "" msgid "" -"CIA notification\n" +"integrate Mercurial with a CIA notification service\n" "\n" "This is meant to be run as a changegroup or incoming hook.\n" "To configure it, set the following options in your hgrc:\n" @@ -1691,7 +1683,7 @@ msgid "cia: no project specified" msgstr "cia: intet project angivet" msgid "" -"browsing the repository in a graphical way\n" +"browse the repository in a graphical way\n" "\n" "The hgk extension allows browsing the history of a repository in a\n" "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" @@ -1802,7 +1794,7 @@ msgid "hg debug-rev-list [options] revs" msgstr "" msgid "" -"syntax highlighting in hgweb, based on Pygments\n" +"syntax highlighting for hgweb\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -1817,7 +1809,7 @@ msgid "" "-- Adam Hupp \n" msgstr "" -msgid "inotify-based status acceleration for Linux systems\n" +msgid "accelerate status report using system level services" msgstr "" msgid "start an inotify server for this repository" @@ -2017,7 +2009,7 @@ msgid "interhg: invalid regexp for %s: % msgstr "" msgid "" -"keyword expansion in tracked files\n" +"expand keywords in tracked files\n" "\n" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" "tracked text files selected by your configuration.\n" @@ -2173,7 +2165,7 @@ msgid "hg kwshrink [OPTION]... [FILE]... msgstr "" msgid "" -"patch management and development\n" +"work with a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" @@ -2196,9 +2188,9 @@ msgid "" "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"udvikling og håndtering af patches\n" -"\n" -"Denne udvidelse lader dig arbejde med en stak af patches i et\n" +"arbejd med en stak af lapper\n" +"\n" +"Denne udvidelse lader dig arbejde med en stak af lapper (patches) i et\n" "Mercurial repository. Den håndterer to stakke af patches - alle kendte\n" "patches og alle anvendte patches (en delmængde af de kendte patches).\n" "\n" @@ -2557,16 +2549,14 @@ msgstr "tilføjer %s til series filen\n" msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to the\n" -" -r/--rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular Mercurial changesets). The qfinish command should\n" -" be used as an alternative for qdelete -r, as the latter option is\n" -" deprecated.\n" +" The patches must not be applied, and at least one patch is\n" +" required.\n" "\n" " With -k/--keep, the patch files are preserved in the patch\n" -" directory." +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" @@ -2995,7 +2985,7 @@ msgstr "" msgid "keep patch file" msgstr "" -msgid "stop managing a revision" +msgid "stop managing a revision (DEPRECATED)" msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -3200,7 +3190,7 @@ msgid "hg qfinish [-a] [REV...]" msgstr "hg qfinish [-a] [REV...]" msgid "" -"hook extension to email notifications on commits/pushes\n" +"send e-mail notifications for commits/pushes\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3294,7 +3284,7 @@ msgid "notify: changes have source \"%s\ msgstr "" msgid "" -"browse command output with external pager\n" +"browse command output with an external pager\n" "\n" "To set the pager that should be used, set the application variable:\n" "\n" @@ -3329,7 +3319,7 @@ msgid "" msgstr "" msgid "" -"use suffixes to refer to ancestor revisions\n" +"interpret suffixes to refer to ancestor revisions\n" "\n" "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" @@ -3349,7 +3339,7 @@ msgid "" msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" +"send Mercurial changesets as a series of patch e-mails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3577,7 +3567,7 @@ msgstr "" msgid "hg email [OPTION]... [DEST]..." msgstr "" -msgid "enable removing untracked files only" +msgid "delete files not tracked from the working directory" msgstr "" msgid "" @@ -3812,7 +3802,7 @@ msgid "" "| [-c] | [-a]" msgstr "" -msgid "interactive change selection during commit or qrefresh" +msgid "interactively select which sets of changes to commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3949,7 +3939,7 @@ msgstr "" msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" -msgid "provides the hg share command" +msgid "share a common history between several working directories" msgstr "" msgid "" @@ -3970,7 +3960,7 @@ msgid "[-U] SOURCE [DEST]" msgstr "" msgid "" -"patch transplanting tool\n" +"transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -4116,7 +4106,7 @@ msgid "" msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" +"allow the use of MBCS paths with problematic encoding\n" "\n" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" @@ -4143,7 +4133,6 @@ msgid "" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" -"\n" msgstr "" #, python-format @@ -4158,7 +4147,7 @@ msgid "[win32mbcs] activated with encodi msgstr "" msgid "" -"LF <-> CRLF/CR translation utilities\n" +"perform automatic newline conversion\n" "\n" "To perform automatic newline conversion, use:\n" "\n" @@ -4223,7 +4212,7 @@ msgid "" msgstr "" msgid "" -"zeroconf support for Mercurial repositories\n" +"discover and advertise repositories on the local network\n" "\n" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" @@ -4502,7 +4491,7 @@ msgid "" " repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -4512,7 +4501,7 @@ msgstr "" " Opskriv filer til at blive versionsstyret og tilføjet til arkivet.\n" "\n" " Filerne vil bliver tilføjet til arkivet ved næste arkivering. For\n" -" at omgøre en tilføjelse før det, se hg revert.\n" +" at omgøre en tilføjelse før det, se hg forget.\n" "\n" " Hvis der ikke er angivet nogen navne tilføjes alle filer til\n" " arkivet.\n" @@ -4813,9 +4802,11 @@ msgid "" " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null). To change the compression method\n" -" applied, use the -t/--type option (by default, bundles are\n" -" compressed using bz2).\n" +" -a/--all (or --base null).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -5310,6 +5301,27 @@ msgid "exporting patch:\n" msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "fjerner ikke %s: filen følges ikke\n" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" @@ -5880,9 +5892,6 @@ msgstr "" " arkivering. For at omgøre en fjernelse før det, se hg revert.\n" " " -msgid "no files specified" -msgstr "" - #, python-format msgid "not removing %s: file is untracked\n" msgstr "fjerner ikke %s: filen følges ikke\n" @@ -7288,16 +7297,18 @@ msgstr "" msgid "" "\n" -" Mercurial has a mechanism for adding new features through the\n" -" use of extensions. Extensions may bring new commands, or new\n" -" hooks, or change Mercurial's behavior.\n" -"\n" -" Extensions are not loaded by default for a variety of reasons,\n" -" they may be meant for advanced users or provide potentially\n" -" dangerous commands (e.g. mq and rebase allow history to be\n" -" rewritten), they might not be ready for prime-time yet, or\n" -" they may alter Mercurial's behavior. It is thus up to the user\n" -" to activate extensions as desired.\n" +" Mercurial has the ability to add new features through the use of\n" +" extensions. Extensions may add new commands, add options to\n" +" existing commands, change the default behavior of commands, or\n" +" implement hooks.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons:\n" +" they can increase startup overhead; they may be meant for\n" +" advanced usage only; they may provide potentially dangerous\n" +" abilities (such as letting you destroy or modify history); they\n" +" might not be ready for prime time; or they may alter some\n" +" usual behaviors of stock Mercurial. It is thus up to the user to\n" +" activate extensions as needed.\n" "\n" " To enable the \"foo\" extension, either shipped with Mercurial\n" " or in the Python search path, create an entry for it in your\n" @@ -7315,7 +7326,7 @@ msgid "" " scope, prepend its path with !:\n" "\n" " [extensions]\n" -" # disabling extension bar residing in /ext/path\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" " hgext.bar = !/path/to/extension/bar.py\n" " # ditto, but no path was supplied for extension baz\n" " hgext.baz = !\n" @@ -8683,9 +8694,8 @@ msgid "" "use (l)ocal source (%s) or (r)emote source (%s)?" msgstr "" -#, fuzzy msgid "&Remote" -msgstr "fjernsystem: " +msgstr "" msgid "r" msgstr ""