# HG changeset patch # User Martin Geisler # Date 1256759304 -3600 # Node ID d942e06d7b14a3744881f87a9646cede6172de76 # Parent 1fd9177932698b65d531c0adca79a2ae9896ec88# Parent 96c803e9018f93493afd90f695178b9495703970 Merge with main diff -r 96c803e9018f -r d942e06d7b14 i18n/da.po --- a/i18n/da.po Wed Oct 28 13:17:03 2009 -0500 +++ b/i18n/da.po Wed Oct 28 20:48:24 2009 +0100 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-29 00:26+0200\n" -"PO-Revision-Date: 2009-09-29 00:41+0200\n" +"POT-Creation-Date: 2009-10-26 19:40+0100\n" +"PO-Revision-Date: 2009-10-26 20:52+0100\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -52,6 +52,502 @@ "\n" msgid "" +"Some commands allow the user to specify a date, e.g.:\n" +"\n" +"- backout, commit, import, tag: Specify the commit date.\n" +"- log, revert, update: Select revision(s) by date.\n" +"\n" +"Many date formats are valid. Here are some examples::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +"Lastly, there is Mercurial's internal format::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"This is the internal representation format for dates. unixtime is the\n" +"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" +"the offset of the local timezone, in seconds west of UTC (negative if\n" +"the timezone is east of UTC).\n" +"\n" +"The log command also accepts date ranges::\n" +"\n" +" \"<{datetime}\" - at or before a given date/time\n" +" \">{datetime}\" - on or after a given date/time\n" +" \"{datetime} to {datetime}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +msgstr "" +"Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" +"\n" +"- backout, commit, import, tag: specificer commit-datoen.\n" +"- log, revert, update: vælg revisioner efter dato.\n" +"\n" +"Der er mange gyldige datoformater. Her er nogle eksempler::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" +" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" +" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" +" \"Dec 6\" (midnat)\n" +" \"13:18\" (antager dags dato)\n" +" \"3:39\"\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (6. dec. 2006)\n" +"\n" +"Endelig er der Mercurials interne format::\n" +"\n" +" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" +"\n" +"Dette er den interne repræsentation af datoer. unixtime er\n" +"antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" +"UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" +"for UTC (negativ hvis tidszonen er øst for UTC).\n" +"\n" +"Kommandoen log accepterer også datointervaller::\n" +"\n" +" \"<{date}\" - på eller før den angivne dato/tidspunkt\n" +" \">{date}\" - på eller efter den angivne dato/tidspunkt\n" +" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" +" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" + +msgid "" +"Mercurial's default format for showing changes between two versions of\n" +"a file is compatible with the unified format of GNU diff, which can be\n" +"used by GNU patch and many other standard tools.\n" +"\n" +"While this standard format is often enough, it does not encode the\n" +"following information:\n" +"\n" +"- executable status and other permission bits\n" +"- copy or rename information\n" +"- changes in binary files\n" +"- creation or deletion of empty files\n" +"\n" +"Mercurial also supports the extended diff format from the git VCS\n" +"which addresses these limitations. The git diff format is not produced\n" +"by default because a few widespread tools still do not understand this\n" +"format.\n" +"\n" +"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" +"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" +"pull) are not affected by this, because they use an internal binary\n" +"format for communicating changes.\n" +"\n" +"To make Mercurial produce the git extended diff format, use the --git\n" +"option available for many commands, or set 'git = True' in the [diff]\n" +"section of your hgrc. You do not need to set this option when\n" +"importing diffs in this format or using them in the mq extension.\n" +msgstr "" + +msgid "" +"HG\n" +" Path to the 'hg' executable, automatically passed when running\n" +" hooks, extensions or external tools. If unset or empty, this is\n" +" the hg executable's name if it's frozen, or an executable named\n" +" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" +" Windows) is searched.\n" +"\n" +"HGEDITOR\n" +" This is the name of the editor to run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user input. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't map a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only the .hg/hgrc\n" +" from the current repository is read.\n" +"\n" +" For each element in HGRCPATH:\n" +"\n" +" - if it's a directory, all files ending with .rc are added\n" +" - otherwise, the file itself will be added\n" +"\n" +"HGUSER\n" +" This is the string used as the author of a commit. If not set,\n" +" available values will be considered in this order:\n" +"\n" +" - HGUSER (deprecated)\n" +" - hgrc files from the HGRCPATH\n" +" - EMAIL\n" +" - interactive prompt\n" +" - LOGNAME (with '@hostname' appended)\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"VISUAL\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR\n" +" Sometimes Mercurial needs to open a text file in an editor for a\n" +" user to modify, for example when writing commit messages. The\n" +" editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH\n" +" This is used by Python to find imported modules and may need to be\n" +" set appropriately if this Mercurial is not installed system-wide.\n" +msgstr "" + +msgid "" +"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 advanced\n" +"usage only; they may provide potentially dangerous abilities (such\n" +"as letting you destroy or modify history); they might not be ready\n" +"for prime time; or they may alter some usual behaviors of stock\n" +"Mercurial. It is thus up to the user to activate extensions as\n" +"needed.\n" +"\n" +"To enable the \"foo\" extension, either shipped with Mercurial or in\n" +"the Python search path, create an entry for it in your hgrc, like\n" +"this::\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +"You may also specify the full path to an extension::\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +"To explicitly disable an extension enabled in an hgrc of broader\n" +"scope, prepend its path with !::\n" +"\n" +" [extensions]\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" +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.\n" +"\n" +"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" +"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" +"specified, it defaults to revision number 0. If END is not specified,\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" +"\n" +"If BEGIN is greater than END, revisions are treated in reverse order.\n" +"\n" +"A range acts as a closed interval. This means that a range of 3:5\n" +"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" +msgstr "" + +msgid "" +"Mercurial accepts several notations for identifying one or more files\n" +"at a time.\n" +"\n" +"By default, Mercurial treats filenames as shell-style extended glob\n" +"patterns.\n" +"\n" +"Alternate pattern notations must be specified explicitly.\n" +"\n" +"To use a plain path name without any pattern matching, start it with\n" +"``path:``. These path names must completely match starting at the\n" +"current repository root.\n" +"\n" +"To use an extended glob, start a name with ``glob:``. Globs are rooted\n" +"at the current directory; a glob such as ``*.c`` will only match files\n" +"in the current directory ending with ``.c``.\n" +"\n" +"The supported glob syntax extensions are ``**`` to match any string\n" +"across path separators and ``{a,b}`` to mean \"a or b\".\n" +"\n" +"To use a Perl/Python regular expression, start a name with ``re:``.\n" +"Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +"Plain examples::\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root\n" +" of the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +"Glob examples::\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in any subdirectory of the\n" +" current directory including itself.\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" +" including itself.\n" +"\n" +"Regexp examples::\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" + +msgid "" +"Mercurial supports several ways to specify individual revisions.\n" +"\n" +"A plain integer is treated as a revision number. Negative integers are\n" +"treated as sequential offsets from the tip, with -1 denoting the tip,\n" +"-2 denoting the revision prior to the tip, and so forth.\n" +"\n" +"A 40-digit hexadecimal string is treated as a unique revision\n" +"identifier.\n" +"\n" +"A hexadecimal string less than 40 characters long is treated as a\n" +"unique revision identifier and is referred to as a short-form\n" +"identifier. A short-form identifier is only valid if it is the prefix\n" +"of exactly one full-length identifier.\n" +"\n" +"Any other string is treated as a tag or branch name. A tag name is a\n" +"symbolic name associated with a revision identifier. A branch name\n" +"denotes the tipmost revision of that branch. Tag and branch names must\n" +"not contain the \":\" character.\n" +"\n" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision.\n" +"\n" +"The reserved name \"null\" indicates the null revision. This is the\n" +"revision of an empty repository, and the parent of revision 0.\n" +"\n" +"The reserved name \".\" indicates the working directory parent. If no\n" +"working directory is checked out, it is equivalent to null. If an\n" +"uncommitted merge is in progress, \".\" is the revision of the first\n" +"parent.\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" +"template-style (--style).\n" +"\n" +"You can customize output for any \"log-like\" command: log,\n" +"outgoing, incoming, tip, parents, heads and glog.\n" +"\n" +"Three styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact and changelog.\n" +"Usage::\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +"A template is a piece of text, with markup to invoke variable\n" +"expansion::\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +"Strings in curly braces are called keywords. The availability of\n" +"keywords depends on the exact context of the templater. These\n" +"keywords are usually available for templating a log-like command:\n" +"\n" +":author: String. The unmodified author of the changeset.\n" +":branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was\n" +" default.\n" +":date: Date information. The date when the changeset was\n" +" committed.\n" +":desc: String. The text of the changeset description.\n" +":diffstat: String. Statistics of changes with the following\n" +" format: \"modified files: +added/-removed lines\"\n" +":files: List of strings. All files modified, added, or removed\n" +" by this changeset.\n" +":file_adds: List of strings. Files added by this changeset.\n" +":file_mods: List of strings. Files modified by this changeset.\n" +":file_dels: List of strings. Files removed by this changeset.\n" +":node: String. The changeset identification hash, as a\n" +" 40-character hexadecimal string.\n" +":parents: List of strings. The parents of the changeset.\n" +":rev: Integer. The repository-local changeset revision\n" +" number.\n" +":tags: List of strings. Any tags associated with the\n" +" changeset.\n" +":latesttag: String. Most recent global tag in the ancestors of this\n" +" changeset.\n" +":latesttagdistance: Integer. Longest path to the latest tag.\n" +"\n" +"The \"date\" keyword does not produce human-readable output. If you\n" +"want to use a date in your output, you can use a filter to process\n" +"it. Filters are functions which return a string based on the input\n" +"variable. You can also use a chain of filters to get the desired\n" +"output::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +"List of filters:\n" +"\n" +":addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" +" every line except the last.\n" +":age: Date. Returns a human-readable date/time difference\n" +" between the given date/time and the current\n" +" date/time.\n" +":basename: Any text. Treats the text as a path, and returns the\n" +" last component of the path after splitting by the\n" +" path separator (ignoring trailing separators). For\n" +" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" +" becomes \"bar\".\n" +":stripdir: Treat the text as path and strip a directory level,\n" +" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" +" \"foo\".\n" +":date: Date. Returns a date in a Unix date format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +":domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain\n" +" component. Example: 'User ' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User '\n" +" becomes 'user@example.com'.\n" +":escape: Any text. Replaces the special XML/XHTML characters\n" +" \"&\", \"<\" and \">\" with XML entities.\n" +":fill68: Any text. Wraps the text to fit in 68 columns.\n" +":fill76: Any text. Wraps the text to fit in 76 columns.\n" +":firstline: Any text. Returns the first line of text.\n" +":nonempty: Any text. Returns '(none)' if the string is empty.\n" +":hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +":isodate: Date. Returns the date in ISO 8601 format:\n" +" \"2009-08-18 13:00 +0200\".\n" +":isodatesec: Date. Returns the date in ISO 8601 format, including\n" +" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" +" rfc3339date filter.\n" +":localdate: Date. Converts a date to local date.\n" +":obfuscate: Any text. Returns the input text rendered as a\n" +" sequence of XML entities.\n" +":person: Any text. Returns the text before an email address.\n" +":rfc822date: Date. Returns a date using the same format used in\n" +" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Date. Returns a date using the Internet date format\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" +":short: Changeset hash. Returns the short form of a changeset\n" +" hash, i.e. a 12-byte hexadecimal string.\n" +":shortdate: Date. Returns a date like \"2006-09-18\".\n" +":strip: Any text. Strips all leading and trailing whitespace.\n" +":tabindent: Any text. Returns the text, with every line except\n" +" the first starting with a tab character.\n" +":urlescape: Any text. Escapes all \"special\" characters. For\n" +" example, \"foo bar\" becomes \"foo%20bar\".\n" +":user: Any text. Returns the user portion of an email\n" +" address.\n" +msgstr "" + +msgid "" +"Valid URLs are of the form::\n" +"\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" +"\n" +"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').\n" +"\n" +"An optional identifier after # indicates a particular branch, tag, or\n" +"changeset to use from the remote repository. See also 'hg help\n" +"revisions'.\n" +"\n" +"Some features, such as pushing to http:// and https:// URLs are only\n" +"possible if the feature is explicitly enabled on the remote Mercurial\n" +"server.\n" +"\n" +"Some notes about using SSH with Mercurial:\n" +"\n" +"- SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +"- path is relative to the remote user's home directory by default. Use\n" +" an extra slash at the start of a path to specify an absolute path::\n" +"\n" +" ssh://example.com//tmp/repository\n" +"\n" +"- Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.::\n" +"\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +"These URLs can all be stored in your hgrc with path aliases under the\n" +"[paths] section like so::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"You can then use the alias for any command that uses a URL (for\n" +"example 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +"Two path aliases are special because they are used as defaults when\n" +"you do not provide the URL to a command:\n" +"\n" +"default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the new repository's\n" +" 'default' path. This is then used when you omit path from push- and\n" +" pull-like commands (including incoming and outgoing).\n" +"\n" +"default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +msgstr "" + +msgid "" "hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" @@ -100,38 +596,14 @@ msgstr "" #, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s er ikke slået til\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s slået til, %d optegnelser for bruger %s\n" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: ændringer har kilde \"%s\" - springer over\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: bruger %s nægtet adgang til %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: adgang nægtet til ændring %s" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: bruger %s ikke tilladt på %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: tillader ændring %s\n" - msgid "" "track a line of development with movable markers\n" "\n" @@ -521,10 +993,6 @@ " bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "antager %i-tegn terminal\n" - msgid "count rate for the specified revision or range" msgstr "lav statistik for de specificerede revisioner" @@ -598,12 +1066,12 @@ msgid "when to colorize (always, auto, or never)" msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" -msgid "don't colorize output" -msgstr "farvelæg ikke output" +msgid "don't colorize output (DEPRECATED)" +msgstr "farvelæg ikke output (FORÆLDET)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" -msgstr "" +msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n" msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "importer revisioner fra fremmede VCS depoter ind i Mercurial" @@ -735,23 +1203,8 @@ " converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" -" Because CVS does not have changesets, it is necessary to collect\n" -" individual commits to CVS and merge them into changesets. CVS\n" -" source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" " The options shown are the defaults.\n" "\n" -" Internal cvsps is selected by setting ::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" and has a few more configurable options:\n" -"\n" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -771,9 +1224,10 @@ " add the most recent revision on the branch indicated in the\n" " regex as the second parent of the changeset.\n" "\n" -" The hgext/convert/cvsps wrapper script allows the builtin\n" +" An additional \"debugcvsps\" Mercurial command allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" -" parameters and output are similar to that of cvsps 2.1.\n" +" parameters and output are similar to that of cvsps 2.1. Please see\n" +" the command help for more details.\n" "\n" " Subversion Source\n" " -----------------\n" @@ -936,10 +1390,6 @@ msgstr "kan ikke finde påkrævet værktøj \"%s\"" #, python-format -msgid "running: %s\n" -msgstr "kører: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s fejl:\n" @@ -1017,19 +1467,9 @@ msgid "--sourcesort is not supported by this data source" msgstr "--sourcesort er ikke supporteret at denne datakilde" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "" -"advarsel: support for ekstern cvsps er forældet og vil blive fjernet i " -"Mercurial 1.4\n" - -#, python-format -msgid "revision %s is not a patchset number or date" -msgstr "" - -msgid "using builtin cvsps\n" -msgstr "bruger indbygget cvsps\n" +#, python-format +msgid "revision %s is not a patchset number" +msgstr "" #, python-format msgid "connecting to %s\n" @@ -1075,10 +1515,6 @@ msgid "running %s\n" msgstr "kører %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "præfiks=%r katalog=%r rod=%r\n" - msgid "RCS file must be followed by working file" msgstr "RCS-fil skal efterfølges af en arbejdsfil" @@ -1092,10 +1528,6 @@ msgstr "revision skal efterfølges af datolinje" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "fandt syntetisk revision i %s: %r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "skriver cvs log-mellemlager %s\n" @@ -1123,15 +1555,11 @@ #, python-format msgid "darcs version 2.1 or newer needed (found %r)" -msgstr "" +msgstr "kræver darcs version 2.1 eller nyere (fandt %r)" msgid "Python ElementTree module is not available" msgstr "Python ElementTree modulet er ikke tilstede" -#, python-format -msgid "cleaning up %s\n" -msgstr "rydder op %s\n" - msgid "internal calling inconsistency" msgstr "intern kaldeinkonsistens" @@ -1166,22 +1594,6 @@ msgstr "" #, python-format -msgid "applying revision %s...\n" -msgstr "anvender revision %s...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "beregner ændringer mellem %s og %s...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "henter revision %s...\n" - -#, python-format -msgid "analyzing revision %s...\n" -msgstr "analyserer revision %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "kan ikke parse cat-log af %s" @@ -1193,12 +1605,6 @@ msgid "initializing destination %s repository\n" msgstr "initialiserer mål %s depot\n" -msgid "run hg sink pre-conversion action\n" -msgstr "" - -msgid "run hg sink post-conversion action\n" -msgstr "" - #, python-format msgid "pulling from %s into %s\n" msgstr "hiver fra %s ind i %s\n" @@ -1217,12 +1623,6 @@ msgid "ignoring: %s\n" msgstr "ignorerer: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "" - -msgid "run hg source post-conversion action\n" -msgstr "" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s ser ikke ud som et monotone depot" @@ -1237,6 +1637,9 @@ msgid "collecting p4 changelists\n" msgstr "samler p4 changelists\n" +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 "Subversion python bindings could not be loaded" msgstr "Subversion python bindingerne kunne ikke indlæses" @@ -1287,69 +1690,22 @@ msgstr "ingen mærkater fundet ved revision %d\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "ignorerer fremmed gren %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s blev ikke fundet op til revision %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "gren omdøbt fra %s til %s ved %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "kopieret til %s fra %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "væk fra %s\n" - -#, python-format -msgid "entry %s\n" -msgstr "" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "ukendt sti i revision %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "parser revision %d (%d ændringer)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "fandt forælder til gren %s ved %d: %s\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "henter revisionslog for \"%s\" fra %d til %d\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "revision %d har ikke nogen indgange\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: gren har ikke nogen revision %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r ikke under %r, ignorerer\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "initialiserer svn depot %r\n" @@ -1364,7 +1720,7 @@ msgstr "kan ikke håndtere svn output" msgid "XXX TAGS NOT IMPLEMENTED YET\n" -msgstr "" +msgstr "XXX MÆRKATER ER IKKE IMPLEMENTERET ENDNU\n" msgid "" "command to allow external programs to compare revisions\n" @@ -1414,14 +1770,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "kan ikke angive --rev og --change på samme tid" -#, python-format -msgid "running %r in %s\n" -msgstr "kører %r i %s\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "" - msgid "cleaning up temp directory\n" msgstr "rydder midlertidigt katalog op\n" @@ -1741,12 +2089,6 @@ msgid "email.from must be defined when sending by email" msgstr "email.from skal være defineret ved afsendelse af email" -msgid "cia: no user specified" -msgstr "cia: ingen bruger angivet" - -msgid "cia: no project specified" -msgstr "cia: intet project angivet" - msgid "" "browse the repository in a graphical way\n" "\n" @@ -1787,13 +2129,13 @@ msgstr "udskriv en bestemt revision" msgid "cat-file: type or revision not supplied\n" -msgstr "" +msgstr "cat-file: ingen type eller revision angivet\n" msgid "aborting hg cat-file only understands commits\n" -msgstr "" +msgstr "afbryder: hg cat-file forstår kun deponeringer\n" msgid "parse given revisions" -msgstr "" +msgstr "fortolk de givne revisioner" msgid "print revisions" msgstr "udskriv revisioner" @@ -1838,22 +2180,22 @@ msgstr "hg debug-merge-base REV REV" msgid "ignored" -msgstr "Ignoreret" +msgstr "ignoreret" msgid "hg debug-rev-parse REV" msgstr "hg debug-rev-parse REV" msgid "header" -msgstr "" +msgstr "header" msgid "topo-order" -msgstr "topologisk ordning" +msgstr "topo-order" msgid "parents" msgstr "forældre" msgid "max-count" -msgstr "" +msgstr "max-count" msgid "hg debug-rev-list [OPTION]... REV..." msgstr "hg debug-rev-list [TILVALG]... REV..." @@ -1923,9 +2265,6 @@ msgid "(found dead inotify server socket; removing it)\n" msgstr "(fandt død inotify server sokkel; fjerner den)\n" -msgid "(starting inotify server)\n" -msgstr "(starter inotify server)\n" - #, python-format msgid "could not start inotify server: %s\n" msgstr "kunne ikke starte inotify server: %s\n" @@ -1934,9 +2273,6 @@ msgid "could not talk to new inotify server: %s\n" msgstr "kunne ikke snakke med ny inotify server: %s\n" -msgid "(inotify server not running)\n" -msgstr "(inotify server kører ikke)\n" - #, python-format msgid "failed to contact inotify server: %s\n" msgstr "kontakt med inotify server miskykkedes: %s\n" @@ -1957,10 +2293,10 @@ #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" -msgstr "" +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 "" +msgstr "*** denne grænse er for lille til at overvåge alle biblioteker i dette depot\n" msgid "*** counting directories: " msgstr "*** tæller kataloger: " @@ -1971,23 +2307,23 @@ #, python-format msgid "*** to raise the limit from %d to %d (run as root):\n" -msgstr "" +msgstr "*** for at hæve grænsen fra %d til %d (kør som root):\n" #, python-format msgid "*** echo %d > %s\n" -msgstr "" +msgstr "*** echo %d > %s\n" #, python-format msgid "cannot watch %s until inotify watch limit is raised" -msgstr "" +msgstr "kan ikke overvåge %s før inotify overvågningsgrænsen er hævet" #, python-format msgid "inotify service not available: %s" -msgstr "" +msgstr "inotify service er ikke tilgængelig: %s" #, python-format msgid "watching %r\n" -msgstr "overvåget %r\n" +msgstr "overvåger %r\n" #, python-format msgid "watching directories under %r\n" @@ -2214,14 +2550,6 @@ "\tkeywords expanded\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" -"\n" -"fjerner midlertidigt depot %s\n" - msgid "" "expand keywords in the working directory\n" "\n" @@ -2244,15 +2572,13 @@ " See \"hg help keyword\" on how to construct patterns both for\n" " inclusion and exclusion of files.\n" "\n" -" Use -u/--untracked to list untracked files as well.\n" -"\n" -" With -a/--all and -v/--verbose the codes used to show the status\n" +" With -A/--all and -v/--verbose the codes used to show the status\n" " of files are::\n" "\n" " K = keyword expansion candidate\n" -" k = keyword expansion candidate (untracked)\n" +" k = keyword expansion candidate (not tracked)\n" " I = ignored\n" -" i = ignored (untracked)\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2284,8 +2610,14 @@ msgid "show files excluded from expansion" msgstr "vis filer ekskluderet fra ekspansion" -msgid "additionally show untracked files" -msgstr "vis også ikke-fulgte filer" +msgid "only show unknown (not tracked) files" +msgstr "vis kun ukendte (ikke-fulgte) filer" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "vis keyword status for alle filer (FORÆLDET)" + +msgid "only show untracked files (DEPRECATED)" +msgstr "vis kun ikke-fulgte filer (FORÆLDET)" msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [TILVALG]... [FIL]..." @@ -2356,10 +2688,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2504,7 +2832,7 @@ #, python-format msgid "patch %s not in series" -msgstr "" +msgstr "rettelsen %s er ikke i serien" msgid "(working directory not at a head)\n" msgstr "(arbejdskatalog er ikke ved et hoved)\n" @@ -2518,11 +2846,11 @@ #, python-format msgid "qpush: %s is already at the top\n" -msgstr "" +msgstr "qpush: %s er allerede ved toppen\n" #, python-format msgid "guarded by %r" -msgstr "" +msgstr "beskyttet af %r" msgid "no matching guards" msgstr "" @@ -2542,7 +2870,7 @@ #, python-format msgid "errors during apply, please fix and refresh %s\n" -msgstr "" +msgstr "der opstod fejl ved anvendelsen, ret dem venligst og genopfrisk %s\n" #, python-format msgid "now at: %s\n" @@ -2560,11 +2888,11 @@ msgstr "qpop: %s er allerede ved toppen\n" msgid "qpop: forcing dirstate update\n" -msgstr "" +msgstr "qpop: gennemtvinger opdatering af dirstate\n" #, python-format msgid "trying to pop unknown node %s" -msgstr "" +msgstr "prøver at fjerne ukendt knude %s" msgid "popping would remove a revision not managed by this patch queue" msgstr "" @@ -2580,7 +2908,7 @@ msgstr "køen af rettelser er nu tom\n" msgid "cannot refresh a revision with children" -msgstr "" +msgstr "kan ikke genopfriske en revision som har børn" msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " @@ -2588,7 +2916,7 @@ msgstr "" msgid "patch queue directory already exists" -msgstr "" +msgstr "rettelsesdepotet findes allerede" #, python-format msgid "patch %s is not in series file" @@ -2613,7 +2941,7 @@ msgstr "" msgid "queue directory updating\n" -msgstr "" +msgstr "opdaterer rettelsesdepotet\n" msgid "Unable to load queue repository\n" msgstr "" @@ -2622,13 +2950,13 @@ msgstr "" msgid "status is already saved\n" -msgstr "" +msgstr "status er allerede gemt\n" msgid "hg patches saved state" msgstr "" msgid "repo commit failed\n" -msgstr "" +msgstr "deponering fejlede\n" #, python-format msgid "patch %s is already in the series file" @@ -2650,7 +2978,7 @@ #, python-format msgid "revision %d is not the parent of the queue" -msgstr "" +msgstr "revision %d er ikke forfaren til køen" #, python-format msgid "revision %d has unmanaged children" @@ -2662,7 +2990,7 @@ #, python-format msgid "revision %d is not the parent of %d" -msgstr "" +msgstr "revision %d er ikke forældren til %d" msgid "-e is incompatible with import from -" msgstr "-e er ikke kompatibelt med importering fra -" @@ -2800,13 +3128,13 @@ msgstr "kloner depotet til rettelser\n" msgid "stripping applied patches from destination repository\n" -msgstr "" +msgstr "stripper anvendte rettelser fra destinationsdepotet\n" msgid "updating destination repository\n" -msgstr "" +msgstr "opdaterer destinationsdepotet\n" msgid "commit changes in the queue repository" -msgstr "" +msgstr "deponerer ændringer i kødepotet" msgid "print the entire series file" msgstr "udskriver hele series filen" @@ -2929,18 +3257,18 @@ #, python-format msgid "Skipping already folded patch %s" -msgstr "" +msgstr "Springer allerede foldet rettelse %s over" #, python-format msgid "qfold cannot fold already applied patch %s" -msgstr "" +msgstr "qfold kan ikke folde allerede anvendt rettelse %s" #, python-format msgid "Error folding patch %s" -msgstr "" +msgstr "Fejl ved foldning af rettelse %s" msgid "push or pop patches until named patch is at top of stack" -msgstr "" +msgstr "tilføj eller fjern rettelser indtil den navngivne rettelser er på toppen af stakken" msgid "" "set or print guards for a patch\n" @@ -2971,7 +3299,7 @@ msgstr "ingen patch ved navn %s" msgid "print the header of the topmost or specified patch" -msgstr "" +msgstr "udskriv hovedet af den øverste eller den angivne rettelse" msgid "" "push the next patch onto the stack\n" @@ -3166,7 +3494,7 @@ msgstr "kan ikke importere henover en anvendt rettelse" msgid "print first line of patch header" -msgstr "" +msgstr "udskriv første linie i rettelsens hoved" msgid "show only the last patch" msgstr "vis kun den sidste rettelse" @@ -3196,7 +3524,7 @@ msgstr "hg qdiff [TILVALG]... [FIL]..." msgid "keep patch file" -msgstr "" +msgstr "behold rettelsesfil" msgid "stop managing a revision (DEPRECATED)" msgstr "" @@ -3205,10 +3533,10 @@ msgstr "hg qdelete [-k] [-r REV]... [RETTELSE]..." msgid "edit patch header" -msgstr "" +msgstr "rediger rettelsens hoved" msgid "keep folded patch files" -msgstr "" +msgstr "behold foldede rettelsesfiler" msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." msgstr "hg qfold [-e] [-k] [-m TEKST] [-l FIL] RETTELSE..." @@ -3232,7 +3560,7 @@ msgstr "hg qheader [RETTELSE]" msgid "import file in patch directory" -msgstr "" +msgstr "importer en fil i rettelsesbiblioteket" msgid "name of patch file" msgstr "navn på rettelse" @@ -3259,7 +3587,7 @@ msgstr "hg qinit [-c]" msgid "import uncommitted changes into patch" -msgstr "" +msgstr "importer ikke-deponerede ændringer ind i rettelse" msgid "add \"From: \" to patch" msgstr "tilføj \"From: \" til rettelsen" @@ -3288,8 +3616,8 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" -msgstr "glem eventuelle lokale ændringer" +msgid "forget any local changes to patched files" +msgstr "glem eventuelle lokale ændringer i de rettede filer" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]" @@ -3313,13 +3641,13 @@ msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [RETTELSE | INDEKS]" msgid "refresh only files already in the patch and specified files" -msgstr "" +msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer" msgid "add/update author field in patch with current user" -msgstr "" +msgstr "tilføj/opdater forfatterfeltet i rettelsen med den aktuelle bruger" msgid "add/update author field in patch with given user" -msgstr "" +msgstr "tilføj/opdater forfatterfeltet i rettelsen med den angivne bruger" msgid "add/update date field in patch with current date" msgstr "tilføj/opdater datofeltet i rettelsen med den aktuelle dato" @@ -3352,7 +3680,7 @@ msgstr "" msgid "force copy" -msgstr "" +msgstr "gennemtving kopiering" msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" msgstr "hg qsave [-m TEKST] [-l FIL] [-c] [-n NAVN] [-e] [-f]" @@ -3373,7 +3701,7 @@ msgstr "hg qselect [TILVALG]... [VAGT]..." msgid "print patches not in series" -msgstr "" +msgstr "udskriv rettelser som ikke er i serien" msgid "hg qseries [-ms]" msgstr "hg qseries [-ms]" @@ -3445,6 +3773,7 @@ " 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" " from = user@host.com # email address to send as if none given\n" " [web]\n" @@ -3483,22 +3812,18 @@ "\n" "diffs (truncated from %d to %d lines):\n" "\n" -msgstr "" +msgstr "\nændringer (afkortet fra %d til %d linier):\n\n" #, python-format msgid "" "\n" "diffs (%d lines):\n" "\n" -msgstr "" - -#, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "notify: ingen abonnementer til depot %s\n" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "notify: ændringer har kilde \"%s\" - springer over\n" +msgstr "\nændringer (%d linier):\n\n" + +#, python-format +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "notify: udelader notifikation for sammenføjning %d:%s\n" msgid "" "browse command output with an external pager\n" @@ -3620,11 +3945,15 @@ "hgrc(5) for details.\n" msgstr "" +#, python-format +msgid "%sPlease enter a valid value" +msgstr "%sAngiv venligst en gyldig værdi." + msgid "Please enter a valid value.\n" msgstr "Angiv venligst en gyldig værdi.\n" msgid "does the diffstat above look okay? " -msgstr "" +msgstr "ser det ovenstående diffstat okay ud? " msgid "diffstat rejected" msgstr "diffstat afvist" @@ -3697,16 +4026,16 @@ "\n" "Write the introductory message for the patch series.\n" "\n" -msgstr "" +msgstr "\nSkriv introduktionsbeskeden for rettelsesserien.\n\n" #, python-format msgid "" "This patch series consists of %d patches.\n" "\n" -msgstr "" +msgstr "Denne rettelsesserie består af %d rettelser.\n\n" msgid "Final summary:\n" -msgstr "" +msgstr "Endeligt sammendrag:\n" msgid "Displaying " msgstr "Viser " @@ -3733,46 +4062,46 @@ msgstr "tilføj diffstat resultat til beskeder" msgid "use the given date as the sending date" -msgstr "" +msgstr "brug den givne dato som afsendelsesdatoen" msgid "use the given file as the series description" -msgstr "" +msgstr "brug den givne fil som seriens beskrivelse" msgid "email address of sender" msgstr "" msgid "print messages that would be sent" -msgstr "" +msgstr "udskriv beskeder som ville være blevet sendt" msgid "write messages to mbox file instead of sending them" -msgstr "" +msgstr "skriv beskeder til mbox-fil i stedet for at sende dem" msgid "subject of first message (intro or single patch)" -msgstr "" +msgstr "emne for den første besked (intro eller en enkelt rettelse)" msgid "message identifier to reply to" -msgstr "" +msgstr "message identifier der skal svares på" msgid "flags to add in subject prefixes" -msgstr "" +msgstr "flag som skal tilføjes i emne-præfixer" msgid "email addresses of recipients" msgstr "" msgid "omit hg patch header" -msgstr "" +msgstr "undlad hg rettelseshoved" msgid "send changes not found in the target repository" -msgstr "" +msgstr "send ændringer som ikke findes i måldepotet" msgid "send changes not in target as a binary bundle" -msgstr "" +msgstr "send de ændringer målet mangler som et binært bundt" msgid "name of the bundle attachment file" -msgstr "" +msgstr "navn på det vedhæftede bundt" msgid "a revision to send" -msgstr "" +msgstr "en revision der skal sendes" msgid "run even when remote repository is unrelated (with -b/--bundle)" msgstr "kør selv hvis fjerndepotet er urelateret (med -b/--bundle)" @@ -3781,7 +4110,7 @@ msgstr "" msgid "send an introduction email for a single patch" -msgstr "" +msgstr "send en introduktionsmail for en enkelt rettelse" msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [TILVALG]... [MÅL]..." @@ -3858,9 +4187,6 @@ "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" -msgid "first revision, do not change ancestor\n" -msgstr "" - msgid "" "move changeset (and descendants) to a different branch\n" "\n" @@ -3904,60 +4230,17 @@ msgid "%d revisions have been skipped\n" msgstr "sprang %d revisioner over\n" -msgid " set parents\n" -msgstr "" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr "" - -#, python-format -msgid " update to %d:%s\n" -msgstr " opdater til %d:%s\n" - -msgid " already in target\n" -msgstr "" - -#, python-format -msgid " merge against %d:%s\n" -msgstr "" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" -msgid "resuming interrupted rebase\n" -msgstr "" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "" #, python-format -msgid "next revision set to %s\n" -msgstr "" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "" - -msgid "rebase status stored\n" -msgstr "" - -msgid "rebase status resumed\n" -msgstr "" - msgid "no rebase in progress" msgstr "" @@ -3970,28 +4253,15 @@ msgid "cannot rebase onto an applied mq patch" msgstr "" -msgid "cannot rebase an ancestor" -msgstr "" - -msgid "cannot rebase a descendant" -msgstr "" - -msgid "already working on current\n" -msgstr "" - -msgid "already working on the current branch\n" -msgstr "" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "" +msgid "source is ancestor of destination" +msgstr "kilden er forfader til destination" + +msgid "source is descendant of destination" +msgstr "kilden nedstammer fra destinationen" msgid "unable to collapse, there is more than one external parent" msgstr "" -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "" - msgid "rebase working directory to branch head" msgstr "" @@ -4004,13 +4274,13 @@ msgid "rebase onto a given revision" msgstr "" -msgid "collapse the rebased revisions" -msgstr "" - -msgid "keep original revisions" -msgstr "" - -msgid "keep original branches" +msgid "collapse the rebased changesets" +msgstr "" + +msgid "keep original changesets" +msgstr "behold de originale ændringer" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -4125,20 +4395,9 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "sikkerhedskopier %r som %r\n" - -msgid "applying patch\n" -msgstr "tilføjer rettelse\n" - msgid "patch failed to apply" msgstr "rettelse kunne ikke tilføjes" -#, python-format -msgid "restoring %r to %r\n" -msgstr "gendanner %r som %r\n" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [TILVALG]... [FIL]..." @@ -4351,10 +4610,6 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "" - msgid "" "perform automatic newline conversion\n" "\n" @@ -4461,15 +4716,15 @@ #, python-format msgid "%s: not a Mercurial bundle file" -msgstr "%s er ikke en Mercurial bundle fil" +msgstr "%s er ikke et Mercurial bundt" #, python-format msgid "%s: unknown bundle version" -msgstr "%s: ukendt bundle version" +msgstr "%s: bundtet har ukendt version" #, python-format msgid "%s: unknown bundle compression type" -msgstr "%s: ukendt bundle kompressionstype" +msgstr "%s: bundet har ukendt kompressionstype" msgid "cannot create new bundle repository" msgstr "" @@ -4959,10 +5214,6 @@ msgstr "inkompatible argumenter" #, python-format -msgid "cannot find executable: %s" -msgstr "kan ikke finde program: %s" - -#, python-format msgid "failed to execute %s" msgstr "kunne ikke køre %s" @@ -5080,7 +5331,7 @@ msgstr "" msgid "--base is incompatible with specifying a destination" -msgstr "" +msgstr "--base er inkompatibelt med at angive en destination" msgid "unknown bundle type specified with --type" msgstr "" @@ -5816,14 +6067,6 @@ msgid "no diffs found" msgstr "fandt ingen ændringer" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"meddelse:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "ikke en Mercurial patch" @@ -6483,6 +6726,100 @@ " " msgid "" +"summarize working directory state\n" +"\n" +" This generates a brief summary of the working directory state,\n" +" including parents, branch, commit status, and available updates.\n" +"\n" +" With the --remote option, this will check the default paths for\n" +" incoming and outgoing changes. This can be time-consuming.\n" +" " +msgstr "" + +msgid " (empty repository)" +msgstr "(tomt depot)" + +msgid " (no revision checked out)" +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 removed" +msgstr "%d fjernet" + +#, python-format +msgid "%d deleted" +msgstr "%d slettet" + +#, 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" + +msgid " (merge)" +msgstr " (sammenføj)" + +msgid " (new branch)" +msgstr " (ny gren)" + +msgid " (clean)" +msgstr " (ren)" + +msgid " (new branch head)" +msgstr " (nyt hoved på gren)" + +#, python-format +msgid "commit: %s\n" +msgstr "deponer: %s\n" + +msgid "update: (current)\n" +msgstr "opdater: (aktuel)\n" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "opdater: %d nye ændringer (update)\n" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "opdater: %d nye ændringer, %d grenhoveder (merge)\n" + +msgid "1 or more incoming" +msgstr "1 eller flere indkomne" + +#, python-format +msgid "%d outgoing" +msgstr "%d udgående" + +#, python-format +msgid "remote: %s\n" +msgstr "fjernsystem: %s\n" + +msgid "remote: (synced)\n" +msgstr "fjernsystem: (synkroniseret)\n" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using .\n" @@ -6672,8 +7009,8 @@ "gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n" "NOGET BESTEMT FORMÅL.\n" -msgid "repository root directory or symbolic path name" -msgstr "depotrodfolder eller symbolsk stinavn" +msgid "repository root directory or name of overlay bundle file" +msgstr "" msgid "change working directory" msgstr "skift arbejdskatalog" @@ -7247,6 +7584,9 @@ msgid "[-u] [NAME]..." msgstr "[-u] [NAVN]..." +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "vis status på alle filer" @@ -7323,36 +7663,6 @@ msgid "branch name not in UTF-8!" msgstr "grennavn er ikke i UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " søger efter kopier tilbage til revision %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr "" - -msgid " checking for directory renames\n" -msgstr " undersøger katalogomdøbninger\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " katalog %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " fil %s -> %s\n" - msgid "working directory state appears damaged!" msgstr "arbejdskatalogtilstand virker beskadiget!" @@ -7399,6 +7709,10 @@ msgstr "afbrudt: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -7407,10 +7721,6 @@ " %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "tiden løb ud ved vent på lås holdt af %s" @@ -7508,10 +7818,6 @@ msgstr "alias '%s' oversætter til tvetydig kommando '%s'\n" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "alias '%s' skygger for en kommando\n" - -#, python-format msgid "malformed --config option: %s" msgstr "misdannet --config tilvalg: %s" @@ -7579,10 +7885,6 @@ msgstr "værktøj %s kræver et GUI\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "valgte værktøj '%s' til %s (binær %s symbolsk link %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -7603,13 +7905,6 @@ msgstr "sammenføjer %s\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "min %s anden %s forfar %s\n" - -msgid " premerge successful\n" -msgstr "præ-sammenføjning succesfuld\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -7633,555 +7928,33 @@ msgid "unknown bisect kind %s" msgstr "" -msgid "" -"\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 advanced\n" -" usage only; they may provide potentially dangerous abilities (such\n" -" as letting you destroy or modify history); they might not be ready\n" -" for prime time; or they may alter some usual behaviors of stock\n" -" Mercurial. It is thus up to the user to activate extensions as\n" -" needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial or in\n" -" the Python search path, create an entry for it in your hgrc, like\n" -" this::\n" -"\n" -" [extensions]\n" -" foo =\n" -"\n" -" You may also specify the full path to an extension::\n" -"\n" -" [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" -" To explicitly disable an extension enabled in an hgrc of broader\n" -" scope, prepend its path with !::\n" -"\n" -" [extensions]\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" -" " -msgstr "" - msgid "disabled extensions:" msgstr "deaktiverede udvidelser:" msgid "Date Formats" msgstr "Datoformater" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\n" -"\n" -" - backout, commit, import, tag: Specify the commit date.\n" -" - log, revert, update: Select revision(s) by date.\n" -"\n" -" Many date formats are valid. Here are some examples::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" -" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" -" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" -" \"Dec 6\" (midnight)\n" -" \"13:18\" (today assumed)\n" -" \"3:39\" (3:39AM assumed)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -" Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" -" This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" -" offset is the offset of the local timezone, in seconds west of UTC\n" -" (negative if the timezone is east of UTC).\n" -"\n" -" The log command also accepts date ranges::\n" -"\n" -" \"<{datetime}\" - at or before a given date/time\n" -" \">{datetime}\" - on or after a given date/time\n" -" \"{datetime} to {datetime}\" - a date range, inclusive\n" -" \"-{days}\" - within a given number of days of today\n" -" " -msgstr "" -"\n" -" Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n" -"\n" -" - backout, commit, import, tag: specificer commit-datoen.\n" -" - log, revert, update: vælg revisioner efter dato.\n" -"\n" -" Der er mange gyldige datoformater. Her er nogle eksempler::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" -" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" -" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" -" \"Dec 6\" (midnat)\n" -" \"13:18\" (antager dags dato)\n" -" \"3:39\"\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (6. dec. 2006)\n" -"\n" -" Endelig er der Mercurials interne format::\n" -"\n" -" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" -"\n" -" Dette er den interne repræsentation af datoer. unixtime er\n" -" antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" -" UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" -" for UTC (negativ hvis tidszonen er øst for UTC).\n" -"\n" -" Kommandoen log accepterer også datointervaller::\n" -"\n" -" \"<{date}\" - på eller før den angivne dato/tidspunkt\n" -" \">{date}\" - på eller efter den angivne dato/tidspunkt\n" -" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" -" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n" -" " - msgid "File Name Patterns" msgstr "Mønstre for filnavne" -msgid "" -"\n" -" Mercurial accepts several notations for identifying one or more\n" -" files at a time.\n" -"\n" -" By default, Mercurial treats filenames as shell-style extended\n" -" glob patterns.\n" -"\n" -" Alternate pattern notations must be specified explicitly.\n" -"\n" -" To use a plain path name without any pattern matching, start it\n" -" with \"path:\". These path names must completely match starting at\n" -" the current repository root.\n" -"\n" -" To use an extended glob, start a name with \"glob:\". Globs are\n" -" rooted at the current directory; a glob such as \"``*.c``\" will\n" -" only match files in the current directory ending with \".c\".\n" -"\n" -" The supported glob syntax extensions are \"``**``\" to match any\n" -" string across path separators and \"{a,b}\" to mean \"a or b\".\n" -"\n" -" To use a Perl/Python regular expression, start a name with \"re:\".\n" -" Regexp pattern matching is anchored at the root of the repository.\n" -"\n" -" Plain examples::\n" -"\n" -" path:foo/bar a name bar in a directory named foo in the root\n" -" of the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -" Glob examples::\n" -"\n" -" glob:*.c any name ending in \".c\" in the current directory\n" -" *.c any name ending in \".c\" in the current directory\n" -" **.c any name ending in \".c\" in any subdirectory of the\n" -" current directory including itself.\n" -" foo/*.c any name ending in \".c\" in the directory foo\n" -" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" -" including itself.\n" -"\n" -" Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -"\n" -" " -msgstr "" - msgid "Environment Variables" msgstr "Miljøvariable" -msgid "" -"\n" -"HG\n" -" Path to the 'hg' executable, automatically passed when running\n" -" hooks, extensions or external tools. If unset or empty, this is\n" -" the hg executable's name if it's frozen, or an executable named\n" -" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" -"HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"HGENCODING\n" -" This overrides the default locale setting detected by Mercurial.\n" -" This setting is used to convert data including usernames,\n" -" changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" -"HGENCODINGMODE\n" -" This sets Mercurial's behavior for handling unknown characters\n" -" while transcoding user input. The default is \"strict\", which\n" -" causes Mercurial to abort if it can't map a character. Other\n" -" settings include \"replace\", which replaces unknown characters, and\n" -" \"ignore\", which drops them. This setting can be overridden with\n" -" the --encodingmode command-line option.\n" -"\n" -"HGMERGE\n" -" An executable to use for resolving merge conflicts. The program\n" -" will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"HGRCPATH\n" -" A list of files or directories to search for hgrc files. Item\n" -" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" -" platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" -" - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" -"HGUSER\n" -" This is the string used as the author of a commit. If not set,\n" -" available values will be considered in this order:\n" -"\n" -" - HGUSER (deprecated)\n" -" - hgrc files from the HGRCPATH\n" -" - EMAIL\n" -" - interactive prompt\n" -" - LOGNAME (with '@hostname' appended)\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" -"EDITOR\n" -" Sometimes Mercurial needs to open a text file in an editor for a\n" -" user to modify, for example when writing commit messages. The\n" -" editor it uses is determined by looking at the environment\n" -" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" -" non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" -"PYTHONPATH\n" -" This is used by Python to find imported modules and may need to be\n" -" set appropriately if this Mercurial is not installed system-wide.\n" -" " -msgstr "" - msgid "Specifying Single Revisions" msgstr "Angivning af en enkelt revision" -msgid "" -"\n" -" Mercurial supports several ways to specify individual revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative integers\n" -" are treated as sequential offsets from the tip, with -1 denoting\n" -" the tip, -2 denoting the revision prior to the tip, and so forth.\n" -"\n" -" A 40-digit hexadecimal string is treated as a unique revision\n" -" identifier.\n" -"\n" -" A hexadecimal string less than 40 characters long is treated as a\n" -" unique revision identifier and is referred to as a short-form\n" -" identifier. A short-form identifier is only valid if it is the\n" -" prefix of exactly one full-length identifier.\n" -"\n" -" Any other string is treated as a tag or branch name. A tag name is\n" -" a symbolic name associated with a revision identifier. A branch\n" -" name denotes the tipmost revision of that branch. Tag and branch\n" -" names must not contain the \":\" character.\n" -"\n" -" The reserved name \"tip\" is a special tag that always identifies\n" -" the most recent revision.\n" -"\n" -" The reserved name \"null\" indicates the null revision. This is the\n" -" revision of an empty repository, and the parent of revision 0.\n" -"\n" -" The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null. If\n" -" an uncommitted merge is in progress, \".\" is the revision of the\n" -" first parent.\n" -" " -msgstr "" - msgid "Specifying Multiple Revisions" msgstr "Angivning af flere revisioner" -msgid "" -"\n" -" When Mercurial accepts more than one revision, they may be\n" -" specified individually, or provided as a topologically continuous\n" -" range, separated by the \":\" character.\n" -"\n" -" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" -" are revision identifiers. Both BEGIN and END are optional. If\n" -" BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus means\n" -" \"all revisions\".\n" -"\n" -" If BEGIN is greater than END, revisions are treated in reverse\n" -" order.\n" -"\n" -" A range acts as a closed interval. This means that a range of 3:5\n" -" gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" -" " -msgstr "" - msgid "Diff Formats" msgstr "" -msgid "" -"\n" -" Mercurial's default format for showing changes between two\n" -" versions of a file is compatible with the unified format of GNU\n" -" diff, which can be used by GNU patch and many other standard\n" -" tools.\n" -"\n" -" While this standard format is often enough, it does not encode the\n" -" following information:\n" -"\n" -" - executable status and other permission bits\n" -" - copy or rename information\n" -" - changes in binary files\n" -" - creation or deletion of empty files\n" -"\n" -" Mercurial also supports the extended diff format from the git VCS\n" -" which addresses these limitations. The git diff format is not\n" -" produced by default because a few widespread tools still do not\n" -" understand this format.\n" -"\n" -" This means that when generating diffs from a Mercurial repository\n" -" (e.g. with \"hg export\"), you should be careful about things like\n" -" file copies and renames or other things mentioned above, because\n" -" when applying a standard diff to a different repository, this\n" -" extra information is lost. Mercurial's internal operations (like\n" -" push and pull) are not affected by this, because they use an\n" -" internal binary format for communicating changes.\n" -"\n" -" To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in\n" -" the [diff] section of your hgrc. You do not need to set this\n" -" option when importing diffs in this format or using them in the mq\n" -" extension.\n" -" " -msgstr "" - msgid "Template Usage" msgstr "Brug af skabeloner" -msgid "" -"\n" -" 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" -" template-style (--style).\n" -"\n" -" You can customize output for any \"log-like\" command: log,\n" -" outgoing, incoming, tip, parents, heads and glog.\n" -"\n" -" Three styles are packaged with Mercurial: default (the style used\n" -" when no explicit preference is passed), compact and changelog.\n" -" Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" A template is a piece of text, with markup to invoke variable\n" -" expansion::\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These\n" -" keywords are usually available for templating a log-like command:\n" -"\n" -" :author: String. The unmodified author of the changeset.\n" -" :branches: String. The name of the branch on which the changeset\n" -" was committed. Will be empty if the branch name was\n" -" default.\n" -" :date: Date information. The date when the changeset was\n" -" committed.\n" -" :desc: String. The text of the changeset description.\n" -" :diffstat: String. Statistics of changes with the following\n" -" format: \"modified files: +added/-removed lines\"\n" -" :files: List of strings. All files modified, added, or removed\n" -" by this changeset.\n" -" :file_adds: List of strings. Files added by this changeset.\n" -" :file_mods: List of strings. Files modified by this changeset.\n" -" :file_dels: List of strings. Files removed by this changeset.\n" -" :node: String. The changeset identification hash, as a\n" -" 40-character hexadecimal string.\n" -" :parents: List of strings. The parents of the changeset.\n" -" :rev: Integer. The repository-local changeset revision\n" -" number.\n" -" :tags: List of strings. Any tags associated with the\n" -" changeset.\n" -"\n" -" The \"date\" keyword does not produce human-readable output. If you\n" -" want to use a date in your output, you can use a filter to process\n" -" it. Filters are functions which return a string based on the input\n" -" variable. You can also use a chain of filters to get the desired\n" -" output::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" List of filters:\n" -"\n" -" :addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" -" every line except the last.\n" -" :age: Date. Returns a human-readable date/time difference\n" -" between the given date/time and the current\n" -" date/time.\n" -" :basename: Any text. Treats the text as a path, and returns the\n" -" last component of the path after splitting by the\n" -" path separator (ignoring trailing separators). For\n" -" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//" -"\"\n" -" becomes \"bar\".\n" -" :stripdir: Treat the text as path and strip a directory level,\n" -" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" -" \"foo\".\n" -" :date: Date. Returns a date in a Unix date format, including\n" -" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" -" :domain: Any text. Finds the first string that looks like an\n" -" email address, and extracts just the domain\n" -" component. Example: 'User ' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User '\n" -" becomes 'user@example.com'.\n" -" :escape: Any text. Replaces the special XML/XHTML characters\n" -" \"&\", \"<\" and \">\" with XML entities.\n" -" :fill68: Any text. Wraps the text to fit in 68 columns.\n" -" :fill76: Any text. Wraps the text to fit in 76 columns.\n" -" :firstline: Any text. Returns the first line of text.\n" -" :nonempty: Any text. Returns '(none)' if the string is empty.\n" -" :hgdate: Date. Returns the date as a pair of numbers:\n" -" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" -" :isodate: Date. Returns the date in ISO 8601 format:\n" -" \"2009-08-18 13:00 +0200\".\n" -" :isodatesec: Date. Returns the date in ISO 8601 format, including\n" -" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" -" rfc3339date filter.\n" -" :localdate: Date. Converts a date to local date.\n" -" :obfuscate: Any text. Returns the input text rendered as a\n" -" sequence of XML entities.\n" -" :person: Any text. Returns the text before an email address.\n" -" :rfc822date: Date. Returns a date using the same format used in\n" -" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" -" :rfc3339date: Date. Returns a date using the Internet date format\n" -" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" -" :short: Changeset hash. Returns the short form of a changeset\n" -" hash, i.e. a 12-byte hexadecimal string.\n" -" :shortdate: Date. Returns a date like \"2006-09-18\".\n" -" :strip: Any text. Strips all leading and trailing whitespace.\n" -" :tabindent: Any text. Returns the text, with every line except\n" -" the first starting with a tab character.\n" -" :urlescape: Any text. Escapes all \"special\" characters. For\n" -" example, \"foo bar\" becomes \"foo%20bar\".\n" -" :user: Any text. Returns the user portion of an email\n" -" address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "URL-stier" -msgid "" -"\n" -" Valid URLs are of the form::\n" -"\n" -" local/filesystem/path[#revision]\n" -" file://local/filesystem/path[#revision]\n" -" http://[user[:pass]@]host[:port]/[path][#revision]\n" -" https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" -"\n" -" 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').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository. See also 'hg help\n" -" revisions'.\n" -"\n" -" Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the remote\n" -" Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\n" -"\n" -" - SSH requires an accessible shell account on the destination\n" -" machine and a copy of hg in the remote path or specified with as\n" -" remotecmd.\n" -" - path is relative to the remote user's home directory by default.\n" -" Use an extra slash at the start of a path to specify an absolute\n" -" path::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" -" - Mercurial doesn't use its own compression via SSH; the right\n" -" thing to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -"\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" -" or with the --ssh command line option.\n" -"\n" -" These URLs can all be stored in your hgrc with path aliases under\n" -" the [paths] section like so::\n" -"\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" You can then use the alias for any command that uses a URL (for\n" -" example 'hg pull alias1' would pull from the 'alias1' path).\n" -"\n" -" Two path aliases are special because they are used as defaults\n" -" when you do not provide the URL to a command:\n" -"\n" -" default:\n" -" When you create a repository with hg clone, the clone command\n" -" saves the location of the source repository as the new\n" -" repository's 'default' path. This is then used when you omit\n" -" path from push- and pull-like commands (including incoming and\n" -" outgoing).\n" -"\n" -" default-push:\n" -" The push command will look for a path named 'default-push', and\n" -" prefer it over 'default' if both are defined.\n" -" " -msgstr "" - msgid "Using additional features" msgstr "Brug af yderligere funktioner" @@ -8214,31 +7987,24 @@ msgid "clone from remote to remote not supported" msgstr "kloning fra fjerndepot til fjerndepot er ikke understøttet" -msgid "updated" -msgstr "opdateret" - -msgid "merged" -msgstr "sammenføjet" - -msgid "removed" -msgstr "fjernet" - -msgid "unresolved" -msgstr "uløst" - -#, python-format -msgid "%d files %s" -msgstr "%d filer %s" +#, python-format +msgid "updating to branch %s\n" +msgstr "opdaterer til gren %s\n" + +#, python-format +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 up --clean' to " +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "" -"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up " -"--clean' for at opgive\n" +"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" @@ -8312,32 +8078,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "ikke-understøttet URL-komponent: \"%s\"" -#, python-format -msgid "using %s\n" -msgstr "bruger %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "kapaciteter: %s\n" - msgid "operation not supported over http" msgstr "operationen understøttes ikke over http" -#, python-format -msgid "sending %s command\n" -msgstr "sender %s kommando\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "sender %s bytes\n" - msgid "authorization failed" msgstr "autorisation fejlede" -#, python-format -msgid "http error while sending %s command\n" -msgstr "http-fejl mens %s kommandoen blev sendt\n" - msgid "http error, possibly caused by proxy setting" msgstr "http-fejl, skyldes muligvis proxy-indstillinger" @@ -8346,10 +8092,6 @@ msgstr "den rigtige URL er %s\n" #, python-format -msgid "requested URL: '%s'\n" -msgstr "forespurgt URL: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' ser ikke ud til at være et hg depot" @@ -8422,10 +8164,6 @@ msgid "unknown revision '%s'" msgstr "ukendt revision '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "filtrerer %s gennem %s\n" - msgid "journal already exists - run hg recover" msgstr "journalen eksisterer allerede -- kør hg recover" @@ -8458,14 +8196,6 @@ msgid "working directory of %s" msgstr "arbejdskatalog for %s" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr "" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr "" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" @@ -8531,41 +8261,6 @@ msgid "searching for changes\n" msgstr "leder efter ændringer\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "undersøger %s:%s\n" - -msgid "branch already found\n" -msgstr "gren er allerede fundet\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "fandt ukomplet gren %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "fandt ny ændring %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "forespørgsel %d: %s\n" - -#, python-format -msgid "received %s:%s\n" -msgstr "modtog %s:%s\n" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "indskrænker %d:%d %s\n" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "fandt ny forgreningsændring %s\n" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "indskrænker forgreningssøgning til %s:%s\n" - msgid "already have changeset " msgstr "har allerede ændringen " @@ -8575,16 +8270,6 @@ msgid "repository is unrelated" msgstr "depotet er urelateret" -msgid "found new changesets starting at " -msgstr "fandt nye ændringer startende ved " - -#, python-format -msgid "%d total queries\n" -msgstr "%d forespørgsler i alt\n" - -msgid "common changesets up to " -msgstr "fælles ændringer op til " - msgid "requesting all changes\n" msgstr "anmoder om alle ændringer\n" @@ -8610,17 +8295,10 @@ msgid "%d changesets found\n" msgstr "fandt %d ændringer\n" -msgid "list of changesets:\n" -msgstr "liste af ændringer:\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "tom eller manglende revlog for %s" -#, python-format -msgid "add changeset %s\n" -msgstr "tilføj ændring %s\n" - msgid "adding changesets\n" msgstr "tilføjer ændringer\n" @@ -8633,10 +8311,6 @@ msgid "adding file changes\n" msgstr "tilføjer filændringer\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "tilføjer %s ændringer\n" - msgid "received file revlog group is empty" msgstr "" @@ -8648,9 +8322,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "tilføjede %d ændringer med %d ændringer i %d filer%s\n" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "Uventet svar fra fjernserver:" @@ -8671,10 +8342,6 @@ msgstr "%d filer at overføre, %s data\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "tilføjer %s (%s)\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "overførte %s i %.1f sekunder (%s/sek)\n" @@ -8755,14 +8422,6 @@ msgstr "løser manifester\n" #, python-format -msgid " overwrite %s partial %s\n" -msgstr "" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "" - -#, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" @@ -8784,10 +8443,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "bevarer %s til løsning af %s\n" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "opdatering kunne ikke fjerne %s: %s!\n" @@ -8838,13 +8493,6 @@ msgstr "kan ikke oprette %s: ikke i stand til at oprette biblioteket" #, python-format -msgid "found patch at byte %d\n" -msgstr "" - -msgid "patch generated by hg export\n" -msgstr "rettelse genereret af hg export\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "kan ikke finde '%s' til retning\n" @@ -8915,10 +8563,6 @@ msgstr "Linieendelse %s understøttes ikke" #, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" - -#, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n" @@ -8931,13 +8575,6 @@ msgstr "dræbt af signal %d" #, python-format -msgid "stopped by signal %d" -msgstr "stoppet af signal %d" - -msgid "invalid exit code" -msgstr "ugyldig returkode" - -#, python-format msgid "saving bundle to %s\n" msgstr "gemmer bundt i %s\n" @@ -9008,12 +8645,12 @@ msgid "could not create remote repo" msgstr "kunne ikke oprette fjerndepot" +msgid "no suitable response from remote hg" +msgstr "intet brugbart svar fra fjernsystemets hg" + msgid "remote: " msgstr "fjernsystem: " -msgid "no suitable response from remote hg" -msgstr "intet brugbart svar fra fjernsystemets hg" - #, python-format msgid "push refused: %s" msgstr "skub afvist: %s" @@ -9031,17 +8668,6 @@ msgid "invalid entry in fncache, line %s" msgstr "" -msgid "scanning\n" -msgstr "skanner\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "%d filer, skal overføre %d byte\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "sender %s (%d byte)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -9185,10 +8811,6 @@ msgstr "http godkendelse: bruger %s, kodeord %s\n" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "kommandoen '%s' fejlede: %s" @@ -9386,6 +9008,10 @@ msgstr "udpakker %s" #, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "" + +#, python-format msgid "empty or missing copy source revlog %s:%s" msgstr "" diff -r 96c803e9018f -r d942e06d7b14 i18n/de.po --- a/i18n/de.po Wed Oct 28 13:17:03 2009 -0500 +++ b/i18n/de.po Wed Oct 28 20:48:24 2009 +0100 @@ -23,8 +23,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 09:57+0300\n" -"PO-Revision-Date: 2009-04-22 08:04+0200\n" +"POT-Creation-Date: 2009-10-20 12:55+0300\n" +"PO-Revision-Date: 2009-10-20 18:09+0200\n" "Last-Translator: Fabian Kreutz \n" "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" "MIME-Version: 1.0\n" @@ -57,6 +57,667 @@ " Aliase: %s\n" "\n" +#: help/dates.txt:1 +msgid "" +"Some commands allow the user to specify a date, e.g.:\n" +"\n" +"- backout, commit, import, tag: Specify the commit date.\n" +"- log, revert, update: Select revision(s) by date.\n" +"\n" +"Many date formats are valid. Here are some examples::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +"Lastly, there is Mercurial's internal format::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"This is the internal representation format for dates. unixtime is the\n" +"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" +"the offset of the local timezone, in seconds west of UTC (negative if\n" +"the timezone is east of UTC).\n" +"\n" +"The log command also accepts date ranges::\n" +"\n" +" \"<{datetime}\" - at or before a given date/time\n" +" \">{datetime}\" - on or after a given date/time\n" +" \"{datetime} to {datetime}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +msgstr "" +"Einige Befehle erlauben dem Benutzer ein Datum anzugeben, z.B.:\n" +"\n" +"- backout, commit, import, tag: Angabe des Versionsdatums.\n" +"- log, revert, update: Selektion von Revisionen anhand ihres Datums.\n" +"\n" +"Viele Datumsformate sind erlaubt. Hier einige Beispiele::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (Lokale Zeitzone angenommen)\n" +" \"Dec 6 13:18 -0600\" (Jahr angenommen, Zeitverschiebung angegeben)\n" +" \"Dec 6 13:18 UTC\" (UTC und GMT sind Aliase für +0000)\n" +" \"Dec 6\" (Mitternacht)\n" +" \"13:18\" (Heute angenommen)\n" +" \"3:39\" (3:39 morgens angenommen)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +"Schließlich gibt es Mercurials internes Format::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"Dies ist das interne Darstellungsformat für Daten. \"Unixzeit\" ist die\n" +"Anzahl von Sekunden seit der UNIX Epoche (1970-01-01 00:00 UTC).\n" +"Abgesetzt davon steht die Verschiebung zur lokalen Zeitzone in Sekunden\n" +"westlich der UTC (negativ wenn die Zeitzone östlich der UTC ist).\n" +"\n" +"Der log-Befehl akzeptiert auch Datumsbereiche::\n" +"\n" +" \"<{datetime}\" - an oder vor einem/r angegebenen Datum/Uhrzeit\n" +" \">{datetime}\" - zu oder nach einem/r angegebenen Datum/Uhrzeit\n" +" \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n" +" \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor heute\n" + +#: help/diffs.txt:1 +msgid "" +"Mercurial's default format for showing changes between two versions of\n" +"a file is compatible with the unified format of GNU diff, which can be\n" +"used by GNU patch and many other standard tools.\n" +"\n" +"While this standard format is often enough, it does not encode the\n" +"following information:\n" +"\n" +"- executable status and other permission bits\n" +"- copy or rename information\n" +"- changes in binary files\n" +"- creation or deletion of empty files\n" +"\n" +"Mercurial also supports the extended diff format from the git VCS\n" +"which addresses these limitations. The git diff format is not produced\n" +"by default because a few widespread tools still do not understand this\n" +"format.\n" +"\n" +"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" +"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" +"pull) are not affected by this, because they use an internal binary\n" +"format for communicating changes.\n" +"\n" +"To make Mercurial produce the git extended diff format, use the --git\n" +"option available for many commands, or set 'git = True' in the [diff]\n" +"section of your hgrc. You do not need to set this option when\n" +"importing diffs in this format or using them in the mq extension.\n" +msgstr "" + +#: help/environment.txt:1 +msgid "" +"HG\n" +" Path to the 'hg' executable, automatically passed when running\n" +" hooks, extensions or external tools. If unset or empty, this is\n" +" the hg executable's name if it's frozen, or an executable named\n" +" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" +" Windows) is searched.\n" +"\n" +"HGEDITOR\n" +" This is the name of the editor to run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user input. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't map a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only the .hg/hgrc\n" +" from the current repository is read.\n" +"\n" +" For each element in HGRCPATH:\n" +"\n" +" - if it's a directory, all files ending with .rc are added\n" +" - otherwise, the file itself will be added\n" +"\n" +"HGUSER\n" +" This is the string used as the author of a commit. If not set,\n" +" available values will be considered in this order:\n" +"\n" +" - HGUSER (deprecated)\n" +" - hgrc files from the HGRCPATH\n" +" - EMAIL\n" +" - interactive prompt\n" +" - LOGNAME (with '@hostname' appended)\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"VISUAL\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR\n" +" Sometimes Mercurial needs to open a text file in an editor for a\n" +" user to modify, for example when writing commit messages. The\n" +" editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH\n" +" This is used by Python to find imported modules and may need to be\n" +" set appropriately if this Mercurial is not installed system-wide.\n" +msgstr "" + +#: help/extensions.txt:1 +msgid "" +"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 advanced\n" +"usage only; they may provide potentially dangerous abilities (such\n" +"as letting you destroy or modify history); they might not be ready\n" +"for prime time; or they may alter some usual behaviors of stock\n" +"Mercurial. It is thus up to the user to activate extensions as\n" +"needed.\n" +"\n" +"To enable the \"foo\" extension, either shipped with Mercurial or in\n" +"the Python search path, create an entry for it in your hgrc, like\n" +"this::\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +"You may also specify the full path to an extension::\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +"To explicitly disable an extension enabled in an hgrc of broader\n" +"scope, prepend its path with !::\n" +"\n" +" [extensions]\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" +msgstr "" + +#: help/multirevs.txt:1 +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.\n" +"\n" +"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" +"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" +"specified, it defaults to revision number 0. If END is not specified,\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" +"\n" +"If BEGIN is greater than END, revisions are treated in reverse order.\n" +"\n" +"A range acts as a closed interval. This means that a range of 3:5\n" +"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" +msgstr "" +"Wenn Mercurial mehr als eine Revision annimmt, können sie einzeln oder als\n" +"topologisch kontinuierlicher Bereich getrennt durch das \":\" Zeichen\n" +"angegeben werden.\n" +"\n" +"Die Syntax der Bereichs-Notation ist [ANFANG]:[ENDE], wobei ANFANG und ENDE\n" +"Revisions-Identifikatoren sind. Sowohl ANFANG als auch ENDE sind optional.\n" +"Sollte ANFANG nicht angegeben werden, wird standardmäßig die Revision 0\n" +"angenommen. Wenn ENDE nicht angegeben wird, wird standardmäßig die Spitze\n" +"genommen. Der Bereich \":\" bedeutet daher \"alle Revisionen\".\n" +"\n" +"Wenn ANFANG größer als ENDE ist, werden die Revisionen in umgekehrter\n" +"Reihenfolge betrachtet.\n" +"\n" +"Ein Bereich fungiert als geschlossenes Intervall. Das heißt, dass der\n" +"Bereich 3:5 die Revisionen 3, 4 und 5 enthält. Ebenso enthält der Bereich\n" +"9:6 die Revisionen 9, 8, 7 und 6.\n" + +#: help/patterns.txt:1 +msgid "" +"Mercurial accepts several notations for identifying one or more files\n" +"at a time.\n" +"\n" +"By default, Mercurial treats filenames as shell-style extended glob\n" +"patterns.\n" +"\n" +"Alternate pattern notations must be specified explicitly.\n" +"\n" +"To use a plain path name without any pattern matching, start it with\n" +"\"path:\". These path names must completely match starting at the\n" +"current repository root.\n" +"\n" +"To use an extended glob, start a name with \"glob:\". Globs are rooted\n" +"at the current directory; a glob such as \"``*.c``\" will only match\n" +"files in the current directory ending with \".c\".\n" +"\n" +"The supported glob syntax extensions are \"``**``\" to match any string\n" +"across path separators and \"{a,b}\" to mean \"a or b\".\n" +"\n" +"To use a Perl/Python regular expression, start a name with \"re:\".\n" +"Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +"Plain examples::\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root\n" +" of the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +"Glob examples::\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in any subdirectory of the\n" +" current directory including itself.\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" +" including itself.\n" +"\n" +"Regexp examples::\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" +"Mercurial akzeptiert verschiedene Schreibweisen zur Identifikation einer\n" +"oder mehrerer Dateien gleichzeitig.\n" +"\n" +"Standardmäßig behandelt Mercurial Dateinamen wie erweiterte \"Glob\"-Muster\n" +"der Shell (shell-style extended glob patterns).\n" +"\n" +"Andere Schreibweisen von Mustern müssen explizit angegeben werden.\n" +"\n" +"Mit dem Prefix \"path:\" wird ein Pfad relativ zur Wurzel des " +"Projektarchivs\n" +"ohne Mustererkennung angenommen.\n" +"\n" +"Für erweiterte Glob-Muster muss das Muster mit \"glob:\" beginnen. Globs\n" +"sind am aktuellen Verzeichnis verankert; ein Glob-Muster wie \"``*.c``\"\n" +"stimmt nur mit Dateien im aktuellen Verzeichnis überein, die mit \".c\"\n" +"enden.\n" +"\n" +"Die unterstützen Erweiterungen der Glob-Syntax sind \"``**``\" für\n" +"Zeichenketten über Pfadtrenner hinweg und \"{a,b}\" in der Bedeutung \"a\n" +"oder b\".\n" +"\n" +"Zur Nutzung von regulären Ausdrücken (Perl/Python) beginne einen Namen mit\n" +"\"re:\". Erkennung mit regulären Ausdrücken ist relativ zur Wurzel des\n" +"Projektarchivs.\n" +"\n" +"Einfache Beispiele::\n" +"\n" +" path:foo/bar eine Datei bar in einem Verzeichnis foo an der Wurzel\n" +" des Projektarchivs\n" +" path:path:name eine Datei oder ein Verzeichnis mit dem Namen \"path:name" +"\"\n" +"\n" +"Glob-Beispiele::\n" +"\n" +" glob:*.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" +" *.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" +" **.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" +" und jedem Unterverzeichnis\n" +" foo/*.c jeder Name endend mit \".c\" im Verzeichnis foo\n" +" foo/**.c jeder Name endend mit \".c\" im Verzeichnis foo\n" +" und jedem Unterverzeichnis.\n" +"\n" +"Beispiel mit regulärem Ausdruck::\n" +"\n" +" re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" + +#: help/revisions.txt:1 +msgid "" +"Mercurial supports several ways to specify individual revisions.\n" +"\n" +"A plain integer is treated as a revision number. Negative integers are\n" +"treated as sequential offsets from the tip, with -1 denoting the tip,\n" +"-2 denoting the revision prior to the tip, and so forth.\n" +"\n" +"A 40-digit hexadecimal string is treated as a unique revision\n" +"identifier.\n" +"\n" +"A hexadecimal string less than 40 characters long is treated as a\n" +"unique revision identifier and is referred to as a short-form\n" +"identifier. A short-form identifier is only valid if it is the prefix\n" +"of exactly one full-length identifier.\n" +"\n" +"Any other string is treated as a tag or branch name. A tag name is a\n" +"symbolic name associated with a revision identifier. A branch name\n" +"denotes the tipmost revision of that branch. Tag and branch names must\n" +"not contain the \":\" character.\n" +"\n" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision.\n" +"\n" +"The reserved name \"null\" indicates the null revision. This is the\n" +"revision of an empty repository, and the parent of revision 0.\n" +"\n" +"The reserved name \".\" indicates the working directory parent. If no\n" +"working directory is checked out, it is equivalent to null. If an\n" +"uncommitted merge is in progress, \".\" is the revision of the first\n" +"parent.\n" +msgstr "" +"Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben.\n" +"\n" +"Eine einfache Ganzzahl wird als Revisionsnummer behandelt. Negative Zahlen\n" +"beschreiben den topologischen Abstand von der Spitze (tip), wobei -1 die\n" +"Spitze selbst, und -2 dessen direkter Vorfahr ist.\n" +"\n" +"Eine 40-stellige Hexadezimalzahl gilt als eindeutige Revisions-ID.\n" +"\n" +"Eine Hexadezimalzahl mit weniger als 40 Zeichen gilt als Kurzform der ID,\n" +"wenn sie ein Präfix der Langform einer Revisions-ID ist.\n" +"\n" +"Jede andere Zeichenfolge wird als Name eines Etiketts oder Zweigs " +"behandelt.\n" +"Ein Etikett ist ein symbolischer Name für eine Revisions-ID. Ein Zweigname\n" +"bezeichnet hier die jüngsten Kopfrevision des Zweigs. Etiketten und\n" +"Zweignamen dürfen das Zeichen \":\" nicht enthalten.\n" +"\n" +"Der reservierte Name \"tip\" ist ein spezielles Etikett, welches immer auf\n" +"die jüngste Revision verweist.\n" +"\n" +"Der reservierte Name \"null\" bezeichnet die null-Revision. Sie ist die\n" +"Revision eines leeren Projektarchivs und der Vorgänger der Version 0.\n" +"\n" +"Der reservierte Name \".\" bezeichnete die Vorgängerversion des\n" +"Arbeitsverzeichnisses. Falls das Arbeitsverzeichnis leer ist, ist diese\n" +"äquivalent zu \"null\". Falls eine nicht versionierte Zusammenführung\n" +"in Bearbeitung ist, bezeichnet \".\" die Revision des ersten Vorgängers.\n" + +#: help/templates.txt:1 +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" +"template-style (--style).\n" +"\n" +"You can customize output for any \"log-like\" command: log,\n" +"outgoing, incoming, tip, parents, heads and glog.\n" +"\n" +"Three styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact and changelog.\n" +"Usage::\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +"A template is a piece of text, with markup to invoke variable\n" +"expansion::\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +"Strings in curly braces are called keywords. The availability of\n" +"keywords depends on the exact context of the templater. These\n" +"keywords are usually available for templating a log-like command:\n" +"\n" +":author: String. The unmodified author of the changeset.\n" +":branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was\n" +" default.\n" +":date: Date information. The date when the changeset was\n" +" committed.\n" +":desc: String. The text of the changeset description.\n" +":diffstat: String. Statistics of changes with the following\n" +" format: \"modified files: +added/-removed lines\"\n" +":files: List of strings. All files modified, added, or removed\n" +" by this changeset.\n" +":file_adds: List of strings. Files added by this changeset.\n" +":file_mods: List of strings. Files modified by this changeset.\n" +":file_dels: List of strings. Files removed by this changeset.\n" +":node: String. The changeset identification hash, as a\n" +" 40-character hexadecimal string.\n" +":parents: List of strings. The parents of the changeset.\n" +":rev: Integer. The repository-local changeset revision\n" +" number.\n" +":tags: List of strings. Any tags associated with the\n" +" changeset.\n" +":latesttag: String. Most recent global tag in the ancestors of this\n" +" changeset.\n" +":latesttagdistance: Integer. Longest path to the latest tag.\n" +"\n" +"The \"date\" keyword does not produce human-readable output. If you\n" +"want to use a date in your output, you can use a filter to process\n" +"it. Filters are functions which return a string based on the input\n" +"variable. You can also use a chain of filters to get the desired\n" +"output::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +"List of filters:\n" +"\n" +":addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" +" every line except the last.\n" +":age: Date. Returns a human-readable date/time difference\n" +" between the given date/time and the current\n" +" date/time.\n" +":basename: Any text. Treats the text as a path, and returns the\n" +" last component of the path after splitting by the\n" +" path separator (ignoring trailing separators). For\n" +" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" +" becomes \"bar\".\n" +":stripdir: Treat the text as path and strip a directory level,\n" +" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" +" \"foo\".\n" +":date: Date. Returns a date in a Unix date format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +":domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain\n" +" component. Example: 'User ' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User '\n" +" becomes 'user@example.com'.\n" +":escape: Any text. Replaces the special XML/XHTML characters\n" +" \"&\", \"<\" and \">\" with XML entities.\n" +":fill68: Any text. Wraps the text to fit in 68 columns.\n" +":fill76: Any text. Wraps the text to fit in 76 columns.\n" +":firstline: Any text. Returns the first line of text.\n" +":nonempty: Any text. Returns '(none)' if the string is empty.\n" +":hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +":isodate: Date. Returns the date in ISO 8601 format:\n" +" \"2009-08-18 13:00 +0200\".\n" +":isodatesec: Date. Returns the date in ISO 8601 format, including\n" +" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" +" rfc3339date filter.\n" +":localdate: Date. Converts a date to local date.\n" +":obfuscate: Any text. Returns the input text rendered as a\n" +" sequence of XML entities.\n" +":person: Any text. Returns the text before an email address.\n" +":rfc822date: Date. Returns a date using the same format used in\n" +" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Date. Returns a date using the Internet date format\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" +":short: Changeset hash. Returns the short form of a changeset\n" +" hash, i.e. a 12-byte hexadecimal string.\n" +":shortdate: Date. Returns a date like \"2006-09-18\".\n" +":strip: Any text. Strips all leading and trailing whitespace.\n" +":tabindent: Any text. Returns the text, with every line except\n" +" the first starting with a tab character.\n" +":urlescape: Any text. Escapes all \"special\" characters. For\n" +" example, \"foo bar\" becomes \"foo%20bar\".\n" +":user: Any text. Returns the user portion of an email\n" +" address.\n" +msgstr "" + +#: help/urls.txt:1 +msgid "" +"Valid URLs are of the form::\n" +"\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" +"\n" +"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').\n" +"\n" +"An optional identifier after # indicates a particular branch, tag, or\n" +"changeset to use from the remote repository. See also 'hg help\n" +"revisions'.\n" +"\n" +"Some features, such as pushing to http:// and https:// URLs are only\n" +"possible if the feature is explicitly enabled on the remote Mercurial\n" +"server.\n" +"\n" +"Some notes about using SSH with Mercurial:\n" +"\n" +"- SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +"- path is relative to the remote user's home directory by default. Use\n" +" an extra slash at the start of a path to specify an absolute path::\n" +"\n" +" ssh://example.com//tmp/repository\n" +"\n" +"- Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.::\n" +"\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +"These URLs can all be stored in your hgrc with path aliases under the\n" +"[paths] section like so::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"You can then use the alias for any command that uses a URL (for\n" +"example 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +"Two path aliases are special because they are used as defaults when\n" +"you do not provide the URL to a command:\n" +"\n" +"default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the new repository's\n" +" 'default' path. This is then used when you omit path from push- and\n" +" pull-like commands (including incoming and outgoing).\n" +"\n" +"default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +msgstr "" +"Gültige URLs haben folgende Form::\n" +"\n" +" lokales/dateisystem/pfad\n" +" file://lokales/dateisystem/pfad\n" +" http://[nutzer[:pass]@]host[:port]/[pfad]\n" +" https://[nutzer[:pass]@]host[:port]/[pfad]\n" +" ssh://[nutzer[:pass]@]host[:port]/[pfad]\n" +"\n" +"Pfade im lokalen Dateisystem können auf ein Mercurial-Archiv oder Bündel-\n" +"dateien verweisen (wie sie von 'hg bundle' oder 'hg incoming --bundle'\n" +"erzeugt werden).\n" +"\n" +"Ein optionaler Bezeichner nach # verweist auf einen bestimmten Zweig,\n" +"Etikett oder Änderungssatz des anderen Projektarchivs. Siehe auch\n" +"\"hg help revisions\".\n" +"\n" +"Einige Funktionen, wie das Übertragen an http:// und https:// URLs, sind\n" +"nur dann möglich, wenn diese Funktionen explizit auf dem entfernten\n" +"Mercurial-Server aktiviert sind.\n" +"\n" +"Einige Hinweise zur Nutzung von SSH mit Mercurial:\n" +"\n" +"- SSH benötigt einen nutzbaren Shell-Zugang auf der Zielmaschine und eine\n" +" Kopie von hg im Pfad der entfernten Maschine oder in der Konfiguration\n" +" remotecmd angegeben.\n" +"- Der Pfad ist standardmäßig relativ vom Home-Verzeichnis des entfernten\n" +" Nutzer. Nutze einen zusätzlichen Schrägstrich um einen absoluen Pfad\n" +" anzugeben::\n" +"\n" +" ssh://example.com//tmp/repository\n" +"\n" +"- Mercurial nutzt keine eigene Kompressionsmechanismen über SSH; hier " +"sollte\n" +" man die Kompression über ~/.ssh/config aktivieren, z.B.::\n" +"\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternativ kann \"ssh -C\" als dein SSH-Befehl in der hgrc oder mit der\n" +" --ssh Befehlszeilenoption angegeben werden.\n" +"\n" +"Diese URLs können alle in der hgrc als Aliase unter der Sektion [paths]\n" +"abgelegt werden::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"Diese Aliase können dann bei jedem Befehl genutzt werden der URLs nutzt\n" +"(beispielsweise 'hg pull alias1' würde vom Pfad URL1 herunterladen).\n" +"\n" +"Es gibt zwei besondere Pfad-Aliase, die standardmäßig genutzt\n" +"werden wenn einem Befehl keine URL übergeben wurde:\n" +"\n" +"default:\n" +" Bei Erstellung eines Projektarchivs mit hg clone, sichert der clone-" +"Befehl\n" +" die Herkunft des Quellarchivs als 'default'-Pfad des neuen Archivs. " +"Dieser\n" +" Pfad wird immer dann genutzt, wenn bei 'push' oder 'pull'-ähnlichen\n" +" Befehlen der Pfad nicht angegeben wurde (auch 'incoming' und 'outgoing').\n" +"\n" +"default-push:\n" +" Der 'push'-Befehl sucht nach dem 'default-push'-Alias und zieht\n" +" diesen dem 'default'-Alias vor, wenn beide definiert sind.\n" + msgid "" "hooks for controlling repository access\n" "\n" @@ -152,39 +813,15 @@ " ** = Benutzer3\n" #, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s nicht aktiviert\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s aktiviert, %d Einträge für Nutzer %s\n" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" "Konfigurationsfehler - Aktionstyp \"%s\" kann hereinkommende Änderungssätze\n" "nicht stoppen" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: Änderungen haben die Quelle \"%s\" - überspringe\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: Benutzer %s nicht berechtigt für %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: Zugriff verweigert auf die Version %s" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: Benutzer %s hat keinen Zugriff auf %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: Gestatte Änderungssatz %s\n" - msgid "" "track a line of development with movable markers\n" "\n" @@ -722,10 +1359,6 @@ " \n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "Gehe von Terminalbreite %i aus\n" - msgid "count rate for the specified revision or range" msgstr "Zählt nur in gegebener Revision oder Intervall" @@ -840,8 +1473,8 @@ msgid "when to colorize (always, auto, or never)" msgstr "Wann soll eingefärbt werden (always, auto oder never)" -msgid "don't colorize output" -msgstr "Keine Färbung der Ausgabe" +msgid "don't colorize output (DEPRECATED)" +msgstr "Keine Färbung der Ausgabe (VERALTET)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" @@ -977,23 +1610,8 @@ " converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" -" Because CVS does not have changesets, it is necessary to collect\n" -" individual commits to CVS and merge them into changesets. CVS\n" -" source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" " The options shown are the defaults.\n" "\n" -" Internal cvsps is selected by setting ::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" and has a few more configurable options:\n" -"\n" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -1013,9 +1631,10 @@ " add the most recent revision on the branch indicated in the\n" " regex as the second parent of the changeset.\n" "\n" -" The hgext/convert/cvsps wrapper script allows the builtin\n" +" An additional \"debugcvsps\" Mercurial command allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" -" parameters and output are similar to that of cvsps 2.1.\n" +" parameters and output are similar to that of cvsps 2.1. Please see\n" +" the command help for more details.\n" "\n" " Subversion Source\n" " -----------------\n" @@ -1199,21 +1818,7 @@ " werden alle Dateien unterhalb des Startverzeichnisses konvertiert und\n" " jegliche Verzeichnis-Umordnung im Sandkasten ignoriert.\n" "\n" -" Da CVS kein Konzept von Änderungssätzen hat, muss jedes einzelne\n" -" Übernehmen in Änderungssätze vereinigt werden. Das Standardprogramm\n" -" (cvsps) welches dazu verwendet wird kann gewechselt werden::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" -" Die oben gezeigten Argumente entsprechend dem Standardaufruf.\n" -"\n" -" Das interne cvsps kann so gewählt werden::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" und hat weitere konfigurierbare Optionen:\n" +" Die oben folgenden Argumente entsprechend dem Standardaufruf.\n" "\n" " --config convert.cvsps.cache=True (boolean)\n" " Kann für Tests oder Debugging deaktiviert werden, um das Zwischen-\n" @@ -1235,10 +1840,10 @@ " jüngste Revision des angegebenen Zweigs als zweiter Vorfahr der\n" " aktuellen Revision angenommen.\n" "\n" -" Mit dem Skript hgext/convert/cvsps kann man die interne Zusammenführung\n" +" Das zusätzliche Kommando \"debugcvsps\" erlaubt es, die Zusammenführung\n" " auch ohne Konversation ausführen. Die Parameter sind denen von cvsps " "2.1\n" -" ähnlich.\n" +" ähnlich. Für weitere Details siehe die Hilfe zu diesem Kommando.\n" "\n" " Subversion als Quelle\n" " ---------------------\n" @@ -1403,10 +2008,6 @@ msgstr "Kann benötigtes Werkzeug\"%s\" nicht finden" #, python-format -msgid "running: %s\n" -msgstr "führe aus: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s Fehler:\n" @@ -1484,19 +2085,9 @@ msgid "--sourcesort is not supported by this data source" msgstr "Option --sourcesort ist für diese Archivquelle nicht unterstützt" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "" -"Warnung: Unterstützung für externes cvsps ist veraltet und wird in Mercurial " -"1.4 entfernt\n" - -#, python-format -msgid "revision %s is not a patchset number or date" -msgstr "Revision %s ist weder ein Satz von Patchnummern noch ein Datum" - -msgid "using builtin cvsps\n" -msgstr "Nutze internes cvsps\n" +#, python-format +msgid "revision %s is not a patchset number" +msgstr "Revision %s ist keine Patchsatz-Nummer" #, python-format msgid "connecting to %s\n" @@ -1542,10 +2133,6 @@ msgid "running %s\n" msgstr "Führe aus: %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "" - msgid "RCS file must be followed by working file" msgstr "RCS Datei muss von Arbeitsdatei gefolgt sein" @@ -1559,10 +2146,6 @@ msgstr "Revision muss von einer Datumszeile gefolgt sein" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "Synthetische Revision gefunden in %s: %r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "Schreibe CVS Logbuch-Zwischenspeicher %s\n" @@ -1595,10 +2178,6 @@ msgid "Python ElementTree module is not available" msgstr "Python-Modul ElementTree ist nicht verfügbar" -#, python-format -msgid "cleaning up %s\n" -msgstr "Räume auf: %s\n" - msgid "internal calling inconsistency" msgstr "Inkonsistenz bei internem Aufruf" @@ -1634,22 +2213,6 @@ "Baumanalyse gestoppt, da er ein unregistriertes Archiv referenziert %s...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "" - -#, python-format -msgid "analyzing revision %s...\n" -msgstr "Analysiere Revision %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1661,12 +2224,6 @@ msgid "initializing destination %s repository\n" msgstr "" -msgid "run hg sink pre-conversion action\n" -msgstr "" - -msgid "run hg sink post-conversion action\n" -msgstr "" - #, python-format msgid "pulling from %s into %s\n" msgstr "Hole von %s nach %s\n" @@ -1685,12 +2242,6 @@ msgid "ignoring: %s\n" msgstr "ignoriere: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "" - -msgid "run hg source post-conversion action\n" -msgstr "" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s scheint kein monotone-Archiv zu sein" @@ -1705,15 +2256,21 @@ msgid "collecting p4 changelists\n" msgstr "Sammle p4 Änderungslisten\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Pythons Subversion-Unterstützung konnte nicht geladen werden" #, python-format msgid "Subversion python bindings %d.%d found, 1.4 or later required" -msgstr "Pythons Subversion-Unterstützung in Version %d.%d gefunden aber mind. 1.4 benötigt " +msgstr "" +"Pythons Subversion-Unterstützung in Version %d.%d gefunden aber mind. 1.4 " +"benötigt " msgid "Subversion python bindings are too old, 1.4 or later required" -msgstr "Pythons Subversion-Unterstützung ist zu alt. Mind. Version 1.4 benötigt " +msgstr "" +"Pythons Subversion-Unterstützung ist zu alt. Mind. Version 1.4 benötigt " #, python-format msgid "svn: revision %s is not an integer" @@ -1755,69 +2312,22 @@ msgstr "Keine Etiketten in Revision %d gefunden\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "Ignoriere externen Zweig %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s nicht in Revision %d gefunden" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "Zweig von %s auf %s bei %d umbenannt\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "Vorfahrwechsel zu %s\n" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "Kopiert von %s nach %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "" - -#, python-format -msgid "entry %s\n" -msgstr "Eintrag %s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "Unbekannter Pfad in Revision %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "Markierung %s kam von %s:%d\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "Analysiere Revision %d (%d Änderungen)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "Vorfahr con Zweig %s gefunden in %d: %s\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "Hole Revisionslogbuch für \"%s\" aus %d nach %d\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "Revision %d hat keine Einträge\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: Zweig hat keine Revisionen: %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "" - -#, python-format msgid "initializing svn repo %r\n" msgstr "" @@ -1877,7 +2387,8 @@ "Ein solches Programm wird mit konfigurierbaren Parameters und zwei nicht-\n" "Optionen aufgerufen. Dies sind die Pfad zu den zu vergleichenden Daten.\n" "\n" -"Durch diese Erweiterung lassen sich auch neue hg-Kommandos definieren, damit\n" +"Durch diese Erweiterung lassen sich auch neue hg-Kommandos definieren, " +"damit\n" "man nicht immer \"hg extdiff -p kdiffs\" eintippen muss. ::\n" "\n" " [extdiff]\n" @@ -1894,7 +2405,8 @@ " # wiederholt werden)\n" " meld =\n" "\n" -" # Fügt Kommando \"vimdiff\" hinzu, welches gvimdiff mit dem DirDiff Plugin\n" +" # Fügt Kommando \"vimdiff\" hinzu, welches gvimdiff mit dem DirDiff " +"Plugin\n" " # ausführt. (http://www.vim.org/scripts/script.php?script_id=102).\n" " # Die .vimrc sollte dazu \"let g:DirDiffDynamicDiffText = 1\" enthalten.\n" " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" @@ -1916,14 +2428,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "--rev und --change können nicht gleichzeitig angegeben werden" -#, python-format -msgid "running %r in %s\n" -msgstr "Führe %r in %s aus\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "Datei wurde während des Vergleichs verändert. Überschreibe: %s (Quelle: %s)\n" - msgid "cleaning up temp directory\n" msgstr "Säubere temporäres Verzeichnis\n" @@ -1952,7 +2456,8 @@ " mit den Optionen \"-Npru\".\n" "\n" " Um ein anderes Programm zu verwenden, nutze die Option -p/--program.\n" -" Die zwei zu vergleichenden Verzeichnisse werden automatisch als Aufrufs-\n" +" Die zwei zu vergleichenden Verzeichnisse werden automatisch als " +"Aufrufs-\n" " parameter angenommen. Weitere Parameter können durch die Option\n" " -o/--option hinzugefügt werden. Diese werden vor den Verzeichnisnamen\n" " übergeben.\n" @@ -2177,8 +2682,8 @@ "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" "force)" msgstr "" -"Arbeitskopie der Datei .hgsigs wurde geändert (bitte manuell übernehmen oder" -"--force verwendet)" +"Arbeitskopie der Datei .hgsigs wurde geändert (bitte manuell übernehmen " +"oder--force verwendet)" msgid "unknown signature version" msgstr "Unbekannte Version der Signatur" @@ -2214,8 +2719,7 @@ "commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" -"Zeigt ASCII Revisionsgraphen bei einigen Befehlen" -"\n" +"Zeigt ASCII Revisionsgraphen bei einigen Befehlen\n" "Diese Erweiterung fügt die Option --graph zu den Kommandos incoming,\n" "outgoing und log hinzu. Wenn die Option angegeben ist, wird eine ASCII-\n" "Repäsentation des Revisionsgraphen angezeigt.\n" @@ -2307,12 +2811,6 @@ msgid "email.from must be defined when sending by email" msgstr "" -msgid "cia: no user specified" -msgstr "" - -msgid "cia: no project specified" -msgstr "" - msgid "" "browse the repository in a graphical way\n" "\n" @@ -2472,9 +2970,6 @@ msgid "(found dead inotify server socket; removing it)\n" msgstr "" -msgid "(starting inotify server)\n" -msgstr "" - #, python-format msgid "could not start inotify server: %s\n" msgstr "" @@ -2483,9 +2978,6 @@ msgid "could not talk to new inotify server: %s\n" msgstr "" -msgid "(inotify server not running)\n" -msgstr "" - #, python-format msgid "failed to contact inotify server: %s\n" msgstr "" @@ -2755,12 +3247,6 @@ "\tkeywords expanded\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" - msgid "" "expand keywords in the working directory\n" "\n" @@ -2783,15 +3269,13 @@ " See \"hg help keyword\" on how to construct patterns both for\n" " inclusion and exclusion of files.\n" "\n" -" Use -u/--untracked to list untracked files as well.\n" -"\n" -" With -a/--all and -v/--verbose the codes used to show the status\n" +" With -A/--all and -v/--verbose the codes used to show the status\n" " of files are::\n" "\n" " K = keyword expansion candidate\n" -" k = keyword expansion candidate (untracked)\n" +" k = keyword expansion candidate (not tracked)\n" " I = ignored\n" -" i = ignored (untracked)\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2823,7 +3307,13 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +msgid "only show unknown (not tracked) files" +msgstr "Zeigt nur unbekannte (nicht überwachte) Dateien" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2894,10 +3384,6 @@ msgstr "Ungültiges Zeichen in Wächter %r: %r" #, python-format -msgid "active guards: %s\n" -msgstr "Aktive Wächter: %s\n" - -#, python-format msgid "guard %r too short" msgstr "Wächter %r zu kurz" @@ -3746,8 +4232,8 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" -msgstr "" +msgid "forget any local changes to patched files" +msgstr "Vergisst alle lokalen Änderungen" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" msgstr "" @@ -3903,6 +4389,7 @@ " 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" " from = user@host.com # email address to send as if none given\n" " [web]\n" @@ -3951,11 +4438,7 @@ msgstr "" #, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" +msgid "notify: suppressing notification for merge %d:%s\n" msgstr "" msgid "" @@ -4318,9 +4801,6 @@ "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" -msgid "first revision, do not change ancestor\n" -msgstr "Erste Revision, ändere den Vorgänger nicht\n" - msgid "" "move changeset (and descendants) to a different branch\n" "\n" @@ -4376,64 +4856,21 @@ msgid "%d revisions have been skipped\n" msgstr "%d Revisionen wurden übersprungen\n" -msgid " set parents\n" -msgstr " setzt die Vorgänger\n" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "Rebase von %d:%s\n" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr " die zukünftigen Vorgänger sind %d und %d\n" - -#, python-format -msgid " update to %d:%s\n" -msgstr " aktualisiert auf %d:%s\n" - -msgid " already in target\n" -msgstr " bereits auf Ziel\n" - -#, python-format -msgid " merge against %d:%s\n" -msgstr " Zusammenführung zwischen %d:%s\n" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" "Behebe ungelöste Konflikte mit hg resolve, dann führe hg rebase --continue " "aus" -msgid "resuming interrupted rebase\n" -msgstr "Nehme unterbrochenen Rebase wieder auf\n" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "keine Änderungen, Revision %d übersprungen\n" #, python-format -msgid "next revision set to %s\n" -msgstr "nächste Revision auf %s gesetzt\n" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" "Revision %d kann nicht als Basis genutzt werden, das Ergebnis hätte 3 " "Vorgänger" -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "Revision %d ist ein MQ-Patch (%s) und muss finalisiert werden.\n" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "Importiere MQ Patch %d (%s)\n" - -msgid "rebase status stored\n" -msgstr "Rebase-Zustand gesichert\n" - -msgid "rebase status resumed\n" -msgstr "Rebase-Zustand wieder aufgenommen\n" - msgid "no rebase in progress" msgstr "Kein vorheriger Rebase zur Wiederaufnahme" @@ -4446,28 +4883,15 @@ msgid "cannot rebase onto an applied mq patch" msgstr "Rebase kann auf einem angewandten MQ-Patch nicht aufsetzen" -msgid "cannot rebase an ancestor" -msgstr "Kann Rebase nicht auf einem Vorläufer ausführen" - -msgid "cannot rebase a descendant" -msgstr "Kann Rebase nicht auf einem Nachfolger ausführen" - -msgid "already working on current\n" -msgstr "Arbeite bereits auf der aktuellen Version\n" - -msgid "already working on the current branch\n" -msgstr "Arbeite bereits auf dem aktuellen Zweig\n" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "Rebase auf %d beginnend bei %d\n" +msgid "source is ancestor of destination" +msgstr "Quelle ist ein Vorfahr des Ziels" + +msgid "source is descendant of destination" +msgstr "Quelle ist Nachfahr des Ziels" msgid "unable to collapse, there is more than one external parent" msgstr "" -"Zusammenfalten nicht möglich, es gibt mehr als einen externen Vorgänger" - -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "--update und --rebase sind nicht kompatibel, ignoriere --update\n" +"Zusammenfalten nicht möglich: es gibt mehr als einen externen Vorgänger" msgid "rebase working directory to branch head" msgstr "Führt Rebase zu einem Zweigkopf auf dem Arbeitsverzeichnis aus" @@ -4481,14 +4905,14 @@ msgid "rebase onto a given revision" msgstr "Rebase der angegebene Revision" -msgid "collapse the rebased revisions" -msgstr "Faltet die erzeugten Revisionen nach dem Rebase zusammen" - -msgid "keep original revisions" -msgstr "Behält die ursprünglichen Revisionen" - -msgid "keep original branches" -msgstr "Behält die ursprünglichen Zweige" +msgid "collapse the rebased changesets" +msgstr "Faltet die erzeugten Änderungssätze nach dem Rebase zusammen" + +msgid "keep original changesets" +msgstr "Behält die ursprünglichen Änderungssätze bei" + +msgid "keep original branch names" +msgstr "Erhält die ursprünglichen Zweignamen" msgid "continue an interrupted rebase" msgstr "Führt einen unterbrochenen Rebase fort" @@ -4622,20 +5046,9 @@ msgid "no changes to record\n" msgstr "Keine Änderungen zu übernehmen\n" -#, python-format -msgid "backup %r as %r\n" -msgstr "Sichere %r unter %r\n" - -msgid "applying patch\n" -msgstr "Wende Patch an\n" - msgid "patch failed to apply" msgstr "Patch schlug fehl" -#, python-format -msgid "restoring %r to %r\n" -msgstr "Wiederherstellung: %r nach %r\n" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPTION]... [DATEI]..." @@ -4848,10 +5261,6 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "" - msgid "" "perform automatic newline conversion\n" "\n" @@ -5474,7 +5883,8 @@ "\n" " Die Markierung kann automatisch durch einem Testprogramm stattfinden.\n" " Ein Rückgabewert von 0 bedeutet dabei Erfolg, 125 Überspringen, 127\n" -" (Kommando nicht gefunden) Abbruch und jeder andere positive Wert Fehler.\n" +" (Kommando nicht gefunden) Abbruch und jeder andere positive Wert " +"Fehler.\n" " " msgid "The first good revision is:\n" @@ -5506,10 +5916,6 @@ msgstr "Inkompatible Argumente" #, python-format -msgid "cannot find executable: %s" -msgstr "Kann ausführbare Datei nicht finden: %s" - -#, python-format msgid "failed to execute %s" msgstr "Fehler bei der Ausführung von %s" @@ -5591,7 +5997,8 @@ "Zeigt alle benannten Zweige des Projektarchiv an\n" "\n" " Listet die benannten Zweige des Projektarchiv auf und zeigt an, welche\n" -" inaktiv sind. Zweige, die durch \"hg commit --close-branch\" geschlossen\n" +" inaktiv sind. Zweige, die durch \"hg commit --close-branch\" " +"geschlossen\n" " wurden, werden nur mit dem Schalter -c/--closed angezeigt.\n" "\n" " Mit der Option -a/--active werden nur aktive Zweige ausgegeben. Ein\n" @@ -5689,7 +6096,6 @@ " %p Pfad und Dateiname relativ zur Archiv-Wurzel\n" " " -#, fuzzy msgid "" "make a copy of an existing repository\n" "\n" @@ -5747,15 +6153,15 @@ " Die Adresse der Quelle wird der .hg/hgrc Datei des neuen Archivs\n" " als Standard für entfernte Aktionen (pull/push) hinzugefügt.\n" "\n" -" Wenn die -r Option zum klonen bis zu einer bestimmten Revision genutzt\n" -" wird, werden keine Folgeversionen (oder Marken) im geklonten Archiv\n" -" vorhanden sein. Diese Option impliziert --pull, auch bei lokalen " -"Archiven.\n" +" Wenn die -r/--rev Option zum klonen bis zu einer bestimmten Revision\n" +" genutzt wird, werden keine Folgeversionen (oder Marken) im geklonten\n" +" Archiv vorhanden sein. Diese Option impliziert --pull, auch bei lokalen\n" +" Archiven.\n" "\n" " Standardmäßig wird clone die Kopfversion des 'default'-Zweiges zum\n" -" Arbeitsverzeichnis machen. Bei Nutzung der -U Option wird der Klon zwar\n" -" das Projektarchiv enthalten (.hg) aber keine Arbeitskopie laden (die\n" -" Vorgängerversion der Arbeitskopie ist die 'null'-Revision).\n" +" Arbeitsverzeichnis machen. Bei Nutzung der -U/--noupdate Option wird\n" +" der Klon zwar das Projektarchiv enthalten (.hg) aber keine Arbeitskopie\n" +" laden (die Vorgängerversion der Arbeitskopie ist die 'null'-Revision).\n" "\n" " Siehe 'hg help urls' für Details gültiger Quellformate.\n" "\n" @@ -5766,7 +6172,7 @@ " Aus Effizienzgründen werden 'hardlinks' für das Klonen genutzt, wann " "immer\n" " Quelle und Ziel auf dem selben Dateisystem sind (dies gilt nur für die\n" -" Daten des Archivs, nicht für die Arbeitskopie). Einige Dateisyteme wie\n" +" Daten des Archivs, nicht für die Arbeitskopie). Einige Dateisyteme, wie\n" " etwa AFS, implementieren 'hardlinks' fehlerhaft, erzeugen dabei aber " "keine\n" " Fehlermeldung. In diesen Fällen muss die --pull Option genutzt werden,\n" @@ -5784,7 +6190,6 @@ " Kernel Tools tun dies). Außerdem ist dies inkompatibel mit einigen\n" " Erweiterungen, die Metadaten unter dem .hg Verzeichnis ablegen, z.B. " "mq.\n" -"\n" " " msgid "" @@ -6133,7 +6538,6 @@ "aufschlussreich.\n" " " -#, fuzzy msgid "" "dump the header and diffs for one or more changesets\n" "\n" @@ -6172,18 +6576,14 @@ "Gibt Kopfzeilen und Änderungsverlauf einer oder mehrerer Versionen aus\n" "\n" " Die angezeigten Daten in den Kopfzeilen sind: Autor,\n" -" Änderungssatz-Prüfsumme, Vorgängerversion und Versionsmeldung.\n" +" Änderungssatz-Prüfsumme, Vorgängerversion(en) und Versionsmeldung.\n" "\n" " HINWEIS: export kann bei Zusammenführungen unerwartete Resultate " "anzeigen,\n" -" da es nur mit einer (der ersten es sei denn --switch-parent ist " -"angegeben)\n" -" Vorgängerversion vergleicht.\n" -"\n" -" Die Ausgabe kann in eine Datei erfolgen (Option -o). In diesem Fall " -"wird\n" -" der Name für jede ausgegebene Revision anhand einer Formatangabe " -"erzeugt::\n" +" da es nur mit der ersten Vorgängerversion vergleicht.\n" +"\n" +" Die Ausgabe kann in eine Datei erfolgen. In diesem Fall wird der Name\n" +" für jede ausgegebene Revision anhand einer Formatangabe erzeugt::\n" "\n" " %% literales \"%\" Zeichen\n" " %H Prüfsumme des Änderungssatzes (40 Byte hexadezimal)\n" @@ -6194,14 +6594,15 @@ " %n laufende Nummer mit führenden Nullen, beginnend bei 1\n" " %r Revisionsnummer mit führenden Nullen\n" "\n" -" Ohne die Option -a vermeidet export den Vergleich von binären Dateien.\n" -" Mit -a wird der Vergleich in jedem Fall durchgeführt, wahrscheinlich " -"mit\n" -" unerwünschtem Resultat.\n" -"\n" -" Nutze die Option --git um Vergleiche im git-erweiterten diff-Format zu\n" -" erzeugen. Zur weiteren Information ist \"hg help diff\" " -"aufschlussreich.\n" +" Ohne die Option -a/--text vermeidet export den Vergleich von binären\n" +" Dateien. Mit -a wird der Vergleich in jedem Fall durchgeführt,\n" +" wahrscheinlich mit unerwünschtem Resultat.\n" +"\n" +" Nutze die Option -g/--git um Vergleiche im git-erweiterten diff-Format\n" +" zu erzeugen. Siehe dazu auch \"hg help diff\".\n" +"\n" +" Mit dem Schalter --switch-parent kann im Falle einer Zusammenführung\n" +" mit dem zweiten Vorfahren verglichen werden.\n" " " msgid "export requires at least one changeset" @@ -6278,23 +6679,25 @@ "\n" " With no arguments, show all repository head changesets.\n" "\n" -" Repository \"heads\" are changesets that don't have child\n" -" changesets. They are where development generally takes place and\n" -" are the usual targets for update and merge operations.\n" +" Repository \"heads\" are changesets with no child changesets. They are\n" +" where development generally takes place and are the usual targets\n" +" for update and merge operations.\n" "\n" " If one or more REV is given, the \"branch heads\" will be shown for\n" -" the named branch associated with that revision. The name of the\n" -" branch is called the revision's branch tag.\n" -"\n" -" Branch heads are revisions on a given named branch that do not have\n" -" any descendants on the same branch. A branch head could be a true head\n" -" or it could be the last changeset on a branch before a new branch\n" -" was created. If none of the branch heads are true heads, the branch\n" -" is considered inactive. If -c/--closed is specified, also show branch\n" -" heads marked closed (see hg commit --close-branch).\n" -"\n" -" If STARTREV is specified only those heads (or branch heads) that\n" -" are descendants of STARTREV will be displayed.\n" +" the named branch associated with the specified changeset(s).\n" +"\n" +" Branch heads are changesets on a named branch with no descendants on\n" +" the same branch. A branch head could be a \"true\" (repository) head,\n" +" or it could be the last changeset on that branch before it was\n" +" merged into another branch, or it could be the last changeset on the\n" +" branch before a new branch was created. If none of the branch heads\n" +" are true heads, the branch is considered inactive.\n" +"\n" +" If -c/--closed is specified, also show branch heads marked closed\n" +" (see hg commit --close-branch).\n" +"\n" +" If STARTREV is specified, only those heads that are descendants of\n" +" STARTREV will be displayed.\n" " " msgstr "" "Zeigt die Köpfe des Archivs oder von Entwicklungszweigen\n" @@ -6337,7 +6740,6 @@ msgid "no changes on branch %s are reachable from %s\n" msgstr "Keine Änderungen auf dem Zweig %s sind von %s erreichbar\n" -#, fuzzy msgid "" "show help for a given topic or a help overview\n" "\n" @@ -6428,7 +6830,6 @@ "Zusätzliche Hilfethemen:\n" "\n" -#, fuzzy msgid "" "identify the working copy or specified revision\n" "\n" @@ -6460,7 +6861,6 @@ " falls nicht der 'default'-Zweig vorliegt.\n" " " -#, fuzzy msgid "" "import an ordered set of patches\n" "\n" @@ -6513,8 +6913,8 @@ "\n" " Falls der einzulesende Patch von \"hg export\" erzeugt wurde, werden\n" " Benutzername und Versionsmeldung aus dem Patch und nicht aus der Email\n" -" verwendet. Die Optionen -m und -u überschreiben aber auch diese " -"Angaben.\n" +" verwendet. Die Optionen -m/--message und -u/--user überschreiben aber\n" +" auch diese Angaben.\n" "\n" " Mit der Option --exact wird das Arbeitsverzeichnis vor jedem Patch auf\n" " dessen Vorgängerversion gebracht. Nach Anwendung wird geprüft, ob der\n" @@ -6523,12 +6923,13 @@ "anderen\n" " Problemen mit dem Patch Format), wird die Operation abgebrochen.\n" "\n" -" Mit der Option --similarity werden Umbenennungen und Kopien auf gleiche\n" -" Weise wie mit dem Befehl \"hg addremove\" erkannt.\n" +" Mit der Option -s/--similarity werden Umbenennungen und Kopien auf\n" +" gleiche Weise wie mit dem Befehl \"hg addremove\" erkannt.\n" "\n" " Um einen Patch von der Standardeingabe zu lesen, kann der Dateiname \"-" "\"\n" -" verwendet werden. Siehe 'hg help dates' für eine Liste aller gültigen\n" +" verwendet werden. Falls eine URL angegeben ist, wird der Patch von dort\n" +" heruntergeladen. Siehe 'hg help dates' für eine Liste aller gültigen\n" " Formate für -d/--date.\n" " " @@ -6538,21 +6939,12 @@ msgid "no diffs found" msgstr "Keine Diffs gefunden" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"Meldung:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "Kein Mercurial Patch" msgid "patch is damaged or loses information" msgstr "Prüfsumme stimmt nicht überein: Patch korrumpiert" -#, fuzzy msgid "" "show new changesets found in source\n" "\n" @@ -6570,6 +6962,7 @@ "\n" " Zeigt alle neuen Änderungen an, die durch ein \"hg pull\" vom \n" " angegebenen Pfad/URL oder dem 'default'-Pfad geholt werden würden.\n" +"\n" " Für entfernte Archive sorgt die Option --bundle dafür, dass die " "Änderungen\n" " bei einem folgenden \"hg pull\" nicht ein zweites Mal geholt werden.\n" @@ -6577,7 +6970,6 @@ " Siehe \"hg help pull\" für gültige Angaben für die Quelle.\n" " " -#, fuzzy msgid "" "create a new repository in the given directory\n" "\n" @@ -6601,7 +6993,6 @@ " Siehe 'hg help urls' für mehr Informationen.\n" " " -#, fuzzy msgid "" "locate files matching specific patterns\n" "\n" @@ -6639,7 +7030,6 @@ " mit Leerzeichen in Dateinamen vermeidet.\n" " " -#, fuzzy msgid "" "show revision history of entire repository or files\n" "\n" @@ -6694,16 +7084,14 @@ " des -v/--verbose Schalters, wird eine Liste aller geänderten Dateien\n" " und die komplette Versionsmeldung angezeigt.\n" "\n" -" HINWEIS: log -p kann ein unerwartetes Diff für " -"Zusammenführungsversionen\n" +" HINWEIS: log -p/--patch kann ein unerwartetes Diff für " +"Zusammenführungen\n" " erzeugen, da es standardmäßig die Zusammenführungsversion mit der " "ersten\n" " Vorgängerversion vergleicht. Auch in der Dateiliste werden nur Dateien\n" " berücksichtigt, die zu BEIDEN Vorgängernversionen verschieden sind.\n" -"\n" -" " - -#, fuzzy +" " + msgid "" "output the current or given revision of the project manifest\n" "\n" @@ -6729,7 +7117,6 @@ " die Prüfsumme.\n" " " -#, fuzzy msgid "" "merge working directory with another revision\n" "\n" @@ -6807,7 +7194,6 @@ " Siehe Hilfe zu 'pull' für das Format der Zieladresse.\n" " " -#, fuzzy msgid "" "show the parents of the working directory or revision\n" "\n" @@ -6821,7 +7207,7 @@ "Zeigt die Vorgänger des Arbeitsverzeichnisses oder einer Revision\n" "\n" " Gibt die Vorgängerversion(en) des Arbeitsverzeichnisses aus. Bei\n" -" Angabe einer Revision via --rev, werden die Vorgänger dieser\n" +" Angabe einer Revision via -r/--rev, werden die Vorgänger dieser\n" " Version ausgegeben. Bei Angabe einer Datei wird die Version\n" " ausgegeben, in der diese Datei zuletzt geändert wurde (noch vor der\n" " Version des Arbeitsverzeichnisses oder dem Argument zu --rev falls\n" @@ -6835,7 +7221,6 @@ msgid "'%s' not found in manifest!" msgstr "'%s' nicht im Manifest gefunden!" -#, fuzzy msgid "" "show aliases for remote repositories\n" "\n" @@ -6874,7 +7259,6 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "(führe \"hg update\" aus, um ein Arbeitsverzeichnis zu erstellen)\n" -#, fuzzy msgid "" "pull changes from the specified source\n" "\n" @@ -6903,15 +7287,14 @@ " wird die Kopie des Projektes im Arbeitsverzeichnis nicht aktualisiert.\n" "\n" " Um zu sehen, was beim nächsten 'pull' geholt würde, ohne dem Archiv\n" -" tatsächlich Änderungen hinzuzufügen, nutze hg incoming.\n" -"\n" -" Beim Weglassen der QUELLE wird standardmäßig der 'default'-Pfad " -"genutzt.\n" +" tatsächlich Änderungen hinzuzufügen, nutze \"hg incoming\". Wenn diese\n" +" dann hinzugefügt werden sollen, kann man mit \"pull -r X\" als X der\n" +" letzte von incoming gezeigte Änderungssatz angegeben werden.\n" +" Ohne Angabe der QUELLE wird standardmäßig der 'default'-Pfad genutzt.\n" " Siehe Hilfe zu 'paths' zu Pfad-Kurznamen und 'urls' für erlaubte\n" " Formate für die Quellangabe.\n" " " -#, fuzzy msgid "" "push changes to the specified destination\n" "\n" @@ -6943,12 +7326,12 @@ "\n" " Im Regelfall wird \"hg push\" die Ausführung verweigern, wenn das\n" " Resultat die Anzahl der Kopfversionen im entfernten Archiv erhöht, da\n" -" dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der " -"Über-\n" -" tragung die entfernten Änderungen zu holen und zusammenzuführen.\n" -"\n" -" Bei Nutzung von -r wird die benannte Revision mit allen Vorgängern in\n" -" das entfernte Archiv übertragen.\n" +" dies normalerweise bedeutet, dass der Nutzer vergessen hat vor der\n" +" Übertragung die entfernten Änderungen zu holen und zusammenzuführen.\n" +"\n" +" Bei Nutzung von -r/--rev wird die benannte Revision mit allen " +"Vorgängern\n" +" in das entfernte Archiv übertragen.\n" "\n" " Für wichtige Details zu ssh://-URLS kann die URL-Hilfe zu Rate gezogen\n" " werden. Beim Weglassen des ZIELs wird standardmäßig der 'default'-Pfad\n" @@ -6979,7 +7362,6 @@ " nur dann nötig sein, wenn eine Meldung von Mercurial es vorschlägt.\n" " " -#, fuzzy msgid "" "remove the specified files on the next commit\n" "\n" @@ -7011,12 +7393,11 @@ "\n" " Merkt die benannten Dateien für die Entfernung aus dem Archiv vor.\n" "\n" -" Dabei werden nur Dateien aus dem aktuellen Zweig gelöscht, nicht aus " -"der\n" -" gesamten Projekthistorie. Option -A kann genutzt werden, um Dateien zu\n" -" entfernen, die bereits gelöscht wurden, -f kann genutzt werden, um die\n" -" Löschung zu erzwingen. -AF entfernt Dateien aus der nächsten Revision,\n" -" ohne sie zu löschen\n" +" Dabei werden nur Dateien aus dem aktuellen Zweig gelöscht, nicht aus\n" +" der gesamten Projekthistorie. Option -A/--after kann genutzt werden,\n" +" um Dateien zu entfernen, die bereits gelöscht wurden, -f/--force kann\n" +" genutzt werden, um die Löschung zu erzwingen. -Af entfernt Dateien aus\n" +" der nächsten Revision, ohne sie zu löschen\n" "\n" " Die folgende Tabelle beschreibt detailliert das Verhalten von 'remove'\n" " für unterschiedliche Dateizustände (Spalten) und Optionskombinationen\n" @@ -7087,7 +7468,6 @@ " \"hg revert\" rückgängig gemacht werden.\n" " " -#, fuzzy msgid "" "retry file merges from a merge or update\n" "\n" @@ -7139,7 +7519,6 @@ msgid "no files or directories specified; use --all to remerge all files" msgstr "Keine Dateien oder Verzeichnisse angegeben; nutze --all für alle" -#, fuzzy msgid "" "restore individual files or directories to an earlier state\n" "\n" @@ -7238,7 +7617,6 @@ msgid "no changes needed to %s\n" msgstr "keine Änderungen notwendig für %s\n" -#, fuzzy msgid "" "roll back the last transaction\n" "\n" @@ -7309,7 +7687,6 @@ " Gibt das Wurzelverzeichnis des aktuellen Arbeitsverzeichnisses aus.\n" " " -#, fuzzy msgid "" "export the repository via HTTP\n" "\n" @@ -7325,15 +7702,14 @@ " Startet einen lokalen HTTP Archivbrowser und einen Pull-Server.\n" "\n" " Standardmäßig schreibt der Server Zugriffe auf die Standardausgabe\n" -" und Fehler auf die Standardfehlerausgabe. Nutze die '-A' und '-E'\n" -" Optionen, um die Ausgabe in Dateien umzulenken.\n" +" und Fehler auf die Standardfehlerausgabe. Nutze die Optionen \n" +" -A/--accesslog und -E/--errorlog, um die Ausgabe in Dateien umzulenken.\n" " " #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "Höre auf http://%s%s/%s (gebunden an %s:%d)\n" -#, fuzzy msgid "" "show changed files in the working directory\n" "\n" @@ -7372,12 +7748,10 @@ "\n" " Zeigt den Status von Dateien im Archiv an. Wenn eine Name übergeben\n" " wird, werden nur zutreffende Dateien angezeigt. Es werden keine Dateien\n" -" angezeigt die unverändert, ignoriert oder Quelle einer Kopier/" -"Verschiebe\n" -" Operation sind, es sei denn -c (unverändert), -i (ignoriert), -C " -"(Kopien)\n" -" order -A wurde angegeben. Außer bei Angabe von Optionen, die mit " -"\"Zeigt\n" +" angezeigt die unverändert, ignoriert oder Quelle einer Kopier- oder\n" +" Verschiebe Operation sind, es sei denn -c/--clean (unverändert),\n" +" -i/--ignored (ignoriert), -C/--copies (Kopien) oder -A/--all (alle)\n" +" wurde angegeben. Außer bei Angabe von Optionen, die mit \"Zeigt\n" " nur ...\" beschrieben werden, werden die Optionen -mardu genutzt.\n" "\n" " Die Option -q/--quiet blendet unüberwachte (unbekannte und ignorierte)\n" @@ -7409,6 +7783,55 @@ " " msgid "" +"summarize working directory state\n" +"\n" +" This generates a brief summary of the working directory state,\n" +" including parents, branch, commit status, and available updates.\n" +" " +msgstr "" + +#, python-format +msgid "parent: %d:%s %s\n" +msgstr "Vorgänger: %d:%s %s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "Zweig: %s\n" + +msgid "modified added removed deleted unknown ignored unresolved" +msgstr "" +"verändert hinzugefügt entfernt verschwunden unbekannt ignoriert " +"konfliktbehaftet" + +msgid " (merge)" +msgstr "(Zusammenführung)" + +msgid " (new branch)" +msgstr "(neuer Zeig)" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, python-format +msgid "commit: %s\n" +msgstr "Übernehme: %s\n" + +msgid "update: (current)\n" +msgstr "Aktualisiere: (aktuell)\n" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "Aktualisiere: %d neue Änderungssätze (Aktualisierung)\n" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" +"Aktualisiere: %d neue Änderungssätze, %d neue Zweigköpfe (Zusammenführung)\n" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using .\n" @@ -7493,7 +7916,6 @@ " --verbose werden lokale in einer dritten Spalte als solche markiert.\n" " " -#, fuzzy msgid "" "show the tip revision\n" "\n" @@ -7512,11 +7934,10 @@ " Die Spitze (tip) bezeichnet den zuletzt hinzugefügten Änderungssatz und\n" " damit den zuletzt geänderten Kopf.\n" "\n" -" Nach einem Übernehmen mit commit wird die neue Revision die Spitze. " -"Nach\n" -" einem Holen mit pull wird die Spitze des anderen Archives übernommen.\n" -" Als Etikettname ist 'tip' ein Spezialfall und kann nicht umbenannt oder\n" -" manuell einem anderen Änderungssatz angehängt werden.\n" +" Nach einem Übernehmen mit commit wird die neue Revision die Spitze.\n" +" Nach einem Holen mit pull wird die Spitze des anderen Archives\n" +" übernommen. Als Etikettname ist \"tip\" ein Spezialfall und kann nicht\n" +" umbenannt oder manuell einem anderen Änderungssatz angehängt werden.\n" " " msgid "" @@ -7532,7 +7953,6 @@ " wie sie durch den Befehl 'bundle' erzeugt werden\n" " " -#, fuzzy msgid "" "update working directory\n" "\n" @@ -7577,9 +7997,10 @@ " die angeforderte Revision aus einem anderen Zweig sein, wird das\n" " Arbeitsverzeichnis zusätzlich auf diesen Zweig umgestellt.\n" "\n" -" Sollten unversionierte Änderungen vorliegen, muss -C genutzt werden,\n" -" um sie zwangsweise mit dem Zustand des Arbeitsverzeichnis der\n" -" angeforderten Revision zu ersetzen.\n" +" Sollten unversionierte Änderungen vorliegen, muss -C/--clean genutzt\n" +" werden, um sie zwangsweise mit dem Zustand des Arbeitsverzeichnis der\n" +" angeforderten Revision zu ersetzen. Alternative, nutze -c/--check um\n" +" abzubrechen.\n" "\n" " Sollten unversionierte Änderungen vorliegen, -C nicht genutzt werden " "und\n" @@ -7591,12 +8012,16 @@ " fehlschlagen mit einem Hinweis 'merge' oder 'update -C' stattdessen zu\n" " nutzen.\n" "\n" -" Sollte nur eine Datei auf eine ältere Revision angehoben werden, kann\n" +" Sollte nur eine Datei auf eine ältere Revision gehoben werden, kann\n" " 'revert' genutzt werden.\n" "\n" " Siehe 'hg help dates' für eine Liste gültiger Formate für -d/--date.\n" " " +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" +"Es können nicht gleichzeitig -c/--check und -C/--clean angegeben werden" + msgid "uncommitted local changes" msgstr "Ausstehende nicht versionierte Änderungen" @@ -7638,8 +8063,8 @@ "KEINE Gewährleistung für das Programm, nicht einmal der Marktreife oder der\n" "Verwendbarkeit für einen bestimmten Zweck.\n" -msgid "repository root directory or symbolic path name" -msgstr "Wurzel des Archivs oder symbolischer Pfadname" +msgid "repository root directory or name of overlay bundle file" +msgstr "Wurzelverzeichnis des Archivs oder Name einer Bündeldatei" msgid "change working directory" msgstr "Wechselt das Arbeitsverzeichnis" @@ -8294,40 +8719,6 @@ msgid "branch name not in UTF-8!" msgstr "Name der Verzweigung nicht in UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " suche Kopien in Revisionen bis %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" -" Dateien nur in lokaler Version:\n" -" %s\n" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" -" Dateien nur in anderer Version:\n" -" %s\n" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr " alle Kopien gefunden (* = zusammenzuführen, ! = abweichend):\n" - -msgid " checking for directory renames\n" -msgstr " suche Umbenennungen von Verzeichnissen\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " Verzeichnis %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " Datei %s -> %s\n" - msgid "working directory state appears damaged!" msgstr "Status des Arbeitsverzeichnis scheint beschädigt zu sein!" @@ -8374,6 +8765,10 @@ msgstr "Abbruch: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -8382,10 +8777,6 @@ " %s\n" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "Zeitüberschreitung beim Warten auf %s" @@ -8483,10 +8874,6 @@ msgstr "" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "Alias '%s' verdeckt einen Befehl\n" - -#, python-format msgid "malformed --config option: %s" msgstr "missgebildete --config Option: %s" @@ -8552,10 +8939,6 @@ msgstr "" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -8576,13 +8959,6 @@ msgstr "" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "" - -msgid " premerge successful\n" -msgstr "" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -8606,736 +8982,33 @@ msgid "unknown bisect kind %s" msgstr "" -msgid "" -"\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 advanced\n" -" usage only; they may provide potentially dangerous abilities (such\n" -" as letting you destroy or modify history); they might not be ready\n" -" for prime time; or they may alter some usual behaviors of stock\n" -" Mercurial. It is thus up to the user to activate extensions as\n" -" needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial or in\n" -" the Python search path, create an entry for it in your hgrc, like\n" -" this::\n" -"\n" -" [extensions]\n" -" foo =\n" -"\n" -" You may also specify the full path to an extension::\n" -"\n" -" [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" -" To explicitly disable an extension enabled in an hgrc of broader\n" -" scope, prepend its path with !::\n" -"\n" -" [extensions]\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" -" " -msgstr "" - msgid "disabled extensions:" msgstr "Inaktive Erweiterungen:" msgid "Date Formats" msgstr "Datumsformate" -#, fuzzy -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\n" -"\n" -" - backout, commit, import, tag: Specify the commit date.\n" -" - log, revert, update: Select revision(s) by date.\n" -"\n" -" Many date formats are valid. Here are some examples::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" -" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" -" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" -" \"Dec 6\" (midnight)\n" -" \"13:18\" (today assumed)\n" -" \"3:39\" (3:39AM assumed)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -" Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" -" This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" -" offset is the offset of the local timezone, in seconds west of UTC\n" -" (negative if the timezone is east of UTC).\n" -"\n" -" The log command also accepts date ranges::\n" -"\n" -" \"<{datetime}\" - at or before a given date/time\n" -" \">{datetime}\" - on or after a given date/time\n" -" \"{datetime} to {datetime}\" - a date range, inclusive\n" -" \"-{days}\" - within a given number of days of today\n" -" " -msgstr "" -"\n" -" Einige Befehle erlauben dem Benutzer ein Datum anzugeben, z.B.:\n" -" * backout, commit, import, tag: Angabe des Versionsdatums.\n" -" * log, revert, update: Selektion von Revisionen anhand ihres Datums.\n" -"\n" -" Viele Datumsformate sind erlaubt. Hier einige Beispiele::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (Lokale Zeitzone angenommen)\n" -" \"Dec 6 13:18 -0600\" (Jahr angenommen, Zeitverschiebung angegeben)\n" -" \"Dec 6 13:18 UTC\" (UTC und GMT sind Aliase für +0000)\n" -" \"Dec 6\" (Mitternacht)\n" -" \"13:18\" (Heute angenommen)\n" -" \"3:39\" (3:39 morgens angenommen)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -" Schließlich gibt es Mercurials internes Format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" -" Dies ist das internationale Darstellungsformat für Daten. Die Unixzeit " -"(unixtime) ist\n" -" die Anzahl von Sekunden seit der UNIX Epoche (1970-01-01 00:00 UTC). " -"Abgesetzt davon\n" -" steht die Verschiebung zur lokalen Zeitzone in Sekunden westlich der UTC " -"(negativ\n" -" wenn die Zeitzone östlich der UTC ist).\n" -"\n" -" Der log-Befehl akkzeptiert auch Datumsbereiche::\n" -"\n" -" \"<{datetime}\" - an oder vor einem/r angegebenen Datum/Uhrzeit\n" -" \">{datetime}\" - zu oder nach einem/r angegebenen Datum/Uhrzeit\n" -" \"{datetime} to {datetime}\" - ein Datumsbereich, inklusive\n" -" \"-{tage}\" - innerhalb der angegebenen Anzahl von Tagen vor dem " -"heutigen Tag\n" -" " - msgid "File Name Patterns" msgstr "Dateimuster" -#, fuzzy -msgid "" -"\n" -" Mercurial accepts several notations for identifying one or more\n" -" files at a time.\n" -"\n" -" By default, Mercurial treats filenames as shell-style extended\n" -" glob patterns.\n" -"\n" -" Alternate pattern notations must be specified explicitly.\n" -"\n" -" To use a plain path name without any pattern matching, start it\n" -" with \"path:\". These path names must completely match starting at\n" -" the current repository root.\n" -"\n" -" To use an extended glob, start a name with \"glob:\". Globs are\n" -" rooted at the current directory; a glob such as \"``*.c``\" will\n" -" only match files in the current directory ending with \".c\".\n" -"\n" -" The supported glob syntax extensions are \"``**``\" to match any\n" -" string across path separators and \"{a,b}\" to mean \"a or b\".\n" -"\n" -" To use a Perl/Python regular expression, start a name with \"re:\".\n" -" Regexp pattern matching is anchored at the root of the repository.\n" -"\n" -" Plain examples::\n" -"\n" -" path:foo/bar a name bar in a directory named foo in the root\n" -" of the repository\n" -" path:path:name a file or directory named \"path:name\"\n" -"\n" -" Glob examples::\n" -"\n" -" glob:*.c any name ending in \".c\" in the current directory\n" -" *.c any name ending in \".c\" in the current directory\n" -" **.c any name ending in \".c\" in any subdirectory of the\n" -" current directory including itself.\n" -" foo/*.c any name ending in \".c\" in the directory foo\n" -" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" -" including itself.\n" -"\n" -" Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -"\n" -" " -msgstr "" -"\n" -" Mercurial akkzeptiert verschiedene Schreibweisen zur Identifikation " -"einer oder\n" -" mehrerer Dateien gleichzeitig.\n" -"\n" -" Standardmäßig behandelt Mercurial Dateinamen wie erweiterte \"Glob\"-" -"Muster der\n" -" Shell (shell-style extended glob patterns).\n" -"\n" -" Andere Schreibweisen von Mustern müssen explizit angegeben werden.\n" -"\n" -" Um einen Dateipfad ohne Mustererkennung zu suchen, beginne mit\n" -" \"path:\". Dies Pfadnamen müssen komplett übereinstimmen beginnend ab\n" -" der aktuellen Wurzel des Projektarchivs.\n" -"\n" -" Um erweiterete Glob-Muster zu nutzen, muss das Muster mit \"glob:\" " -"beginnen.\n" -" Globs sind am aktuellen Verzeichnis verankert; ein Glob-Muster wie \"*.c" -"\" stimmt nur\n" -" mit Dateien im aktuellen Verzeichnis überein, die mit \".c\" enden.\n" -"\n" -" Die unterstützen Erweiterungen der Glob-Syntax sind \"**\" zur " -"Übereinstimmung mit\n" -" Zeichenketten über Pfadtrenner hinweg und \"{a,b}\" in der Bedeutung \"a " -"oder b\".\n" -"\n" -" Zur Nutzung von regulären Ausdrücken (Perl/Python) beginne einen Namen " -"mit \"re:\".\n" -" Erkennung mit regulären Ausdrücken wird an der Wurzel des Projektarchivs " -"verankert.\n" -"\n" -" Pfad-Beispiele::\n" -"\n" -" path:foo/bar eine Datei bar in einem Verzeichnis foo an der Basis\n" -" des Projektarchivs\n" -" path:path:name eine Datei oder eine Verzeichnis mit dem Namen \"path:" -"name\"\n" -"\n" -" Glob-Beispiele::\n" -"\n" -" glob:*.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" -" *.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" -" **.c jeder Name endend mit \".c\" im aktuellen Verzeichnis\n" -" und jedem Unterverzeichnis\n" -" foo/*.c jeder Name endend mit \".c\" im Verzeichnis foo\n" -" foo/**.c jeder Name endend mit \".c\" im Verzeichnis foo\n" -" und jedem Unterverzeichnis.\n" -"\n" -" Beispiel mit regulärem Ausdruck::\n" -"\n" -" re:.*\\.c$ jeder Name endend mit \".c\" überall im Projektarchiv\n" -"\n" -" " - msgid "Environment Variables" msgstr "Umgebungsvariablen" -msgid "" -"\n" -"HG\n" -" Path to the 'hg' executable, automatically passed when running\n" -" hooks, extensions or external tools. If unset or empty, this is\n" -" the hg executable's name if it's frozen, or an executable named\n" -" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" -"HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"HGENCODING\n" -" This overrides the default locale setting detected by Mercurial.\n" -" This setting is used to convert data including usernames,\n" -" changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" -"HGENCODINGMODE\n" -" This sets Mercurial's behavior for handling unknown characters\n" -" while transcoding user input. The default is \"strict\", which\n" -" causes Mercurial to abort if it can't map a character. Other\n" -" settings include \"replace\", which replaces unknown characters, and\n" -" \"ignore\", which drops them. This setting can be overridden with\n" -" the --encodingmode command-line option.\n" -"\n" -"HGMERGE\n" -" An executable to use for resolving merge conflicts. The program\n" -" will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"HGRCPATH\n" -" A list of files or directories to search for hgrc files. Item\n" -" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" -" platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" -" - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" -"HGUSER\n" -" This is the string used as the author of a commit. If not set,\n" -" available values will be considered in this order:\n" -"\n" -" - HGUSER (deprecated)\n" -" - hgrc files from the HGRCPATH\n" -" - EMAIL\n" -" - interactive prompt\n" -" - LOGNAME (with '@hostname' appended)\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" -"EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" -"VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" -"EDITOR\n" -" Sometimes Mercurial needs to open a text file in an editor for a\n" -" user to modify, for example when writing commit messages. The\n" -" editor it uses is determined by looking at the environment\n" -" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" -" non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" -"PYTHONPATH\n" -" This is used by Python to find imported modules and may need to be\n" -" set appropriately if this Mercurial is not installed system-wide.\n" -" " -msgstr "" - msgid "Specifying Single Revisions" msgstr "Angabe Einzelner Revisionen" -msgid "" -"\n" -" Mercurial supports several ways to specify individual revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative integers\n" -" are treated as sequential offsets from the tip, with -1 denoting\n" -" the tip, -2 denoting the revision prior to the tip, and so forth.\n" -"\n" -" A 40-digit hexadecimal string is treated as a unique revision\n" -" identifier.\n" -"\n" -" A hexadecimal string less than 40 characters long is treated as a\n" -" unique revision identifier and is referred to as a short-form\n" -" identifier. A short-form identifier is only valid if it is the\n" -" prefix of exactly one full-length identifier.\n" -"\n" -" Any other string is treated as a tag or branch name. A tag name is\n" -" a symbolic name associated with a revision identifier. A branch\n" -" name denotes the tipmost revision of that branch. Tag and branch\n" -" names must not contain the \":\" character.\n" -"\n" -" The reserved name \"tip\" is a special tag that always identifies\n" -" the most recent revision.\n" -"\n" -" The reserved name \"null\" indicates the null revision. This is the\n" -" revision of an empty repository, and the parent of revision 0.\n" -"\n" -" The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null. If\n" -" an uncommitted merge is in progress, \".\" is the revision of the\n" -" first parent.\n" -" " -msgstr "" -"\n" -" Mercurial unterstützt mehrere Arten individuelle Revisionen anzugeben\n" -"\n" -" Eine einfache Ganzzahl wird als Revisionsnummer behandelt. Negative\n" -" Zahlen beschreiben den topologischen Abstand von der Spitze (tip), " -"wobei\n" -" -1 die Spitze selbst ist.\n" -"\n" -" Eine 40-stellige Hexadezimalzahl gilt als eindeutiger Identifikator\n" -" einer Revision.\n" -"\n" -" Eine Hexadezimalzahl mit weniger als 40 Zeichen gilt als eindeutiger\n" -" Identifikator und wird als Kurzform des Identifikators bezeichnet.\n" -" Die Kurzform ist nur dann gültig, wenn sie Präfix exakt einer Langform\n" -" eines Identifikators ist.\n" -"\n" -" Jede andere Zeichenfolge wird als Name eines Etiketts behandelt.\n" -" Dieser symbolische Name verweist auf einen Revisionsidentifikator.\n" -" Etiketten dürfen das Zeichen \":\" nicht enthalten.\n" -"\n" -" Der reservierte Name \"tip\" ist ein spezielles Etikett, welches immer\n" -" auf die jüngste Revision verweist.\n" -"\n" -" Der reservierte Name \"null\" bezeichnet die null-Revision. Sie ist die\n" -" Revision eines leeren Projektarchivs und der Vorgänger der Version 0.\n" -"\n" -" Der reservierte Name \".\" bezeichnete die Vorgängerversion des\n" -" Arbeitsverzeichnisses. Falls das Arbeitsverzeichnis leer ist, ist diese\n" -" äquivalent zu \"null\". Falls eine nicht versionierte Zusammenführung\n" -" in Bearbeitung ist, bezeichnet \".\" die Revision des ersten " -"Vorgängers.\n" -" " - msgid "Specifying Multiple Revisions" msgstr "Angabe Mehrerer Revisionen" -msgid "" -"\n" -" When Mercurial accepts more than one revision, they may be\n" -" specified individually, or provided as a topologically continuous\n" -" range, separated by the \":\" character.\n" -"\n" -" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" -" are revision identifiers. Both BEGIN and END are optional. If\n" -" BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus means\n" -" \"all revisions\".\n" -"\n" -" If BEGIN is greater than END, revisions are treated in reverse\n" -" order.\n" -"\n" -" A range acts as a closed interval. This means that a range of 3:5\n" -" gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" -" " -msgstr "" -"\n" -" Wenn Mercurial mehr als eine Revision annimmt, können sie\n" -" einzeln angegeben werden oder als topologisch kontinuierlicher\n" -" Bereich getrennt durch das \":\" Zeichen.\n" -"\n" -" Die Syntax der Bereichs-Notation ist [ANFANG]:[ENDE], wobei ANFANG und\n" -" ENDE Revisions-Identifikatoren sind. Sowohl ANFANG als auch ENDE sind\n" -" optional. Sollte ANFANG nicht angegeben werden, wird standardmäßig die\n" -" die Revisionsnummer 0 angenommen. Wenn ENDE nicht angegeben wird, wird\n" -" standardmäßig tip genommen. Der Bereich \":\" bedeute daher\n" -" \"alle Revisionen\".\n" -"\n" -" Wenn ANFANG größer als ENDE ist, werden die Revisionen in umgekehrter\n" -" Reihenfolge betrachtet.\n" -"\n" -" Ein Bereich fungiert als geschlossenes Intervall . Das heißt, dass\n" -" der Bereich 3:5 die Revisionen 3, 4 und 5 enthält. Ebenso enthält der\n" -" Bereich 9:6 die Revisionen 9, 8, 7 und 6.\n" -" " - msgid "Diff Formats" msgstr "Diff-Formate" -msgid "" -"\n" -" Mercurial's default format for showing changes between two\n" -" versions of a file is compatible with the unified format of GNU\n" -" diff, which can be used by GNU patch and many other standard\n" -" tools.\n" -"\n" -" While this standard format is often enough, it does not encode the\n" -" following information:\n" -"\n" -" - executable status and other permission bits\n" -" - copy or rename information\n" -" - changes in binary files\n" -" - creation or deletion of empty files\n" -"\n" -" Mercurial also supports the extended diff format from the git VCS\n" -" which addresses these limitations. The git diff format is not\n" -" produced by default because a few widespread tools still do not\n" -" understand this format.\n" -"\n" -" This means that when generating diffs from a Mercurial repository\n" -" (e.g. with \"hg export\"), you should be careful about things like\n" -" file copies and renames or other things mentioned above, because\n" -" when applying a standard diff to a different repository, this\n" -" extra information is lost. Mercurial's internal operations (like\n" -" push and pull) are not affected by this, because they use an\n" -" internal binary format for communicating changes.\n" -"\n" -" To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in\n" -" the [diff] section of your hgrc. You do not need to set this\n" -" option when importing diffs in this format or using them in the mq\n" -" extension.\n" -" " -msgstr "" - msgid "Template Usage" msgstr "Nutzung von Vorlagen" -msgid "" -"\n" -" 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" -" template-style (--style).\n" -"\n" -" You can customize output for any \"log-like\" command: log,\n" -" outgoing, incoming, tip, parents, heads and glog.\n" -"\n" -" Three styles are packaged with Mercurial: default (the style used\n" -" when no explicit preference is passed), compact and changelog.\n" -" Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" A template is a piece of text, with markup to invoke variable\n" -" expansion::\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These\n" -" keywords are usually available for templating a log-like command:\n" -"\n" -" :author: String. The unmodified author of the changeset.\n" -" :branches: String. The name of the branch on which the changeset\n" -" was committed. Will be empty if the branch name was\n" -" default.\n" -" :date: Date information. The date when the changeset was\n" -" committed.\n" -" :desc: String. The text of the changeset description.\n" -" :diffstat: String. Statistics of changes with the following\n" -" format: \"modified files: +added/-removed lines\"\n" -" :files: List of strings. All files modified, added, or removed\n" -" by this changeset.\n" -" :file_adds: List of strings. Files added by this changeset.\n" -" :file_mods: List of strings. Files modified by this changeset.\n" -" :file_dels: List of strings. Files removed by this changeset.\n" -" :node: String. The changeset identification hash, as a\n" -" 40-character hexadecimal string.\n" -" :parents: List of strings. The parents of the changeset.\n" -" :rev: Integer. The repository-local changeset revision\n" -" number.\n" -" :tags: List of strings. Any tags associated with the\n" -" changeset.\n" -"\n" -" The \"date\" keyword does not produce human-readable output. If you\n" -" want to use a date in your output, you can use a filter to process\n" -" it. Filters are functions which return a string based on the input\n" -" variable. You can also use a chain of filters to get the desired\n" -" output::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" List of filters:\n" -"\n" -" :addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" -" every line except the last.\n" -" :age: Date. Returns a human-readable date/time difference\n" -" between the given date/time and the current\n" -" date/time.\n" -" :basename: Any text. Treats the text as a path, and returns the\n" -" last component of the path after splitting by the\n" -" path separator (ignoring trailing separators). For\n" -" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//" -"\"\n" -" becomes \"bar\".\n" -" :stripdir: Treat the text as path and strip a directory level,\n" -" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" -" \"foo\".\n" -" :date: Date. Returns a date in a Unix date format, including\n" -" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" -" :domain: Any text. Finds the first string that looks like an\n" -" email address, and extracts just the domain\n" -" component. Example: 'User ' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User '\n" -" becomes 'user@example.com'.\n" -" :escape: Any text. Replaces the special XML/XHTML characters\n" -" \"&\", \"<\" and \">\" with XML entities.\n" -" :fill68: Any text. Wraps the text to fit in 68 columns.\n" -" :fill76: Any text. Wraps the text to fit in 76 columns.\n" -" :firstline: Any text. Returns the first line of text.\n" -" :nonempty: Any text. Returns '(none)' if the string is empty.\n" -" :hgdate: Date. Returns the date as a pair of numbers:\n" -" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" -" :isodate: Date. Returns the date in ISO 8601 format:\n" -" \"2009-08-18 13:00 +0200\".\n" -" :isodatesec: Date. Returns the date in ISO 8601 format, including\n" -" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" -" rfc3339date filter.\n" -" :localdate: Date. Converts a date to local date.\n" -" :obfuscate: Any text. Returns the input text rendered as a\n" -" sequence of XML entities.\n" -" :person: Any text. Returns the text before an email address.\n" -" :rfc822date: Date. Returns a date using the same format used in\n" -" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" -" :rfc3339date: Date. Returns a date using the Internet date format\n" -" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" -" :short: Changeset hash. Returns the short form of a changeset\n" -" hash, i.e. a 12-byte hexadecimal string.\n" -" :shortdate: Date. Returns a date like \"2006-09-18\".\n" -" :strip: Any text. Strips all leading and trailing whitespace.\n" -" :tabindent: Any text. Returns the text, with every line except\n" -" the first starting with a tab character.\n" -" :urlescape: Any text. Escapes all \"special\" characters. For\n" -" example, \"foo bar\" becomes \"foo%20bar\".\n" -" :user: Any text. Returns the user portion of an email\n" -" address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "URL-Pfade" -#, fuzzy -msgid "" -"\n" -" Valid URLs are of the form::\n" -"\n" -" local/filesystem/path[#revision]\n" -" file://local/filesystem/path[#revision]\n" -" http://[user[:pass]@]host[:port]/[path][#revision]\n" -" https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" -"\n" -" 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').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository. See also 'hg help\n" -" revisions'.\n" -"\n" -" Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the remote\n" -" Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\n" -"\n" -" - SSH requires an accessible shell account on the destination\n" -" machine and a copy of hg in the remote path or specified with as\n" -" remotecmd.\n" -" - path is relative to the remote user's home directory by default.\n" -" Use an extra slash at the start of a path to specify an absolute\n" -" path::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" -" - Mercurial doesn't use its own compression via SSH; the right\n" -" thing to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -"\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" -" or with the --ssh command line option.\n" -"\n" -" These URLs can all be stored in your hgrc with path aliases under\n" -" the [paths] section like so::\n" -"\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" You can then use the alias for any command that uses a URL (for\n" -" example 'hg pull alias1' would pull from the 'alias1' path).\n" -"\n" -" Two path aliases are special because they are used as defaults\n" -" when you do not provide the URL to a command:\n" -"\n" -" default:\n" -" When you create a repository with hg clone, the clone command\n" -" saves the location of the source repository as the new\n" -" repository's 'default' path. This is then used when you omit\n" -" path from push- and pull-like commands (including incoming and\n" -" outgoing).\n" -"\n" -" default-push:\n" -" The push command will look for a path named 'default-push', and\n" -" prefer it over 'default' if both are defined.\n" -" " -msgstr "" -"\n" -" Gültige URLs haben folgende Form::\n" -"\n" -" lokales/dateisystem/pfad (oder file://lokales/dateisystem/pfad)\n" -" http://[nutzer[:pass]@]host[:port]/[pfad]\n" -" https://[nutzer[:pass]@]host[:port]/[pfad]\n" -" ssh://[nutzer[:pass]@]host[:port]/[pfad]\n" -"\n" -" Pfade im lokalen Dateisystem können auf ein Mercurial-Archiv oder\n" -" Bündeldateien verweisen (wie sie von 'hg bundle' oder\n" -" 'hg incoming --bundle' erzeugt werden).\n" -"\n" -" Ein optionaler Bezeichner nach # verweist auf einen bestimmten Zweig, " -"Tag\n" -" oder Änderungssatz des anderen Projektarchivs.\n" -"\n" -" Einige Funktionen, wie das Ausliefern an http:// und https:// URLs, " -"sind\n" -" nur mögliche wenn diese Funktionen explizit auf dem entfernten\n" -" Mercurial-Server aktiviert sind.\n" -"\n" -" Einige Hinweise zur Nutzung von SSH mit Mercurial:\n" -"\n" -" - SSH benötigt einen nutzbaren Shell-Zugang auf der Zielmaschine und\n" -" eine Kopie von hg im Pfad der entfernten Maschine oder in der " -"Konfiguration\n" -" remotecmd angegeben.\n" -" - Der Pfad ist standardmäßig relativ vom Home-Verzeichnis des " -"entfernten\n" -" Nutzer. Nutze einen zusätzlichen Schrägstrich um einen absoluen Pfad\n" -" anzugeben::\n" -"\n" -" ssh://example.com//tmp/repository\n" -"\n" -" - Mercurial nutzt nicht eigene Kompressionsmechanismen über SSH:\n" -" Hier sollte man die Kompression über ~/.ssh/config aktivieren, z.B.::\n" -"\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -"\n" -" Alternativ kann \"ssh -C\" als dein SSH-Befehl in der hgrc oder\n" -" mit der --ssh Befehlszeilenoption angegeben werden.\n" -"\n" -" Diese URLs können alle in deiner hgrc als Aliase unter der Sektion\n" -" [paths] abgelegt werden::\n" -"\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" Diese Aliase können dann bei jedem Befehl genutzt werden der URLs nutzt\n" -" (beispielsweise 'hg pull alias1' würde vom 'alias1' Pfad " -"herunterladen).\n" -"\n" -" Es gibt zwei besondere Pfad-Aliase, die standardmäßig genutzt\n" -" werden wenn einem Befehl keine URL übergeben wurde:\n" -"\n" -" default:\n" -" Bei Erstellung eines Projektarchivs mit hg clone, sichert der clone\n" -" Befehl die Herkunft des Quellarchivs als 'default'-Pfad des neuen\n" -" Archivs. Dieser Pfad wird immer dann genutzt, wenn bei 'push' oder\n" -" 'pull'-ähnlichen Befehlen der Pfad nicht angegeben wurde (auch bei\n" -" 'incoming' oder 'outgoing').\n" -"\n" -" default-push:\n" -" Der 'push'-Befehl sucht nach dem 'default-push'-Alias und zieht\n" -" diesen dem 'default'-Alias vor, wenn beide definiert sind.\n" -" " - msgid "Using additional features" msgstr "Benutzung erweiterter Funktionen" @@ -9370,32 +9043,21 @@ msgid "clone from remote to remote not supported" msgstr "Klonen von entferntem Archiv zu entferntem Archiv nicht möglich" -msgid "updated" -msgstr "aktualisiert" - -msgid "merged" -msgstr "zusammengeführt" - -msgid "removed" -msgstr "entfernt" - -msgid "unresolved" -msgstr "ungelöst" - -#, python-format -msgid "%d files %s" -msgstr "%d Dateien %s" +#, python-format +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 "Verwende 'hg resolve', um die Zusammenführung erneut zu versuchen\n" msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "" "Nutze 'hg resolve', um nicht aufgelöste Zusammenführungen zu wiederholen " "oder\n" -"'hg up --clean' um abzubrechen\n" +"'hg up --clean' um andere Änderungen aufzugeben\n" msgid "(branch merge, don't forget to commit)\n" msgstr "(Zweig-Zusammenführung, vergiss nicht 'hg commit' auszuführen)\n" @@ -9469,32 +9131,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "" -#, python-format -msgid "using %s\n" -msgstr "" - -#, python-format -msgid "capabilities: %s\n" -msgstr "" - msgid "operation not supported over http" msgstr "" -#, python-format -msgid "sending %s command\n" -msgstr "" - -#, python-format -msgid "sending %s bytes\n" -msgstr "" - msgid "authorization failed" msgstr "" -#, python-format -msgid "http error while sending %s command\n" -msgstr "" - msgid "http error, possibly caused by proxy setting" msgstr "" @@ -9503,10 +9145,6 @@ msgstr "" #, python-format -msgid "requested URL: '%s'\n" -msgstr "Angeforderte URL: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -9580,10 +9218,6 @@ msgid "unknown revision '%s'" msgstr "Unbekannte Revision '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "Filtere %s bis %s\n" - msgid "journal already exists - run hg recover" msgstr "Journal existiert bereits - führe hg recover aus" @@ -9616,14 +9250,6 @@ msgid "working directory of %s" msgstr "Arbeitsverzeichnis von %s" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr " %s: Suche kopierte Revision für %s\n" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr " %s: kopiere %s:%s\n" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" "Eine Zusammenführung kann nicht teilweise versioniert werden (Gib keine " @@ -9696,41 +9322,6 @@ msgid "searching for changes\n" msgstr "Suche nach Änderungen\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "Untersuche %s:%s\n" - -msgid "branch already found\n" -msgstr "Zweig bereits gefunden\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "Unvollständiger Zweig gefunden %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "Neue Änderungssätze gefunden %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "Angefordert %d: %s\n" - -#, python-format -msgid "received %s:%s\n" -msgstr "Erhalten %s:%s\n" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "Verringere %d:%d %s\n" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "Neue Zweigversion gefunden %s\n" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "Zweig-Suche verringert auf %s:%s\n" - msgid "already have changeset " msgstr "Änderungssatz bereits vorhanden " @@ -9740,16 +9331,6 @@ msgid "repository is unrelated" msgstr "Projektarchiv steht in keinem Zusammenhang" -msgid "found new changesets starting at " -msgstr "Neue Änderungssätze gefunden ab" - -#, python-format -msgid "%d total queries\n" -msgstr "%d Abfragen insgesamt\n" - -msgid "common changesets up to " -msgstr "Gemeinsame Änderungssätze bis zu" - msgid "requesting all changes\n" msgstr "Fordere alle Änderungen an\n" @@ -9777,17 +9358,10 @@ msgid "%d changesets found\n" msgstr "%d Änderungssätze gefunden\n" -msgid "list of changesets:\n" -msgstr "Liste der Änderungssätze:\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "Leeres oder fehlendes Revlog für %s" -#, python-format -msgid "add changeset %s\n" -msgstr "Füge Änderungssatz hinzu %s\n" - msgid "adding changesets\n" msgstr "Füge Änderungssätze hinzu\n" @@ -9800,10 +9374,6 @@ msgid "adding file changes\n" msgstr "Füge Dateiänderungen hinzu\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "Füge %s Revisionen hinzu\n" - msgid "received file revlog group is empty" msgstr "Erhaltene Datei revlog group ist leer" @@ -9815,9 +9385,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "Fügte %d Änderungssätze mit %d Änderungen zu %d Dateien%s hinzu\n" -msgid "updating the branch cache\n" -msgstr "Aktualisiere den Zweig-Cache\n" - msgid "Unexpected response from remote server:" msgstr "" @@ -9838,10 +9405,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -9922,14 +9485,6 @@ msgstr "" #, python-format -msgid " overwrite %s partial %s\n" -msgstr "" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "" - -#, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" @@ -9951,10 +9506,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -10003,13 +9554,6 @@ msgstr "" #, python-format -msgid "found patch at byte %d\n" -msgstr "" - -msgid "patch generated by hg export\n" -msgstr "" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "" @@ -10080,153 +9624,137 @@ msgstr "Nicht unterstützter Typ von Zeilenende: %s" #, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" - -#, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "" #, python-format msgid "exited with status %d" -msgstr "" +msgstr "Beendet mit Status %d" #, python-format msgid "killed by signal %d" -msgstr "" - -#, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" +msgstr "Getötet von Signal %d" #, python-format msgid "saving bundle to %s\n" -msgstr "" +msgstr "Speichere Bündel in %s\n" msgid "adding branch\n" -msgstr "" +msgstr "füge Zweig hinzu\n" #, python-format msgid "cannot %s; remote repository does not support the %r capability" -msgstr "" +msgstr "Kann nicht %s; entferntes Archiv hat keine %r-Kapabilität" #, python-format msgid "unknown compression type %r" -msgstr "" +msgstr "Unbekannter Kompressionstyp %r" #, python-format msgid "index %s unknown flags %#04x for format v0" -msgstr "" +msgstr "Index %s hat unbekannte Schalter %#04x für Format v0" #, python-format msgid "index %s unknown flags %#04x for revlogng" -msgstr "" +msgstr "Index %s hat unbekannte Schalter %#04x für revlogng" #, python-format msgid "index %s unknown format %d" -msgstr "" +msgstr "Index %s hat unbekanntes Format %d" #, python-format msgid "index %s is corrupted" -msgstr "" +msgstr "Index %s ist beschädigt" msgid "no node" -msgstr "" +msgstr "kein Knoten" msgid "ambiguous identifier" -msgstr "" +msgstr "mehrdeutiger Identifizierer" msgid "no match found" -msgstr "" +msgstr "Nichts gefunden" #, python-format msgid "incompatible revision flag %x" -msgstr "" +msgstr "Inkompatibler Revisions-Schater %x" #, python-format msgid "%s not found in the transaction" -msgstr "" +msgstr "%s nicht in Transaktion gefunden" msgid "unknown base" -msgstr "" +msgstr "unbekannte Basis" msgid "consistency error adding group" -msgstr "" +msgstr "Konsistenzfehler beim Hinzufügen der Gruppe" #, python-format msgid "%s looks like a binary file." -msgstr "" +msgstr "%s scheint eine Binärdatei zu sein" msgid "can only specify two labels." -msgstr "" +msgstr "Kann nur zwei Marken angeben" msgid "warning: conflicts during merge.\n" -msgstr "" +msgstr "Warnung: Konflikte bei Zusammenführung.\n" #, python-format msgid "couldn't parse location %s" -msgstr "" +msgstr "Kann Ort %s nicht entziffern" msgid "could not create remote repo" -msgstr "" +msgstr "Konnte entferntes Archiv nicht erstellen" + +msgid "no suitable response from remote hg" +msgstr "Keine passende Antwort des entfernten hg" msgid "remote: " -msgstr "" - -msgid "no suitable response from remote hg" -msgstr "" +msgstr "Entfernt: " #, python-format msgid "push refused: %s" -msgstr "" +msgstr "Hochladen abgeweisen: %s" msgid "unsynced changes" -msgstr "" +msgstr "asynchrone Änderungen" msgid "cannot lock static-http repository" -msgstr "" +msgstr "Kann statisches http-Archiv nicht abschliessen" msgid "cannot create new static-http repository" -msgstr "" +msgstr "Kann kein neues, statisches http-Archiv erstellen" #, python-format msgid "invalid entry in fncache, line %s" -msgstr "" - -msgid "scanning\n" -msgstr "" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "" +msgstr "Ungültiger Eintrag in fncache, Zeile %s" #, python-format msgid "" " subrepository sources for %s differ\n" "use (l)ocal source (%s) or (r)emote source (%s)?" msgstr "" +" Unterarchivquellen für %s sind verschieden\n" +"nutze (l)okale Quelle (%s) oder entfe(r)nte Quelle (%s)?" msgid "&Remote" -msgstr "" +msgstr "Entfe&rnt" #, python-format msgid "" " local changed subrepository %s which remote removed\n" "use (c)hanged version or (d)elete?" msgstr "" +" lokales Unterarchiv ändert %s, aber entferntes löscht\n" +"nutze (c) geänderte Version oder (d) lösche?" #, python-format msgid "" " remote changed subrepository %s which local removed\n" "use (c)hanged version or (d)elete?" msgstr "" +" Entferntes Unterarchiv ändert %s, aber lokales löscht\n" +"nutze (c) geänderte Version oder (d) lösche?" #, python-format msgid "removing subrepo %s\n" @@ -10252,7 +9780,7 @@ msgstr "Knoten '%s' ist fehlerhaft" msgid "unmatched quotes" -msgstr "" +msgstr "unpassende Klammern" #, python-format msgid "error expanding '%s%%%s'" @@ -10264,24 +9792,24 @@ #, python-format msgid "style not found: %s" -msgstr "" +msgstr "Stil nicht gefunden: %s" #, python-format msgid "template file %s: %s" -msgstr "" +msgstr "Vorlagedatei %s: %s" msgid "cannot use transaction when it is already committed/aborted" -msgstr "" +msgstr "Kann Transaktion nicht verwenden, wenn sie bereits Übernommen/Abgebrochen ist" #, python-format msgid "failed to truncate %s\n" -msgstr "" +msgstr "Konnte %s nicht abschneiden\n" msgid "transaction abort!\n" -msgstr "" +msgstr "Transaktionsabbruch!\n" msgid "rollback completed\n" -msgstr "" +msgstr "Rücknahme abgeschlossen\n" msgid "rollback failed - please run hg recover\n" msgstr "Rücksetzen fehlgeschlagen - bitte führe hg recover aus\n" @@ -10350,10 +9878,6 @@ msgstr "HTTP Auth: Benutzer %s, Passwort%s\n" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "Verwende Proxy http://%s:%s\n" - -#, python-format msgid "command '%s' failed: %s" msgstr "Befehl '%s' fehlgeschlagen: %s" @@ -10430,129 +9954,133 @@ #, python-format msgid "%.0f bytes" -msgstr "%.0f Byte" +msgstr "%.0f Bytes" msgid "cannot verify bundle or remote repos" -msgstr "" +msgstr "Kann keine Bündel oder entfernte Archive verifizieren" msgid "interrupted" -msgstr "" +msgstr "unterbrochen" #, python-format msgid "empty or missing %s" -msgstr "" +msgstr "leeres oder fehlendes %s" #, python-format msgid "data length off by %d bytes" -msgstr "" +msgstr "Datenlänge um %d bytes daneben" #, python-format msgid "index contains %d extra bytes" -msgstr "" +msgstr "Index enthält %d überflüssige Bytes" #, python-format msgid "warning: `%s' uses revlog format 1" -msgstr "" +msgstr "Warnung: `%s' nutzt Revlogformat 1" #, python-format msgid "warning: `%s' uses revlog format 0" -msgstr "" +msgstr "Warnung: `%s' nutzt Revlogformat 0" #, python-format msgid "rev %d points to nonexistent changeset %d" -msgstr "" +msgstr "Revision %d zeigt auf nicht existenten Änderungssatz %d" #, python-format msgid "rev %d points to unexpected changeset %d" -msgstr "" +msgstr "Revision %d zeigt auf unerwarteten Änderungssatz %d" #, python-format msgid " (expected %s)" -msgstr "" +msgstr " (erwartete %s)" #, python-format msgid "unknown parent 1 %s of %s" -msgstr "" +msgstr "Unbekannter erster Vorfahr %s von %s" #, python-format msgid "unknown parent 2 %s of %s" -msgstr "" +msgstr "Unbekannter zweiter Vorfahr %s von %s" #, python-format msgid "checking parents of %s" -msgstr "" +msgstr "Prüfe Vorfahren von %s" #, python-format msgid "duplicate revision %d (%d)" -msgstr "" +msgstr "Doppelte Revision %d (%d)" #, python-format msgid "repository uses revlog format %d\n" -msgstr "" +msgstr "Archiv verwendet Revlogformat %d\n" msgid "checking changesets\n" -msgstr "" +msgstr "Prüfe Änderungssätze\n" #, python-format msgid "unpacking changeset %s" -msgstr "" +msgstr "Entpacke Änderungssatz %s" msgid "checking manifests\n" -msgstr "" +msgstr "Prüfe Manifeste\n" #, python-format msgid "%s not in changesets" msgstr "%s nicht in den Änderungssätzen vorhanden" msgid "file without name in manifest" -msgstr "" +msgstr "Datei ohne Namen im Manifest" #, python-format msgid "reading manifest delta %s" -msgstr "" +msgstr "Lese Manifest delta %s" msgid "crosschecking files in changesets and manifests\n" -msgstr "" +msgstr "Gegenüberstellung der Dateien in Änderungssätzen und Manifesten\n" #, python-format msgid "changeset refers to unknown manifest %s" -msgstr "" +msgstr "Änderungssatz referenziert unbekanntes Manifest %s" msgid "in changeset but not in manifest" -msgstr "" +msgstr "im Änderungssatz aber nicht im Manifest" msgid "in manifest but not in changeset" -msgstr "" +msgstr "im Manifest, aber nicht im Änderungssatz" msgid "checking files\n" -msgstr "" +msgstr "Prüfe Dateien\n" #, python-format msgid "cannot decode filename '%s'" -msgstr "" +msgstr "Kann Dateinamen '%s' nicht dekodieren" #, python-format msgid "broken revlog! (%s)" -msgstr "" +msgstr "Beschädigtes Revlof! (%s)" msgid "missing revlog!" -msgstr "" +msgstr "Fehlendes Revlog!" #, python-format msgid "%s not in manifests" -msgstr "" +msgstr "%s nicht in Manifesten" #, python-format msgid "unpacked size is %s, %s expected" -msgstr "" +msgstr "entpackte Größe ist %s, aber %s erwartet" #, python-format msgid "unpacking %s" msgstr "entpacke %s" #, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "Warnung: Kopierquelle von '%s' ist in keinem Vorfahren von %s" + +#, python-format msgid "empty or missing copy source revlog %s:%s" -msgstr "" +msgstr "Leeres oder fehlendes revlog %s:%s der Kopierquelle" #, python-format msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" @@ -10560,31 +10088,31 @@ #, python-format msgid "checking rename of %s" -msgstr "" +msgstr "Prüfe Umbenennung von %s" #, python-format msgid "%s in manifests not found" -msgstr "" +msgstr "%s nicht im Manifest gefunden" #, python-format msgid "warning: orphan revlog '%s'" -msgstr "" +msgstr "Warnung: Verwaistes revlog '%s'" #, python-format msgid "%d files, %d changesets, %d total revisions\n" -msgstr "" +msgstr "%d Dateien, %d Änderungssätze, %d Revisionen insgesamt\n" #, python-format msgid "%d warnings encountered!\n" -msgstr "" +msgstr "%d Warnungen gefunden!\n" #, python-format msgid "%d integrity errors encountered!\n" -msgstr "" +msgstr "%d Integritätsfehler gefunden!\n" #, python-format msgid "(first damaged changeset appears to be %d)\n" -msgstr "" +msgstr "(erster beschädigter Änderungssatz scheint %d zu sein)\n" msgid "user name not available - set USERNAME environment variable" -msgstr "" +msgstr "Benutzername nicht verfügbar - setze die USERNAME Umgebungsvariable" diff -r 96c803e9018f -r d942e06d7b14 i18n/el.po --- a/i18n/el.po Wed Oct 28 13:17:03 2009 -0500 +++ b/i18n/el.po Wed Oct 28 20:48:24 2009 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-21 04:21+0300\n" -"PO-Revision-Date: 2009-02-13 16:27+0200\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:42+0100\n" "Last-Translator: \n" "Language-Team: Greek\n" "MIME-Version: 1.0\n" @@ -27,7 +27,10 @@ msgid "COMMANDS" msgstr "ΕΝΤΟΛΕΣ" -msgid " options:\n" +#, fuzzy +msgid "" +" options:\n" +"\n" msgstr " επιλογές:\n" #, python-format @@ -38,13 +41,551 @@ " ψευδώνυμα: %s\n" "\n" -#, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s ανενεργό\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s ενεργό, %d εγγραφές για τον χρήστη %s\n" +#, fuzzy +msgid "" +"Some commands allow the user to specify a date, e.g.:\n" +"\n" +"- backout, commit, import, tag: Specify the commit date.\n" +"- log, revert, update: Select revision(s) by date.\n" +"\n" +"Many date formats are valid. Here are some examples::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" +" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" +" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" +" \"Dec 6\" (midnight)\n" +" \"13:18\" (today assumed)\n" +" \"3:39\" (3:39AM assumed)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (Dec 6 2006)\n" +"\n" +"Lastly, there is Mercurial's internal format::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"This is the internal representation format for dates. unixtime is the\n" +"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" +"the offset of the local timezone, in seconds west of UTC (negative if\n" +"the timezone is east of UTC).\n" +"\n" +"The log command also accepts date ranges::\n" +"\n" +" \"<{datetime}\" - at or before a given date/time\n" +" \">{datetime}\" - on or after a given date/time\n" +" \"{datetime} to {datetime}\" - a date range, inclusive\n" +" \"-{days}\" - within a given number of days of today\n" +msgstr "" +"\n" +" Nogle kommandoer tillader brugeren at specificere en dato:\n" +" backout, commit, import, tag: specificer commit-datøn.\n" +" log, revert, update: vælg revisioner eftre dato.\n" +"\n" +" Der er mange gyldige datoformater. Her er nogle eksempler:\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n" +" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n" +" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n" +" \"Dec 6\" (midnat)\n" +" \"13:18\" (antager dags dato)\n" +" \"3:39\"\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 format)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (6. dec. 2006)\n" +"\n" +" Endelig er der Mercurials interne format:\n" +"\n" +" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n" +"\n" +" Dette er den interne representation af datoer. unixtime er\n" +" antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n" +" UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n" +" for UTC (negativ hvis tidszonen er øst for UTC).\n" +"\n" +" Kommandoen log accepterer også datointervaller:\n" +"\n" +" \"<{date}\" - på eller før den angivne dato\n" +" \">{date}\" - på eller efter den angivne dato\n" +" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n" +" \"-{days}\" - indenfor et angivet antal date, fra dags dato\n" +" " + +msgid "" +"Mercurial's default format for showing changes between two versions of\n" +"a file is compatible with the unified format of GNU diff, which can be\n" +"used by GNU patch and many other standard tools.\n" +"\n" +"While this standard format is often enough, it does not encode the\n" +"following information:\n" +"\n" +"- executable status and other permission bits\n" +"- copy or rename information\n" +"- changes in binary files\n" +"- creation or deletion of empty files\n" +"\n" +"Mercurial also supports the extended diff format from the git VCS\n" +"which addresses these limitations. The git diff format is not produced\n" +"by default because a few widespread tools still do not understand this\n" +"format.\n" +"\n" +"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" +"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" +"pull) are not affected by this, because they use an internal binary\n" +"format for communicating changes.\n" +"\n" +"To make Mercurial produce the git extended diff format, use the --git\n" +"option available for many commands, or set 'git = True' in the [diff]\n" +"section of your hgrc. You do not need to set this option when\n" +"importing diffs in this format or using them in the mq extension.\n" +msgstr "" + +msgid "" +"HG\n" +" Path to the 'hg' executable, automatically passed when running\n" +" hooks, extensions or external tools. If unset or empty, this is\n" +" the hg executable's name if it's frozen, or an executable named\n" +" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" +" Windows) is searched.\n" +"\n" +"HGEDITOR\n" +" This is the name of the editor to run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGENCODING\n" +" This overrides the default locale setting detected by Mercurial.\n" +" This setting is used to convert data including usernames,\n" +" changeset descriptions, tag names, and branches. This setting can\n" +" be overridden with the --encoding command-line option.\n" +"\n" +"HGENCODINGMODE\n" +" This sets Mercurial's behavior for handling unknown characters\n" +" while transcoding user input. The default is \"strict\", which\n" +" causes Mercurial to abort if it can't map a character. Other\n" +" settings include \"replace\", which replaces unknown characters, and\n" +" \"ignore\", which drops them. This setting can be overridden with\n" +" the --encodingmode command-line option.\n" +"\n" +"HGMERGE\n" +" An executable to use for resolving merge conflicts. The program\n" +" will be executed with three arguments: local file, remote file,\n" +" ancestor file.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"HGRCPATH\n" +" A list of files or directories to search for hgrc files. Item\n" +" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" +" platform default search path is used. If empty, only the .hg/hgrc\n" +" from the current repository is read.\n" +"\n" +" For each element in HGRCPATH:\n" +"\n" +" - if it's a directory, all files ending with .rc are added\n" +" - otherwise, the file itself will be added\n" +"\n" +"HGUSER\n" +" This is the string used as the author of a commit. If not set,\n" +" available values will be considered in this order:\n" +"\n" +" - HGUSER (deprecated)\n" +" - hgrc files from the HGRCPATH\n" +" - EMAIL\n" +" - interactive prompt\n" +" - LOGNAME (with '@hostname' appended)\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"VISUAL\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"EDITOR\n" +" Sometimes Mercurial needs to open a text file in an editor for a\n" +" user to modify, for example when writing commit messages. The\n" +" editor it uses is determined by looking at the environment\n" +" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" +" non-empty one is chosen. If all of them are empty, the editor\n" +" defaults to 'vi'.\n" +"\n" +"PYTHONPATH\n" +" This is used by Python to find imported modules and may need to be\n" +" set appropriately if this Mercurial is not installed system-wide.\n" +msgstr "" + +msgid "" +"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 advanced\n" +"usage only; they may provide potentially dangerous abilities (such\n" +"as letting you destroy or modify history); they might not be ready\n" +"for prime time; or they may alter some usual behaviors of stock\n" +"Mercurial. It is thus up to the user to activate extensions as\n" +"needed.\n" +"\n" +"To enable the \"foo\" extension, either shipped with Mercurial or in\n" +"the Python search path, create an entry for it in your hgrc, like\n" +"this::\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +"You may also specify the full path to an extension::\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +"To explicitly disable an extension enabled in an hgrc of broader\n" +"scope, prepend its path with !::\n" +"\n" +" [extensions]\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" +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.\n" +"\n" +"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" +"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" +"specified, it defaults to revision number 0. If END is not specified,\n" +"it defaults to the tip. The range \":\" thus means \"all revisions\".\n" +"\n" +"If BEGIN is greater than END, revisions are treated in reverse order.\n" +"\n" +"A range acts as a closed interval. This means that a range of 3:5\n" +"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" +msgstr "" + +msgid "" +"Mercurial accepts several notations for identifying one or more files\n" +"at a time.\n" +"\n" +"By default, Mercurial treats filenames as shell-style extended glob\n" +"patterns.\n" +"\n" +"Alternate pattern notations must be specified explicitly.\n" +"\n" +"To use a plain path name without any pattern matching, start it with\n" +"``path:``. These path names must completely match starting at the\n" +"current repository root.\n" +"\n" +"To use an extended glob, start a name with ``glob:``. Globs are rooted\n" +"at the current directory; a glob such as ``*.c`` will only match files\n" +"in the current directory ending with ``.c``.\n" +"\n" +"The supported glob syntax extensions are ``**`` to match any string\n" +"across path separators and ``{a,b}`` to mean \"a or b\".\n" +"\n" +"To use a Perl/Python regular expression, start a name with ``re:``.\n" +"Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +"Plain examples::\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root\n" +" of the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +"Glob examples::\n" +"\n" +" glob:*.c any name ending in \".c\" in the current directory\n" +" *.c any name ending in \".c\" in the current directory\n" +" **.c any name ending in \".c\" in any subdirectory of the\n" +" current directory including itself.\n" +" foo/*.c any name ending in \".c\" in the directory foo\n" +" foo/**.c any name ending in \".c\" in any subdirectory of foo\n" +" including itself.\n" +"\n" +"Regexp examples::\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" + +msgid "" +"Mercurial supports several ways to specify individual revisions.\n" +"\n" +"A plain integer is treated as a revision number. Negative integers are\n" +"treated as sequential offsets from the tip, with -1 denoting the tip,\n" +"-2 denoting the revision prior to the tip, and so forth.\n" +"\n" +"A 40-digit hexadecimal string is treated as a unique revision\n" +"identifier.\n" +"\n" +"A hexadecimal string less than 40 characters long is treated as a\n" +"unique revision identifier and is referred to as a short-form\n" +"identifier. A short-form identifier is only valid if it is the prefix\n" +"of exactly one full-length identifier.\n" +"\n" +"Any other string is treated as a tag or branch name. A tag name is a\n" +"symbolic name associated with a revision identifier. A branch name\n" +"denotes the tipmost revision of that branch. Tag and branch names must\n" +"not contain the \":\" character.\n" +"\n" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision.\n" +"\n" +"The reserved name \"null\" indicates the null revision. This is the\n" +"revision of an empty repository, and the parent of revision 0.\n" +"\n" +"The reserved name \".\" indicates the working directory parent. If no\n" +"working directory is checked out, it is equivalent to null. If an\n" +"uncommitted merge is in progress, \".\" is the revision of the first\n" +"parent.\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" +"template-style (--style).\n" +"\n" +"You can customize output for any \"log-like\" command: log,\n" +"outgoing, incoming, tip, parents, heads and glog.\n" +"\n" +"Three styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact and changelog.\n" +"Usage::\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +"A template is a piece of text, with markup to invoke variable\n" +"expansion::\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +"Strings in curly braces are called keywords. The availability of\n" +"keywords depends on the exact context of the templater. These\n" +"keywords are usually available for templating a log-like command:\n" +"\n" +":author: String. The unmodified author of the changeset.\n" +":branches: String. The name of the branch on which the changeset\n" +" was committed. Will be empty if the branch name was\n" +" default.\n" +":date: Date information. The date when the changeset was\n" +" committed.\n" +":desc: String. The text of the changeset description.\n" +":diffstat: String. Statistics of changes with the following\n" +" format: \"modified files: +added/-removed lines\"\n" +":files: List of strings. All files modified, added, or removed\n" +" by this changeset.\n" +":file_adds: List of strings. Files added by this changeset.\n" +":file_mods: List of strings. Files modified by this changeset.\n" +":file_dels: List of strings. Files removed by this changeset.\n" +":node: String. The changeset identification hash, as a\n" +" 40-character hexadecimal string.\n" +":parents: List of strings. The parents of the changeset.\n" +":rev: Integer. The repository-local changeset revision\n" +" number.\n" +":tags: List of strings. Any tags associated with the\n" +" changeset.\n" +":latesttag: String. Most recent global tag in the ancestors of this\n" +" changeset.\n" +":latesttagdistance: Integer. Longest path to the latest tag.\n" +"\n" +"The \"date\" keyword does not produce human-readable output. If you\n" +"want to use a date in your output, you can use a filter to process\n" +"it. Filters are functions which return a string based on the input\n" +"variable. You can also use a chain of filters to get the desired\n" +"output::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +"List of filters:\n" +"\n" +":addbreaks: Any text. Add an XHTML \"
\" tag before the end of\n" +" every line except the last.\n" +":age: Date. Returns a human-readable date/time difference\n" +" between the given date/time and the current\n" +" date/time.\n" +":basename: Any text. Treats the text as a path, and returns the\n" +" last component of the path after splitting by the\n" +" path separator (ignoring trailing separators). For\n" +" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" +" becomes \"bar\".\n" +":stripdir: Treat the text as path and strip a directory level,\n" +" if possible. For example, \"foo\" and \"foo/bar\" becomes\n" +" \"foo\".\n" +":date: Date. Returns a date in a Unix date format, including\n" +" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" +":domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain\n" +" component. Example: 'User ' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User '\n" +" becomes 'user@example.com'.\n" +":escape: Any text. Replaces the special XML/XHTML characters\n" +" \"&\", \"<\" and \">\" with XML entities.\n" +":fill68: Any text. Wraps the text to fit in 68 columns.\n" +":fill76: Any text. Wraps the text to fit in 76 columns.\n" +":firstline: Any text. Returns the first line of text.\n" +":nonempty: Any text. Returns '(none)' if the string is empty.\n" +":hgdate: Date. Returns the date as a pair of numbers:\n" +" \"1157407993 25200\" (Unix timestamp, timezone offset).\n" +":isodate: Date. Returns the date in ISO 8601 format:\n" +" \"2009-08-18 13:00 +0200\".\n" +":isodatesec: Date. Returns the date in ISO 8601 format, including\n" +" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" +" rfc3339date filter.\n" +":localdate: Date. Converts a date to local date.\n" +":obfuscate: Any text. Returns the input text rendered as a\n" +" sequence of XML entities.\n" +":person: Any text. Returns the text before an email address.\n" +":rfc822date: Date. Returns a date using the same format used in\n" +" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Date. Returns a date using the Internet date format\n" +" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" +":short: Changeset hash. Returns the short form of a changeset\n" +" hash, i.e. a 12-byte hexadecimal string.\n" +":shortdate: Date. Returns a date like \"2006-09-18\".\n" +":strip: Any text. Strips all leading and trailing whitespace.\n" +":tabindent: Any text. Returns the text, with every line except\n" +" the first starting with a tab character.\n" +":urlescape: Any text. Escapes all \"special\" characters. For\n" +" example, \"foo bar\" becomes \"foo%20bar\".\n" +":user: Any text. Returns the user portion of an email\n" +" address.\n" +msgstr "" + +msgid "" +"Valid URLs are of the form::\n" +"\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" +"\n" +"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').\n" +"\n" +"An optional identifier after # indicates a particular branch, tag, or\n" +"changeset to use from the remote repository. See also 'hg help\n" +"revisions'.\n" +"\n" +"Some features, such as pushing to http:// and https:// URLs are only\n" +"possible if the feature is explicitly enabled on the remote Mercurial\n" +"server.\n" +"\n" +"Some notes about using SSH with Mercurial:\n" +"\n" +"- SSH requires an accessible shell account on the destination machine\n" +" and a copy of hg in the remote path or specified with as remotecmd.\n" +"- path is relative to the remote user's home directory by default. Use\n" +" an extra slash at the start of a path to specify an absolute path::\n" +"\n" +" ssh://example.com//tmp/repository\n" +"\n" +"- Mercurial doesn't use its own compression via SSH; the right thing\n" +" to do is to configure it in your ~/.ssh/config, e.g.::\n" +"\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" +" with the --ssh command line option.\n" +"\n" +"These URLs can all be stored in your hgrc with path aliases under the\n" +"[paths] section like so::\n" +"\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +"You can then use the alias for any command that uses a URL (for\n" +"example 'hg pull alias1' would pull from the 'alias1' path).\n" +"\n" +"Two path aliases are special because they are used as defaults when\n" +"you do not provide the URL to a command:\n" +"\n" +"default:\n" +" When you create a repository with hg clone, the clone command saves\n" +" the location of the source repository as the new repository's\n" +" 'default' path. This is then used when you omit path from push- and\n" +" pull-like commands (including incoming and outgoing).\n" +"\n" +"default-push:\n" +" The push command will look for a path named 'default-push', and\n" +" prefer it over 'default' if both are defined.\n" +msgstr "" + +msgid "" +"hooks for controlling repository access\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" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\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 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. ::\n" +"\n" +" [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\n" +"\n" +" [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" @@ -53,52 +594,38 @@ "αλλαγές" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: αλλαγές από \"%s\" - εξαίρεση αλλαγών\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: ο χρήστης %s δεν επιτρέπεται να κάνει αλλαγές στο %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: η πρόσβαση για την αλλαγή %s δεν επιτρέπεται" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: ο χρήστης %s δεν επιτρέπεται στο %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: αποδοχή αλλαγής %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" +msgid "" +"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, the\n" -"bookmark is forwarded to the new changeset.\n" +"bookmark shifts 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" +"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" @@ -147,7 +674,7 @@ msgstr "hg bookmarks [-d] [-m ΟΝΟΜΑ] [-r ΟΝΟΜΑ] [ΟΝΟΜΑ]" msgid "" -"Bugzilla integration\n" +"hooks for integrating with the 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" @@ -163,65 +690,86 @@ "be run by Mercurial as the user pushing the change; you will need to\n" "ensure the Bugzilla install file permissions are set appropriately.\n" "\n" -"Configuring the extension:\n" -"\n" -" [bugzilla]\n" -"\n" -" host Hostname of the MySQL server holding the Bugzilla\n" -" database.\n" -" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -" user Username to use to access MySQL server. Default 'bugs'.\n" -" password Password to use to access MySQL server.\n" -" timeout Database connection timeout (seconds). Default 5.\n" -" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" -" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" -" and '2.16' for versions prior to 2.18.\n" -" bzuser Fallback Bugzilla user name to record comments with, if\n" -" changeset committer cannot be found as a Bugzilla user.\n" -" bzdir Bugzilla install directory. Used by default notify.\n" -" Default '/var/www/html/bugzilla'.\n" -" notify The command to run to get Bugzilla to send bug change\n" -" notification emails. Substitutes from a map with 3\n" -" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" -" bugzilla email). Default depends on version; from 2.18\n" -" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" -" %(id)s %(user)s\".\n" -" regexp Regular expression to match bug IDs in changeset commit\n" -" message. Must contain one \"()\" group. The default\n" -" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" -" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" -" variations thereof. Matching is case insensitive.\n" -" style The style file to use when formatting comments.\n" -" template Template to use when formatting comments. Overrides\n" -" style if specified. In addition to the usual Mercurial\n" -" keywords, the extension specifies:\n" -" {bug} The Bugzilla bug ID.\n" -" {root} The full pathname of the Mercurial\n" -" repository.\n" -" {webroot} Stripped pathname of the Mercurial\n" -" repository.\n" -" {hgweb} Base URL for browsing Mercurial\n" -" repositories.\n" -" Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" -" strip The number of slashes to strip from the front of {root}\n" -" to produce {webroot}. Default 0.\n" -" usermap Path of file containing Mercurial committer ID to\n" -" Bugzilla user ID mappings. If specified, the file\n" -" should contain one mapping per line,\n" -" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" -" section.\n" -"\n" -" [usermap]\n" -" Any entries in this section specify mappings of Mercurial\n" -" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" -" \"committer\"=\"Bugzilla user\"\n" -"\n" -" [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference\n" -" from templates as {hgweb}.\n" -"\n" -"Activating the extension:\n" +"The extension is configured through three different configuration\n" +"sections. These keys are recognized in the [bugzilla] section:\n" +"\n" +"host\n" +" Hostname of the MySQL server holding the Bugzilla database.\n" +"\n" +"db\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +"\n" +"user\n" +" Username to use to access MySQL server. Default 'bugs'.\n" +"\n" +"password\n" +" Password to use to access MySQL server.\n" +"\n" +"timeout\n" +" Database connection timeout (seconds). Default 5.\n" +"\n" +"version\n" +" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" +" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" +" to 2.18.\n" +"\n" +"bzuser\n" +" Fallback Bugzilla user name to record comments with, if changeset\n" +" committer cannot be found as a Bugzilla user.\n" +"\n" +"bzdir\n" +" Bugzilla install directory. Used by default notify. Default\n" +" '/var/www/html/bugzilla'.\n" +"\n" +"notify\n" +" The command to run to get Bugzilla to send bug change notification\n" +" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" +" and 'user' (committer bugzilla email). Default depends on version;\n" +" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +"\n" +"regexp\n" +" Regular expression to match bug IDs in changeset commit message.\n" +" Must contain one \"()\" group. The default expression matches 'Bug\n" +" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" +" 1234 and 5678' and variations thereof. Matching is case insensitive.\n" +"\n" +"style\n" +" The style file to use when formatting comments.\n" +"\n" +"template\n" +" Template to use when formatting comments. Overrides style if\n" +" specified. In addition to the usual Mercurial keywords, the\n" +" extension specifies::\n" +"\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial repository.\n" +" {webroot} Stripped pathname of the Mercurial repository.\n" +" {hgweb} Base URL for browsing Mercurial repositories.\n" +"\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +"\n" +"strip\n" +" The number of slashes to strip from the front of {root} to produce\n" +" {webroot}. Default 0.\n" +"\n" +"usermap\n" +" Path of file containing Mercurial committer ID to Bugzilla user ID\n" +" mappings. If specified, the file should contain one mapping per\n" +" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" +"\n" +"The [usermap] section is used to specify mappings of Mercurial\n" +"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" +"\"committer\"=\"Bugzilla user\"\n" +"\n" +"Finally, the [web] section supports one entry:\n" +"\n" +"baseurl\n" +" Base URL for browsing Mercurial repositories. Reference from\n" +" templates as {hgweb}.\n" +"\n" +"Activating the extension::\n" "\n" " [extensions]\n" " hgext.bugzilla =\n" @@ -234,7 +782,7 @@ "\n" "This example configuration is for a collection of Mercurial\n" "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" -"installation in /opt/bugzilla-3.2.\n" +"installation in /opt/bugzilla-3.2. ::\n" "\n" " [bugzilla]\n" " host=localhost\n" @@ -242,8 +790,9 @@ " 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" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" " strip=5\n" "\n" " [web]\n" @@ -252,7 +801,7 @@ " [usermap]\n" " user@emaildomain.com=user.name@bugzilladomain.com\n" "\n" -"Commits add a comment to the Bugzilla bug record of the form:\n" +"Commits add a comment to the Bugzilla bug record of the form::\n" "\n" " Changeset 3b16791d6642 in repository-name.\n" " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" @@ -331,6 +880,9 @@ msgid "database error: %s" msgstr "σφάλμα βάσης δεδομένων: %s" +msgid "command to display child changesets" +msgstr "" + msgid "" "show the children of the given or working directory revision\n" "\n" @@ -349,7 +901,8 @@ msgid "hg children [-r REV] [FILE]" msgstr "hg children [-r ΕΚΔΟΣΗ] [ΑΡΧΕΙΟ]" -msgid "command to show certain statistics about revision history" +#, fuzzy +msgid "command to display statistics about repository history" msgstr "" "εντολή η οποία δείχνει κάποια στατιστικά για το ιστορικό του αποθετηρίου" @@ -375,7 +928,7 @@ " alternatively the number of matching revisions if the\n" " --changesets option is specified.\n" "\n" -" Examples:\n" +" Examples::\n" "\n" " # display count of changed lines for every committer\n" " hg churn -t '{author|email}'\n" @@ -390,12 +943,12 @@ " hg churn -f '%Y' -s\n" "\n" " It is possible to map alternate email addresses to a main address\n" -" by providing a file using the following format:\n" -" \n" -" \n" -"\n" -" Such a file may be specified with the --aliases option, otherwise a\n" -" .hgchurn file will be looked for in the working directory root.\n" +" by providing a file using the following format::\n" +"\n" +" \n" +"\n" +" Such a file may be specified with the --aliases option, otherwise\n" +" a .hgchurn file will be looked for in the working directory root.\n" " " msgstr "" "plot antallet af revisioner grupperet efter et mønster\n" @@ -425,14 +978,9 @@ "\n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "" - msgid "count rate for the specified revision or range" msgstr "" -#, fuzzy msgid "count rate for revisions matching date spec" msgstr "" @@ -458,7 +1006,7 @@ msgstr "" 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" @@ -471,52 +1019,53 @@ "function (aka ANSI escape codes). This module also provides the\n" "render_text function, which can be used to add effects to any text.\n" "\n" -"To enable this extension, add this to your .hgrc file:\n" -"[extensions]\n" -"color =\n" -"\n" -"Default effects may be overridden from the .hgrc file:\n" -"\n" -"[color]\n" -"status.modified = blue bold underline red_background\n" -"status.added = green bold\n" -"status.removed = red bold blue_background\n" -"status.deleted = cyan bold underline\n" -"status.unknown = magenta bold underline\n" -"status.ignored = black bold\n" -"\n" -"# 'none' turns off all effects\n" -"status.clean = none\n" -"status.copied = none\n" -"\n" -"qseries.applied = blue bold underline\n" -"qseries.unapplied = black bold\n" -"qseries.missing = red bold\n" -"\n" -"diff.diffline = bold\n" -"diff.extended = cyan bold\n" -"diff.file_a = red bold\n" -"diff.file_b = green bold\n" -"diff.hunk = magenta\n" -"diff.deleted = red\n" -"diff.inserted = green\n" -"diff.changed = white\n" -"diff.trailingwhitespace = bold red_background\n" +"Default effects may be overridden from the .hgrc file::\n" +"\n" +" [color]\n" +" status.modified = blue bold underline red_background\n" +" status.added = green bold\n" +" status.removed = red bold blue_background\n" +" status.deleted = cyan bold underline\n" +" status.unknown = magenta bold underline\n" +" status.ignored = black bold\n" +"\n" +" # 'none' turns off all effects\n" +" status.clean = none\n" +" status.copied = none\n" +"\n" +" qseries.applied = blue bold underline\n" +" qseries.unapplied = black bold\n" +" qseries.missing = red bold\n" +"\n" +" diff.diffline = bold\n" +" diff.extended = cyan bold\n" +" diff.file_a = red bold\n" +" diff.file_b = green bold\n" +" diff.hunk = magenta\n" +" diff.deleted = red\n" +" diff.inserted = green\n" +" diff.changed = white\n" +" diff.trailingwhitespace = bold red_background\n" msgstr "" msgid "when to colorize (always, auto, or never)" msgstr "" -msgid "don't colorize output" -msgstr "" - -msgid "converting foreign VCS repositories to Mercurial" +msgid "don't colorize output (DEPRECATED)" +msgstr "" + +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" "\n" " Accepted source formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -528,6 +1077,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -539,23 +1089,28 @@ " basename of the source with '-hg' appended. If the destination\n" " repository doesn't exist, it will be created.\n" "\n" -" By default, all sources except Mercurial will use\n" -" --branchsort. Mercurial uses --sourcesort to preserve original\n" -" revision numbers order. Sort modes have the following effects:\n" -" --branchsort: convert from parent to child revision when\n" -" possible, which means branches are usually converted one after\n" -" the other. It generates more compact repositories.\n" -" --datesort: sort revisions by date. Converted repositories have\n" -" good-looking changelogs but are often an order of magnitude\n" -" larger than the same ones generated by --branchsort.\n" -" --sourcesort: try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" +" By default, all sources except Mercurial will use --branchsort.\n" +" Mercurial uses --sourcesort to preserve original revision numbers\n" +" order. Sort modes have the following effects:\n" +"\n" +" --branchsort convert from parent to child revision when possible,\n" +" which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +"\n" +" --datesort sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of\n" +" magnitude larger than the same ones generated by\n" +" --branchsort.\n" +"\n" +" --sourcesort try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" "\n" " If isn't given, it will be put in a default location\n" " (/.hg/shamap by default). The is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" \n" +" revision, like so::\n" +"\n" +" \n" "\n" " If the file doesn't exist, it's automatically created. It's\n" " updated on each commit copied, so convert-repo can be interrupted\n" @@ -569,7 +1124,7 @@ "\n" " The filemap is a file that allows filtering and remapping of files\n" " and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives:\n" +" contain one of the following directives::\n" "\n" " include path/to/file\n" "\n" @@ -579,11 +1134,11 @@ "\n" " The 'include' directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" -" exclusion of all other files and directories not explicitly included.\n" -" The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from\n" -" a subdirectory into the root of the repository, use '.' as the\n" -" path to rename to.\n" +" exclusion of all other files and directories not explicitly\n" +" included. The 'exclude' directive causes files or directories to\n" +" be omitted. The 'rename' directive renames a file or directory. To\n" +" rename from a subdirectory into the root of the repository, use\n" +" '.' as the path to rename to.\n" "\n" " The splicemap is a file that allows insertion of synthetic\n" " history, letting you specify the parents of a revision. This is\n" @@ -608,7 +1163,7 @@ " in one repository from \"default\" to a named branch.\n" "\n" " Mercurial Source\n" -" -----------------\n" +" ----------------\n" "\n" " --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" @@ -633,43 +1188,31 @@ " converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" -" Because CVS does not have changesets, it is necessary to collect\n" -" individual commits to CVS and merge them into changesets. CVS\n" -" source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting:\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" " The options shown are the defaults.\n" "\n" -" Internal cvsps is selected by setting\n" -" --config convert.cvsps=builtin\n" -" and has a few more configurable options:\n" -" --config convert.cvsps.cache=True (boolean)\n" -" Set to False to disable remote log caching, for testing and\n" -" debugging purposes.\n" -" --config convert.cvsps.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed\n" -" between commits with identical user and log message in a\n" -" single changeset. When very large files were checked in as\n" -" part of a changeset then the default may not be long\n" -" enough.\n" -" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages\n" -" are matched. If a match occurs, then the conversion\n" -" process will insert a dummy revision merging the branch on\n" -" which this log message occurs to the branch indicated in\n" -" the regex.\n" -" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages\n" -" are matched. If a match occurs, then the conversion\n" -" process will add the most recent revision on the branch\n" -" indicated in the regex as the second parent of the\n" -" changeset.\n" -"\n" -" The hgext/convert/cvsps wrapper script allows the builtin\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed between\n" +" commits with identical user and log message in a single\n" +" changeset. When very large files were checked in as part of a\n" +" changeset then the default may not be long enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" insert a dummy revision merging the branch on which this log\n" +" message occurs to the branch indicated in the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages are\n" +" matched. If a match occurs, then the conversion process will\n" +" add the most recent revision on the branch indicated in the\n" +" regex as the second parent of the changeset.\n" +"\n" +" An additional \"debugcvsps\" Mercurial command allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" -" parameters and output are similar to that of cvsps 2.1.\n" +" parameters and output are similar to that of cvsps 2.1. Please see\n" +" the command help for more details.\n" "\n" " Subversion Source\n" " -----------------\n" @@ -715,7 +1258,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -833,18 +1375,10 @@ msgstr "" #, python-format -msgid "running: %s\n" -msgstr "" - -#, python-format msgid "%s error:\n" msgstr "" #, python-format -msgid "%s %s" -msgstr "" - -#, python-format msgid "syntax error in %s(%d): key/value pair expected" msgstr "" @@ -864,7 +1398,7 @@ msgid "%s: unknown repository type" msgstr "" -#, fuzzy, python-format +#, python-format msgid "unknown sort mode: %s" msgstr "" @@ -918,16 +1452,8 @@ msgid "--sourcesort is not supported by this data source" msgstr "" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "" - -#, python-format -msgid "revision %s is not a patchset number or date" -msgstr "" - -msgid "using builtin cvsps\n" +#, python-format +msgid "revision %s is not a patchset number" msgstr "" #, python-format @@ -937,7 +1463,9 @@ msgid "CVS pserver authentication failed" msgstr "" -msgid "server sucks" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -971,10 +1499,6 @@ msgid "running %s\n" msgstr "εκτέλεση %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "πρόθεμα=%r κατάλογος=%r αρχικός-κατάλογος=%r\n" - msgid "RCS file must be followed by working file" msgstr "το αρχείο RCS πρέπει να ακολουθείται από ένα αρχείο εργασίας" @@ -987,10 +1511,6 @@ msgid "revision must be followed by date line" msgstr "η έκδοση αρχείου πρέπει να ακολουθείται από γραμμή ημερομηνίας" -#, fuzzy, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "" - #, python-format msgid "writing cvs log cache %s\n" msgstr "αποθήκευση προσωρινού αντιγράφου cvs log %s\n" @@ -1015,13 +1535,13 @@ msgid "%d changeset entries\n" msgstr "%d αλλαγές\n" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "δεν είναι διαθέσιμο το άρθρωμα ElementTree της Python" -#, python-format -msgid "cleaning up %s\n" -msgstr "καθαρισμός %s\n" - msgid "internal calling inconsistency" msgstr "εσωτερικό πρόβλημα κλήσης" @@ -1058,22 +1578,6 @@ "s, η οποία δεν υπάρχει ή δεν είναι διαθέσιμη...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "" - -#, fuzzy, python-format -msgid "analyzing revision %s...\n" -msgstr "ανάλυση καταλόγου αρχείων για την έκδοση %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1085,12 +1589,6 @@ msgid "initializing destination %s repository\n" msgstr "" -msgid "run hg sink pre-conversion action\n" -msgstr "" - -msgid "run hg sink post-conversion action\n" -msgstr "" - #, python-format msgid "pulling from %s into %s\n" msgstr "" @@ -1109,12 +1607,6 @@ msgid "ignoring: %s\n" msgstr "" -msgid "run hg source pre-conversion action\n" -msgstr "" - -msgid "run hg source post-conversion action\n" -msgstr "" - #, python-format msgid "%s does not look like a monotone repo" msgstr "" @@ -1131,6 +1623,9 @@ msgid "collecting p4 changelists\n" msgstr "δημιουργία αλλαγών\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1181,84 +1676,22 @@ msgstr "" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "" - -#, python-format msgid "%s not found up to revision %d" msgstr "" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "" - -#, python-format -msgid "reparent to %s\n" -msgstr "" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "" - -#, python-format -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" -msgstr "" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "" #, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "" - -#, python-format -msgid "revision %d has no entries\n" -msgstr "" - -#, python-format msgid "svn: branch has no revision %s" msgstr "" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "" - -#, python-format msgid "initializing svn repo %r\n" msgstr "" @@ -1276,20 +1709,16 @@ msgstr "" msgid "" -"\n" -"The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working directory. The external diff\n" -"programs are called with a configurable set of options and two\n" +"command to allow external programs to compare revisions\n" +"\n" +"The extdiff Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working directory. The external\n" +"diff programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" "files to compare.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.extdiff =\n" -"\n" -"The `extdiff' extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"The extdiff extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" "\n" " [extdiff]\n" " # add new command that runs GNU diff(1) in 'context diff' mode\n" @@ -1305,14 +1734,13 @@ " meld =\n" "\n" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" -" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" -" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " -"in\n" +" # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" +" # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" "\n" "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" +"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" msgstr "" @@ -1328,14 +1756,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "" -#, python-format -msgid "running %r in %s\n" -msgstr "" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "" - msgid "cleaning up temp directory\n" msgstr "" @@ -1371,10 +1791,25 @@ msgstr "" #, python-format +msgid "" +"use %(path)s to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using the\n" +" %(path)s program.\n" +"\n" +" When two revision arguments are given, then changes are shown between\n" +" those revisions. If only one revision is specified then that revision " +"is\n" +" compared to the working directory, and, when no revisions are " +"specified,\n" +" the working directory files are compared to its parent." +msgstr "" + +#, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pulling, updating and merging in one command" +msgid "pull, update and merge in one command" msgstr "" msgid "" @@ -1438,10 +1873,6 @@ msgstr "" #, python-format -msgid "Automated merge with %s" -msgstr "" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" @@ -1460,6 +1891,9 @@ msgid "hg fetch [SOURCE]" msgstr "" +msgid "commands to sign and verify changesets" +msgstr "" + msgid "error while verifying signature" msgstr "" @@ -1510,10 +1944,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1542,7 +1972,7 @@ msgstr "" msgid "" -"show revision graphs in terminal windows\n" +"command to view revision graphs from a shell\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" @@ -1587,40 +2017,40 @@ msgstr "" msgid "" -"CIA notification\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" -"\n" -"[cia]\n" -"# your registered CIA user name\n" -"user = foo\n" -"# the name of the project in CIA\n" -"project = foo\n" -"# the module (subproject) (optional)\n" -"#module = foo\n" -"# Append a diffstat to the log message (optional)\n" -"#diffstat = False\n" -"# Template to use for log messages (optional)\n" -"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" -"# Style to use (optional)\n" -"#style = foo\n" -"# The URL of the CIA notification service (optional)\n" -"# You can use mailto: URLs to send by email, eg\n" -"# mailto:cia@cia.vc\n" -"# Make sure to set email.from if you do this.\n" -"#url = http://cia.vc/\n" -"# print message instead of sending it (optional)\n" -"#test = False\n" -"\n" -"[hooks]\n" -"# one of these:\n" -"changegroup.cia = python:hgcia.hook\n" -"#incoming.cia = python:hgcia.hook\n" -"\n" -"[web]\n" -"# If you want hyperlinks (optional)\n" -"baseurl = http://server/path/to/repo\n" +"hooks for integrating with the CIA.vc notification service\n" +"\n" +"This is meant to be run as a changegroup or incoming hook. To\n" +"configure it, set the following options in your hgrc::\n" +"\n" +" [cia]\n" +" # your registered CIA user name\n" +" user = foo\n" +" # the name of the project in CIA\n" +" project = foo\n" +" # the module (subproject) (optional)\n" +" #module = foo\n" +" # Append a diffstat to the log message (optional)\n" +" #diffstat = False\n" +" # Template to use for log messages (optional)\n" +" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +" # Style to use (optional)\n" +" #style = foo\n" +" # The URL of the CIA notification service (optional)\n" +" # You can use mailto: URLs to send by email, eg\n" +" # mailto:cia@cia.vc\n" +" # Make sure to set email.from if you do this.\n" +" #url = http://cia.vc/\n" +" # print message instead of sending it (optional)\n" +" #test = False\n" +"\n" +" [hooks]\n" +" # one of these:\n" +" changegroup.cia = python:hgcia.hook\n" +" #incoming.cia = python:hgcia.hook\n" +"\n" +" [web]\n" +" # If you want hyperlinks (optional)\n" +" baseurl = http://server/path/to/repo\n" msgstr "" #, python-format @@ -1630,14 +2060,8 @@ msgid "email.from must be defined when sending by email" msgstr "" -msgid "cia: no user specified" -msgstr "" - -msgid "cia: no project specified" -msgstr "" - -msgid "" -"browsing the repository in a graphical way\n" +msgid "" +"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" @@ -1646,36 +2070,24 @@ "hgk consists of two parts: a Tcl script that does the displaying and\n" "querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" -"the contrib directory, and hgk.py can be found in the hgext directory.\n" -"\n" -"To load the hgext.py extension, add it to your .hgrc file (you have to\n" -"use your global $HOME/.hgrc file, not one in a repository). You can\n" -"specify an absolute path:\n" -"\n" -" [extensions]\n" -" hgk=/usr/local/lib/hgk.py\n" -"\n" -"Mercurial can also scan the default python library path for a file\n" -"named 'hgk.py' if you set hgk empty:\n" -"\n" -" [extensions]\n" -" hgk=\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" "\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:\n" +"the path to hgk in your .hgrc file::\n" "\n" " [hgk]\n" " path=/location/of/hgk\n" "\n" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add:\n" +"Assuming you had already configured extdiff vdiff command, just add::\n" "\n" " [hgk]\n" " vdiff=vdiff\n" "\n" "Revisions context menu will now display additional entries to fire\n" -"vdiff on hovered and selected revisions." +"vdiff on hovered and selected revisions.\n" msgstr "" msgid "diff trees from two commits" @@ -1735,7 +2147,7 @@ msgid "hg debug-config" msgstr "" -msgid "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" msgstr "" msgid "ignored" @@ -1756,31 +2168,24 @@ msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "" + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"To enable the extension add this to hgrc:\n" -"\n" -"[extensions]\n" -"hgext.highlight =\n" -"\n" -"There is a single configuration option:\n" -"\n" -"[web]\n" -"pygments_style =