Mercurial > hg
changeset 9778:6cb1808e5ae7
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 07 Nov 2009 14:13:15 -0600 |
| parents | ffda19f351fa (current diff) b2dfe76459dc (diff) |
| children | 58a6f3f4d553 54d292da1df7 a0bf760c0dae |
| files | |
| diffstat | 10 files changed, 14215 insertions(+), 17218 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/da.po Sat Nov 07 14:13:15 2009 -0600 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\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: <mg@lazybytes.net>\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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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: <current user>\" to patch" msgstr "tilføj \"From: <aktuel bruger>\" 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 <name>.\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 \"<br />\" 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 <user@example.com>' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User <user@example.com>'\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 ""
--- a/i18n/de.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/de.po Sat Nov 07 14:13:15 2009 -0600 @@ -23,8 +23,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\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-11-02 16:48+0200\n" +"PO-Revision-Date: 2009-10-20 18:09+0200\n" "Last-Translator: Fabian Kreutz <fabian.kreutz@starnet.fi>\n" "Language-Team: German (Tobias Bell, Fabian Kreutz, Lutz Horn)\n" "MIME-Version: 1.0\n" @@ -58,6 +58,658 @@ "\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 "" +"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" + +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 "" +"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" + +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 "" +"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" + +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" + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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' will be treated as 'hg pull URL1').\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" +"(z.B. 'hg pull alias1' würde als 'hg pull URL1' gewertet werden).\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" "This hook makes it possible to allow or deny write access to portions\n" @@ -152,39 +804,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 +1350,6 @@ " <alias Email> <echte Email>\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 +1464,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" @@ -938,7 +1562,10 @@ " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" -" should be used as the new parents for that node.\n" +" should be used as the new parents for that node. For example, if\n" +" you have merged \"release-1.0\" into \"trunk\", then you should\n" +" specify the revision on \"trunk\" as the first parent and the one on\n" +" the \"release-1.0\" branch as the second.\n" "\n" " The branchmap is a file that allows you to rename a branch when it is\n" " being brought in from whatever external repository. When used in\n" @@ -977,23 +1604,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 +1625,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" @@ -1163,8 +1776,10 @@ " Revisions-ID des Quellarchivs, eine Leerstelle und eine oder (mit " "Komma)\n" " zwei Revisions-IDs, die als Vorfahren der ersten angenommen werden\n" -" sollen. Die Vorfahren-IDs können entweder im Format der Quelle oder des\n" -" Ziels angegeben werden.\n" +" sollen. Wurde z.B. \"trunk\" mit \"release-1.0\" zusammengeführt, so\n" +" sollte die Revision aus \"trunk\" als erster und die aus dem Zweig\n" +" \"release-1.0\" als zweiter Vorfahr angegeben werden. Die Vorfahren-IDs\n" +" können entweder im Format der Quelle oder des Ziels angegeben werden.\n" "\n" " Die Zweig-Abbildungsdatei erlaubt das Umbenennen von Zweigen. Zusammen\n" " mit der Spleißdatei können so auch sehr unorganisierte Archive in\n" @@ -1199,21 +1814,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 +1836,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 +2004,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 +2081,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 +2129,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 +2142,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 +2174,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 +2209,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 +2220,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 +2238,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 +2252,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 +2308,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 +2383,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 +2401,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 +2424,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 +2452,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 +2678,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 +2715,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 +2807,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 +2966,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 +2974,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 +3243,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 +3265,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 +3303,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 +3380,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 +4228,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 +4385,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" @@ -3930,11 +4413,11 @@ #, python-format msgid "%s: %d new changesets" -msgstr "" +msgstr "%s: %d neue Änderungssätze" #, python-format msgid "notify: sending %d subscribers %d changes\n" -msgstr "" +msgstr "notify: Sende %d Empfängern %d Änderungen\n" #, python-format msgid "" @@ -3942,6 +4425,9 @@ "diffs (truncated from %d to %d lines):\n" "\n" msgstr "" +"\n" +"Unterschiede (Ausschnitt von %d bis %d Zeilen):\n" +"\n" #, python-format msgid "" @@ -3949,14 +4435,13 @@ "diffs (%d lines):\n" "\n" msgstr "" - -#, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" +"\n" +"Unterschiede (%d Zeilen):\n" +"\n" + +#, python-format +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "notify: unterdrücke Benachrichtigung über Zusammenführung %d:%s\n" msgid "" "browse command output with an external pager\n" @@ -4078,14 +4563,18 @@ "hgrc(5) for details.\n" msgstr "" +#, python-format +msgid "%s Please enter a valid value" +msgstr "%s Bitte einen gültigen Wert angeben" + msgid "Please enter a valid value.\n" -msgstr "" - -msgid "does the diffstat above look okay? " -msgstr "" +msgstr "Bitte einen gültigen Wert angeben.\n" + +msgid "does the diffstat above look okay?" +msgstr "Ist die obige diffstat-Ausgabe in Ordnung?" msgid "diffstat rejected" -msgstr "" +msgstr "diffstat abgelehnt" msgid "" "send changesets by email\n" @@ -4318,9 +4807,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 +4862,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 +4889,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 +4911,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 +5052,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 +5267,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 +5889,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 +5922,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 +6003,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 +6102,6 @@ " %p Pfad und Dateiname relativ zur Archiv-Wurzel\n" " " -#, fuzzy msgid "" "make a copy of an existing repository\n" "\n" @@ -5747,15 +6159,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 +6178,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 +6196,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 +6544,6 @@ "aufschlussreich.\n" " " -#, fuzzy msgid "" "dump the header and diffs for one or more changesets\n" "\n" @@ -6172,18 +6582,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 +6600,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 +6685,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 +6746,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" @@ -6419,6 +6827,9 @@ "Grundlegende Befehle:\n" "\n" +msgid "DEPRECATED" +msgstr "VERALTET" + msgid "" "\n" "additional help topics:\n" @@ -6428,7 +6839,6 @@ "Zusätzliche Hilfethemen:\n" "\n" -#, fuzzy msgid "" "identify the working copy or specified revision\n" "\n" @@ -6460,11 +6870,11 @@ " falls nicht der 'default'-Zweig vorliegt.\n" " " -#, fuzzy msgid "" "import an ordered set of patches\n" "\n" -" Import a list of patches and commit them individually.\n" +" Import a list of patches and commit them individually (unless\n" +" --no-commit is specified).\n" "\n" " If there are outstanding changes in the working directory, import\n" " will abort unless given the -f/--force flag.\n" @@ -6513,8 +6923,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 +6933,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 +6949,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 +6972,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 +6980,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 +7003,6 @@ " Siehe 'hg help urls' für mehr Informationen.\n" " " -#, fuzzy msgid "" "locate files matching specific patterns\n" "\n" @@ -6639,7 +7040,6 @@ " mit Leerzeichen in Dateinamen vermeidet.\n" " " -#, fuzzy msgid "" "show revision history of entire repository or files\n" "\n" @@ -6694,16 +7094,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 +7127,6 @@ " die Prüfsumme.\n" " " -#, fuzzy msgid "" "merge working directory with another revision\n" "\n" @@ -6807,7 +7204,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 +7217,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 +7231,6 @@ msgid "'%s' not found in manifest!" msgstr "'%s' nicht im Manifest gefunden!" -#, fuzzy msgid "" "show aliases for remote repositories\n" "\n" @@ -6874,7 +7269,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 +7297,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 +7336,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 +7372,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 +7403,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,11 +7478,10 @@ " \"hg revert\" rückgängig gemacht werden.\n" " " -#, fuzzy msgid "" "retry file merges from a merge or update\n" "\n" -" This command will cleanly retry unresolved file merges using file\n" +" This command can cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" " resolve all unresolved files, use the -a/--all switch.\n" "\n" @@ -7139,7 +7529,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 +7627,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 +7697,6 @@ " Gibt das Wurzelverzeichnis des aktuellen Arbeitsverzeichnisses aus.\n" " " -#, fuzzy msgid "" "export the repository via HTTP\n" "\n" @@ -7325,15 +7712,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 +7758,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 +7793,101 @@ " " 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 " (leeres Archiv)" + +msgid " (no revision checked out)" +msgstr " (keine Revision geladen)" + +#, 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" + +#, python-format +msgid "%d added" +msgstr "%d hinzugefügt" + +#, python-format +msgid "%d modified" +msgstr "%d modifiziert" + +#, python-format +msgid "%d removed" +msgstr "%d entfernt" + +#, python-format +msgid "%d deleted" +msgstr "%d gelöscht" + +#, python-format +msgid "%d ignored" +msgstr "%d ignoriert" + +#, python-format +msgid "%d unknown" +msgstr "%d unbekannt" + +#, python-format +msgid "%d unresolved" +msgstr "%d 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 "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, python-format +msgid "remote: %s\n" +msgstr "Entfernt: %s\n" + +msgid "remote: (synced)\n" +msgstr "Entfernt: (synchonisiert)\n" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -7493,7 +7972,6 @@ " --verbose werden lokale in einer dritten Spalte als solche markiert.\n" " " -#, fuzzy msgid "" "show the tip revision\n" "\n" @@ -7512,11 +7990,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 +8009,6 @@ " wie sie durch den Befehl 'bundle' erzeugt werden\n" " " -#, fuzzy msgid "" "update working directory\n" "\n" @@ -7577,9 +8053,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 +8068,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 +8119,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" @@ -7740,6 +8221,9 @@ msgid "number of lines of context to show" msgstr "Anzahl der anzuzeigenden Kontextzeilen" +msgid "output diffstat-style summary of changes" +msgstr "Zusammenfassung der Änderungen im diffstat-Stil" + msgid "guess renamed files by similarity (0<=s<=100)" msgstr "Bewertet ähnliche Dateien (0<=s<=100) als Umbenennung" @@ -8040,8 +8524,8 @@ msgid "file to store the bundles into" msgstr "Dateiname zum Zwischenspeichern" -msgid "a specific revision up to which you would like to pull" -msgstr "eine bestimmte Revision bis zu der geholt werden soll" +msgid "a specific remote revision up to which you would like to pull" +msgstr "eine bestimmte enfernte Revision bis zu der geholt werden soll" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle DATEINAME] [QUELLE]" @@ -8160,6 +8644,9 @@ msgid "unmark files as resolved" msgstr "Markiert eine Datei als konfliktbehaftet" +msgid "hide status prefix" +msgstr "Verdeckt den Status-Präfix" + msgid "revert all changes when no arguments given" msgstr "Nimmt alle lokalen Änderungen zurück (ohne andere Parameter)" @@ -8218,6 +8705,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "Zeigt den Status aller Dateien" @@ -8242,9 +8732,6 @@ msgid "show only ignored files" msgstr "Zeigt nur ignorierte Dateien" -msgid "hide status prefix" -msgstr "Verdeckt den Status-Präfix" - msgid "show source of copied files" msgstr "Zeigt die Quelle von kopierten Dateien" @@ -8294,40 +8781,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 +8827,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 +8839,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 +8936,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 +9001,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 +9021,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 +9044,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 \"<br />\" 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 <user@example.com>' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User <user@example.com>'\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 +9105,25 @@ 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 "updating to branch %s\n" +msgstr "Aktualisiere auf Zweig %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 "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 +9197,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 +9211,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 +9284,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 +9316,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 +9388,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 +9397,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 +9424,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 +9440,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 +9451,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 +9471,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -9922,14 +9551,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 +9572,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 +9620,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 +9690,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 +9846,7 @@ msgstr "Knoten '%s' ist fehlerhaft" msgid "unmatched quotes" -msgstr "" +msgstr "unpassende Klammern" #, python-format msgid "error expanding '%s%%%s'" @@ -10264,24 +9858,25 @@ #, 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 "" +"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 +9945,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 +10021,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 +10155,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"
--- a/i18n/el.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/el.po Sat Nov 07 14:13:15 2009 -0600 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\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: <keramida@ceid.upatras.gr>\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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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" -" <alias email> <actual email>\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" +" <alias email> <actual email>\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" " <alias email> <faktisk email>" -#, 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 <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" <source ID> <destination ID>\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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 = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "inotify-based status acceleration for Linux systems\n" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" msgstr "" msgid "start an inotify server for this repository" @@ -1808,15 +2213,12 @@ msgid "name of file to write process ID to" msgstr "" -msgid "hg inserve [OPT]..." +msgid "hg inserve [OPTION]..." msgstr "" 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 "" @@ -1825,9 +2227,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 "" @@ -1885,10 +2284,6 @@ msgstr "" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "" @@ -1957,16 +2352,12 @@ msgid "" "expand expressions into changelog and summaries\n" "\n" -"This extension allows the use of a special syntax in summaries,\n" -"which will be automatically expanded into links or any other\n" -"arbitrary expression, much like InterWiki does.\n" -"\n" -"To enable this extension, add the following lines to your hgrc:\n" -"\n" -" [extensions]\n" -" interhg =\n" -"\n" -"A few example patterns (link to bug tracking, etc.):\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" @@ -1984,7 +2375,7 @@ msgstr "" msgid "" -"keyword expansion in tracked files\n" +"expand keywords in tracked files\n" "\n" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" "tracked text files selected by your configuration.\n" @@ -1996,20 +2387,22 @@ "Configuration is done in the [keyword] and [keywordmaps] sections of\n" "hgrc files.\n" "\n" -"Example:\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repositories.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" "\n" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" @@ -2028,8 +2421,8 @@ "have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" msgstr "" #, python-format @@ -2052,36 +2445,55 @@ " Show current, custom, or default keyword template maps and their\n" " expansions.\n" "\n" -" Extend current configuration by specifying maps as arguments and\n" -" optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" -#, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - #, fuzzy, python-format msgid "creating temporary repository at %s\n" msgstr "δημιουργία αποθετηρίου για το queue" -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +msgid "\tdisabling current template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" +msgid "" +"\n" +"\tkeywords expanded\n" msgstr "" msgid "" @@ -2094,11 +2506,25 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2130,7 +2556,13 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +msgid "only show unknown (not tracked) files" +msgstr "" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2141,7 +2573,7 @@ #, fuzzy msgid "" -"patch management and development\n" +"manage a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" @@ -2150,19 +2582,18 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" "udvikling og håndtering af patches\n" "\n" @@ -2204,10 +2635,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2273,9 +2700,9 @@ msgid "applying %s\n" msgstr "" -#, python-format -msgid "Unable to read %s\n" -msgstr "" +#, fuzzy, python-format +msgid "unable to read %s\n" +msgstr " ενημέρωση σε %d:%s\n" #, python-format msgid "imported patch %s\n" @@ -2305,6 +2732,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "" +#, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2415,6 +2846,10 @@ msgid "deletions found between repo revs" msgstr "" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "αφαίρεση του %s\n" + msgid "patch queue now empty\n" msgstr "" @@ -2520,24 +2955,26 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to the\n" -" -r/--rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular Mercurial changesets). The qfinish command should\n" -" be used as an alternative for qdelete -r, as the latter option is\n" -" deprecated.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory." +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" msgstr "" +msgid "only one patch applied\n" +msgstr "μόνο ένα patch έχει εφαρμοστεί\n" + msgid "print the patches not yet applied" msgstr "" +msgid "all patches applied\n" +msgstr "όλα τα patches έχουν εφαρμοστεί\n" + msgid "" "import a patch\n" "\n" @@ -2597,7 +3034,6 @@ msgid "versioned patch repository not found (see qinit -c)" msgstr "" -#, fuzzy msgid "cloning main repository\n" msgstr "" @@ -2608,7 +3044,6 @@ msgid "stripping applied patches from destination repository\n" msgstr "" -#, fuzzy msgid "updating destination repository\n" msgstr "" @@ -2624,15 +3059,9 @@ msgid "print the name of the next patch" msgstr "" -msgid "all patches applied\n" -msgstr "όλα τα patches έχουν εφαρμοστεί\n" - msgid "print the name of the previous patch" msgstr "προβολή του ονόματος του προηγούμενου patch" -msgid "only one patch applied\n" -msgstr "μόνο ένα patch έχει εφαρμοστεί\n" - msgid "" "create a new patch\n" "\n" @@ -2934,7 +3363,10 @@ msgid "print first line of patch header" msgstr "" -msgid "hg qapplied [-s] [PATCH]" +msgid "show only the last patch" +msgstr "" + +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "" msgid "use pull protocol to copy metadata" @@ -2962,7 +3394,7 @@ msgid "keep patch file" msgstr "" -msgid "stop managing a revision" +msgid "stop managing a revision (DEPRECATED)" msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -2998,7 +3430,6 @@ msgid "import file in patch directory" msgstr "" -#, fuzzy msgid "name of patch file" msgstr "" @@ -3053,7 +3484,8 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "ακύρωση όλων των τοπικών αλλαγών" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3080,16 +3512,16 @@ msgid "refresh only files already in the patch and specified files" msgstr "" -msgid "add/update \"From: <current user>\" in patch" -msgstr "" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +msgid "add/update date field in patch with current date" +msgstr "" + +msgid "add/update date field in patch with given date" msgstr "" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3159,77 +3591,82 @@ msgid "hg qtop [-s]" msgstr "" -msgid "hg qunapplied [-s] [PATCH]" +msgid "show only the first patch" +msgstr "" + +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "" msgid "finish all applied changesets" msgstr "" -msgid "hg qfinish [-a] [REV...]" -msgstr "" - -msgid "" -"hook extension to email notifications on commits/pushes\n" -"\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +msgid "hg qfinish [-a] [REV]..." +msgstr "" + +msgid "" +"hooks for sending email notifications at commit/push time\n" +"\n" +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repository root.\n" -"\n" -" if you like, you can put notify config file in repository that users\n" -" can push changes to, they can manage their own subscriptions." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -3255,17 +3692,13 @@ msgstr "" #, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" - -msgid "" -"browse command output with external pager\n" -"\n" -"To set the pager that should be used, set the application variable:\n" +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "" + +msgid "" +"browse command output with an external pager\n" +"\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" @@ -3274,19 +3707,19 @@ "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" "\n" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting:\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend:\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" @@ -3298,27 +3731,27 @@ msgstr "" msgid "" -"use suffixes to refer to ancestor revisions\n" +"interpret suffixes to refer to ancestor revisions\n" "\n" "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" "\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3327,11 +3760,9 @@ "first line of the changeset description as the subject text. The\n" "message contains two or three body parts:\n" "\n" -" The changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3341,13 +3772,8 @@ "with a diffstat summary and the changeset summary, so you can be sure\n" "you are sending the right changes.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" "To configure other defaults, add a section like this to your hgrc\n" -"file:\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3370,13 +3796,13 @@ "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt:\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out:\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" @@ -3386,7 +3812,11 @@ "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" "directly from the commandline. See the [email] and [smtp] sections in\n" -"hgrc(5) for details." +"hgrc(5) for details.\n" +msgstr "" + +#, python-format +msgid "%sPlease enter a valid value" msgstr "" msgid "Please enter a valid value.\n" @@ -3426,23 +3856,24 @@ " single email containing a binary Mercurial bundle as an attachment\n" " will be sent.\n" "\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -3521,6 +3952,9 @@ msgid "message identifier to reply to" msgstr "" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "" @@ -3551,6 +3985,9 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" +msgid "command to delete untracked files from the working directory" +msgstr "" + msgid "" "removes files not tracked by Mercurial\n" "\n" @@ -3558,13 +3995,16 @@ " and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -3608,16 +4048,13 @@ msgstr "" msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgstr "" - -msgid "first revision, do not change ancestor\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" msgid "" @@ -3663,60 +4100,17 @@ msgid "%d revisions have been skipped\n" msgstr "" -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 " ενημέρωση σε %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 "" @@ -3729,28 +4123,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" +msgid "source is ancestor of destination" +msgstr "" + +msgid "source is descendant of destination" msgstr "" 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 "" @@ -3763,13 +4144,14 @@ 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 "" + +#, fuzzy +msgid "keep original changesets" +msgstr "το %s δεν υπάρχει στα manifests" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -3783,7 +4165,7 @@ "| [-c] | [-a]" msgstr "" -msgid "interactive change selection during commit or qrefresh" +msgid "commands to interactively select changes for commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3817,37 +4199,15 @@ msgid "Record &all changes to all remaining files" msgstr "" -#, fuzzy msgid "&Quit, recording no changes" msgstr "" msgid "&?" msgstr "" -msgid "y" -msgstr "" - -msgid "?" -msgstr "" - msgid "y - record this change" msgstr "" -msgid "s" -msgstr "" - -msgid "f" -msgstr "" - -msgid "d" -msgstr "" - -msgid "a" -msgstr "" - -msgid "q" -msgstr "" - msgid "user quit" msgstr "" @@ -3858,6 +4218,9 @@ msgid " and " msgstr "" +msgid "y" +msgstr "" + #, python-format msgid "record this change to %r?" msgstr "" @@ -3877,19 +4240,19 @@ " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -3901,26 +4264,18 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "" - -msgid "applying patch\n" -msgstr "" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" +msgid "share a common history between several working directories" +msgstr "" + msgid "" "create a new shared repository (experimental)\n" "\n" @@ -3940,7 +4295,7 @@ msgstr "" msgid "" -"patch transplanting tool\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -4003,9 +4358,9 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" @@ -4086,7 +4441,7 @@ msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" +"allow the use of MBCS paths with problematic encodings\n" "\n" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" @@ -4096,40 +4451,63 @@ "operation.\n" "\n" "This extension is useful for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ASCII chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" -"\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" "\n" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" -"\n" -msgstr "" - -#, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" #, python-format @@ -4168,28 +4546,22 @@ msgstr "" msgid "" -"zeroconf support for Mercurial repositories\n" +"discover and advertise repositories on the local network\n" "\n" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" "without knowing their actual IP address.\n" "\n" -"To use the zeroconf extension add the following entry to your hgrc\n" -"file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -4231,7 +4603,6 @@ msgid "premature EOF reading chunk (got %d bytes, expected %d)" msgstr "" -#, fuzzy msgid "empty username" msgstr "" @@ -4428,6 +4799,10 @@ msgid "HG: branch '%s'" msgstr "" +#, fuzzy, python-format +msgid "HG: subrepo %s" +msgstr "καθαρισμός %s\n" + #, python-format msgid "HG: added %s" msgstr "" @@ -4436,7 +4811,7 @@ msgid "HG: changed %s" msgstr "προσθήκη αλλαγής %s\n" -#, fuzzy, python-format +#, python-format msgid "HG: removed %s" msgstr "" @@ -4454,7 +4829,7 @@ " repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -4482,11 +4857,11 @@ " commit.\n" "\n" " Use the -s/--similarity option to detect renamed files. With a\n" -" parameter > 0, this compares every removed file with every added\n" -" file and records those similar enough as renames. This option\n" -" takes a percentage between 0 (disabled) and 100 (files must be\n" -" identical) as its parameter. Detecting renamed files this way can\n" -" be expensive.\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" @@ -4529,14 +4904,14 @@ " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -4599,10 +4974,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -4666,10 +5037,6 @@ msgstr "" #, python-format -msgid "cannot find executable: %s" -msgstr "" - -#, python-format msgid "failed to execute %s" msgstr "" @@ -4682,7 +5049,7 @@ msgstr "Αλλαγή: %s: %s\n" #, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" msgid "" @@ -4701,7 +5068,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -4720,9 +5088,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -4737,9 +5107,11 @@ " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null). To change the compression method\n" -" applied, use the -t/--type option (by default, bundles are\n" -" compressed using bz2).\n" +" -a/--all (or --base null).\n" +"\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -4766,11 +5138,11 @@ "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" @@ -4809,7 +5181,7 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -4819,7 +5191,6 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" " " msgstr "" @@ -4843,6 +5214,9 @@ " " msgstr "" +msgid "nothing changed\n" +msgstr "" + msgid "created new head\n" msgstr "δημιουργήθηκε νέο παρακλάδι\n" @@ -4996,8 +5370,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5079,16 +5453,16 @@ " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -5112,6 +5486,27 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" @@ -5138,25 +5533,31 @@ "\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 children 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.\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 "" +msgid "you must specify a branch to use --closed" +msgstr "" + #, python-format msgid "no open branch heads on branch %s\n" msgstr "" @@ -5222,25 +5623,21 @@ msgid "no commands defined\n" msgstr "δεν έχει οριστεί καμία εντολή\n" -msgid "" -"\n" -"enabled extensions:\n" -"\n" +#, fuzzy +msgid "enabled extensions:" msgstr "" "\n" "ενεργές επεκτάσεις:\n" "\n" -#, python-format -msgid " %s %s\n" -msgstr "" - msgid "no help text available" msgstr "δεν υπάρχει κείμενο βοήθειας" -#, python-format -msgid "%s extension - %s\n" -msgstr "" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" +msgstr "** Ενεργές επεκτάσεις: %s\n" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Κατανεμημένο SCM\n" @@ -5306,7 +5703,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5317,14 +5715,6 @@ msgid "no diffs found" msgstr "" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"meddelse:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "" @@ -5552,7 +5942,6 @@ "\n" " Please see 'hg help urls' for important details about ssh://\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" " " msgstr "" @@ -5584,24 +5973,21 @@ "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" " " msgstr "" -msgid "no files specified" -msgstr "" - #, python-format msgid "not removing %s: file is untracked\n" msgstr "" @@ -5650,9 +6036,10 @@ " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" "\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" @@ -5738,12 +6125,13 @@ " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" -" any dirstate changes since that time.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -5804,19 +6192,117 @@ " If two revisions are given, the differences between them are\n" " shown.\n" "\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = missing (deleted by non-hg command, but still tracked)\n" -" ? = not tracked\n" -" I = ignored\n" -" = origin of the previous file listed as A (added)\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" +" " +msgstr "" + +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 "" #, fuzzy +msgid " (empty repository)" +msgstr "δε μπορεί να δημιουργηθεί ένα νέο αποθετήριο μέσω http" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "αλλαγή" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "Αλλαγή: %s: %s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "" + +#, python-format +msgid "%d added" +msgstr "" + +#, fuzzy, python-format +msgid "%d modified" +msgstr "έχει τροποποιηθεί" + +#, python-format +msgid "%d removed" +msgstr "" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, python-format +msgid "%d ignored" +msgstr "" + +#, python-format +msgid "%d unknown" +msgstr "" + +#, python-format +msgid "%d unresolved" +msgstr "" + +msgid " (merge)" +msgstr "" + +msgid " (new branch)" +msgstr "" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "τώρα στο: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "απομακρυσμένο:" + +#, fuzzy +msgid "remote: (synced)\n" +msgstr "απομακρυσμένο:" + +#, fuzzy msgid "" "add one or more tags for the current or given revision\n" "\n" @@ -5887,17 +6373,9 @@ msgstr "" #, python-format -msgid "Removed tag %s" -msgstr "" - -#, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "" - msgid "" "list repository tags\n" "\n" @@ -5944,7 +6422,8 @@ "\n" " When there are uncommitted changes, use option -C/--clean to\n" " discard them, forcibly replacing the state of the working\n" -" directory with the requested revision.\n" +" directory with the requested revision. Alternately, use -c/--check\n" +" to abort.\n" "\n" " When there are uncommitted changes and option -C/--clean is not\n" " used, and the parent revision and requested revision are on the\n" @@ -5960,6 +6439,13 @@ " " msgstr "" +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" + +#, fuzzy +msgid "uncommitted local changes" +msgstr "υπάρχουν τοπικές αλλαγές ακόμη" + msgid "" "verify the integrity of the repository\n" "\n" @@ -5986,7 +6472,7 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -msgid "repository root directory or symbolic path name" +msgid "repository root directory or name of overlay bundle file" msgstr "" msgid "change working directory" @@ -6178,6 +6664,9 @@ msgid "show only branches that have unmerged heads" msgstr "" +msgid "show normal and closed branches" +msgstr "" + msgid "[-a]" msgstr "" @@ -6324,10 +6813,10 @@ msgid "show only heads which are descendants of REV" msgstr "" -msgid "show only the active heads from open branches" -msgstr "" - -msgid "show normal and closed heads" +msgid "show only the active branch heads from open branches" +msgstr "" + +msgid "show normal and closed branch heads" msgstr "" msgid "[-r STARTREV] [REV]..." @@ -6336,7 +6825,6 @@ msgid "[TOPIC]" msgstr "" -#, fuzzy msgid "identify the specified revision" msgstr "" @@ -6408,7 +6896,6 @@ msgid "only follow the first parent of merge changesets" msgstr "" -#, fuzzy msgid "show revisions matching date spec" msgstr "" @@ -6460,7 +6947,6 @@ msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgstr "" -#, fuzzy msgid "show parents from the specified revision" msgstr "" @@ -6564,6 +7050,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "" @@ -6624,10 +7113,14 @@ msgid "overwrite locally modified files (no backup)" msgstr "" +#, fuzzy +msgid "check for uncommitted changes" +msgstr "υπάρχουν τοπικές αλλαγές ακόμη" + msgid "[-C] [-d DATE] [[-r] REV]" msgstr "" -#, fuzzy, python-format +#, python-format msgid "config error at %s:%d: '%s'" msgstr "" @@ -6637,36 +7130,6 @@ msgid "branch name not in UTF-8!" msgstr "" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "" - -#, 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 "" - -#, python-format -msgid " dir %s -> %s\n" -msgstr "" - -#, python-format -msgid " file %s -> %s\n" -msgstr "" - #, fuzzy msgid "working directory state appears damaged!" msgstr "χώρος εργασίας του %s" @@ -6714,6 +7177,10 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -6722,10 +7189,6 @@ " %s\n" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "" @@ -6794,7 +7257,7 @@ msgid "** unknown exception encountered, details follow\n" msgstr "" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "** or mercurial@selenic.com\n" @@ -6820,12 +7283,6 @@ msgid "alias '%s' resolves to ambiguous command '%s'\n" msgstr "" -#, fuzzy, python-format -msgid "alias '%s' shadows command\n" -msgstr "" -"λίστα εντολών:\n" -"\n" - #, python-format msgid "malformed --config option: %s" msgstr "" @@ -6890,10 +7347,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?" @@ -6905,9 +7358,6 @@ msgid "&Other" msgstr "" -msgid "l" -msgstr "" - #, python-format msgid "merging %s and %s to %s\n" msgstr "" @@ -6917,13 +7367,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)?" @@ -6935,9 +7378,6 @@ msgid "&Yes" msgstr "" -msgid "n" -msgstr "" - #, python-format msgid "merging %s failed!\n" msgstr "" @@ -6950,494 +7390,43 @@ msgid "unknown bisect kind %s" msgstr "" +#, fuzzy +msgid "disabled extensions:" +msgstr "" +"\n" +"ενεργές επεκτάσεις:\n" +"\n" + msgid "Date Formats" msgstr "" -#, fuzzy -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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:\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 "File Name Patterns" msgstr "" -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 only\n" -" match 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 of\n" -" 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 "" -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" -" * 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 "" -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 topological offsets from the tip, with -1 denoting\n" -" the tip. As such, negative numbers are only useful if you've\n" -" memorized your local tree numbers and want to save typing a single\n" -" digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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 "" -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 "" -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 default.\n" -" - date: Date information. The date when the changeset was 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 by\n" -" 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 number.\n" -" - tags: List of strings. Any tags associated with the 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing separators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\n" -" - stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an\n" -" email address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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\n" -" in email headers.\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 address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "" -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\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" -" - 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 " -"path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [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" -" " +msgid "Using additional features" msgstr "" msgid "can only share local repositories" msgstr "" -#, fuzzy msgid "destination already exists" msgstr "" @@ -7452,7 +7441,7 @@ msgid "destination '%s' already exists" msgstr "" -#, fuzzy, python-format +#, python-format msgid "destination '%s' is not empty" msgstr "" @@ -7464,27 +7453,20 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updated" -msgstr "" - -msgid "merged" -msgstr "" - -msgid "removed" -msgstr "" - -msgid "unresolved" -msgstr "" - -#, python-format -msgid "%d files %s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr " ενημέρωση σε %d:%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 "" 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 "" @@ -7498,7 +7480,6 @@ msgid "SSL support is unavailable" msgstr "" -#, fuzzy msgid "IPv6 is not available on this system" msgstr "" @@ -7561,32 +7542,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 "" @@ -7595,10 +7556,6 @@ msgstr "" #, python-format -msgid "requested URL: '%s'\n" -msgstr "" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -7633,7 +7590,7 @@ msgstr "δε μπορεί να δημιουργηθεί ένα νέο αποθετήριο μέσω http" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -7663,21 +7620,6 @@ msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "" -#, python-format -msgid "%s, line %s: %s\n" -msgstr "%s, γραμμή %s: %s\n" - -msgid "cannot parse entry" -msgstr "" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "" - -#, python-format -msgid "tag '%s' refers to unknown node" -msgstr "" - #, fuzzy, python-format msgid "working directory has unknown parent '%s'!" msgstr "χώρος εργασίας του %s" @@ -7686,10 +7628,6 @@ msgid "unknown revision '%s'" msgstr "" -#, python-format -msgid "filtering %s through %s\n" -msgstr "" - msgid "journal already exists - run hg recover" msgstr "" @@ -7721,14 +7659,6 @@ msgid "working directory of %s" msgstr "χώρος εργασίας του %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 "" @@ -7742,9 +7672,6 @@ msgid "file not tracked!" msgstr "" -msgid "nothing changed\n" -msgstr "" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "" @@ -7797,41 +7724,6 @@ msgid "searching for changes\n" msgstr "" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "" - -#, python-format -msgid "found new changeset %s\n" -msgstr "" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -7841,16 +7733,6 @@ msgid "repository is unrelated" msgstr "" -msgid "found new changesets starting at " -msgstr "" - -#, python-format -msgid "%d total queries\n" -msgstr "" - -msgid "common changesets up to " -msgstr "" - msgid "requesting all changes\n" msgstr "" @@ -7876,17 +7758,10 @@ msgid "%d changesets found\n" msgstr "" -msgid "list of changesets:\n" -msgstr "" - #, python-format msgid "empty or missing revlog for %s" msgstr "" -#, python-format -msgid "add changeset %s\n" -msgstr "προσθήκη αλλαγής %s\n" - msgid "adding changesets\n" msgstr "προσθήκη αλλαγών\n" @@ -7899,10 +7774,6 @@ msgid "adding file changes\n" msgstr "" -#, python-format -msgid "adding %s revisions\n" -msgstr "" - msgid "received file revlog group is empty" msgstr "" @@ -7914,9 +7785,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "" @@ -7937,10 +7805,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -8022,14 +7886,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?" @@ -8041,9 +7897,6 @@ msgid "&Delete" msgstr "" -msgid "c" -msgstr "" - #, python-format msgid "" "remote changed %s which local deleted\n" @@ -8054,10 +7907,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -8105,13 +7954,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 "" @@ -8181,9 +8023,9 @@ msgid "Unsupported line endings type: %s" msgstr "" -#, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" +#, fuzzy, python-format +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" +msgstr "%d αρχεία, %d αλλαγές, %d εκδόσεις αρχείων\n" #, python-format msgid "exited with status %d" @@ -8194,13 +8036,6 @@ msgstr "" #, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" - -#, python-format msgid "saving bundle to %s\n" msgstr "" @@ -8227,7 +8062,7 @@ msgid "index %s unknown format %d" msgstr "" -#, fuzzy, python-format +#, python-format msgid "index %s is corrupted" msgstr "" @@ -8271,12 +8106,12 @@ msgid "could not create remote repo" msgstr "" +msgid "no suitable response from remote hg" +msgstr "" + msgid "remote: " msgstr "απομακρυσμένο:" -msgid "no suitable response from remote hg" -msgstr "" - #, python-format msgid "push refused: %s" msgstr "" @@ -8294,17 +8129,6 @@ 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 "" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -8315,9 +8139,6 @@ msgid "&Remote" msgstr "απομακρυσμένο:" -msgid "r" -msgstr "" - #, python-format msgid "" " local changed subrepository %s which remote removed\n" @@ -8338,14 +8159,25 @@ msgid "pulling subrepo %s\n" msgstr "καθαρισμός %s\n" -#, fuzzy, python-format +#, python-format msgid "pushing subrepo %s\n" msgstr "" +#, python-format +msgid "%s, line %s: %s\n" +msgstr "%s, γραμμή %s: %s\n" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + msgid "unmatched quotes" msgstr "" -#, fuzzy, python-format +#, python-format msgid "error expanding '%s%%%s'" msgstr "" @@ -8407,12 +8239,12 @@ msgid "username %s contains a newline\n" msgstr "" +msgid "response expected" +msgstr "" + msgid "unrecognized response\n" msgstr "" -msgid "response expected" -msgstr "" - msgid "password: " msgstr "κωδικός: " @@ -8441,10 +8273,6 @@ msgstr "" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -8641,12 +8469,18 @@ msgid "unpacking %s" msgstr "εξαγωγή του %s" +#, fuzzy, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "" +"προειδοποίηση: %s@%s: η έκδοση προέλευσης της αντιγραφής αρχείου είναι το " +"nullid %s:%s" + #, python-format msgid "empty or missing copy source revlog %s:%s" msgstr "κενό ή μη έγκυρο revlog προέλευσης %s:%s" -#, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +#, fuzzy, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" "προειδοποίηση: %s@%s: η έκδοση προέλευσης της αντιγραφής αρχείου είναι το " "nullid %s:%s" @@ -8681,99 +8515,3 @@ msgid "user name not available - set USERNAME environment variable" msgstr "" - -#~ msgid "return tuple of (match function, list enabled)." -#~ msgstr "επιστρέφει ένα tuple (match function, list enabled)." - -#~ msgid "" -#~ "allow user-defined command aliases\n" -#~ "\n" -#~ "To use, create entries in your hgrc of the form\n" -#~ "\n" -#~ "[alias]\n" -#~ "mycmd = cmd --args\n" -#~ msgstr "" -#~ "ορισμός προσαρμοσμένων εντολών\n" -#~ "\n" -#~ "Για να ορίσετε δικές σας εντολές, προσθέστε στο αρχείο hgrc ένα τμήμα\n" -#~ "σαν το παρακάτω\n" -#~ "\n" -#~ "[alias]\n" -#~ "mycmd = cmd --args\n" - -#~ msgid "" -#~ "defer command lookup until needed, so that extensions loaded\n" -#~ " after alias can be aliased" -#~ msgstr "" -#~ "καθυστέρηση ελέγχου εντολών μέχρι να έχουν φορτωθεί όλες οι\n" -#~ " επεκτάσεις και να ορισθούν όλα τα aliases" - -#~ msgid "*** [alias] %s: command %s is unknown" -#~ msgstr "*** [alias] %s: η εντολή %s είναι άγνωστη" - -#~ msgid "*** [alias] %s: command %s is ambiguous" -#~ msgstr "*** [alias] %s: η εντολή %s είναι ασαφής" - -#~ msgid "*** [alias] %s: circular dependency on %s" -#~ msgstr "*** [alias] %s: κυκλική εξάρτηση από την εντολή %s" - -#~ msgid "*** [alias] %s: no definition\n" -#~ msgstr "*** [alias] %s: δεν υπάρχει ορισμός\n" - -#~ msgid "" -#~ "Strip bookmarks if revisions are stripped using\n" -#~ " the mercurial.strip method. This usually happens during\n" -#~ " qpush and qpop" -#~ msgstr "" -#~ "Αφαίρεση των σελιδοδεικτών όταν αφαιρούνται κάποιες\n" -#~ " αλλαγές από το αποθετήριο με τη μέθοδο mercurial.strip.\n" -#~ " Αυτό γίνεται συνήθως με τις εντολές qpush και qpop" - -#~ msgid "" -#~ "Add a revision to the repository and\n" -#~ " move the bookmark" -#~ msgstr "" -#~ "Προσθήκη μιας αλλαγής στο αποθετήριο και\n" -#~ " μετακίνηση του σελιδοδείκτη" - -#~ msgid "Merge bookmarks with normal tags" -#~ msgstr "Συγχώνευση σελιδοδεικτών με τα κανονικά tags" - -#~ msgid "" -#~ "Set the current bookmark\n" -#~ "\n" -#~ " If the user updates to a bookmark we update the .hg/bookmarks." -#~ "current\n" -#~ " file.\n" -#~ " " -#~ msgstr "" -#~ "Ορισμός ενεργού σελιδοδείκτη\n" -#~ "\n" -#~ " Αυτόματη ενημέρωση του .hg/bookmarks.current κάθε φορά που ο χρήστης\n" -#~ " εξάγει τα αρχεία με βάση ένα σελιδοδείκτη.\n" -#~ " " - -#~ msgid "support for bugzilla version 2.16." -#~ msgstr "υποστήριξη για το buzgilla 2.16." - -#~ msgid "run a query." -#~ msgstr "εκτέλεση μιας αίτησης." - -#~ msgid "look up numeric bugzilla user id." -#~ msgstr "αναζήτηση χρήστη με βάση τον αριθμό id του." - -#~ msgid "map name of committer to bugzilla user name." -#~ msgstr "" -#~ "αντιστοίχηση ονόματος συγγραφέα αλλαγών με όνομα χρήστη στο bugzilla." - -#~ msgid "support for bugzilla 2.18 series." -#~ msgstr "υποστήριξη για τη σειρά bugzilla 2.18." - -#~ msgid "support for bugzilla 3.0 series." -#~ msgstr "υποστήριξη για τη σειρά bugzilla 3.0." - -#~ msgid "unable to open %s: %s" -#~ msgstr "" - -#~ msgid "%s, please check your locale settings" -#~ msgstr ""
--- a/i18n/fr.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/fr.po Sat Nov 07 14:13:15 2009 -0600 @@ -86,8 +86,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-07-18 22:46+0200\n" -"PO-Revision-Date: 2009-05-14 13:06+0200\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:43+0100\n" "Last-Translator: Cedric Duval <cedricduval@free.fr>\n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -105,8 +105,11 @@ msgid "COMMANDS" msgstr "" -msgid " options:\n" -msgstr "" +#, fuzzy +msgid "" +" options:\n" +"\n" +msgstr "options :\n" #, python-format msgid "" @@ -115,6 +118,507 @@ msgstr "" 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 "" + +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 "" + +#, fuzzy +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 "" +"\n" +" Mercurial a la capacité de s'enrichir de nouvelles\n" +" fonctionnalités par le biais d'extensions. Les extensions\n" +" permettent d'ajouter des nouvelles commandes, de changer le\n" +" comportement de commandes existantes ou leur ajouter des\n" +" options, ou encore d'implémenter de nouveaux \"hooks\".\n" +"\n" +" Les extensions ne sont pas chargées automatiquement par défaut\n" +" pour diverses raisons : elles peuvent accroître la latence\n" +" de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" +" une utilisation avancée ; elle peuvent fournir des\n" +" fonctionnalités potentiellement dangereuses, comme de vous\n" +" permettre de modifier ou détruire l'historique du dépôt ; elles\n" +" peuvent ne pas être encore prêtes à être utilisées par le plus\n" +" grand nombre ; ou encore elles peuvent modifier certains des\n" +" comportements habituels de Mercurial.\n" +" Il appartient donc à l'utilisateur de les activer en fonction\n" +" de ses besoins.\n" +"\n" +" Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" +" présente dans le chemin de recherche de Python, déclarez-la\n" +" dans votre fichier de configuration hgrc comme suit :\n" +"\n" +" [extensions]\n" +" truc =\n" +"\n" +" Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" +"\n" +" [extensions]\n" +" monbidule = ~/.hgext/monbidule.py\n" +"\n" +" Pour forcer la désactivation d'une extension activée par un\n" +" autre hgrc, précédez son chemin d'un point d'exclamation :\n" +"\n" +" [extensions]\n" +" # désactivation de machin qui se trouve dans /vers/machin.py\n" +" hgext.bar = !/vers/machin.py\n" +" # idem, mais aucun chemin n'avait été donné pour chose \n" +" hgext.chose = !\n" +" " + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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" @@ -131,7 +635,7 @@ "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" +"To use this hook, configure the acl extension in your hgrc like this::\n" "\n" " [extensions]\n" " hgext.acl =\n" @@ -144,10 +648,10 @@ " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" " sources = serve\n" "\n" -"The allow and deny sections take a subtree pattern as key (with a\n" -"glob syntax by default), and a comma separated list of users as\n" -"the corresponding value. The deny list is checked before the allow\n" -"list is.\n" +"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" @@ -163,52 +667,28 @@ msgstr "" #, python-format -msgid "acl: %s not enabled\n" -msgstr "" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "" - 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,\n" -"the bookmark shifts to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup\n" -"(e.g. hg merge, hg update).\n" +"changeset that is based on a changeset that has a bookmark on it, the\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" "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" +"your .hgrc::\n" "\n" " [bookmarks]\n" " track.current = True\n" @@ -283,65 +763,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" @@ -354,7 +855,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" @@ -362,8 +863,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" @@ -372,7 +874,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" @@ -495,7 +997,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" @@ -510,19 +1012,15 @@ " 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" -" <alias email> <actual email>\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" +" <alias email> <actual email>\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 "" -#, python-format -msgid "assuming %i character terminal\n" -msgstr "" - msgid "count rate for the specified revision or range" msgstr "" @@ -564,39 +1062,39 @@ "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" -"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" +msgid "don't colorize output (DEPRECATED)" msgstr "" #, python-format @@ -610,6 +1108,7 @@ "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" @@ -621,6 +1120,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -632,23 +1132,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 <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" <source ID> <destination ID>\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" @@ -662,7 +1167,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" @@ -672,11 +1177,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" @@ -701,7 +1206,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" @@ -726,43 +1231,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" @@ -808,7 +1301,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -926,10 +1418,6 @@ msgstr "" #, python-format -msgid "running: %s\n" -msgstr "" - -#, python-format msgid "%s error:\n" msgstr "" @@ -1007,17 +1495,9 @@ 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" -msgstr "" +#, fuzzy, python-format +msgid "revision %s is not a patchset number" +msgstr "la révision %d n'est pas parente de la pile" #, python-format msgid "connecting to %s\n" @@ -1062,10 +1542,6 @@ msgid "running %s\n" msgstr "" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "" - msgid "RCS file must be followed by working file" msgstr "" @@ -1079,10 +1555,6 @@ msgstr "" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1106,13 +1578,13 @@ msgid "%d changeset entries\n" msgstr "" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "" -#, python-format -msgid "cleaning up %s\n" -msgstr "" - msgid "internal calling inconsistency" msgstr "" @@ -1147,22 +1619,6 @@ msgstr "" #, 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 "" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1174,12 +1630,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 "" @@ -1198,12 +1648,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 "" @@ -1218,6 +1662,9 @@ msgid "collecting p4 changelists\n" msgstr "" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1268,69 +1715,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 "entry %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 "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 "" @@ -1350,14 +1750,14 @@ msgid "" "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 diff\n" -"programs are called with a configurable set of options and two\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" -"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" @@ -1373,14 +1773,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 "" @@ -1396,14 +1795,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 "" @@ -1439,6 +1830,21 @@ 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 "" @@ -1506,10 +1912,6 @@ msgstr "" #, python-format -msgid "Automated merge with %s" -msgstr "" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" @@ -1581,10 +1983,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1660,38 +2058,38 @@ msgid "" "hooks for integrating with the CIA.vc notification service\n" "\n" -"This is meant to be run as a changegroup or incoming hook.\n" -"To configure it, set the following options in your hgrc:\n" -"\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" +"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 @@ -1701,12 +2099,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" @@ -1722,19 +2114,19 @@ "\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" @@ -1824,10 +2216,10 @@ "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"There is a single configuration option:\n" -"\n" -"[web]\n" -"pygments_style = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" msgstr "" @@ -1866,9 +2258,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 "" @@ -1877,9 +2266,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 "" @@ -1937,10 +2323,6 @@ msgstr "" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "" @@ -2009,12 +2391,12 @@ msgid "" "expand expressions into changelog and summaries\n" "\n" -"This extension allows the use of a special syntax in summaries,\n" -"which will be automatically expanded into links or any other\n" -"arbitrary expression, much like InterWiki does.\n" -"\n" -"A few example patterns (link to bug tracking, etc.) that may\n" -"be used in your hgrc:\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" @@ -2044,20 +2426,22 @@ "Configuration is done in the [keyword] and [keywordmaps] sections of\n" "hgrc files.\n" "\n" -"Example:\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repositories.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" "\n" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" @@ -2076,8 +2460,8 @@ "have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" msgstr "" #, python-format @@ -2100,10 +2484,12 @@ " Show current, custom, or default keyword template maps and their\n" " expansions.\n" "\n" -" Extend current configuration by specifying maps as arguments and\n" -" optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" @@ -2111,31 +2497,42 @@ msgid "creating temporary repository at %s\n" msgstr "" -#, python-format -msgid "" -"\n" -"\tconfig using %s keyword template maps\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +msgid "\tdisabling current template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"\t%s keywords expanded%s\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" +msgid "" +"\n" +"\tkeywords expanded\n" msgstr "" msgid "" @@ -2154,20 +2551,19 @@ " [keyword] configuration patterns.\n" "\n" " Useful to prevent inadvertent keyword expansion and to speed up\n" -" execution by including only files that are actual candidates\n" -" for expansion.\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" "\n" " 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" -" of files are:\n" -" K = keyword expansion candidate\n" -" k = keyword expansion candidate (untracked)\n" -" I = ignored\n" -" i = ignored (untracked)\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2199,7 +2595,13 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +msgid "only show unknown (not tracked) files" +msgstr "" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2208,6 +2610,7 @@ msgid "hg kwshrink [OPTION]... [FILE]..." msgstr "" +#, fuzzy msgid "" "manage a stack of patches\n" "\n" @@ -2218,19 +2621,18 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" "gestion et utilisation d'une pile de patchs\n" "\n" @@ -2274,10 +2676,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2496,6 +2894,10 @@ msgid "deletions found between repo revs" msgstr "suppressions trouvées entre des révisions du dépôt" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "application de %s\n" + msgid "patch queue now empty\n" msgstr "la pile de patchs est maintenant vide\n" @@ -2629,9 +3031,15 @@ msgid "print the patches already applied" msgstr "affiche les patchs déjà appliqués" +msgid "only one patch applied\n" +msgstr "un seul patch d'appliqué\n" + msgid "print the patches not yet applied" msgstr "affiche les patchs non encore appliqués" +msgid "all patches applied\n" +msgstr "tous les patchs ont été appliqués\n" + msgid "" "import a patch\n" "\n" @@ -2759,15 +3167,9 @@ msgid "print the name of the next patch" msgstr "affiche le nom du prochain patch" -msgid "all patches applied\n" -msgstr "tous les patchs ont été appliqués\n" - msgid "print the name of the previous patch" msgstr "affiche le nom du patch précédent" -msgid "only one patch applied\n" -msgstr "un seul patch d'appliqué\n" - msgid "" "create a new patch\n" "\n" @@ -3129,7 +3531,11 @@ msgid "print first line of patch header" msgstr "affiche la première ligne de l'en-tête d'un patch" -msgid "hg qapplied [-s] [PATCH]" +msgid "show only the last patch" +msgstr "" + +#, fuzzy +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" @@ -3246,7 +3652,8 @@ msgid "queue name to pop" msgstr "nom de la pile à dépiler" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "oublier toute modification locale" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3275,16 +3682,18 @@ "ne rafraîchir que les fichiers déjà présent dans le patch et ceux " "explicitement spécifiés" -msgid "add/update \"From: <current user>\" in patch" -msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +#, fuzzy +msgid "add/update date field in patch with current date" +msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" + +#, fuzzy +msgid "add/update date field in patch with given date" msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3353,7 +3762,11 @@ msgid "hg qtop [-s]" msgstr "hg qtop [-s]" -msgid "hg qunapplied [-s] [PATCH]" +msgid "show only the first patch" +msgstr "" + +#, fuzzy +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" @@ -3365,65 +3778,67 @@ msgid "" "hooks for sending email notifications at commit/push time\n" "\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repository root.\n" -"\n" -" if you like, you can put notify config file in repository that users\n" -" can push changes to, they can manage their own subscriptions." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -3449,17 +3864,13 @@ 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 "" "browse command output with an external pager\n" "\n" -"To set the pager that should be used, set the application variable:\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" @@ -3468,19 +3879,19 @@ "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" "\n" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting:\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend:\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" @@ -3493,21 +3904,22 @@ # première ligne trop longue -> traduction abrégée (à retraduire quand hg # sera capable de replier automatiquement la première ligne d'aide) +#, fuzzy msgid "" "interpret suffixes to refer to ancestor revisions\n" "\n" "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" "\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" @@ -3532,6 +3944,7 @@ # première ligne trop longue -> traduction abrégée (à retraduire quand hg # sera capable de replier automatiquement la première ligne d'aide) +#, fuzzy msgid "" "command to send changesets as (a series of) patch emails\n" "\n" @@ -3542,11 +3955,9 @@ "first line of the changeset description as the subject text. The\n" "message contains two or three body parts:\n" "\n" -" The changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3557,7 +3968,7 @@ "you are sending the right changes.\n" "\n" "To configure other defaults, add a section like this to your hgrc\n" -"file:\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3580,13 +3991,13 @@ "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt:\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out:\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" @@ -3596,7 +4007,7 @@ "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" "directly from the commandline. See the [email] and [smtp] sections in\n" -"hgrc(5) for details." +"hgrc(5) for details.\n" msgstr "" "envoi d'une série de \"changesets\" par courrier électronique\n" "\n" @@ -3671,6 +4082,10 @@ "ligne de commande. Consulter les sections [email] et [smtp] dans la\n" "page de manuel hgrc(5) pour plus de détails." +#, fuzzy, python-format +msgid "%sPlease enter a valid value" +msgstr "Veuillez fournir une valeur valide.\n" + msgid "Please enter a valid value.\n" msgstr "Veuillez fournir une valeur valide.\n" @@ -3680,6 +4095,7 @@ msgid "diffstat rejected" msgstr "résumé des modifications rejeté" +#, fuzzy msgid "" "send changesets by email\n" "\n" @@ -3708,23 +4124,24 @@ " single email containing a binary Mercurial bundle as an attachment\n" " will be sent.\n" "\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -3864,6 +4281,9 @@ msgid "message identifier to reply to" msgstr "identifiant du message auquel répondre" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "adresses électroniques des destinataires" @@ -3901,6 +4321,7 @@ msgid "command to delete untracked files from the working directory" msgstr "" +#, fuzzy msgid "" "removes files not tracked by Mercurial\n" "\n" @@ -3908,13 +4329,16 @@ " and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -3992,10 +4416,7 @@ "repository.\n" "\n" "For more information:\n" -"http://mercurial.selenic.com/wiki/RebaseProject\n" -msgstr "" - -msgid "first revision, do not change ancestor\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" msgid "" @@ -4041,60 +4462,17 @@ msgid "%d revisions have been skipped\n" msgstr "" -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 "" - -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 "" @@ -4107,28 +4485,17 @@ 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 "" +#, fuzzy +msgid "source is ancestor of destination" +msgstr "le répertoire racine ne peut servir de destination" + +#, fuzzy +msgid "source is descendant of destination" +msgstr "le répertoire racine ne peut servir de destination" 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 "" @@ -4141,13 +4508,14 @@ 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 "" + +#, fuzzy +msgid "keep original changesets" +msgstr "ne pas considérer la révision" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -4201,30 +4569,9 @@ msgid "&?" msgstr "" -msgid "y" -msgstr "" - -msgid "?" -msgstr "" - msgid "y - record this change" msgstr "" -msgid "s" -msgstr "" - -msgid "f" -msgstr "" - -msgid "d" -msgstr "" - -msgid "a" -msgstr "" - -msgid "q" -msgstr "" - msgid "user quit" msgstr "" @@ -4235,6 +4582,9 @@ msgid " and " msgstr "" +msgid "y" +msgstr "" + #, python-format msgid "record this change to %r?" msgstr "" @@ -4254,19 +4604,19 @@ " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -4278,20 +4628,9 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "" - -msgid "applying patch\n" -msgstr "" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" @@ -4382,9 +4721,9 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" @@ -4475,19 +4814,22 @@ "operation.\n" "\n" "This extension is useful for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ASCII chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" "\n" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" @@ -4495,44 +4837,40 @@ msgstr "" #, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" 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" -"To perform automatic newline conversion, use:\n" -"\n" -"[extensions]\n" -"hgext.win32text =\n" -"[encode]\n" -"** = cleverencode:\n" -"# or ** = macencode:\n" -"\n" -"[decode]\n" -"** = cleverdecode:\n" -"# or ** = macdecode:\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" "\n" "If not doing conversion, to make sure you do not commit CRLF/CR by " -"accident:\n" -"\n" -"[hooks]\n" -"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" "\n" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled:\n" -"\n" -"[hooks]\n" -"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" #, python-format @@ -4570,6 +4908,7 @@ "** = %sdecode:\n" msgstr "" +#, fuzzy msgid "" "discover and advertise repositories on the local network\n" "\n" @@ -4578,15 +4917,15 @@ "without knowing their actual IP address.\n" "\n" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" "découverte et annonce de dépôts sur le réseau local\n" "\n" @@ -4890,11 +5229,11 @@ " commit.\n" "\n" " Use the -s/--similarity option to detect renamed files. With a\n" -" parameter > 0, this compares every removed file with every added\n" -" file and records those similar enough as renames. This option\n" -" takes a percentage between 0 (disabled) and 100 (files must be\n" -" identical) as its parameter. Detecting renamed files this way can\n" -" be expensive.\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" @@ -4930,6 +5269,7 @@ msgid "%s: binary file\n" msgstr "" +#, fuzzy msgid "" "create an unversioned archive of a repository revision\n" "\n" @@ -4937,14 +5277,14 @@ " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -5033,10 +5373,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -5127,10 +5463,6 @@ msgstr "arguments incompatibles" #, python-format -msgid "cannot find executable: %s" -msgstr "exécutable %s introuvable" - -#, python-format msgid "failed to execute %s" msgstr "impossible d'exécuter %s" @@ -5142,8 +5474,8 @@ msgid "Changeset %d:%s: %s\n" msgstr "\"Changeset\" %d:%s: %s\n" -#, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +#, fuzzy, python-format +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n" msgid "" @@ -5232,11 +5564,11 @@ "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" @@ -5275,7 +5607,7 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -5285,7 +5617,6 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" " " msgstr "" @@ -5548,16 +5879,16 @@ " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -5628,26 +5959,31 @@ "\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 "" +msgid "you must specify a branch to use --closed" +msgstr "" + #, python-format msgid "no open branch heads on branch %s\n" msgstr "" @@ -5720,8 +6056,10 @@ msgid "no help text available" msgstr "pas d'aide disponible" -#, python-format -msgid "%s extension - %s\n" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" msgstr "extension %s - %s\n" msgid "Mercurial Distributed SCM\n" @@ -5800,12 +6138,6 @@ msgid "no diffs found" msgstr "" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" - msgid "not a Mercurial patch" msgstr "" @@ -6063,15 +6395,15 @@ "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" @@ -6126,9 +6458,10 @@ " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" "\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" @@ -6218,7 +6551,7 @@ " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -6279,18 +6612,115 @@ " If two revisions are given, the differences between them are\n" " shown.\n" "\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = missing (deleted by non-hg command, but still tracked)\n" -" ? = not tracked\n" -" I = ignored\n" -" = origin of the previous file listed as A (added)\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" +" " +msgstr "" + +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 "" +#, fuzzy +msgid " (empty repository)" +msgstr "clônage du dépôt des patchs\n" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "aucune révision spécifiée" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "abandon : %s : %s\n" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "abandon : %s\n" + +#, python-format +msgid "%d added" +msgstr "" + +#, python-format +msgid "%d modified" +msgstr "" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "%s ne peut être supprimé" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, python-format +msgid "%d ignored" +msgstr "" + +#, python-format +msgid "%d unknown" +msgstr "" + +#, python-format +msgid "%d unresolved" +msgstr "" + +msgid " (merge)" +msgstr "" + +msgid " (new branch)" +msgstr "" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "abandon : %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "suppression de %s\n" + +msgid "remote: (synced)\n" +msgstr "" + msgid "" "add one or more tags for the current or given revision\n" "\n" @@ -6336,17 +6766,9 @@ msgstr "" #, python-format -msgid "Removed tag %s" -msgstr "" - -#, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "" - msgid "" "list repository tags\n" "\n" @@ -6410,6 +6832,9 @@ " " msgstr "" +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" + msgid "uncommitted local changes" msgstr "" @@ -6439,7 +6864,7 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -msgid "repository root directory or symbolic path name" +msgid "repository root directory or name of overlay bundle file" msgstr "" msgid "change working directory" @@ -6631,7 +7056,7 @@ msgid "show only branches that have unmerged heads" msgstr "" -msgid "show normal and closed heads" +msgid "show normal and closed branches" msgstr "" msgid "[-a]" @@ -6778,7 +7203,10 @@ msgid "show only heads which are descendants of REV" msgstr "" -msgid "show only the active heads from open branches" +msgid "show only the active branch heads from open branches" +msgstr "" + +msgid "show normal and closed branch heads" msgstr "" msgid "[-r STARTREV] [REV]..." @@ -7011,6 +7439,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "" @@ -7087,36 +7518,6 @@ msgid "branch name not in UTF-8!" msgstr "le nom de la branche n'est pas en UTF-8 !" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "" - -#, 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 "" - -#, python-format -msgid " dir %s -> %s\n" -msgstr "" - -#, python-format -msgid " file %s -> %s\n" -msgstr "" - msgid "working directory state appears damaged!" msgstr "" @@ -7163,6 +7564,10 @@ msgstr "abandon : %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -7171,10 +7576,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 "attendu trop longtemps le verrou détenu par %s" @@ -7276,10 +7677,6 @@ msgstr "" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "" - -#, python-format msgid "malformed --config option: %s" msgstr "option incorrecte pour --config : %s" @@ -7345,10 +7742,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?" @@ -7360,9 +7753,6 @@ msgid "&Other" msgstr "" -msgid "l" -msgstr "" - #, python-format msgid "merging %s and %s to %s\n" msgstr "" @@ -7372,13 +7762,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)?" @@ -7390,9 +7773,6 @@ msgid "&Yes" msgstr "" -msgid "n" -msgstr "" - #, python-format msgid "merging %s failed!\n" msgstr "" @@ -7405,535 +7785,33 @@ msgid "unknown bisect kind %s" msgstr "type inconnu pour dichotomie : %s" -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\n" -" advanced usage only; they may provide potentially dangerous\n" -" abilities (such as letting you destroy or modify history); they\n" -" might not be ready for prime time; or they may alter some\n" -" usual behaviors of stock Mercurial. It is thus up to the user to\n" -" activate extensions as needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial\n" -" or in the Python search path, create an entry for it in your\n" -" hgrc, like 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 "" -"\n" -" Mercurial a la capacité de s'enrichir de nouvelles\n" -" fonctionnalités par le biais d'extensions. Les extensions\n" -" permettent d'ajouter des nouvelles commandes, de changer le\n" -" comportement de commandes existantes ou leur ajouter des\n" -" options, ou encore d'implémenter de nouveaux \"hooks\".\n" -"\n" -" Les extensions ne sont pas chargées automatiquement par défaut\n" -" pour diverses raisons : elles peuvent accroître la latence\n" -" de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" -" une utilisation avancée ; elle peuvent fournir des\n" -" fonctionnalités potentiellement dangereuses, comme de vous\n" -" permettre de modifier ou détruire l'historique du dépôt ; elles\n" -" peuvent ne pas être encore prêtes à être utilisées par le plus\n" -" grand nombre ; ou encore elles peuvent modifier certains des\n" -" comportements habituels de Mercurial.\n" -" Il appartient donc à l'utilisateur de les activer en fonction\n" -" de ses besoins.\n" -"\n" -" Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" -" présente dans le chemin de recherche de Python, déclarez-la\n" -" dans votre fichier de configuration hgrc comme suit :\n" -"\n" -" [extensions]\n" -" truc =\n" -"\n" -" Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" -"\n" -" [extensions]\n" -" monbidule = ~/.hgext/monbidule.py\n" -"\n" -" Pour forcer la désactivation d'une extension activée par un\n" -" autre hgrc, précédez son chemin d'un point d'exclamation :\n" -"\n" -" [extensions]\n" -" # désactivation de machin qui se trouve dans /vers/machin.py\n" -" hgext.bar = !/vers/machin.py\n" -" # idem, mais aucun chemin n'avait été donné pour chose \n" -" hgext.chose = !\n" -" " - msgid "disabled extensions:" msgstr "extensions désactivées :" msgid "Date Formats" msgstr "" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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 "" - msgid "File Name Patterns" msgstr "" -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 only\n" -" match 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 of\n" -" 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 "" -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" -" * 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 "" -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 topological offsets from the tip, with -1 denoting\n" -" the tip. As such, negative numbers are only useful if you've\n" -" memorized your local tree numbers and want to save typing a single\n" -" digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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 "" -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 "" -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 default.\n" -" - date: Date information. The date when the changeset was 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 by\n" -" 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 number.\n" -" - tags: List of strings. Any tags associated with the 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing separators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\n" -" - stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an\n" -" email address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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\n" -" in email headers.\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 address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "" -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\n" -" 'hg 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" -" - 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 " -"path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [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 "" @@ -7966,27 +7844,20 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updated" -msgstr "" - -msgid "merged" -msgstr "" - -msgid "removed" -msgstr "" - -msgid "unresolved" -msgstr "" - -#, python-format -msgid "%d files %s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "comparaison avec %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 "" 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 "" @@ -8062,32 +7933,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 "" @@ -8096,10 +7947,6 @@ msgstr "" #, python-format -msgid "requested URL: '%s'\n" -msgstr "" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -8134,7 +7981,7 @@ msgstr "" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -8165,17 +8012,6 @@ msgstr "" #, python-format -msgid "%s, line %s: %s\n" -msgstr "" - -msgid "cannot parse entry" -msgstr "" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "" - -#, python-format msgid "working directory has unknown parent '%s'!" msgstr "" @@ -8183,10 +8019,6 @@ msgid "unknown revision '%s'" msgstr "" -#, python-format -msgid "filtering %s through %s\n" -msgstr "" - msgid "journal already exists - run hg recover" msgstr "" @@ -8218,14 +8050,6 @@ msgid "working directory of %s" msgstr "" -#, 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 "" @@ -8290,41 +8114,6 @@ msgid "searching for changes\n" msgstr "" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "" - -#, python-format -msgid "found new changeset %s\n" -msgstr "" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -8334,16 +8123,6 @@ msgid "repository is unrelated" msgstr "" -msgid "found new changesets starting at " -msgstr "" - -#, python-format -msgid "%d total queries\n" -msgstr "" - -msgid "common changesets up to " -msgstr "" - msgid "requesting all changes\n" msgstr "" @@ -8369,17 +8148,10 @@ msgid "%d changesets found\n" msgstr "" -msgid "list of changesets:\n" -msgstr "" - #, python-format msgid "empty or missing revlog for %s" msgstr "" -#, python-format -msgid "add changeset %s\n" -msgstr "" - msgid "adding changesets\n" msgstr "" @@ -8392,10 +8164,6 @@ msgid "adding file changes\n" msgstr "" -#, python-format -msgid "adding %s revisions\n" -msgstr "" - msgid "received file revlog group is empty" msgstr "" @@ -8407,9 +8175,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "" @@ -8430,10 +8195,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -8514,14 +8275,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?" @@ -8533,9 +8286,6 @@ msgid "&Delete" msgstr "" -msgid "c" -msgstr "" - #, python-format msgid "" "remote changed %s which local deleted\n" @@ -8546,10 +8296,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -8596,13 +8342,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 "" @@ -8673,7 +8412,7 @@ msgstr "" #, python-format -msgid "no valid hunks found; trying with %r instead\n" +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "" #, python-format @@ -8685,13 +8424,6 @@ msgstr "" #, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" - -#, python-format msgid "saving bundle to %s\n" msgstr "" @@ -8762,12 +8494,12 @@ msgid "could not create remote repo" msgstr "" +msgid "no suitable response from remote hg" +msgstr "" + msgid "remote: " msgstr "" -msgid "no suitable response from remote hg" -msgstr "" - #, python-format msgid "push refused: %s" msgstr "" @@ -8785,17 +8517,6 @@ 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 "" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -8805,9 +8526,6 @@ msgid "&Remote" msgstr "" -msgid "r" -msgstr "" - #, python-format msgid "" " local changed subrepository %s which remote removed\n" @@ -8832,6 +8550,17 @@ msgid "pushing subrepo %s\n" msgstr "" +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + msgid "unmatched quotes" msgstr "" @@ -8897,12 +8626,12 @@ msgid "username %s contains a newline\n" msgstr "" +msgid "response expected" +msgstr "" + msgid "unrecognized response\n" msgstr "" -msgid "response expected" -msgstr "" - msgid "password: " msgstr "" @@ -8931,10 +8660,6 @@ msgstr "" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -9132,6 +8857,10 @@ msgstr "" #, 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 ""
--- a/i18n/it.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/it.po Sat Nov 07 14:13:15 2009 -0600 @@ -4,9 +4,9 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-27 18:18+0100\n" -"PO-Revision-Date: 2009-03-03 20:05+0100\n" +"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:45+0100\n" "Last-Translator: Stefano Tortarolo <stefano.tortarolo@gmail.com>\n" "Language-Team: Italian <Italian>\n" "MIME-Version: 1.0\n" @@ -24,7 +24,10 @@ msgid "COMMANDS" msgstr "COMANDI" -msgid " options:\n" +#, fuzzy +msgid "" +" options:\n" +"\n" msgstr " opzioni:\n" #, python-format @@ -35,16 +38,513 @@ " alias: %s\n" "\n" -msgid "return tuple of (match function, list enabled)." -msgstr "restituisce una tupla di (funzione match, elenco abilitato)." - -#, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s non abilitato\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s abilitato, %d entry per l'utente %s\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 "" + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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,85 +553,32 @@ "in entrata" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: le modifiche hanno sorgente \"%s\" - saltato\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: utente %s bloccato su %s\n" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "acl: accesso negato per il changeset %s" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: l'utente %s non pu avere accesso a %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: consentendo il changeset %s\n" - -msgid "" -"allow user-defined command aliases\n" -"\n" -"To use, create entries in your hgrc of the form\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" -msgstr "" -"consente alias definiti dall'utente\n" -"\n" -"Per usarlo, crea entry nel tuo hgrc della forma\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" - -msgid "" -"defer command lookup until needed, so that extensions loaded\n" -" after alias can be aliased" -msgstr "" -"ritarda la ricerca del comando fin quando necessario, in modo che si " -"attivino gli alias\n" -" per le estensioni caricate dopo alias" - -#, python-format -msgid "*** [alias] %s: command %s is unknown" -msgstr "*** [alias] %s: il comando %s sconosciuto" - -#, python-format -msgid "*** [alias] %s: command %s is ambiguous" -msgstr "*** [alias] %s: il comando %s ambiguo" - -#, python-format -msgid "*** [alias] %s: circular dependency on %s" -msgstr "*** [alias] %s: dipendenza circolare su %s" - -#, python-format -msgid "*** [alias] %s: no definition\n" -msgstr "*** [alias] %s: nessuna definizione\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" +#, fuzzy +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 " -"experience\n" -"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 on, " -"and\n" -"just updates it. This is similar to git's approach of branching.\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 "" "mercurial bookmarks\n" "\n" @@ -156,88 +603,17 @@ "ad aggiornarlo. Questo simile all'approccio di branching di git.\n" msgid "" -"Parse .hg/bookmarks file and return a dictionary\n" -"\n" -" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" -" in the .hg/bookmarks file. They are read by the parse() method and\n" -" returned as a dictionary with name => hash values.\n" -"\n" -" The parsed dictionary is cached until a write() operation is done.\n" -" " -msgstr "" -"Parsifica il file .hg/bookmarks e restituisce un dizionario\n" -"\n" -" I segnalibri sono memorizzati nel file .hg/bookmarks come \n" -" valori {HASH}\\s{NAME} (formato di localtags).\n" -" Sono letti dal metodo parse() e restituiti come dizionario con \n" -" nome => valore di hash.\n" -"\n" -" Il dizionario parsificato viene memorizzato in cache finchè\n" -" un'operazione di write() non viene eseguita.\n" -" " - -msgid "" -"Write bookmarks\n" -"\n" -" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" -" in a format equal to those of localtags.\n" -"\n" -" We also store a backup of the previous state in undo.bookmarks that\n" -" can be copied back on rollback.\n" -" " -msgstr "" -"Scrive segnalibri\n" -"\n" -" Scrive il dato dizionario segnalibro => hash nel file\n" -" .hg/bookmarks nello stesso formato di localtags.\n" -"\n" -" Viene anche effettuato un backup dello stato\n" -" precedente in undo.bookmarks che può essere\n" -" ripristinato con rollback.\n" -" " - -msgid "" -"Get the current bookmark\n" -"\n" -" If we use gittishsh branches we have a current bookmark that\n" -" we are on. This function returns the name of the bookmark. It\n" -" is stored in .hg/bookmarks.current\n" -" " -msgstr "" -"Ottiene il segnalibro corrente\n" -"\n" -" Se si usano branch in stile git si ha un segnalibro\n" -" corrente attivo. Questa funzione restituisce il\n" -" nome del segnalibro. Questi è memorizzato in\n" -" .hg/bookmarks.current\n" -" " - -msgid "" -"Set the name of the bookmark that we are currently on\n" -"\n" -" Set the name of the bookmark that we are on (hg update <bookmark>).\n" -" The name is recoreded in .hg/bookmarks.current\n" -" " -msgstr "" -"Imposta il nome del segnalibro sul quale ci si trova attualmente\n" -"\n" -" Imposta il nome del segnalibro sul quale ci si trova\n" -" (hg update <bookmark>). Il nome viene memorizzato in\n" -" .hg/bookmarks.current\n" -" " - -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" -" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" -" update' to update to a given bookmark.\n" -"\n" -" You can use 'hg bookmark NAME' to set a bookmark on the current\n" -" tip with the given name. If you specify a revision using -r REV\n" -" (where REV may be an existing bookmark), the bookmark is set to\n" -" that revision.\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" +" You can use 'hg bookmark NAME' to set a bookmark on the working\n" +" directory's parent revision with the given name. If you specify\n" +" a revision using -r REV (where REV may be an existing bookmark),\n" +" the bookmark is assigned to that revision.\n" " " msgstr "" @@ -259,37 +635,6 @@ msgid "a bookmark cannot have the name of an existing branch" msgstr "un segnalibro non può avere lo stesso nome di una branch esistente" -msgid "" -"Strip bookmarks if revisions are stripped using\n" -" the mercurial.strip method. This usually happens during\n" -" qpush and qpop" -msgstr "" -"Elimina i segnalibri se revisioni sono rimosse usando il metodo\n" -" mercurial.strip. Questo di norma succede durante qpush e qpop" - -msgid "" -"Add a revision to the repository and\n" -" move the bookmark" -msgstr "" -"Aggiunge una revisione al repository e\n" -" sposta il segnalibro" - -msgid "Merge bookmarks with normal tags" -msgstr "Fa il merge dei segnalibri con tag normali" - -msgid "" -"Set the current bookmark\n" -"\n" -" If the user updates to a bookmark we update the .hg/bookmarks.current\n" -" file.\n" -" " -msgstr "" -"Imposta il segnalibro corrente\n" -"\n" -" Se l'utente fa l'update ad un segnalibro viene aggiornato il file\n" -" .hg/bookmarks.current\n" -" " - msgid "force" msgstr "forza" @@ -306,89 +651,102 @@ msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]" 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 bug\n" -"status.\n" -"\n" -"The hook updates the Bugzilla database directly. Only Bugzilla " -"installations\n" -"using MySQL are supported.\n" -"\n" -"The hook relies on a Bugzilla script to send bug change notification " -"emails.\n" -"That script changes between Bugzilla versions; the 'processmail' script " -"used\n" -"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" -"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " +"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" +"bug status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla\n" +"installations using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification\n" +"emails. That script changes between Bugzilla versions; the\n" +"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" +"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" +"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" +"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" -"pushing the change; you will need to ensure the Bugzilla install file\n" -"permissions are set appropriately.\n" -"\n" -"Configuring the extension:\n" -"\n" -" [bugzilla]\n" -" host Hostname of the MySQL server holding the Bugzilla 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 3.0 " -"and\n" -" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" -" 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 keys,\n" -" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " -"email).\n" -" Default depends on version; from 2.18 it is\n" -" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" -"(user)s\".\n" -" regexp Regular expression to match bug IDs in changeset commit " -"message.\n" -" Must contain one \"()\" group. The default expression " -"matches\n" -" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" -" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " -"thereof.\n" -" 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 " -"repository.\n" -" {webroot} Stripped pathname of the Mercurial " -"repository.\n" -" {hgweb} Base URL for browsing Mercurial " -"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 Bugzilla " -"user\n" -" ID mappings. If specified, the file should contain one " -"mapping\n" -" per line, \"committer\"=\"Bugzilla user\". See also the\n" -" [usermap] section.\n" -"\n" -" [usermap]\n" -" Any entries in this section specify mappings of Mercurial committer ID\n" -" to Bugzilla user ID. See also [bugzilla].usermap.\n" -" \"committer\"=\"Bugzilla user\"\n" -"\n" -" [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" -"\n" -"Activating the extension:\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" @@ -399,9 +757,9 @@ "\n" "Example configuration:\n" "\n" -"This example configuration is for a collection of Mercurial repositories\n" -"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" -"/opt/bugzilla-3.2.\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" "\n" " [bugzilla]\n" " host=localhost\n" @@ -409,8 +767,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" @@ -419,7 +778,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" @@ -427,16 +786,10 @@ " Changeset commit comment. Bug 1234.\n" msgstr "" -msgid "support for bugzilla version 2.16." -msgstr "supporto per la versione di bugzilla 2.16." - #, python-format msgid "connecting to %s:%s as %s, password %s\n" msgstr "sto connettendomi a %s:%s come %s, password %s\n" -msgid "run a query." -msgstr "esegue una query." - #, python-format msgid "query: %s %s\n" msgstr "query: %s %s\n" @@ -445,25 +798,13 @@ msgid "failed query: %s %s\n" msgstr "query fallita: %s %s\n" -msgid "get identity of longdesc field" -msgstr "" - msgid "unknown database schema" msgstr "schema del database sconosciuto" -msgid "filter not-existing bug ids from list." -msgstr "filtra id di bug non esistenti dalla lista" - -msgid "filter bug ids from list that already refer to this changeset." -msgstr "" - #, python-format msgid "bug %d already knows about changeset %s\n" msgstr "il bug %d gi a conoscenza del changeset %s\n" -msgid "tell bugzilla to send mail." -msgstr "dice a bugzilla di inviare la mail." - msgid "telling bugzilla to send mail:\n" msgstr "sto dicendo a bugzilla di inviare la mail:\n" @@ -482,25 +823,10 @@ msgid "done\n" msgstr "fatto\n" -msgid "look up numeric bugzilla user id." -msgstr "cerca l'identificatore utente numerico di bugzilla" - #, python-format msgid "looking up user %s\n" msgstr "ricercando l'utente %s\n" -msgid "map name of committer to bugzilla user name." -msgstr "mappa il nome del committente al nome utente bugzilla" - -msgid "" -"see if committer is a registered bugzilla user. Return\n" -" bugzilla username and userid if so. If not, return default\n" -" bugzilla username and userid." -msgstr "" -"controlla se il committente è un utente registrato bugzilla. In tal\n" -" caso restituisce userid e username bugzilla. Altrimenti\n" -" restituisce userid e username bugzilla di default." - #, python-format msgid "cannot find bugzilla user id for %s" msgstr "impossibile trovare nome utente bugzilla per %s" @@ -509,41 +835,11 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "impossibile trovare nome utente bugzilla per %s o %s" -msgid "" -"add comment to bug. try adding comment as committer of\n" -" changeset, otherwise as default bugzilla user." -msgstr "" - -msgid "support for bugzilla 2.18 series." -msgstr "supporto per la serie di bugzilla 2.18." - -msgid "support for bugzilla 3.0 series." -msgstr "sopporto per la serie di bugzilla 3.0." - -msgid "" -"return object that knows how to talk to bugzilla version in\n" -" use." -msgstr "" - #, python-format msgid "bugzilla version %s not supported" msgstr "versione di bugzilla %s non supportata" msgid "" -"find valid bug ids that are referred to in changeset\n" -" comments and that do not already have references to this\n" -" changeset." -msgstr "" - -msgid "update bugzilla bug with reference to changeset." -msgstr "aggiorna il bug bugzilla con riferimento al changeset." - -msgid "" -"strip leading prefix of repo root and turn into\n" -" url-safe path." -msgstr "" - -msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" "\t{desc|tabindent}" @@ -552,12 +848,6 @@ "dettagli:\n" "\t{desc|tabindent}" -msgid "" -"add comment to bugzilla for each changeset that refers to a\n" -" bugzilla bug id. only add a comment once per bug, so same change\n" -" seen multiple times does not fill bug with duplicate data." -msgstr "" - #, python-format msgid "python mysql support not available: %s" msgstr "il supporto per python per mysql non è disponibile: %s" @@ -570,48 +860,64 @@ msgid "database error: %s" msgstr "errore del database: %s" -msgid "" -"show the children of the given or working dir revision\n" -"\n" -" Print the children of the working directory's revisions.\n" -" If a revision is given via --rev, the children of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (after the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +#, fuzzy +msgid "command to display child changesets" +msgstr "usa il comando per controllare lo stato del changeset" + +#, fuzzy +msgid "" +"show the children of the given or working directory revision\n" +"\n" +" Print the children of the working directory's revisions. If a\n" +" revision is given via -r/--rev, the children of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (after the working directory revision or the\n" +" argument to --rev if given) is printed.\n" " " msgstr "" - -msgid "show children of the specified rev" +"mostra i genitori della directory di lavoro o di una revisione\n" +"\n" +" Stampa le revisioni genitori della directory di lavoro. Se una\n" +" revisione è data tramite --rev, verrà stampato il genitore di\n" +" quella revisione. Se viene fornito un file come argomento,\n" +" verrà stampata l'ultima revisione in cui il file è stato\n" +" modificato (prima della revisione della directory di lavoro\n" +" o dell'argomento di --rev se fornito).\n" +" " + +#, fuzzy +msgid "show children of the specified revision" msgstr "mostra i figli della revisione specificata" msgid "hg children [-r REV] [FILE]" msgstr "hg·children·[-r·REV]·[FILE]" -msgid "command to show certain statistics about revision history" +#, fuzzy +msgid "command to display statistics about repository history" msgstr "comando per mostrare alcune statistiche sulla storia delle revisioni" -msgid "Calculate stats" -msgstr "Calcola statistiche" - #, python-format msgid "Revision %d is a merge, ignoring...\n" msgstr "La revisione %d è un merge, ignoro...\n" -#, python-format -msgid "\rgenerating stats: %d%%" +#, fuzzy, python-format +msgid "generating stats: %d%%" msgstr "\rsto generando le statistiche: %d%%" msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template or\n" -" alternatively by date, if dateformat is used. In this case it will " -"override\n" -" template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" -"\n" -" Examples:\n" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" +"\n" +" Examples::\n" "\n" " # display count of changed lines for every committer\n" " hg churn -t '{author|email}'\n" @@ -625,20 +931,22 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" -"\n" -" <alias email> <actual email>" -msgstr "" - -#, python-format -msgid "assuming %i character terminal\n" -msgstr "assumo carattere di terminazione %i\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format::\n" +"\n" +" <alias email> <actual email>\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 "" msgid "count rate for the specified revision or range" msgstr "" -msgid "count rate for revs matching date spec" -msgstr "" +#, fuzzy +msgid "count rate for revisions matching date spec" +msgstr "mostra le revisioni che corrispondono ad una data fornita" msgid "template to group changesets" msgstr "" @@ -662,89 +970,68 @@ msgstr "hg churn [-d DATA] [-r REV] [--aliases FILE] [--progress] [FILE]" msgid "" -"add color output to status, qseries, and diff-related commands\n" -"\n" -"This extension modifies the status command to add color to its output to\n" -"reflect file status, the qseries command to add color to reflect patch " -"status\n" -"(applied, unapplied, missing), and to diff-related commands to highlight\n" -"additions, removals, diff headers, and trailing whitespace.\n" -"\n" -"Other effects in addition to color, like bold and underlined text, are also\n" -"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" -"ANSI escape codes). This module also provides the render_text function,\n" -"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 my be overriden 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 "Wrap text in commands to turn on each effect." -msgstr "" - -msgid "run the status command with colored output" -msgstr "esegue il comando status con output colorato" - -msgid "run the qseries command with colored output" -msgstr "esegue il comando qseries con output colorato" - -msgid "wrap ui.write for colored diff output" -msgstr "" - -msgid "wrap cmdutil.changeset_printer.showpatch with colored output" -msgstr "" - -msgid "run the diff command with colored output" -msgstr "esegue il comando diff con output colorato" - -msgid "Initialize the extension." -msgstr "Inizializza l'estensione." - -msgid "patch in command to command table and load effect map" +"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" +"patch status (applied, unapplied, missing), and to diff-related\n" +"commands to highlight additions, removals, diff headers, and trailing\n" +"whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are\n" +"also available. Effects are rendered with the ECMA-48 SGR control\n" +"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" +"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 "quando colorare (sempre, auto o mai)" -msgid "don't colorize output" +#, fuzzy +msgid "don't colorize output (DEPRECATED)" msgstr "non colorare l'output" -msgid "converting foreign VCS repositories to Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +#, fuzzy +msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "converte repository di altri VCS in Mercurial" 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" @@ -756,37 +1043,54 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" -" If no revision is given, all revisions will be converted. Otherwise,\n" -" convert will only import up to the named revision (given in a format\n" -" understood by the source).\n" +" If no revision is given, all revisions will be converted.\n" +" Otherwise, convert will only import up to the named revision\n" +" (given in a format understood by the source).\n" "\n" " If no destination directory name is specified, it defaults to the\n" -" basename of the source with '-hg' appended. If the destination\n" +" basename of the source with '-hg' appended. If the destination\n" " repository doesn't exist, it will be created.\n" "\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 <REVMAP> isn't given, it will be put in a default location\n" -" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" -" file that maps each source commit ID to the destination ID for\n" -" that revision, like so:\n" -" <source ID> <destination ID>\n" -"\n" -" If the file doesn't exist, it's automatically created. It's updated\n" -" on each commit copied, so convert-repo can be interrupted and can\n" -" be run repeatedly to copy new commits.\n" -"\n" -" The [username mapping] file is a simple text file that maps each source\n" -" commit author to a destination commit author. It is handy for source " -"SCMs\n" -" that use unix logins to identify authors (eg: CVS). One line per author\n" -" mapping and the line format is:\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" +" and can be run repeatedly to copy new commits.\n" +"\n" +" The [username mapping] file is a simple text file that maps each\n" +" source commit author to a destination commit author. It is handy\n" +" for source SCMs that use unix logins to identify authors (eg:\n" +" CVS). One line per author mapping and the line format is:\n" " srcauthor=whatever string you want\n" "\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" +" and directories. Comment lines start with '#'. Each line can\n" +" contain one of the following directives::\n" "\n" " include path/to/file\n" "\n" @@ -796,33 +1100,44 @@ "\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 dirs not explicitely included.\n" -" The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from a\n" -" subdirectory into the root of the repository, use '.' as the path to\n" -" 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" +" history, letting you specify the parents of a revision. This is\n" " useful if you want to e.g. give a Subversion merge two parents, or\n" -" graft two disconnected series of history together. Each entry\n" +" graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" values, separated by spaces. The key is the revision ID in the\n" -" source revision control system whose parents should be modified\n" -" (same format as a key in .hg/shamap). The values are the revision\n" -" IDs (in either the source or destination revision control system)\n" -" that should be used as the new parents for that node.\n" +" comma-separated values. The key is the revision ID in the source\n" +" revision control system whose parents should be modified (same\n" +" format as a key in .hg/shamap). The values are the revision IDs\n" +" (in either the source or destination revision control system) that\n" +" should be used as the new parents for that node.\n" +"\n" +" The branchmap is a file that allows you to rename a branch when it is\n" +" being brought in from whatever external repository. When used in\n" +" conjunction with a splicemap, it allows for a powerful combination\n" +" to help fix even the most badly mismanaged repositories and turn them\n" +" into nicely structured Mercurial repositories. The branchmap contains\n" +" lines of the form \"original_branch_name new_branch_name\".\n" +" \"original_branch_name\" is the name of the branch in the source\n" +" repository, and \"new_branch_name\" is the name of the branch is the\n" +" destination repository. This can be used to (for instance) move code\n" +" in one repository from \"default\" to a named branch.\n" "\n" " Mercurial Source\n" -" -----------------\n" -"\n" -" --config convert.hg.ignoreerrors=False (boolean)\n" +" ----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" " Mercurial.\n" -" --config convert.hg.saverev=False (boolean)\n" -" store original revision ID in changeset (forces target IDs to " -"change)\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to\n" +" change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" " convert start revision and its descendants\n" "\n" @@ -831,59 +1146,53 @@ "\n" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" -" access to the repository files is not needed, unless of course\n" -" the repository is :local:. The conversion uses the top level\n" -" directory in the sandbox to find the CVS repository, and then uses\n" -" CVS rlog commands to find files to convert. This means that unless\n" -" a filemap is given, all files under the starting directory will be\n" -" converted, and that any directory reorganisation in the CVS\n" +" access to the repository files is not needed, unless of course the\n" +" repository is :local:. The conversion uses the top level directory\n" +" in the sandbox to find the CVS repository, and then uses CVS rlog\n" +" commands to find files to convert. This means that unless a\n" +" filemap is given, all files under the starting directory will be\n" +" 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 is a legacy option and may be removed in future.\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.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\n" -" of a 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" -" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" -" merging code to be run without doing a conversion. Its parameters and\n" -" output are similar to that of cvsps 2.1.\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. Please see\n" +" the command help for more details.\n" "\n" " Subversion Source\n" " -----------------\n" "\n" " Subversion source detects classical trunk/branches/tags layouts.\n" " By default, the supplied \"svn://repo/path/\" source URL is\n" -" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" -" it replaces the default branch. If \"svn://repo/path/branches\"\n" -" exists, its subdirectories are listed as possible branches. If\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" +" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" +" its subdirectories are listed as possible branches. If\n" " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" -" can be overriden with following options. Set them to paths\n" -" relative to the source URL, or leave them blank to disable\n" -" autodetection.\n" +" can be overridden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable auto\n" +" detection.\n" "\n" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" @@ -902,20 +1211,19 @@ " Perforce Source\n" " ---------------\n" "\n" -" The Perforce (P4) importer can be given a p4 depot path or a client\n" -" specification as source. It will convert all files in the source to\n" -" a flat Mercurial repository, ignoring labels, branches and " -"integrations.\n" -" Note that when a depot path is given you then usually should specify a\n" -" target directory, because otherwise the target may be named ...-hg.\n" -"\n" -" It is possible to limit the amount of source history to be converted\n" -" by specifying an initial Perforce revision.\n" -"\n" -" --config convert.p4.startrev=0 (perforce changelist number)\n" +" The Perforce (P4) importer can be given a p4 depot path or a\n" +" client specification as source. It will convert all files in the\n" +" source to a flat Mercurial repository, ignoring labels, branches\n" +" and integrations. Note that when a depot path is given you then\n" +" usually should specify a target directory, because otherwise the\n" +" target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be\n" +" converted by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -932,12 +1240,14 @@ msgid "" "create changeset information from CVS\n" "\n" -" This command is intended as a debugging tool for the CVS to Mercurial\n" -" converter, and can be used as a direct replacement for cvsps.\n" -"\n" -" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" -" directory) in the CVS repository, and converts the log to a series of\n" -" changesets based on matching commit log entries and dates." +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." msgstr "" msgid "username mapping filename" @@ -958,9 +1268,20 @@ msgid "splice synthesized history into place" msgstr "" +msgid "change branch names while converting" +msgstr "" + +#, fuzzy +msgid "try to sort changesets by branches" +msgstr "prova ad ordinare i changeset per data" + msgid "try to sort changesets by date" msgstr "prova ad ordinare i changeset per data" +#, fuzzy +msgid "preserve source changesets order" +msgstr "prova ad ordinare i changeset per data" + msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "hg convert [OPZIONI]... SORGENTE [DEST [REVMAP]]" @@ -997,6 +1318,14 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..." +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" +msgstr "" + +msgid "bzr source type could not be determined\n" +msgstr "" + #, python-format msgid "%s is not a valid revision in current branch" msgstr "%s non è una revisione valida nella branch corrente" @@ -1006,20 +1335,20 @@ msgstr "%s non è più disponibile in %s" #, python-format +msgid "%s.%s symlink has no target" +msgstr "" + +#, python-format msgid "cannot find required \"%s\" tool" msgstr "impossibile trovare il tool \"%s\"" #, python-format -msgid "running: %s\n" -msgstr "sto eseguendo: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s errore:\n" #, python-format -msgid "%s %s" -msgstr "%s %s" +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "" #, python-format msgid "could not open map file %r: %s" @@ -1037,6 +1366,10 @@ msgid "%s: unknown repository type" msgstr "%s: tipo di repository sconosciuto" +#, fuzzy, python-format +msgid "unknown sort mode: %s" +msgstr "risposta CVS sconosciuta: %s" + #, python-format msgid "cycle detected between %s and %s" msgstr "ciclo rilevato tra %s e %s" @@ -1049,16 +1382,16 @@ msgstr "Scrivo il file di associazione degli autori %s\n" #, python-format -msgid "Overriding mapping for author %s, was %s, will be %s\n" -msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n" +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n" #, python-format msgid "mapping author %s to %s\n" msgstr "sto associando l'autore %s a %s\n" -#, python-format -msgid "Ignoring bad line in author map file %s: %s\n" -msgstr "Ignoro riga non valida nel file di associazione degli autori %s: %s\n" +#, fuzzy, python-format +msgid "overriding mapping for author %s, was %s, will be %s\n" +msgstr "Rimpiazzo l'associazione per l'autore %s, era %s, sarà %s\n" #, python-format msgid "spliced in %s as parents of %s\n" @@ -1081,13 +1414,17 @@ msgid "assuming destination %s\n" msgstr "assumo destinazione %s\n" -#, python-format -msgid "revision %s is not a patchset number or date" +#, fuzzy +msgid "more than one sort mode specified" +msgstr "troppe opzioni specificate" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + +#, fuzzy, python-format +msgid "revision %s is not a patchset number" msgstr "la revisione %s non è un numero di patchset o una data" -msgid "using builtin cvsps\n" -msgstr "sto usando cvsps integrato\n" - #, python-format msgid "connecting to %s\n" msgstr "sto connettendomi a %s\n" @@ -1095,8 +1432,10 @@ msgid "CVS pserver authentication failed" msgstr "autenticazione al pserver CVS fallita" -msgid "server sucks" -msgstr "il server fa schifo" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "" #, python-format msgid "%d bytes missing from remote file" @@ -1129,10 +1468,6 @@ msgid "running %s\n" msgstr "sto eseguendo %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "prefisso=%r directory=%r radice=%r\n" - msgid "RCS file must be followed by working file" msgstr "Il file RCS deve essere seguito da un file funzionante" @@ -1146,10 +1481,6 @@ msgstr "la revisione deve essere seguita da una riga con la data" #, python-format -msgid "found synthetic rev in %s: %r\n" -msgstr "trovata revisione sintetica in %s: %r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "sto scrivendo la cache dei log cvs %s\n" @@ -1164,16 +1495,22 @@ msgstr "changeset sintetici non possono avere genitori multipli" #, python-format +msgid "" +"warning: CVS commit message references non-existent branch %r:\n" +"%s\n" +msgstr "" + +#, python-format msgid "%d changeset entries\n" msgstr "%d voci di changeset\n" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "il modulo Python ElementTree non è disponibile" -#, python-format -msgid "cleaning up %s\n" -msgstr "sto ripulendo %s\n" - msgid "internal calling inconsistency" msgstr "inconsistenza nella chiamata interna" @@ -1210,22 +1547,6 @@ " registrato %s...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "sto applicando la revisione %s...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "sto calcolando il changeset tra %s e %s...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "sto ottenendo la revisione %s...\n" - -#, python-format -msgid "analysing revision %s...\n" -msgstr "sto analizzando la revisione %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1237,16 +1558,14 @@ msgid "initializing destination %s repository\n" msgstr "sto inizializzando il repository destinatario %s\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 "sto effettuando il pull da %s a %s\n" +#, fuzzy +msgid "filtering out empty revision\n" +msgstr "stampa la data revisione" + msgid "updating tags\n" msgstr "sto aggiornando le tag\n" @@ -1258,18 +1577,12 @@ msgid "ignoring: %s\n" msgstr "sto ignorando: %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 non sembra essere un repository monotone" #, python-format -msgid "copying file in renamed dir from '%s' to '%s'" +msgid "copying file in renamed directory from '%s' to '%s'" msgstr "" msgid "reading p4 views\n" @@ -1278,6 +1591,9 @@ msgid "collecting p4 changelists\n" msgstr "sto raccogliendo le changelist p4\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Non è stato possibile caricare i binding python per Subversion" @@ -1319,7 +1635,8 @@ msgid "found branch %s at %d\n" msgstr "trovata branch %s in %d\n" -msgid "svn: start revision is not supported with with more than one branch" +#, fuzzy +msgid "svn: start revision is not supported with more than one branch" msgstr "svn: non è supportata una revisione iniziale con più di una branch" #, python-format @@ -1331,84 +1648,22 @@ msgstr "nessuna tag trovata alla revisione %d\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "ignoro la branch straniera %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s non trovato fino alla revisione %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "branch rinominata da %s a %s in %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "riassociato il genitore come %s\n" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "copiato in %s da %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "andato da %s\n" - -#, python-format -msgid "found parent directory %s\n" -msgstr "trovata directory genitore %s\n" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "base, voce %s %s\n" - -msgid "munge-o-matic\n" -msgstr "munge-o-matic\n" - -#, python-format -msgid "info: %s %s %s %s\n" -msgstr "info: %s %s %s %s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "percorso sconosciuto nella revisione %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "%s marcato come proveniente da %s:%d\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "sto effettuando il parsing della revisione %d (%d modifiche)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "trovato genitore della branch %s 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 "" #, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "sto saltando la revisione nella blacklist %d\n" - -#, python-format -msgid "revision %d has no entries\n" -msgstr "la revisione %d non ha voci\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: la branch non ha nessuna revisione %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r non è sotto %r, ignoro\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "inizializzo il repository svn %r\n" @@ -1426,20 +1681,16 @@ msgstr "XXX TAG NON ANCORA IMPLEMENTATE\n" msgid "" -"\n" -"The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working dir. 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" @@ -1455,56 +1706,28 @@ " 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\n" -"\"hg diff\" command. The `extdiff' extension makes snapshots of only\n" -"needed files, so running the external diff program will actually be\n" -"pretty fast (at least faster than having to compare the entire tree).\n" -msgstr "" - -msgid "snapshot files as of some revision" +"You can use -I/-X and list of file or directory names like normal \"hg\n" +"diff\" command. The extdiff extension makes snapshots of only needed\n" +"files, so running the external diff program will actually be pretty\n" +"fast (at least faster than having to compare the entire tree).\n" msgstr "" #, python-format msgid "making snapshot of %d files from rev %s\n" msgstr "" -msgid "" -"snapshot files from working directory.\n" -" if not using snapshot, -I/-X does not work and recursive diff\n" -" in tools like kdiff3 and meld displays too many files." -msgstr "" - -#, python-format -msgid "making snapshot of %d files from working dir\n" -msgstr "" - -msgid "" -"Do the actuall diff:\n" -"\n" -" - copy to a temp structure if diffing 2 internal revisions\n" -" - copy to a temp structure if diffing working revision with\n" -" another one and more than 1 file is changed\n" -" - just invoke the diff for a single file in the working dir\n" -" " +#, python-format +msgid "making snapshot of %d files from working directory\n" msgstr "" msgid "cannot specify --rev and --change at the same time" msgstr "impossibile specificare sia --rev sia --change" -#, python-format -msgid "running %r in %s\n" -msgstr "sto eseguendo %r in %s\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "file modificato durante il diff. Sovrascrivo: %s (sorgente: %s)\n" - msgid "cleaning up temp directory\n" msgstr "sto ripulendo la directory temporanea\n" @@ -1512,19 +1735,19 @@ "use external program to diff repository (or selected files)\n" "\n" " Show differences between revisions for the specified files, using\n" -" an external program. The default program used is diff, with\n" +" an external program. The default program used is diff, with\n" " default options \"-Npru\".\n" "\n" -" To select a different program, use the -p option. The program\n" -" will be passed the names of two directories to compare. To pass\n" -" additional options to the program, use the -o option. These will\n" -" be passed before the names of the directories to compare.\n" -"\n" -" When two revision arguments are given, then changes are\n" -" shown between those revisions. If only one revision is\n" -" specified then that revision is compared to the working\n" -" directory, and, when no revisions are specified, the\n" -" working directory files are compared to its parent." +" To select a different program, use the -p/--program option. The\n" +" program will be passed the names of two directories to compare. To\n" +" pass additional options to the program, use -o/--option. These\n" +" will be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." msgstr "" msgid "comparison program to run" @@ -1539,29 +1762,44 @@ msgid "hg extdiff [OPT]... [FILE]..." msgstr "hg extdiff [OPT]... [FILE]..." -msgid "use closure to save diff command to use" +#, 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 "hg %s [OPZIONI]... [FILE]..." -msgid "pulling, updating and merging in one command" +#, fuzzy +msgid "pull, update and merge in one command" msgstr "pull, update e merge in un comando" +#, fuzzy msgid "" "pull changes from a remote repository, merge new changes if needed.\n" "\n" " This finds all changes from the repository at the specified path\n" " or URL and adds them to the local repository.\n" "\n" -" If the pulled changes add a new branch head, the head is automatically\n" -" merged, and the result of the merge is committed. Otherwise, the\n" -" working directory is updated to include the new changes.\n" +" If the pulled changes add a new branch head, the head is\n" +" automatically merged, and the result of the merge is committed.\n" +" Otherwise, the working directory is updated to include the new\n" +" changes.\n" "\n" " When a merge occurs, the newly pulled changes are assumed to be\n" -" \"authoritative\". The head of the new changes is used as the first\n" -" parent, with local changes as the second. To switch the merge\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" " order, use --switch-parent.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -1613,8 +1851,12 @@ msgid "pulling from %s\n" msgstr "sto facendo pull da %s\n" -msgid "fetch -r doesn't work for remote repositories yet" -msgstr "" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"L'altro repository non supporta la ricerca di revisioni, quindi una " +"revisione non può essere specificata." #, python-format msgid "" @@ -1631,10 +1873,6 @@ msgstr "sto facendo il merge con %d:%s\n" #, python-format -msgid "Automated merge with %s" -msgstr "Merge automatico con %s" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" "il nuovo changeset %d:%s fa il merge delle modifiche remote con quelle " @@ -1655,29 +1893,13 @@ msgid "hg fetch [SOURCE]" msgstr "hg fetch [SORGENTE]" -msgid " returns of the good and bad signatures" -msgstr " restituisce le firme valide e non valide" +#, fuzzy +msgid "commands to sign and verify changesets" +msgstr "elenca i changeset firmati" msgid "error while verifying signature" msgstr "errore durante la verifica della firma" -msgid "create a new gpg instance" -msgstr "crea una nuova istanza gpg" - -msgid "" -"\n" -" walk over every sigs, yields a couple\n" -" ((node, version, sig), (filename, linenumber))\n" -" " -msgstr "" -"\n" -" percorre ogni firma, restituendo una coppia\n" -" ((nodo, versione, firma), (nome del file, numero di riga))\n" -" " - -msgid "get the keys who signed a data" -msgstr "ottiene le chiavi di chi ha firmato i dati" - #, python-format msgid "%s Bad signature from \"%s\"\n" msgstr "%s Firma non valida da \"%s\"\n" @@ -1705,9 +1927,6 @@ msgid "No valid signature for %s\n" msgstr "Nessuna firma valida per %s\n" -msgid "associate a string to a key (username, comment)" -msgstr "associa una stringa ad una chiave (username, commento)" - msgid "" "add a signature for the current or given revision\n" "\n" @@ -1742,13 +1961,6 @@ "la copia di lavoro di .hgsigs è cambiata (si prega di fare il commit " "manualmente di .hgsigs o usare --force)" -#, python-format -msgid "Added signature for changeset %s" -msgstr "Aggiunta firma per il changeset %s" - -msgid "map a manifest into some text" -msgstr "associa un manifesto ad un qualche testo" - msgid "unknown signature version" msgstr "versione della firma sconosciuta" @@ -1777,60 +1989,13 @@ msgstr "hg sigs" 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" +"commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" -msgid "" -"cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history from " -"revision\n" -" start to revision stop (which must be less than or equal to start).\n" -" " -msgstr "" - -msgid "" -"file cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history of a single\n" -" file from revision start to revision stop (which must be less than or\n" -" equal to start).\n" -" " -msgstr "" - -msgid "" -"grapher for asciigraph on a list of nodes and their parents\n" -"\n" -" nodes must generate tuples (node, parents, char, lines) where\n" -" - parents must generate the parents of node, in sorted order,\n" -" and max length 2,\n" -" - char is the char to print as the node symbol, and\n" -" - lines are the lines to display next to the node.\n" -" " -msgstr "" - -msgid "" -"prints an ASCII graph of the DAG returned by the grapher\n" -"\n" -" grapher is a generator that emits tuples with the following elements:\n" -"\n" -" - Character to use as node's symbol.\n" -" - List of lines to display as the node's text.\n" -" - Column of the current node in the set of ongoing edges.\n" -" - Edges; a list of (col, next_col) indicating the edges between\n" -" the current node and its parents.\n" -" - Number of columns (ongoing edges) in the current revision.\n" -" - The difference between the number of columns (ongoing edges)\n" -" in the next revision and the number of columns (ongoing edges)\n" -" in the current revision. That is: -1 means one column removed;\n" -" 0 means no columns added or removed; 1 means one column added.\n" -" " -msgstr "" - #, python-format msgid "--graph option is incompatible with --%s" msgstr "l'opzione --graph è incompatibile con --%s" @@ -1846,17 +2011,6 @@ " " msgstr "" -msgid "" -"show the outgoing changesets alongside an ASCII revision graph\n" -"\n" -" Print the outgoing changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" - #, python-format msgid "comparing with %s\n" msgstr "sto confrontando con %s\n" @@ -1864,20 +2018,6 @@ msgid "no changes found\n" msgstr "nessuna modifica trovata\n" -msgid "" -"show the incoming changesets alongside an ASCII revision graph\n" -"\n" -" Print the incoming changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" - -msgid "wrap the command" -msgstr "" - msgid "show the revision DAG" msgstr "" @@ -1894,105 +2034,77 @@ msgstr "hg glog [OPZIONI]... [FILE]" 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" -msgstr "" - -msgid " A CIA message " -msgstr "" - -msgid " CIA notification class " +"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 msgid "hgcia: sending update to %s\n" msgstr "" -msgid " send CIA notification " -msgstr "invia notifica CIA" - msgid "email.from must be defined when sending by email" msgstr "email.from deve essere definito quando si mandano mail" -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\n" -"not distributed with Mercurial.)\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" +"distributed with Mercurial.)\n" "\n" "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" +"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\n" -"to use your global $HOME/.hgrc file, not one in a repository). You\n" -"can 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\n" -"specify the path to hgk in your .hgrc file:\n" +"to work, hgk must be in your search path. Alternately, you can specify\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" @@ -2052,8 +2164,9 @@ msgid "hg debug-config" msgstr "hg debug-config" -msgid "hg debug-merge-base node node" -msgstr "hg debug-merge-base nodo nodo" +#, fuzzy +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-rev-parse REV" msgid "ignored" msgstr "ignorato" @@ -2073,56 +2186,39 @@ msgid "max-count" msgstr "conto massimo" -msgid "hg debug-rev-list [options] revs" -msgstr "hg debug-rev-list [opzioni] revs" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" -"\n" -"It depends on the pygments syntax highlighting library:\n" +#, fuzzy +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debugcvsps [OPZIONI]... [PERCORSO]..." + +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 = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "inotify-based status acceleration for Linux systems\n" -msgstr "accelerazione di status per sistemi Linux basata su inotify\n" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" +msgstr "" msgid "start an inotify server for this repository" msgstr "avvia un server inotify per questo repository" -msgid "(found dead inotify server socket; removing it)\n" -msgstr "(trovato socket morto del server inotify; lo rimuovo)\n" - -msgid "(starting inotify server)\n" -msgstr "(sto avviando il server inotify)\n" - -#, python-format -msgid "could not start inotify server: %s\n" -msgstr "impossibile avviare il server inotify: %s\n" - -#, python-format -msgid "could not talk to new inotify server: %s\n" -msgstr "impossibile comunicare con il nuovo server inotify: %s\n" - -msgid "(inotify server not running)\n" -msgstr "(server inotify non in esecuzione\n" - -#, python-format -msgid "failed to contact inotify server: %s\n" -msgstr "non sono riuscito a contattare il server inotify: %s\n" +msgid "" +"debugging information for inotify extension\n" +"\n" +" Prints the list of directories being watched by the inotify server.\n" +" " +msgstr "" + +msgid "directories being watched:\n" +msgstr "" msgid "run server in background" msgstr "avvia il server in background" @@ -2136,13 +2232,37 @@ msgid "name of file to write process ID to" msgstr "nome del file in cui scrivere l'ID del processo" -msgid "hg inserve [OPT]..." +#, fuzzy +msgid "hg inserve [OPTION]..." msgstr "hg inserve [OPT]..." +msgid "(found dead inotify server socket; removing it)\n" +msgstr "(trovato socket morto del server inotify; lo rimuovo)\n" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "impossibile avviare il server inotify: %s\n" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "impossibile comunicare con il nuovo server inotify: %s\n" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "non sono riuscito a contattare il server inotify: %s\n" + +#, fuzzy +msgid "received empty answer from inotify server" +msgstr "Risposta inaspettata dal server remoto:" + #, python-format msgid "(inotify: received response from incompatible server version %d)\n" msgstr "" +#, python-format +msgid "(inotify: received '%s' response when expecting '%s')\n" +msgstr "" + msgid "this system does not seem to support inotify" msgstr "questo sistema sembra non supportare inotify" @@ -2187,10 +2307,6 @@ msgstr "sto controllando le directory sotto %r\n" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "status: %r dir(%d) -> %s\n" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "status: %r %s -> %s\n" @@ -2238,29 +2354,39 @@ msgstr "" #, python-format -msgid "%s processing %d deferred events as %d\n" -msgstr "" - -#, python-format msgid "could not start server: %s" msgstr "" #, python-format +msgid "answering query for %r\n" +msgstr "" + +#, python-format msgid "received query from incompatible client version %d\n" msgstr "" -#, python-format -msgid "answering query for %r\n" -msgstr "" +#, fuzzy, python-format +msgid "unrecognized query type: %s\n" +msgstr "risposta non riconosciuta\n" msgid "finished setup\n" msgstr "" -msgid "polling: no timeout\n" -msgstr "" - -#, python-format -msgid "polling: %sms timeout\n" +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" +"\n" +" [interhg]\n" +" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" #, python-format @@ -2272,119 +2398,63 @@ msgstr "" msgid "" -"keyword expansion in local repositories\n" -"\n" -"This extension expands RCS/CVS-like or self-customized $Keywords$\n" -"in tracked text files selected by your configuration.\n" -"\n" -"Keywords are only expanded in local repositories and not stored in\n" -"the change history. The mechanism can be regarded as a convenience\n" -"for the current user or for archive distribution.\n" -"\n" -"Configuration is done in the [keyword] and [keywordmaps] sections\n" -"of hgrc files.\n" -"\n" -"Example:\n" +"expand keywords in tracked files\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" +"tracked text files selected by your configuration.\n" +"\n" +"Keywords are only expanded in local repositories and not stored in the\n" +"change history. The mechanism can be regarded as a convenience for the\n" +"current user or for archive distribution.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections of\n" +"hgrc files.\n" +"\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repos.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" -"\n" -"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" -"with customized keywords and templates.\n" -"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" +"\n" +"The default template mappings (view with \"hg kwdemo -d\") can be\n" +"replaced with customized keywords and templates. Again, run \"hg\n" +"kwdemo\" to control the results of your config changes.\n" "\n" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" -"the risk of inadvertedly storing expanded keywords in the change history.\n" +"the risk of inadvertently storing expanded keywords in the change\n" +"history.\n" "\n" "To force expansion after enabling it, or a configuration change, run\n" "\"hg kwexpand\".\n" "\n" -"Also, when committing with the record extension or using mq's qrecord, be " -"aware\n" -"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" -"question to update keyword expansions after all changes have been checked " -"in.\n" +"Also, when committing with the record extension or using mq's qrecord,\n" +"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" +"the files in question to update keyword expansions after all changes\n" +"have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" -msgstr "" - -msgid "Returns hgdate in cvs-like UTC format." -msgstr "" - -msgid "" -"\n" -" Sets up keyword templates, corresponding keyword regex, and\n" -" provides keyword substitution functions.\n" -" " -msgstr "" - -msgid "Replaces keywords in data with expanded template." -msgstr "" - -msgid "Returns data with keywords expanded." -msgstr "" - -msgid "" -"Returns true if path matches [keyword] pattern\n" -" and is not a symbolic link.\n" -" Caveat: localrepository._link fails on Windows." -msgstr "" - -msgid "Overwrites selected files expanding/shrinking keywords." -msgstr "" - -#, python-format -msgid "overwriting %s %s keywords\n" -msgstr "" - -msgid "Unconditionally removes all keyword substitutions from text." -msgstr "" - -msgid "Returns text with all keyword substitutions removed." -msgstr "" - -msgid "Returns lines with keyword substitutions removed." -msgstr "" - -msgid "" -"If in restricted mode returns data read from wdir with\n" -" keyword substitutions removed." -msgstr "" - -msgid "" -"\n" -" Subclass of filelog to hook into its read, add, cmp methods.\n" -" Keywords are \"stored\" unexpanded, and processed on reading.\n" -" " -msgstr "" - -msgid "Expands keywords when reading filelog." -msgstr "" - -msgid "Removes keyword substitutions when adding to filelog." -msgstr "" - -msgid "Removes keyword substitutions for comparison." -msgstr "" - -msgid "" -"Bails out if [keyword] configuration is not active.\n" -" Returns status of working directory." -msgstr "" -"Esce se la configurazione [keyword] non è attiva.\n" -" Restituisce lo stato della directory di lavoro." +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +#, fuzzy, python-format +msgid "overwriting %s expanding keywords\n" +msgstr "sovrascrivi %s parziale %s\n" + +#, python-format +msgid "overwriting %s shrinking keywords\n" +msgstr "" msgid "[keyword] patterns cannot match" msgstr "" @@ -2392,49 +2462,66 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "Selects files and passes them to kwtemplater.overwrite." -msgstr "" - msgid "" "print [keywordmaps] configuration and an expansion example\n" "\n" -" Show current, custom, or default keyword template maps\n" -" and their expansion.\n" -"\n" -" Extend current configuration by specifying maps as arguments\n" -" and optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Show current, custom, or default keyword template maps and their\n" +" expansions.\n" +"\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" -#, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - -#, python-format -msgid "creating temporary repo at %s\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +#, fuzzy, python-format +msgid "creating temporary repository at %s\n" +msgstr "lock del repository remoto fallito" + +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +#, fuzzy +msgid "\tdisabling current template maps\n" +msgstr "mostra usando un file mappa template" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repo %s\n" -msgstr "" - -msgid "" -"expand keywords in working directory\n" +msgid "" +"\n" +"\tkeywords expanded\n" +msgstr "" + +msgid "" +"expand keywords in the working directory\n" "\n" " Run after (re)enabling keyword expansion.\n" "\n" @@ -2443,54 +2530,38 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets for\n" -" keyword expansion.\n" -" That is, files matched by [keyword] config patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" msgid "" -"revert expanded keywords in working directory\n" -"\n" -" Run before changing/disabling active keywords\n" -" or if you experience problems with \"hg import\" or \"hg merge\".\n" +"revert expanded keywords in the working directory\n" +"\n" +" Run before changing/disabling active keywords or if you experience\n" +" problems with \"hg import\" or \"hg merge\".\n" "\n" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"Collects [keyword] config in kwtools.\n" -" Monkeypatches dispatch._parse if needed." -msgstr "" - -msgid "Monkeypatch dispatch._parse to obtain running hg command." -msgstr "" - -msgid "" -"Sets up repo as kwrepo for keyword substitution.\n" -" Overrides file method to return kwfilelog instead of filelog\n" -" if file matches user configuration.\n" -" Wraps commit to overwrite configured files with updated\n" -" keyword substitutions.\n" -" Monkeypatches patch and webcommands." -msgstr "" - -msgid "" -"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" -" rejects or conflicts due to expanded keywords in working dir." -msgstr "" - -msgid "" -"Monkeypatch patch.diff to avoid expansion except when\n" -" comparing against working dir." -msgstr "" - -msgid "Wraps webcommands.x turning off keyword expansion." -msgstr "" - msgid "show default keyword template maps" msgstr "" @@ -2509,7 +2580,15 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +#, fuzzy +msgid "only show unknown (not tracked) files" +msgstr "mostra solo i file sconosciuti (non tracciati)" + +#, fuzzy +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "mostra lo stato di tutti i file" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2519,41 +2598,27 @@ msgstr "hg kwshrink [OPZIONI]... [FILE]..." msgid "" -"patch management and development\n" +"manage a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" -"repository. It manages two stacks of patches - all known patches, and\n" +"repository. It manages two stacks of patches - all known patches, and\n" "applied patches (subset of known patches).\n" "\n" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" -"\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" -msgstr "" - -msgid "" -"Update all references to a field in the patch header.\n" -" If none found, add it email style." -msgstr "" -"Aggiorna tutti i riferimenti ad un campo nell'intestazione della patch.\n" -" If none found, add it email style." - -msgid "" -"Remove existing message, keeping the rest of the comments fields.\n" -" If comments contains 'subject: ', message will prepend\n" -" the field and a blank line." +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" #, python-format @@ -2572,10 +2637,6 @@ msgstr "carattere non valido nella guardia %r: %r" #, python-format -msgid "active guards: %s\n" -msgstr "guardie attive: %s\n" - -#, python-format msgid "guard %r too short" msgstr "la guardia %r è troppo corta" @@ -2634,11 +2695,6 @@ msgid "patch %s is not applied\n" msgstr "la patch %s non è applicata\n" -msgid "" -"Apply patchfile to the working directory.\n" -" patchfile: file name of patch" -msgstr "" - msgid "patch failed, unable to continue (try -v)\n" msgstr "patch fallita, impossibile continuare (provare con -v)\n" @@ -2646,9 +2702,9 @@ msgid "applying %s\n" msgstr "sto applicando %s\n" -#, python-format -msgid "Unable to read %s\n" -msgstr "Impossibile leggere %s\n" +#, fuzzy, python-format +msgid "unable to read %s\n" +msgstr "impossibile leggere %s" #, python-format msgid "imported patch %s\n" @@ -2680,6 +2736,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "" +#, fuzzy, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "mostra solo i file senza modifiche" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2707,12 +2767,6 @@ msgid "\"%s\" cannot be used as the name of a patch" msgstr "" -msgid "" -"options:\n" -" msg: a string or a no-argument function returning a string\n" -" " -msgstr "" - #, python-format msgid "patch \"%s\" already exists" msgstr "la patch \"%s\" esiste gi" @@ -2721,9 +2775,6 @@ msgid "error unlinking %s\n" msgstr "" -msgid "returns (index, rev, patch)" -msgstr "" - #, python-format msgid "patch name \"%s\" is ambiguous:\n" msgstr "il nome della patch \"%s\" ambiguo:\n" @@ -2732,7 +2783,8 @@ msgid "patch %s not in series" msgstr "la patch %s non nella serie" -msgid "(working directory not at tip)\n" +#, fuzzy +msgid "(working directory not at a head)\n" msgstr "(directory di lavoro non tip)\n" msgid "no patches in series\n" @@ -2799,6 +2851,10 @@ msgid "deletions found between repo revs" msgstr "" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "sto applicando %s\n" + msgid "patch queue now empty\n" msgstr "" @@ -2853,14 +2909,6 @@ msgid "repo commit failed\n" msgstr "commit del repository fallito\n" -msgid "" -"If all_patches is False, return the index of the next pushable patch\n" -" in the series, or the series length. If all_patches is True, return " -"the\n" -" index of the first patch past the last applied one.\n" -" " -msgstr "" - #, python-format msgid "patch %s is already in the series file" msgstr "la patch %s gi nel file series" @@ -2912,54 +2960,64 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to\n" -" the --rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular mercurial changesets). The qfinish command should be\n" -" used as an alternative for qdel -r, as the latter option is deprecated.\n" -"\n" -" With --keep, the patch files are preserved in the patch directory." +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" msgstr "stampa le patch gi applicate" +msgid "only one patch applied\n" +msgstr " stata applicata solo una patch\n" + msgid "print the patches not yet applied" msgstr "stampa le patch non ancora applicate" +msgid "all patches applied\n" +msgstr "tutte le patch sono state applicate\n" + msgid "" "import a patch\n" "\n" -" The patch is inserted into the series after the last applied patch.\n" -" If no patches have been applied, qimport prepends the patch\n" +" The patch is inserted into the series after the last applied\n" +" patch. If no patches have been applied, qimport prepends the patch\n" " to the series.\n" "\n" " The patch will have the same name as its source file unless you\n" -" give it a new one with --name.\n" -"\n" -" You can register an existing patch inside the patch directory\n" -" with the --existing flag.\n" -"\n" -" With --force, an existing patch of the same name will be overwritten.\n" -"\n" -" An existing changeset may be placed under mq control with --rev\n" +" give it a new one with -n/--name.\n" +"\n" +" You can register an existing patch inside the patch directory with\n" +" the -e/--existing flag.\n" +"\n" +" With -f/--force, an existing patch of the same name will be\n" +" overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" -" With --git, patches imported with --rev will use the git diff\n" +" With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" -" important for preserving rename/copy information and permission " -"changes.\n" +" important for preserving rename/copy information and permission\n" +" changes.\n" +"\n" +" To import a patch from standard input, pass - as the patch file.\n" +" When importing from standard input, a patch name must be specified\n" +" using the --name flag.\n" " " msgstr "" +#, fuzzy msgid "" "init a new queue repository\n" "\n" -" The queue repository is unversioned by default. If -c is\n" -" specified, qinit will create a separate nested repository\n" -" for patches (qinit -c may also be run later to convert\n" -" an unversioned patch repository into a versioned one).\n" -" You can use qcommit to commit changes to this queue repository." +" The queue repository is unversioned by default. If\n" +" -c/--create-repo is specified, qinit will create a separate nested\n" +" repository for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one). You can use\n" +" qcommit to commit changes to this queue repository." msgstr "" "inizializza un nuovo repository della coda\n" "\n" @@ -2974,16 +3032,16 @@ msgid "" "clone main and patch repository at same time\n" "\n" -" If source is local, destination will have no patches applied. If\n" +" If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" -" applied in destination. If you clone remote repository, be sure\n" +" applied in destination. If you clone remote repository, be sure\n" " before that it has no patches applied.\n" "\n" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" -" The patch directory must be a nested mercurial repository, as\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " msgstr "" @@ -2993,16 +3051,20 @@ "repository delle patch sotto controllo di versione non trovato (vedere qinit " "-c)" -msgid "cloning main repo\n" +#, fuzzy +msgid "cloning main repository\n" msgstr "sto clonando il repository principale\n" -msgid "cloning patch repo\n" +#, fuzzy +msgid "cloning patch repository\n" msgstr "sto clonando il repository delle patch\n" -msgid "stripping applied patches from destination repo\n" +#, fuzzy +msgid "stripping applied patches from destination repository\n" msgstr "sto rimuovendo le patch applicate dal repository di destinazione\n" -msgid "updating destination repo\n" +#, fuzzy +msgid "updating destination repository\n" msgstr "sto aggiornando il repository di destinazione\n" msgid "commit changes in the queue repository" @@ -3017,35 +3079,30 @@ msgid "print the name of the next patch" msgstr "stampa il nome della patch seguente" -msgid "all patches applied\n" -msgstr "tutte le patch sono state applicate\n" - msgid "print the name of the previous patch" msgstr "stampa il nome della patch precedente" -msgid "only one patch applied\n" -msgstr " stata applicata solo una patch\n" - +#, fuzzy msgid "" "create a new patch\n" "\n" -" qnew creates a new patch on top of the currently-applied patch (if " -"any).\n" -" It will refuse to run if there are any outstanding changes unless -f is\n" -" specified, in which case the patch will be initialized with them. You\n" -" may also use -I, -X, and/or a list of files after the patch name to add\n" -" only changes to matching files to the new patch, leaving the rest as\n" -" uncommitted modifications.\n" -"\n" -" -u and -d can be used to set the (given) user and date, respectively.\n" -" -U and -D set user to current user and date to current date.\n" -"\n" -" -e, -m or -l set the patch header as well as the commit message. If " -"none\n" -" is specified, the header is empty and the commit message is '[mq]: " -"PATCH'.\n" -"\n" -" Use the --git option to keep the patch in the git extended diff\n" +" qnew creates a new patch on top of the currently-applied patch (if\n" +" any). It will refuse to run if there are any outstanding changes\n" +" unless -f/--force is specified, in which case the patch will be\n" +" initialized with them. You may also use -I/--include,\n" +" -X/--exclude, and/or a list of files after the patch name to add\n" +" only changes to matching files to the new patch, leaving the rest\n" +" as uncommitted modifications.\n" +"\n" +" -u/--user and -d/--date can be used to set the (given) user and\n" +" date, respectively. -U/--currentuser and -D/--currentdate set user\n" +" to current user and date to current date.\n" +"\n" +" -e/--edit, -m/--message or -l/--logfile set the patch header as\n" +" well as the commit message. If none is specified, the header is\n" +" empty and the commit message is '[mq]: PATCH'.\n" +"\n" +" Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" " information.\n" @@ -3080,18 +3137,17 @@ msgid "" "update the current patch\n" "\n" -" If any file patterns are provided, the refreshed patch will contain " -"only\n" -" the modifications that match those patterns; the remaining " -"modifications\n" -" will remain in the working directory.\n" -"\n" -" If --short is specified, files currently included in the patch will\n" -" be refreshed just like matched files and remain in the patch.\n" -"\n" -" hg add/remove/copy/rename work as usual, though you might want to use\n" -" git-style patches (--git or [diff] git=1) to track copies and renames.\n" -" See the diffs help topic for more information on the git diff format.\n" +" If any file patterns are provided, the refreshed patch will\n" +" contain only the modifications that match those patterns; the\n" +" remaining modifications will remain in the working directory.\n" +"\n" +" If -s/--short is specified, files currently included in the patch\n" +" will be refreshed just like matched files and remain in the patch.\n" +"\n" +" hg add/remove/copy/rename work as usual, though you might want to\n" +" use git-style patches (-g/--git or [diff] git=1) to track copies\n" +" and renames. See the diffs help topic for more information on the\n" +" git diff format.\n" " " msgstr "" @@ -3101,14 +3157,15 @@ msgid "" "diff of the current patch and subsequent modifications\n" "\n" -" Shows a diff which includes the current patch as well as any changes " -"which\n" -" have been made in the working directory since the last refresh (thus\n" -" showing what the current patch would become after a qrefresh).\n" -"\n" -" Use 'hg diff' if you only want to see the changes made since the last\n" -" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" -" current patch without including changes made since the qrefresh.\n" +" Shows a diff which includes the current patch as well as any\n" +" changes which have been made in the working directory since the\n" +" last refresh (thus showing what the current patch would become\n" +" after a qrefresh).\n" +"\n" +" Use 'hg diff' if you only want to see the changes made since the\n" +" last qrefresh, or 'hg export qtip' if you want to see changes made\n" +" by the current patch without including changes made since the\n" +" qrefresh.\n" " " msgstr "" @@ -3118,12 +3175,12 @@ " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" -" with the new cumulative patch, and the folded patches will\n" -" be deleted. With -k/--keep, the folded patch files will not\n" -" be removed afterwards.\n" -"\n" -" The header for each folded patch will be concatenated with\n" -" the current patch header, separated by a line of '* * *'." +" with the new cumulative patch, and the folded patches will be\n" +" deleted. With -k/--keep, the folded patch files will not be\n" +" removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with the\n" +" current patch header, separated by a line of '* * *'." msgstr "" msgid "qfold requires at least one patch name" @@ -3181,8 +3238,8 @@ msgid "" "push the next patch onto the stack\n" "\n" -" When --force is applied, all local changes in patched files will be " -"lost.\n" +" When -f/--force is applied, all local changes in patched files\n" +" will be lost.\n" " " msgstr "" @@ -3196,9 +3253,9 @@ msgid "" "pop the current patch off the stack\n" "\n" -" By default, pops off the top of the patch stack. If given a patch name,\n" -" keeps popping off patches until the named patch is at the top of the " -"stack.\n" +" By default, pops off the top of the patch stack. If given a patch\n" +" name, keeps popping off patches until the named patch is at the\n" +" top of the stack.\n" " " msgstr "" @@ -3225,7 +3282,8 @@ msgid "A patch named %s already exists in the series file" msgstr "Una patch chiamata %s esiste già nel file series" -msgid "restore the queue state saved by a rev" +#, fuzzy +msgid "restore the queue state saved by a revision" msgstr "ripristina lo stato della coda salvato da una revisione" msgid "save current queue state" @@ -3243,11 +3301,13 @@ msgid "copy %s to %s\n" msgstr "copia %s a %s\n" +#, fuzzy msgid "" "strip a revision and all its descendants from the repository\n" "\n" -" If one of the working dir's parent revisions is stripped, the working\n" -" directory will be updated to the parent of the stripped revision.\n" +" If one of the working directory's parent revisions is stripped, the\n" +" working directory will be updated to the parent of the stripped\n" +" revision.\n" " " msgstr "" "elimina una revisione e tutti i suoi discendenti dal repository\n" @@ -3261,34 +3321,34 @@ "set or print guarded patches to push\n" "\n" " Use the qguard command to set or print guards on patch, then use\n" -" qselect to tell mq which guards to use. A patch will be pushed if it\n" -" has no guards or any positive guards match the currently selected " -"guard,\n" -" but will not be pushed if any negative guards match the current guard.\n" -" For example:\n" +" qselect to tell mq which guards to use. A patch will be pushed if\n" +" it has no guards or any positive guards match the currently\n" +" selected guard, but will not be pushed if any negative guards\n" +" match the current guard. For example:\n" "\n" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" " qselect stable\n" "\n" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" -" it has a negative match) but push bar.patch (because it\n" -" has a positive match).\n" +" it has a negative match) but push bar.patch (because it has a\n" +" positive match).\n" "\n" " With no arguments, prints the currently active guards.\n" " With one argument, sets the active guard.\n" "\n" " Use -n/--none to deactivate guards (no other arguments needed).\n" -" When no guards are active, patches with positive guards are skipped\n" -" and patches with negative guards are pushed.\n" +" When no guards are active, patches with positive guards are\n" +" skipped and patches with negative guards are pushed.\n" "\n" " qselect can change the guards on applied patches. It does not pop\n" -" guarded patches by default. Use --pop to pop back to the last applied\n" -" patch that is not guarded. Use --reapply (which implies --pop) to push\n" -" back to the current patch afterwards, but skip guarded patches.\n" -"\n" -" Use -s/--series to print a list of all guards in the series file (no\n" -" other arguments needed). Use -v for more information." +" guarded patches by default. Use --pop to pop back to the last\n" +" applied patch that is not guarded. Use --reapply (which implies\n" +" --pop) to push back to the current patch afterwards, but skip\n" +" guarded patches.\n" +"\n" +" Use -s/--series to print a list of all guards in the series file\n" +" (no other arguments needed). Use -v for more information." msgstr "" msgid "guards deactivated\n" @@ -3324,17 +3384,18 @@ msgid "" "move applied patches into repository history\n" "\n" -" Finishes the specified revisions (corresponding to applied patches) by\n" -" moving them out of mq control into regular repository history.\n" -"\n" -" Accepts a revision range or the --applied option. If --applied is\n" -" specified, all applied mq revisions are removed from mq control.\n" -" Otherwise, the given revisions must be at the base of the stack of\n" -" applied patches.\n" -"\n" -" This can be especially useful if your changes have been applied to an\n" -" upstream repository, or if you are about to push your changes to " -"upstream.\n" +" Finishes the specified revisions (corresponding to applied\n" +" patches) by moving them out of mq control into regular repository\n" +" history.\n" +"\n" +" Accepts a revision range or the -a/--applied option. If --applied\n" +" is specified, all applied mq revisions are removed from mq\n" +" control. Otherwise, the given revisions must be at the base of the\n" +" stack of applied patches.\n" +"\n" +" This can be especially useful if your changes have been applied to\n" +" an upstream repository, or if you are about to push your changes\n" +" to upstream.\n" " " msgstr "" @@ -3361,7 +3422,12 @@ msgid "print first line of patch header" msgstr "stampa la prima riga dell'intestazione della patch" -msgid "hg qapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the last patch" +msgstr "mostra solo i file aggiunti" + +#, fuzzy +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" @@ -3373,7 +3439,8 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "usa trasferimento non compresso (veloce su LAN)" -msgid "location of source patch repo" +#, fuzzy +msgid "location of source patch repository" msgstr "posizione del repository delle patch sorgente" msgid "hg qclone [OPTION]... SOURCE [DEST]" @@ -3388,7 +3455,8 @@ msgid "keep patch file" msgstr "mantieni il file della patch" -msgid "stop managing a revision" +#, fuzzy +msgid "stop managing a revision (DEPRECATED)" msgstr "smetti di gestire una revisione" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -3421,11 +3489,13 @@ msgid "hg qheader [PATCH]" msgstr "hg qheader [PATCH]" -msgid "import file in patch dir" +#, fuzzy +msgid "import file in patch directory" msgstr "importa il file nella directory delle patch" -msgid "patch file name" -msgstr "nome del file della patch" +#, fuzzy +msgid "name of patch file" +msgstr "mantieni il file della patch" msgid "overwrite existing files" msgstr "sovrascrive i file esistenti" @@ -3436,7 +3506,11 @@ msgid "use git extended diff format" msgstr "usa il formato diff git esteso" -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgid "qpush after importing" +msgstr "" + +#, fuzzy +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." msgstr "hg qimport [-e] [-n NOME] [-f] [-g] [-r REV]... FILE..." msgid "create queue repository" @@ -3475,7 +3549,8 @@ msgid "queue name to pop" msgstr "nome della coda da disapplicare" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "dimentica ogni modifica locale" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3502,16 +3577,18 @@ msgid "refresh only files already in the patch and specified files" msgstr "aggiorna solo file già nella patch e quelli specificati" -msgid "add/update \"From: <current user>\" in patch" -msgstr "aggiunge/aggiorna \"Da: <utente corrente>\" nella patch" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "aggiunge/aggiorna \"Da: <utente fornito>\" nella patch" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "aggiorna \"Data: <data corrente>\" nella patch (se presente)" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +#, fuzzy +msgid "add/update date field in patch with current date" +msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)" + +#, fuzzy +msgid "add/update date field in patch with given date" msgstr "aggiorna \"Data: <data fornita>\" nella patch (se presente)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3523,7 +3600,8 @@ msgid "delete save entry" msgstr "elimina la voce salvata" -msgid "update queue working dir" +#, fuzzy +msgid "update queue working directory" msgstr "aggiorna la directory di lavoro della coda" msgid "hg qrestore [-d] [-u] REV" @@ -3580,100 +3658,86 @@ msgid "hg qtop [-s]" msgstr "hg qtop [-s]" -msgid "hg qunapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the first patch" +msgstr "mostra solo i file aggiunti" + +#, fuzzy +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" msgstr "finalizza tutti i changeset applicati" -msgid "hg qfinish [-a] [REV...]" +#, fuzzy +msgid "hg qfinish [-a] [REV]..." msgstr "hg qfinish [-a] [REV...]" msgid "" -"hook extension to email notifications on commits/pushes\n" -"\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +"hooks for sending email notifications at commit/push time\n" +"\n" +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repo root.\n" -"\n" -" if you like, you can put notify config file in repo that users can\n" -" push changes to, they can manage their own subscriptions." -msgstr "" - -msgid "email notification class." -msgstr "classe per la notifica via email." - -msgid "strip leading slashes from local path, turn into web-safe path." -msgstr "" - -msgid "try to clean up email addresses." -msgstr "prova a pulire gli indirizzi email." - -msgid "return list of email addresses of subscribers to this repo." -msgstr "restituisce gli indirizzi email dei sottoscritti a questo repository" - -msgid "format one changeset." -msgstr "formatta un changeset." - -msgid "true if incoming changes from this source should be skipped." -msgstr "" -"vero se le modifiche in entrata da questa sorgente dovrebbero essere saltate." - -msgid "send message." -msgstr "invia messaggio." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" +msgstr "" #, python-format msgid "%s: %d new changesets" @@ -3703,107 +3767,89 @@ "diff (%d linee):\n" "\n" -msgid "" -"send email notifications to interested subscribers.\n" -"\n" -" if used as changegroup hook, send one email for all changesets in\n" -" changegroup. else send one email per changeset." -msgstr "" - -#, python-format -msgid "notify: no subscribers to repo %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" - -msgid "" -"browse command output with external pager\n" -"\n" -"To set the pager that should be used, set the application variable:\n" +#, python-format +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "" + +msgid "" +"browse command output with an external pager\n" +"\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" "\n" -"If no pager is set, the pager extensions uses the environment\n" -"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" -"is used.\n" -"\n" -"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" -"by setting:\n" +"If no pager is set, the pager extensions uses the environment variable\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" -"You can also enable the pager only for certain commands using pager.attend:\n" +"You can also enable the pager only for certain commands using\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" -"To ignore global commands like \"hg version\" or \"hg help\", you have to " -"specify\n" -"them in the global .hgrc\n" -msgstr "" - -msgid "" -"use suffixes to refer to ancestor revisions\n" -"\n" -"This extension allows you to use git-style suffixes to refer to\n" -"the ancestors of a specific revision.\n" -"\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo:\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" +msgstr "" + +msgid "" +"interpret suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to the\n" +"ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" -"\n" -"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" -"which describes the series as a whole.\n" -"\n" -"Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" -"the first line of the changeset description as the subject text.\n" -"The message contains two or three body parts:\n" -"\n" -" The remainder of the changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" -"\n" -"Each message refers to all of its predecessors using the In-Reply-To\n" -"and References headers, so they will show up as a sequence in\n" -"threaded mail and news readers, and in mail archives.\n" -"\n" -"For each changeset, you will be prompted with a diffstat summary and\n" -"the changeset summary, so you can be sure you are sending the right " -"changes.\n" -"\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" -"To configure other defaults, add a section like this to your hgrc file:\n" +"command to send changesets as (a series of) patch emails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" +"describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" +"first line of the changeset description as the subject text. The\n" +"message contains two or three body parts:\n" +"\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to the first in the series using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in threaded\n" +"mail and news readers, and in mail archives.\n" +"\n" +"With the -d/--diffstat option, you will be prompted for each changeset\n" +"with a diffstat summary and the changeset summary, so you can be sure\n" +"you are sending the right changes.\n" +"\n" +"To configure other defaults, add a section like this to your hgrc\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3815,35 +3861,39 @@ "as a patchbomb.\n" "\n" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject an an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If PAGER environment variable\n" -"is set, your pager will be fired up once for each patchbomb message, so\n" -"you can verify everything is alright.\n" -"\n" -"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" -"each patchbomb message in a pager or sending the messages directly,\n" -"it will create a UNIX mailbox file with the patch emails. This\n" -"mailbox file can be previewed with any mail user agent which supports\n" -"UNIX mbox files, e.g. with mutt:\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" +"prompted for an email recipient address, a subject and an introductory\n" +"message describing the patches of your patchbomb. Then when all is\n" +"done, patchbomb messages are displayed. If the PAGER environment\n" +"variable is set, your pager will be fired up once for each patchbomb\n" +"message, so you can verify everything is alright.\n" +"\n" +"The -m/--mbox option is also very useful. Instead of previewing each\n" +"patchbomb message in a pager or sending the messages directly, it will\n" +"create a UNIX mailbox file with the patch emails. This mailbox file\n" +"can be previewed with any mail user agent which supports UNIX mbox\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" -"(a utility that is commonly installed as part of the procmail package),\n" -"to send each message out:\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" +"(a utility that is commonly installed as part of the procmail\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" "That should be all. Now your patchbomb is on its way out.\n" "\n" "You can also either configure the method option in the email section\n" -"to be a sendmail compatable mailer or fill out the [smtp] section so\n" -"that the patchbomb extension can automatically send patchbombs directly\n" -"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" -"for details." -msgstr "" +"to be a sendmail compatible mailer or fill out the [smtp] section so\n" +"that the patchbomb extension can automatically send patchbombs\n" +"directly from the commandline. See the [email] and [smtp] sections in\n" +"hgrc(5) for details.\n" +msgstr "" + +#, fuzzy, python-format +msgid "%sPlease enter a valid value" +msgstr "Si prega di inserire un valore valido.\n" msgid "Please enter a valid value.\n" msgstr "Si prega di inserire un valore valido.\n" @@ -3858,50 +3908,54 @@ "send changesets by email\n" "\n" " By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" " introduction, which describes the series as a whole.\n" "\n" " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" -" The message contains two or three body parts. First, the rest of\n" -" the changeset description. Next, (optionally) if the diffstat\n" -" program is installed, the result of running diffstat on the patch.\n" -" Finally, the patch itself, as generated by \"hg export\".\n" -"\n" -" With --outgoing, emails will be generated for patches not\n" -" found in the destination repository (or only those which are\n" -" ancestors of the specified revisions if any are provided)\n" -"\n" -" With --bundle, changesets are selected as for --outgoing,\n" -" but a single email containing a binary Mercurial bundle as an\n" -" attachment will be sent.\n" -"\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" The message contains two or three parts. First, the changeset\n" +" description. Next, (optionally) if the diffstat program is\n" +" installed and -d/--diffstat is used, the result of running\n" +" diffstat on the patch. Finally, the patch itself, as generated by\n" +" \"hg export\".\n" +"\n" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created.\n" +"\n" +" With -o/--outgoing, emails will be generated for patches not found\n" +" in the destination repository (or only those which are ancestors\n" +" of the specified revisions if any are provided)\n" +"\n" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent.\n" +"\n" +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" -"\n" -" Before using this command, you will need to enable email in your hgrc.\n" -" See the [email] section in hgrc(5) for details.\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" +"\n" +" Before using this command, you will need to enable email in your\n" +" hgrc. See the [email] section in hgrc(5) for details.\n" " " msgstr "" -msgid "Return the revisions present locally but not in dest" -msgstr "" - msgid "specify at least one changeset with -r or -o" msgstr "" @@ -3976,6 +4030,12 @@ msgid "subject of first message (intro or single patch)" msgstr "soggetto del primo messaggio (introduzione o patch singola)" +msgid "message identifier to reply to" +msgstr "" + +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "indirizzi mail dei destinatari" @@ -3988,16 +4048,19 @@ msgid "send changes not in target as a binary bundle" msgstr "invia le modifiche non in target come bundle binario" -msgid "file name of the bundle attachment" +#, fuzzy +msgid "name of the bundle attachment file" msgstr "nome del file dell'allegato bundle" msgid "a revision to send" msgstr "una revisione da inviare" -msgid "run even when remote repository is unrelated (with -b)" +#, fuzzy +msgid "run even when remote repository is unrelated (with -b/--bundle)" msgstr "esegui anche quando il repository remoto non è collegato (con -b)" -msgid "a base changeset to specify instead of a destination (with -b)" +#, fuzzy +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" msgstr "un changeset base da specificare invece di una destinazione (con -b)" msgid "send an introduction email for a single patch" @@ -4006,27 +4069,35 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPZIONI]... [DEST]..." +#, fuzzy +msgid "command to delete untracked files from the working directory" +msgstr "non effettuare il commit, aggiorna solo la directory di lavoro" + msgid "" "removes files not tracked by Mercurial\n" "\n" -" Delete files not known to Mercurial. This is useful to test local and\n" -" uncommitted changes in an otherwise-clean source tree.\n" +" Delete files not known to Mercurial. This is useful to test local\n" +" and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless they\n" -" contain files under source control managment\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" "\n" -" Be careful with purge, as you could irreversibly delete some files you\n" -" forgot to add to the repository. If you only want to print the list of\n" -" files that this program would delete, use the --print option.\n" +" Be careful with purge, as you could irreversibly delete some files\n" +" you forgot to add to the repository. If you only want to print the\n" +" list of files that this program would delete, use the --print\n" +" option.\n" " " msgstr "" @@ -4052,23 +4123,26 @@ msgid "purge ignored files too" msgstr "rimuove anche i file ignorati" -msgid "print the file names instead of deleting them" +#, fuzzy +msgid "print filenames instead of deleting them" msgstr "stampa i nomi dei file invece di cancellarli" -msgid "end filenames with NUL, for use with xargs (implies -p)" +#, fuzzy +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" msgstr "termina il nome dei file con NUL, per usarli con xargs (implica -p)" msgid "hg purge [OPTION]... [DIR]..." msgstr "hg purge [OPZIONI]... [DIR]..." -msgid "" -"move sets of revisions to a different ancestor\n" -"\n" -"This extension lets you rebase changesets in an existing Mercurial " +#, fuzzy +msgid "" +"command to move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" "sposta insiemi di revisioni su un antenato differente\n" "\n" @@ -4078,24 +4152,16 @@ "Per maggiori informazioni:\n" "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgid "return the correct ancestor" -msgstr "restituisce l'antenato corretto" - -msgid "first revision, do not change ancestor\n" -msgstr "prima revisione, non cambia l'antenato\n" - +#, fuzzy msgid "" "move changeset (and descendants) to a different branch\n" "\n" -" Rebase uses repeated merging to graft changesets from one part of " -"history\n" -" onto another. This can be useful for linearizing local changes relative " -"to\n" -" a master development tree.\n" -"\n" -" If a rebase is interrupted to manually resolve a merge, it can be " -"continued\n" -" with --continue or aborted with --abort.\n" +" Rebase uses repeated merging to graft changesets from one part of\n" +" history onto another. This can be useful for linearizing local\n" +" changes relative to a master development tree.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be\n" +" continued with --continue/-c or aborted with --abort/-a.\n" " " msgstr "" "sposta changeset (e discendenti) su una branch differente\n" @@ -4108,9 +4174,6 @@ " può essere ripreso con --continue o abortito con --abort.\n" " " -msgid "cannot use both keepbranches and extrafn" -msgstr "non è possibile usare sia keepbranches sia extrafn" - msgid "cannot use both abort and continue" msgstr "non è possibile usare sia abort sia continue" @@ -4126,6 +4189,9 @@ msgid "nothing to rebase\n" msgstr "niente di cui effettuare il rebase\n" +msgid "cannot use both keepbranches and extrafn" +msgstr "non è possibile usare sia keepbranches sia extrafn" + msgid "rebase merging completed\n" msgstr "merge del rebase completato\n" @@ -4140,101 +4206,24 @@ msgid "%d revisions have been skipped\n" msgstr "%d revisioni sono state saltate\n" -msgid "" -"Skip commit if collapsing has been required and rev is not the last\n" -" revision, commit otherwise\n" -" " -msgstr "" -"Salta il commit se è stato richiesto di collassare e rev non è l'ultima\n" -" revisione, effettua il commit altrimenti\n" -" " - -msgid " set parents\n" -msgstr " imposta i genitori\n" - -msgid "Rebase a single revision" -msgstr "Rebase di una singola revisione" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "sto effettuando il rebase di %d:%s\n" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr " i genitori futuri sono %d e %d\n" - -#, python-format -msgid " update to %d:%s\n" -msgstr " aggiorno a %d:%s\n" - -msgid " already in target\n" -msgstr " già su target\n" - -#, python-format -msgid " merge against %d:%s\n" -msgstr " merge con %d:%s\n" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" "correggi i conflitti non risolti con hg resolve e poi esegui hg rebase --" "continue" -msgid "resuming interrupted rebase\n" -msgstr "sto riprendendo un rebase interrotto\n" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "nessuna modifica, revisione %d saltata\n" #, python-format -msgid "next revision set to %s\n" -msgstr "prossima revisione impostata su %s\n" - -msgid "Return the new parent relationship of the revision that will be rebased" -msgstr "" -"Restituisce la nuova relazione di parentela della revisione di cui si farà " -"il rebase" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" "non è possibile usare la revisione %d come base, il risultato avrebbe 3 " "genitori" -msgid "Update rebased mq patches - finalize and then import them" -msgstr "" -"Aggiorna le patch mq di cui si è effettuato il rebase - le finalizza e poi " -"le importa" - -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "la revisione %d è una patch mq (%s), la finalizzo.\n" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "import della patch mq %d (%s)\n" - -msgid "Store the current status to allow recovery" -msgstr "Salva lo status corrente per consentire il recupero" - -msgid "rebase status stored\n" -msgstr "status del rebase salvato\n" - -msgid "Remove the status files" -msgstr "Rimuove i file dello stato" - -msgid "Restore a previously stored status" -msgstr "Ripristina uno stato precedentemente salvato" - -msgid "rebase status resumed\n" -msgstr "status di rebase recuperato\n" - msgid "no rebase in progress" msgstr "nessun rebase in corso" -msgid "Restore the repository to its original state" -msgstr "Ripristina il repository al suo stato originale" - msgid "warning: new changesets detected on target branch, not stripping\n" msgstr "" "attenzione: nuovi changeset rilevati sulla branch target, non li rimuovo\n" @@ -4242,49 +4231,22 @@ msgid "rebase aborted\n" msgstr "rebase abortito\n" -msgid "Define which revisions are going to be rebased and where" -msgstr "Definisce di quali revisioni si farà il rebase e dove" - msgid "cannot rebase onto an applied mq patch" msgstr "non è possibile effettuare il rebase su una patch mq applicata" -msgid "cannot rebase an ancestor" -msgstr "non è possibile effettuare il rebase di un antenato" - -msgid "cannot rebase a descendant" -msgstr "non è possibile effettuare il rebase di un discendente" - -msgid "already working on current\n" -msgstr "sto già lavorando su current\n" - -msgid "already working on the current branch\n" -msgstr "sto già lavorando sulla branch corrente\n" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "rebase su %d partendo da %d\n" +#, fuzzy +msgid "source is ancestor of destination" +msgstr "nessuna sorgente o destinazione specificata" + +msgid "source is descendant of destination" +msgstr "" msgid "unable to collapse, there is more than one external parent" msgstr "impossibile effettuare il collapse, c'è più di un genitore esterno" -msgid "Call rebase after pull if the latter has been invoked with --rebase" -msgstr "Invoca rebase dopo pull se l'ultimo è stato invocato con --rebase" - -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "--update e --rebase non sono compatibili, ignoro il flag update\n" - -msgid "Replace pull with a decorator to provide --rebase option" -msgstr "Rimpiazza pull con un decoratore per fornire l'opzione --rebase" - msgid "rebase working directory to branch head" msgstr "effettua il rebase della directory di lavoro sulla head della branch" -msgid "keep original revisions" -msgstr "mantiene le revisioni originali" - -msgid "keep original branches" -msgstr "mantiene le branch originali" - msgid "rebase from a given revision" msgstr "rebase da una data revisione" @@ -4294,47 +4256,35 @@ msgid "rebase onto a given revision" msgstr "rebase su una data revisione" -msgid "collapse the rebased revisions" +#, fuzzy +msgid "collapse the rebased changesets" msgstr "collassa le revisioni di cui si effettua il rebase" +#, fuzzy +msgid "keep original changesets" +msgstr "mantiene le branch originali" + +#, fuzzy +msgid "keep original branch names" +msgstr "mantiene le branch originali" + msgid "continue an interrupted rebase" msgstr "continua un rebase interrotto" msgid "abort an interrupted rebase" msgstr "abortisce un rebase interrotto" -msgid "" -"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" +#, fuzzy +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" msgstr "" "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" -msgid "interactive change selection during commit or qrefresh" +#, fuzzy +msgid "commands to interactively select changes for commit/qrefresh" msgstr "cambia interattivamente la selezione durante un commit o qrefresh" -msgid "" -"like patch.iterhunks, but yield different events\n" -"\n" -" - ('file', [header_lines + fromfile + tofile])\n" -" - ('context', [context_lines])\n" -" - ('hunk', [hunk_lines])\n" -" - ('range', (-start,len, +start,len, diffp))\n" -" " -msgstr "" - -msgid "scan lr while predicate holds" -msgstr "scansiona lr fino a quando il predicato vale" - -msgid "" -"patch header\n" -"\n" -" XXX shoudn't we move this to mercurial/patch.py ?\n" -" " -msgstr "" -"intestazione della patch\n" -"\n" -" XXX non dovremmo spostare questo in mercurial/patch.py ?\n" -" " - msgid "this modifies a binary file (all or nothing)\n" msgstr "questo modifica un file binario (tutto o niente)\n" @@ -4345,70 +4295,41 @@ msgid "%d hunks, %d lines changed\n" msgstr "" -msgid "hunk -> (n+,n-)" -msgstr "hunk -> (n+,n-)" - -msgid "" -"patch hunk\n" -"\n" -" XXX shouldn't we merge this with patch.hunk ?\n" -" " -msgstr "" - -msgid "patch -> [] of hunks " -msgstr "" - -msgid "patch parsing state machine" -msgstr "" - -msgid "Interactively filter patch chunks into applied-only chunks" -msgstr "" - -msgid "" -"fetch next portion from chunks until a 'header' is seen\n" -" NB: header == new-file mark\n" -" " -msgstr "" - -msgid "" -"prompt query, and process base inputs\n" -"\n" -" - y/n for the rest of file\n" -" - y/n for the rest\n" -" - ? (help)\n" -" - q (quit)\n" -"\n" -" else, input is returned to the caller.\n" -" " -msgstr "" - msgid "[Ynsfdaq?]" msgstr "[Ynsfdaq?]" -msgid "y" -msgstr "y" - -msgid "?" +#, fuzzy +msgid "&Yes, record this change" +msgstr "y - registra questa modifica" + +#, fuzzy +msgid "&No, skip this change" +msgstr "salta il changeset di test" + +msgid "&Skip remaining changes to this file" +msgstr "" + +msgid "Record remaining changes to this &file" +msgstr "" + +msgid "&Done, skip remaining changes and files" +msgstr "" + +#, fuzzy +msgid "Record &all changes to all remaining files" +msgstr "registra cancellazione per i file mancanti" + +#, fuzzy +msgid "&Quit, recording no changes" +msgstr "y - registra questa modifica" + +#, fuzzy +msgid "&?" msgstr "?" msgid "y - record this change" msgstr "y - registra questa modifica" -msgid "s" -msgstr "s" - -msgid "f" -msgstr "f" - -msgid "d" -msgstr "d" - -msgid "a" -msgstr "a" - -msgid "q" -msgstr "q" - msgid "user quit" msgstr "" @@ -4419,10 +4340,18 @@ msgid " and " msgstr " e " +msgid "y" +msgstr "y" + #, python-format msgid "record this change to %r?" msgstr "registrare questa modifica a %r?" +#, fuzzy, python-format +msgid "record change %d/%d to %r?" +msgstr "registrare questa modifica a %r?" + +#, fuzzy msgid "" "interactively select changes to commit\n" "\n" @@ -4433,20 +4362,20 @@ "\n" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" -" change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" change to use. For each query, the following responses are\n" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" "seleziona interattivamente le modifiche di cui eseguire il commit\n" "\n" @@ -4474,74 +4403,53 @@ "\n" " ? - mostra il messaggio di aiuto" -msgid "" -"interactively record a new patch\n" -"\n" -" see 'hg help qnew' & 'hg help record' for more information and usage\n" -" " -msgstr "" - msgid "'mq' extension not loaded" msgstr "estensione 'mq' non caricata" msgid "running non-interactively, use commit instead" msgstr "" -msgid "" -"This is generic record driver.\n" -"\n" -" It's job is to interactively filter local changes, and accordingly\n" -" prepare working dir into a state, where the job can be delegated to\n" -" non-interactive commit command such as 'commit' or 'qrefresh'.\n" -"\n" -" After the actual job is done by non-interactive command, working " -"dir\n" -" state is restored to original.\n" -"\n" -" In the end we'll record intresting changes, and everything else will " -"be\n" -" left in place, so the user can continue his work.\n" -" " -msgstr "" - msgid "no changes to record\n" msgstr "nessuna modifica da registrare\n" -#, python-format -msgid "backup %r as %r\n" -msgstr "backup %r come %r\n" - -msgid "applying patch\n" -msgstr "sto applicando una patch\n" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPZIONI]... [FILE]..." msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "hg qrecord [OPZIONI]... PATCH [FILE]..." -msgid "" -"patch transplanting tool\n" +msgid "share a common history between several working directories" +msgstr "" + +msgid "" +"create a new shared repository (experimental)\n" +"\n" +" Initialize a new repository and working directory that shares its\n" +" history with another repository.\n" +"\n" +" NOTE: actions that change history such as rollback or moving the\n" +" source may confuse sharers.\n" +" " +msgstr "" + +#, fuzzy +msgid "do not create a working copy" +msgstr "non aggiornare le nuove directory di lavoro" + +#, fuzzy +msgid "[-U] SOURCE [DEST]" +msgstr "[OPZIONI]... SORGENTE [DEST]" + +msgid "" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" -"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" -"from a changeset hash to its hash in the source repository.\n" -msgstr "" - -msgid "" -"returns True if a node is already an ancestor of parent\n" -" or has already been transplanted" -msgstr "" - -msgid "apply the revisions in revmap one by one in revision order" +"Transplanted patches are recorded in .hg/transplant/transplants, as a\n" +"map from a changeset hash to its hash in the source repository.\n" msgstr "" #, python-format @@ -4560,9 +4468,6 @@ msgid "%s transplanted to %s\n" msgstr "" -msgid "arbitrarily rewrite changeset before applying it" -msgstr "" - #, python-format msgid "filtering %s\n" msgstr "sto filtrando %s\n" @@ -4570,9 +4475,6 @@ msgid "filter failed" msgstr "filtraggio fallito" -msgid "apply the patch in patchfile to the repository as a transplant" -msgstr "" - msgid "can only omit patchfile if merging" msgstr "" @@ -4583,16 +4485,10 @@ msgid "Fix up the merge and run hg transplant --continue" msgstr "" -msgid "recover last transaction and apply remaining changesets" -msgstr "" - #, python-format msgid "%s transplanted as %s\n" msgstr "%s trapiantato come %s\n" -msgid "commit working directory using journal metadata" -msgstr "" - msgid "transplant log file is corrupt" msgstr "" @@ -4603,15 +4499,6 @@ msgid "commit failed" msgstr "commit fallito" -msgid "journal changelog metadata for later recover" -msgstr "" - -msgid "remove changelog journal" -msgstr "" - -msgid "interactively transplant changesets" -msgstr "" - msgid "apply changeset? [ynmpcq?]:" msgstr "applicare il changeset? [ynmpcq?]:" @@ -4620,33 +4507,36 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" -" Its argument will be invoked with the current changelog message\n" -" as $1 and the patch as $2.\n" -"\n" -" If --source is specified, selects changesets from the named\n" -" repository. If --branch is specified, selects changesets from the\n" -" branch holding the named revision, up to that revision. If --all\n" -" is specified, all changesets on the branch will be transplanted,\n" -" otherwise you will be prompted to select the changesets you want.\n" -"\n" -" hg transplant --branch REVISION --all will rebase the selected branch\n" -" (up to the named revision) onto your current working directory.\n" -"\n" -" You can optionally mark selected transplanted changesets as\n" -" merge changesets. You will not be prompted to transplant any\n" -" ancestors of a merged transplant, and you can merge descendants\n" -" of them normally instead of transplanting them.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2.\n" +"\n" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected\n" +" branch (up to the named revision) onto your current working\n" +" directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them.\n" "\n" " If no merges or revisions are provided, hg transplant will start\n" " an interactive changeset browser.\n" "\n" -" If a changeset application fails, you can fix the merge by hand and\n" -" then resume where you left off by calling hg transplant --continue.\n" +" If a changeset application fails, you can fix the merge by hand\n" +" and then resume where you left off by calling hg transplant\n" +" --continue/-c.\n" " " msgstr "" @@ -4700,48 +4590,73 @@ msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" -"\n" -"Some MBCS encodings are not good for some path operations\n" -"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" -"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" -"encoding\". This extension can be used to fix the issue with those\n" -"encodings by wrapping some functions to convert to unicode string\n" -"before path operation.\n" -"\n" -"This extension is usefull for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings\n" -" on case-insensitive file system.\n" +"allow the use of MBCS paths with problematic encodings\n" +"\n" +"Some MBCS encodings are not good for some path operations (i.e.\n" +"splitting path, case conversion, etc.) with its encoded bytes. We call\n" +"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" +"This extension can be used to fix the issue with those encodings by\n" +"wrapping some functions to convert to Unicode string before path\n" +"operation.\n" +"\n" +"This extension is useful for:\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ascii chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or HGENCODING.\n" -"\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" -"\n" -"Path encoding conversion are done between unicode and util._encoding\n" -"which is decided by mercurial from current locale setting or HGENCODING.\n" -"\n" -msgstr "" - -#, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" +"\n" +"Path encoding conversion are done between Unicode and\n" +"encoding.encoding which is decided by Mercurial from current locale\n" +"setting or HGENCODING.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" #, python-format @@ -4780,29 +4695,22 @@ msgstr "" msgid "" -"zeroconf support for mercurial repositories\n" -"\n" -"Zeroconf enabled repositories will be announced in a network without the " -"need\n" -"to configure a server or a service. They can be discovered without knowing\n" -"their actual IP address.\n" -"\n" -"To use the zeroconf extension add the following entry to your hgrc file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" -"To allow other people to discover your repository using run \"hg serve\" in " -"your\n" -"repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"discover and advertise repositories on the local network\n" +"\n" +"Zeroconf enabled repositories will be announced in a network without\n" +"the need to configure a server or a service. They can be discovered\n" +"without knowing their actual IP address.\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\"\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -4844,6 +4752,10 @@ msgid "premature EOF reading chunk (got %d bytes, expected %d)" msgstr "" +#, fuzzy +msgid "empty username" +msgstr "stringa vuota\n" + #, python-format msgid "username %s contains a newline" msgstr "" @@ -4865,7 +4777,7 @@ msgstr "" #, python-format -msgid "invalid format spec '%%%s' in output file name" +msgid "invalid format spec '%%%s' in output filename" msgstr "" #, python-format @@ -5015,32 +4927,57 @@ msgid "%s:%s copy source revision cannot be found!\n" msgstr "" -msgid "can only follow copies/renames for explicit file names" -msgstr "" - -#, python-format -msgid "file %s not found!" -msgstr "file %s non trovato!" - -#, python-format -msgid "no match under directory %s!" -msgstr "nessuna corrispondenza sotto la directory %s!" - -#, python-format -msgid "can't commit %s: unsupported file type!" -msgstr "impossibile fare il commit di %s: tipo di file non supportato!" - -#, python-format -msgid "file %s not tracked!" -msgstr "il file %s non è tracciato!" +msgid "can only follow copies/renames for explicit filenames" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "HG: Leave message empty to abort commit." +msgstr "" + +#, fuzzy, python-format +msgid "HG: user: %s" +msgstr "utente: %s\n" + +msgid "HG: branch merge" +msgstr "" + +#, python-format +msgid "HG: branch '%s'" +msgstr "" + +#, python-format +msgid "HG: subrepo %s" +msgstr "" + +#, python-format +msgid "HG: added %s" +msgstr "" + +#, fuzzy, python-format +msgid "HG: changed %s" +msgstr "aggiungo changeset %s\n" + +#, fuzzy, python-format +msgid "HG: removed %s" +msgstr "rimossi" + +#, fuzzy +msgid "HG: no files changed" +msgstr "sto aggiungendo le modifiche ai file\n" + +msgid "empty commit message" +msgstr "messaggio di commit vuoto" msgid "" "add the specified files on the next commit\n" "\n" -" Schedule files to be version controlled and added to the repository.\n" +" Schedule files to be version controlled and added to the\n" +" repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -5049,17 +4986,19 @@ msgid "" "add all new files, delete all missing files\n" "\n" -" Add all new files and remove all missing files from the repository.\n" -"\n" -" New files are ignored if they match any of the patterns in .hgignore. " -"As\n" -" with add, these changes take effect at the next commit.\n" -"\n" -" Use the -s option to detect renamed files. With a parameter > 0,\n" -" this compares every removed file with every added file and records\n" -" those similar enough as renames. This option takes a percentage\n" -" between 0 (disabled) and 100 (files must be identical) as its\n" -" parameter. Detecting renamed files this way can be expensive.\n" +" Add all new files and remove all missing files from the\n" +" repository.\n" +"\n" +" New files are ignored if they match any of the patterns in\n" +" .hgignore. As with add, these changes take effect at the next\n" +" commit.\n" +"\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" @@ -5070,22 +5009,22 @@ msgstr "" msgid "" -"show changeset information per file line\n" -"\n" -" List changes in files, showing the revision id responsible for each " -"line\n" -"\n" -" This command is useful to discover who did a change or when a change " -"took\n" -" place.\n" -"\n" -" Without the -a option, annotate will avoid processing files it\n" -" detects as binary. With -a, annotate will generate an annotation\n" -" anyway, probably with undesirable results.\n" +"show changeset information by line for each file\n" +"\n" +" List changes in files, showing the revision id responsible for\n" +" each line\n" +"\n" +" This command is useful for discovering when a change was made and\n" +" by whom.\n" +"\n" +" Without the -a/--text option, annotate will avoid processing files\n" +" it detects as binary. With -a, annotate will annotate the file\n" +" anyway, although the results will probably be neither useful\n" +" nor desirable.\n" " " msgstr "" -msgid "at least one file name or pattern required" +msgid "at least one filename or pattern is required" msgstr "" msgid "at least one of -n/-c is required for -l" @@ -5096,27 +5035,28 @@ msgstr "" msgid "" -"create unversioned archive of a repository revision\n" +"create an unversioned archive of a repository revision\n" "\n" " By default, the revision used is the parent of the working\n" -" directory; use \"-r\" to specify a different revision.\n" -"\n" -" To specify the type of archive to create, use \"-t\". Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" directory; use -r/--rev to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use -t/--type. Valid\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" -" using a format string; see \"hg help export\" for details.\n" +" using a format string; see 'hg help export' for details.\n" "\n" " Each member added to an archive file has a directory prefix\n" -" prepended. Use \"-p\" to specify a format string for the prefix.\n" -" The default is the basename of the archive, with suffixes removed.\n" +" prepended. Use -p/--prefix to specify a format string for the\n" +" prefix. The default is the basename of the archive, with suffixes\n" +" removed.\n" " " msgstr "" @@ -5129,21 +5069,21 @@ msgid "cannot archive plain files to stdout" msgstr "" +#, fuzzy msgid "" "reverse effect of earlier changeset\n" "\n" " Commit the backed out changes as a new changeset. The new\n" " changeset is a child of the backed out changeset.\n" "\n" -" If you back out a changeset other than the tip, a new head is\n" +" If you backout a changeset other than the tip, a new head is\n" " created. This head will be the new tip and you should merge this\n" -" backout changeset with another head (current one by default).\n" +" backout changeset with another head.\n" "\n" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" -" changeset afterwards. This saves you from doing the merge by\n" -" hand. The result of this merge is not committed, as with a normal\n" -" merge.\n" +" changeset afterwards. This saves you from doing the merge by hand.\n" +" The result of this merge is not committed, as with a normal merge.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5174,13 +5114,13 @@ msgid "please specify a revision to backout" msgstr "" -msgid "cannot back out change on a different branch" -msgstr "" - -msgid "cannot back out a change with no parents" -msgstr "" - -msgid "cannot back out a merge changeset without --parent" +msgid "cannot backout change on a different branch" +msgstr "" + +msgid "cannot backout a change with no parents" +msgstr "" + +msgid "cannot backout a merge changeset without --parent" msgstr "" #, python-format @@ -5191,10 +5131,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -5211,35 +5147,38 @@ msgid "" "subdivision search of changesets\n" "\n" -" This command helps to find changesets which introduce problems.\n" -" To use, mark the earliest changeset you know exhibits the problem\n" -" as bad, then mark the latest changeset which is free from the\n" -" problem as good. Bisect will update your working directory to a\n" -" revision for testing (unless the --noupdate option is specified).\n" -" Once you have performed tests, mark the working directory as bad\n" -" or good and bisect will either update to another candidate changeset\n" +" This command helps to find changesets which introduce problems. To\n" +" use, mark the earliest changeset you know exhibits the problem as\n" +" bad, then mark the latest changeset which is free from the problem\n" +" as good. Bisect will update your working directory to a revision\n" +" for testing (unless the -U/--noupdate option is specified). Once\n" +" you have performed tests, mark the working directory as good or\n" +" bad, and bisect will either update to another candidate changeset\n" " or announce that it has found the bad revision.\n" "\n" " As a shortcut, you can also use the revision argument to mark a\n" " revision as good or bad without checking it out first.\n" "\n" -" If you supply a command it will be used for automatic bisection. Its " -"exit\n" -" status will be used as flag to mark revision as bad or good. In case " -"exit\n" -" status is 0 the revision is marked as good, 125 - skipped, 127 (command " -"not\n" -" found) - bisection will be aborted; any other status bigger than 0 will\n" -" mark revision as bad.\n" +" If you supply a command, it will be used for automatic bisection.\n" +" Its exit status will be used to mark revisions as good or bad:\n" +" status 0 means good, 125 means to skip the revision, 127\n" +" (command not found) will abort the bisection, and any other\n" +" non-zero exit status means the revision is bad.\n" " " msgstr "" -#, python-format -msgid "The first %s revision is:\n" +#, fuzzy +msgid "The first good revision is:\n" msgstr "La prima revisione %s è:\n" -#, python-format -msgid "Due to skipped revisions, the first %s revision could be any of:\n" +#, fuzzy +msgid "The first bad revision is:\n" +msgstr "La prima revisione %s è:\n" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" msgstr "" msgid "cannot bisect (no known good revisions)" @@ -5262,28 +5201,32 @@ msgid "%s killed" msgstr "%s ucciso" -#, python-format -msgid "Changeset %s: %s\n" +#, fuzzy, python-format +msgid "Changeset %d:%s: %s\n" msgstr "Changeset %s: %s\n" #, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" msgid "" "set or show the current branch name\n" "\n" " With no argument, show the current branch name. With one argument,\n" -" set the working directory branch name (the branch does not exist in\n" -" the repository until the next commit).\n" -"\n" -" Unless --force is specified, branch will not let you set a\n" -" branch name that shadows an existing branch.\n" -"\n" -" Use --clean to reset the working directory branch to that of the\n" -" parent of the working directory, negating a previous branch change.\n" -"\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" set the working directory branch name (the branch will not exist\n" +" in the repository until the next commit). Standard practice\n" +" recommends that primary development take place on the 'default'\n" +" branch.\n" +"\n" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive.\n" +"\n" +" Use -C/--clean to reset the working directory branch to that of\n" +" the parent of the working directory, negating a previous branch\n" +" change.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -5303,9 +5246,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -5320,21 +5265,25 @@ " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" --all (or --base null). To change the compression method applied,\n" -" use the -t option (by default, bundles are compressed using bz2).\n" -"\n" -" The bundle file can then be transferred using conventional means and\n" -" applied to another repository with the unbundle or pull command.\n" -" This is useful when direct push and pull are not available or when\n" -" exporting an entire repository is undesirable.\n" +" -a/--all (or --base null).\n" +"\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" +"\n" +" The bundle file can then be transferred using conventional means\n" +" and applied to another repository with the unbundle or pull\n" +" command. This is useful when direct push and pull are not\n" +" available or when exporting an entire repository is undesirable.\n" "\n" " Applying bundles preserves all changeset contents including\n" " permissions, copy/rename information, and revision history.\n" " " msgstr "" -msgid "--base is incompatible with specifiying a destination" -msgstr "" +#, fuzzy +msgid "--base is incompatible with specifying a destination" +msgstr "un changeset base da specificare invece di una destinazione" msgid "unknown bundle type specified with --type" msgstr "" @@ -5342,17 +5291,17 @@ msgid "" "output the current or given revision of files\n" "\n" -" Print the specified files as they were at the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" +" Print the specified files as they were at the given revision. If\n" +" no revision is given, the parent of the working directory is used,\n" " or tip if no revision is checked out.\n" "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repo root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" @@ -5367,6 +5316,22 @@ " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls.\n" "\n" +" If you use the -r/--rev option to clone up to a specific revision,\n" +" no subsequent revisions (including subsequent tags) will be\n" +" present in the cloned repository. This option implies --pull, even\n" +" on local repositories.\n" +"\n" +" By default, clone will check out the head of the 'default' branch.\n" +" If the -U/--noupdate option is used, the new clone will contain\n" +" only a repository (.hg) and no working copy (the working copy\n" +" parent is the null revision).\n" +"\n" +" See 'hg help urls' for valid source format details.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Please see 'hg help urls' for important details about ssh:// URLs.\n" +"\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" " to the repository data, not to the checked out files). Some\n" @@ -5375,96 +5340,35 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" -" This is the fastest way to clone, but it is not always safe. The\n" +" This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" " the operation is up to you) and you have to make sure your editor\n" -" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" -" If you use the -r option to clone up to a specific revision, no\n" -" subsequent revisions will be present in the cloned repository.\n" -" This option implies --pull, even on local repositories.\n" -"\n" -" If the -U option is used, the new clone will contain only a repository\n" -" (.hg) and no working copy (the working copy parent is the null " -"revision).\n" -"\n" -" See 'hg help urls' for valid source format details.\n" -"\n" -" It is possible to specify an ssh:// URL as the destination, but no\n" -" .hg/hgrc and working directory will be created on the remote side.\n" -" Look at the help text for urls for important details about ssh:// URLs.\n" " " msgstr "" -"crea una copia di un repository esistente\n" -"\n" -" Crea una copia di un repository esistente in una nuova directory.\n" -"\n" -" Se non viene specificato nessun nome di directory\n" -" destinazione, di default viene usata la directory base\n" -" della sorgente.\n" -"\n" -" La posizione della sorgente viene aggiunta al file .hg/hgrc\n" -" del nuovo repository, come default da usare per pull futuri.\n" -"\n" -" Per efficienza, si usano hardlink per clonare ogni volta che\n" -" la sorgente e la destinazione sono sullo stesso filesystem\n" -" (notare che questo vale per i dati del repository, non per\n" -" per i file di cui si è fatto il check out). Alcuni\n" -" filesystem, tipo AFS, non implementano correttamente gli\n" -" hardlink, ma non riportano errori. In questi casi, usare\n" -" l'opzione --pull per evitare gli hardlink.\n" -"\n" -" In alcuni casi, è possibile clonare i repository e i file di\n" -" cui si è fatto il check out usando hardlink completi con\n" -"\n" -" $ cp -al REPO REPOCLONE\n" -"\n" -" Questo è il modo più veloce per clonare, ma non è sempre\n" -" sicuro. L'operazione non è atomica (spetta all'utente\n" -" assicurarsi che REPO non venga modificato durante la\n" -" operazione) e bisogna assicurarsi che l'editor usato spezzi\n" -" gli hardlink (Emacs e i principali tool del Kernel Linux lo\n" -" fanno). Inoltre, questo non è compatibile con alcune\n" -" estensioni che mettono i loro metadati sotto la directory\n" -" .hg, tipo mq.\n" -"\n" -" Se viene usata l'opzione -r per clonare fino ad una\n" -" revisione specifica, nessuna revisione seguente sarà presente\n" -" nel repository clonato. Questa opzione implica --pull, anche\n" -" per repository locali.\n" -"\n" -" Se viene usata l'opzione -U, il nuovo clone conterrà solo un\n" -" repository (.hg) e nessuna copia di lavoro (il genitore\n" -" della copia di lavoro è la revisione nulla).\n" -"\n" -" Vedere 'hg help urls' per dettagli sui formati di sorgenti\n" -" validi.\n" -"\n" -" E' possibile specificare un URL ssh:// come destinazione, ma\n" -" nessun .hg/hgrc e directory di lavoro verranno creati sul\n" -" lato remoto. Riferirsi al testo di aiuto per gli url per\n" -" dettagli importanti riguardo gli URL ssh://.\n" -" " - + +#, fuzzy msgid "" "commit the specified files or all outstanding changes\n" "\n" -" Commit changes to the given files into the repository.\n" +" Commit changes to the given files into the repository. Unlike a\n" +" centralized RCS, this operation is a local operation. See hg push\n" +" for a way to actively distribute your changes.\n" "\n" " If a list of files is omitted, all changes reported by \"hg status\"\n" " will be committed.\n" "\n" " If you are committing the result of a merge, do not provide any\n" -" file names or -I/-X filters.\n" -"\n" -" If no commit message is specified, the configured editor is started to\n" -" prompt you for a message.\n" +" filenames or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is\n" +" started to prompt you for a message.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5486,6 +5390,9 @@ " -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "nulla è cambiato\n" + msgid "created new head\n" msgstr "creata una nuova head\n" @@ -5501,7 +5408,7 @@ " the source must be a single file.\n" "\n" " By default, this command copies the contents of files as they\n" -" stand in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect with the next commit. To undo a copy\n" @@ -5549,13 +5456,17 @@ msgid "" "show combined config settings from all hgrc files\n" "\n" -" With no args, print names and values of all config items.\n" -"\n" -" With one arg of the form section.name, print just the value of\n" -" that config item.\n" -"\n" -" With multiple args, print names and values of all config items\n" -" with matching section names." +" With no arguments, print names and values of all config items.\n" +"\n" +" With one argument of the form section.name, print just the value\n" +" of that config item.\n" +"\n" +" With multiple arguments, print names and values of all config\n" +" items with matching section names.\n" +"\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" +" " msgstr "" msgid "only one config item permitted" @@ -5589,7 +5500,7 @@ msgid "dump the contents of an index file" msgstr "" -msgid "dump an index DAG as a .dot file" +msgid "dump an index DAG as a graphviz dot file" msgstr "" msgid "test Mercurial installation" @@ -5635,8 +5546,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5696,12 +5607,12 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" -" Without the -a option, diff will avoid generating diffs of files\n" -" it detects as binary. With -a, diff will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. For more information, read hg help diffs.\n" +" Without the -a/--text option, diff will avoid generating diffs of\n" +" files it detects as binary. With -a, diff will generate a diff\n" +" anyway, probably with undesirable results.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" " " msgstr "" @@ -5713,30 +5624,31 @@ " The information shown in the changeset header is: author,\n" " changeset hash, parent(s) and commit comment.\n" "\n" -" NOTE: export may generate unexpected diff output for merge changesets,\n" -" as it will compare the merge changeset against its first parent only.\n" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" -"\n" -" Without the -a option, export will avoid generating diffs of files\n" -" it detects as binary. With -a, export will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the second\n" -" parent. It can be useful to review a merge.\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" +"\n" +" Without the -a/--text option, export will avoid generating diffs\n" +" of files it detects as binary. With -a, export will generate a\n" +" diff anyway, probably with undesirable results.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" " " msgstr "" @@ -5750,14 +5662,35 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "nessun file specificato" + +#, fuzzy, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" "\n" " This command behaves differently than Unix grep. It only accepts\n" " Python/Perl regexps. It searches repository history, not the\n" -" working directory. It always prints the revision number in which\n" -" a match appears.\n" +" working directory. It always prints the revision number in which a\n" +" match appears.\n" "\n" " By default, grep only prints output for the first revision of a\n" " file in which it finds a match. To get it to print every revision\n" @@ -5776,20 +5709,35 @@ "\n" " With no arguments, show all repository head changesets.\n" "\n" -" If branch or revisions names are given this will show the heads of\n" -" the specified branches or the branches those revisions are tagged\n" -" with.\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" -"\n" -" Branch heads are changesets that have a given branch tag, but have\n" -" no child changesets with that tag. They are usually where\n" -" development on the given branch takes place.\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 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 "" +msgid "you must specify a branch to use --closed" +msgstr "" + +#, fuzzy, python-format +msgid "no open branch heads on branch %s\n" +msgstr "svn: la branch non ha nessuna revisione %s" + #, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" msgstr "" @@ -5798,12 +5746,14 @@ msgid "no changes on branch %s are reachable from %s\n" msgstr "" +#, fuzzy msgid "" "show help for a given topic or a help overview\n" "\n" -" With no arguments, print a list of commands and short help.\n" -"\n" -" Given a topic, extension, or command name, print help for that topic." +" With no arguments, print a list of commands with short help messages.\n" +"\n" +" Given a topic, extension, or command name, print help for that\n" +" topic." msgstr "" "mostra l'aiuto per un dato argomento o una panoramica d'aiuto\n" "\n" @@ -5855,24 +5805,20 @@ msgid "no commands defined\n" msgstr "nessun comando definito\n" -msgid "" -"\n" -"enabled extensions:\n" -"\n" +#, fuzzy +msgid "enabled extensions:" msgstr "" "\n" "estensioni abilitate:\n" "\n" -#, python-format -msgid " %s %s\n" -msgstr " %s %s\n" - msgid "no help text available" msgstr "nessun testo di aiuto disponibile" -#, python-format -msgid "%s extension - %s\n" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" msgstr "estensione %s - %s\n" msgid "Mercurial Distributed SCM\n" @@ -5894,17 +5840,20 @@ "argomenti di aiuto aggiuntivi:\n" "\n" +#, fuzzy msgid "" "identify the working copy or specified revision\n" "\n" -" With no revision, print a summary of the current state of the repo.\n" -"\n" -" With a path, do a lookup in another repository.\n" -"\n" -" This summary identifies the repository state using one or two parent\n" -" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" -" in the working directory, a list of tags for this revision and a branch\n" -" name for non-default branches.\n" +" With no revision, print a summary of the current state of the\n" +" repository.\n" +"\n" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle.\n" +"\n" +" This summary identifies the repository state using one or two\n" +" parent hash identifiers, followed by a \"+\" if there are\n" +" uncommitted changes in the working directory, a list of tags for\n" +" this revision and a branch name for non-default branches.\n" " " msgstr "" "identifica la copia di lavoro o una revisione specifica\n" @@ -5921,35 +5870,38 @@ " non-default.\n" " " +#, fuzzy msgid "" "import an ordered set of patches\n" "\n" " Import a list of patches and commit them individually.\n" "\n" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f flag.\n" +" will abort unless given the -f/--force flag.\n" "\n" " You can import a patch straight from a mail message. Even patches\n" -" as attachments work (body part must be type text/plain or\n" -" text/x-patch to be used). From and Subject headers of email\n" +" as attachments work (to use the body part, it must have type\n" +" text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" " text/plain body parts before first diff are added to commit\n" " message.\n" "\n" -" If the imported patch was generated by hg export, user and description\n" -" from patch override values from message headers and body. Values\n" -" given on command line with -m and -u override these.\n" -"\n" -" If --exact is specified, import will set the working directory\n" -" to the parent of each patch before applying it, and will abort\n" -" if the resulting changeset has a different ID than the one\n" -" recorded in the patch. This may happen due to character set\n" -" problems or other deficiencies in the text patch format.\n" -"\n" -" With --similarity, hg will attempt to discover renames and copies\n" -" in the patch in the same way as 'addremove'.\n" -"\n" -" To read a patch from standard input, use patch name \"-\".\n" +" If the imported patch was generated by hg export, user and\n" +" description from patch override values from message headers and\n" +" body. Values given on command line with -m/--message and -u/--user\n" +" override these.\n" +"\n" +" If --exact is specified, import will set the working directory to\n" +" the parent of each patch before applying it, and will abort if the\n" +" resulting changeset has a different ID than the one recorded in\n" +" the patch. This may happen due to character set problems or other\n" +" deficiencies in the text patch format.\n" +"\n" +" With -s/--similarity, hg will attempt to discover renames and\n" +" copies in the patch in the same way as 'addremove'.\n" +"\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5995,29 +5947,23 @@ msgid "no diffs found" msgstr "nessun diff trovato" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"messaggio:\n" -"%s\n" - -msgid "not a mercurial patch" +#, fuzzy +msgid "not a Mercurial patch" msgstr "non è una patch di mercurial" msgid "patch is damaged or loses information" msgstr "la patch è danneggiata o perde informazioni" +#, fuzzy msgid "" "show new changesets found in source\n" "\n" " Show new changesets found in the specified path/URL or the default\n" -" pull location. These are the changesets that would be pulled if a pull\n" -" was requested.\n" -"\n" -" For remote repository, using --bundle avoids downloading the changesets\n" -" twice if the incoming is followed by a pull.\n" +" pull location. These are the changesets that would have been pulled\n" +" if a pull at the time you issued this command.\n" +"\n" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull.\n" "\n" " See pull for valid source format details.\n" " " @@ -6034,11 +5980,12 @@ " Vedere pull per dettagli sui formati di sorgenti validi.\n" " " +#, fuzzy msgid "" "create a new repository in the given directory\n" "\n" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it is created.\n" +" directory does not exist, it will be created.\n" "\n" " If no directory is given, the current directory is used.\n" "\n" @@ -6057,23 +6004,24 @@ " Vedere 'hg help urls' per maggiorni informazioni.\n" " " +#, fuzzy msgid "" "locate files matching specific patterns\n" "\n" -" Print all files under Mercurial control whose names match the\n" -" given patterns.\n" -"\n" -" This command searches the entire repository by default. To search\n" -" just the current directory and its subdirectories, use\n" -" \"--include .\".\n" -"\n" -" If no patterns are given to match, this command prints all file\n" -" names.\n" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns.\n" +"\n" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory.\n" "\n" " If you want to feed the output of this command into the \"xargs\"\n" -" command, use the \"-0\" option to both this command and \"xargs\".\n" -" This will avoid the problem of \"xargs\" treating single filenames\n" -" that contain white space as multiple filenames.\n" +" command, use the -0 option to both this command and \"xargs\". This\n" +" will avoid the problem of \"xargs\" treating single filenames that\n" +" contain whitespace as multiple filenames.\n" " " msgstr "" "trova file corrispondenti a pattern specificati\n" @@ -6103,8 +6051,8 @@ " project.\n" "\n" " File history is shown without following rename or copy history of\n" -" files. Use -f/--follow with a file name to follow history across\n" -" renames and copies. --follow without a file name will only show\n" +" files. Use -f/--follow with a filename to follow history across\n" +" renames and copies. --follow without a filename will only show\n" " ancestors or descendants of the starting revision. --follow-first\n" " only follows the first parent of merge revisions.\n" "\n" @@ -6114,16 +6062,15 @@ "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" -" By default this command outputs: changeset id and hash, tags,\n" -" non-trivial parents, user, date and time, and a summary for each\n" -" commit. When the -v/--verbose switch is used, the list of changed\n" -" files and full commit message is shown.\n" -"\n" -" NOTE: log -p may generate unexpected diff output for merge\n" +" By default this command prints revision number and changeset id,\n" +" tags, non-trivial parents, user, date and time, and a summary for\n" +" each commit. When the -v/--verbose switch is used, the list of\n" +" changed files and full commit message are shown.\n" +"\n" +" NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" -" its first parent. Also, the files: list will only reflect files\n" -" that are different from BOTH parents.\n" -"\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:.\n" " " msgstr "" "show revision history of entire repository or files\n" @@ -6156,45 +6103,32 @@ " " msgid "" -"looks up all renames for a file (up to endrev) the first\n" -" time the file is given. It indexes on the changerev and only\n" -" parses the manifest if linkrev != changerev.\n" -" Returns rename info for fn at changerev rev." -msgstr "" -"cerca tutte le rinomine di un file (fino a endrev) la prima volta che\n" -" il file viene fornito. Indicizza su changerev e parsifica solo\n" -" il manifesto se linkrev != changerev.\n" -" Restituisce le informazioni sulle rinomine per fn alla\n" -" revisione changerev." - -msgid "" "output the current or given revision of the project manifest\n" "\n" " Print a list of version controlled files for the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" The manifest is the list of files being version controlled. If no " -"revision\n" -" is given then the first parent of the working directory is used.\n" -"\n" -" With -v flag, print file permissions, symlink and executable bits. With\n" -" --debug flag, print file revision hashes.\n" +" If no revision is given, the first parent of the working directory\n" +" is used, or the null revision if no revision is checked out.\n" +"\n" +" With -v, print file permissions, symlink and executable bits.\n" +" With --debug, print file revision hashes.\n" " " msgstr "" msgid "" "merge working directory with another revision\n" "\n" -" Merge the contents of the current working directory and the\n" -" requested revision. Files that changed between either parent are\n" -" marked as changed for the next commit and a commit must be\n" -" performed before any further updates are allowed.\n" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision.\n" +"\n" +" Files that changed between either parent are marked as changed for\n" +" the next commit and a commit must be performed before any further\n" +" updates to the repository are allowed. The next commit will have\n" +" two parents.\n" "\n" " If no revision is specified, the working directory's parent is a\n" -" head revision, and the current branch contains exactly one other head,\n" -" the other head is merged with by default. Otherwise, an explicit\n" -" revision to merge with must be provided.\n" +" head revision, and the current branch contains exactly one other\n" +" head, the other head is merged with by default. Otherwise, an\n" +" explicit revision with which to merge with must be provided.\n" " " msgstr "" @@ -6220,13 +6154,13 @@ "la directory di lavoro non è una revisione head - usare \"hg update\"\n" "o fare il merge con una revisione esplicita" +#, fuzzy msgid "" "show changesets not found in destination\n" "\n" -" Show changesets not found in the specified destination repository or\n" -" the default push location. These are the changesets that would be " -"pushed\n" -" if a push was requested.\n" +" Show changesets not found in the specified destination repository\n" +" or the default push location. These are the changesets that would\n" +" be pushed if a push was requested.\n" "\n" " See pull for valid destination format details.\n" " " @@ -6241,14 +6175,15 @@ " Vedere pull per dettagli sui formati validi di destinazioni.\n" " " -msgid "" -"show the parents of the working dir or revision\n" -"\n" -" Print the working directory's parent revisions. If a\n" -" revision is given via --rev, the parent of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (before the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +#, fuzzy +msgid "" +"show the parents of the working directory or revision\n" +"\n" +" Print the working directory's parent revisions. If a revision is\n" +" given via -r/--rev, the parent of that revision will be printed.\n" +" If a file argument is given, the revision in which the file was\n" +" last changed (before the working directory revision or the\n" +" argument to --rev if given) is printed.\n" " " msgstr "" "mostra i genitori della directory di lavoro o di una revisione\n" @@ -6261,8 +6196,9 @@ " o dell'argomento di --rev se fornito).\n" " " -msgid "can only specify an explicit file name" -msgstr "" +#, fuzzy +msgid "can only specify an explicit filename" +msgstr "possibile specificare solo due etichette." #, python-format msgid "'%s' not found in manifest!" @@ -6271,8 +6207,8 @@ msgid "" "show aliases for remote repositories\n" "\n" -" Show definition of symbolic path name NAME. If no name is given, show\n" -" definition of available names.\n" +" Show definition of symbolic path name NAME. If no name is given,\n" +" show definition of all available names.\n" "\n" " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" @@ -6293,14 +6229,21 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "(esegui 'hg update' per ottenere una copia funzionante)\n" +#, fuzzy msgid "" "pull changes from the specified source\n" "\n" " Pull changes from a remote repository to a local one.\n" "\n" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository. By default, this\n" -" does not update the copy of the project in the working directory.\n" +" or URL and adds them to a local repository (the current one unless\n" +" -R is specified). By default, this does not update the copy of the\n" +" project in the working directory.\n" +"\n" +" Use hg incoming if you want to see what would have been added by a\n" +" pull at the time you issued this command. If you then decide to\n" +" added those changes to the repository, you should use pull -r X\n" +" where X is the last changeset listed by hg incoming.\n" "\n" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" @@ -6320,33 +6263,26 @@ " Vedere 'hg help urls' per maggiori informazioni.\n" " " -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" -"L'altro repository non supporta la ricerca di revisioni, quindi una " -"revisione non può essere specificata." - +#, fuzzy msgid "" "push changes to the specified destination\n" "\n" " Push changes from the local repository to the given destination.\n" "\n" -" This is the symmetrical operation for pull. It helps to move\n" -" changes from the current repository to a different one. If the\n" -" destination is local this is identical to a pull in that directory\n" -" from the current one.\n" +" This is the symmetrical operation for pull. It moves changes from\n" +" the current repository to a different one. If the destination is\n" +" local this is identical to a pull in that directory from the\n" +" current one.\n" "\n" " By default, push will refuse to run if it detects the result would\n" " increase the number of remote heads. This generally indicates the\n" -" the client has forgotten to pull and merge before pushing.\n" -"\n" -" If -r is used, the named changeset and all its ancestors will be pushed\n" -" to the remote repository.\n" -"\n" -" Look at the help text for urls for important details about ssh:// URLs.\n" -" If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" +" user forgot to pull and merge before pushing.\n" +"\n" +" If -r/--rev is used, the named revision and all its ancestors will\n" +" be pushed to the remote repository.\n" +"\n" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" "effettua il push di modifiche verso la destinazione specificata\n" @@ -6376,30 +6312,15 @@ msgid "pushing to %s\n" msgstr "sto effettuando il push verso %s\n" -msgid "" -"raw commit interface (DEPRECATED)\n" -"\n" -" (DEPRECATED)\n" -" Lowlevel commit, for use in helper scripts.\n" -"\n" -" This command is not intended to be used by normal users, as it is\n" -" primarily useful for importing from other SCMs.\n" -"\n" -" This command is now deprecated and will be removed in a future\n" -" release, please use debugsetparents and commit instead.\n" -" " -msgstr "" - -msgid "(the rawcommit command is deprecated)\n" -msgstr "(il comando rawcommit è deprecato)\n" - +#, fuzzy msgid "" "roll back an interrupted transaction\n" "\n" " Recover from an interrupted commit or pull.\n" "\n" -" This command tries to fix the repository status after an interrupted\n" -" operation. It should only be necessary when Mercurial suggests it.\n" +" This command tries to fix the repository status after an\n" +" interrupted operation. It should only be necessary when Mercurial\n" +" suggests it.\n" " " msgstr "" "effettua il rollback di una transazione interrotta\n" @@ -6416,29 +6337,32 @@ "\n" " Schedule the indicated files for removal from the repository.\n" "\n" -" This only removes files from the current branch, not from the entire\n" -" project history. -A can be used to remove only files that have already\n" -" been deleted, -f can be used to force deletion, and -Af can be used\n" -" to remove files from the next revision without deleting them.\n" -"\n" -" The following table details the behavior of remove for different file\n" -" states (columns) and option combinations (rows). The file states are\n" -" Added, Clean, Modified and Missing (as reported by hg status). The\n" -" actions are Warn, Remove (from branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" This only removes files from the current branch, not from the\n" +" entire project history. -A/--after can be used to remove only\n" +" files that have already been deleted, -f/--force can be used to\n" +" force deletion, and -Af can be used to remove files from the next\n" +" revision without deleting them from the working directory.\n" +"\n" +" The following table details the behavior of remove for different\n" +" file states (columns) and option combinations (rows). The file\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" " " msgstr "" -msgid "no files specified" -msgstr "nessun file specificato" +#, fuzzy, python-format +msgid "not removing %s: file is untracked\n" +msgstr "non rimuovo %s: file %s (usare -f per forzare la rimozione)\n" #, python-format msgid "not removing %s: file %s (use -f to force removal)\n" @@ -6456,12 +6380,12 @@ msgid "" "rename files; equivalent of copy + remove\n" "\n" -" Mark dest as copies of sources; mark sources for deletion. If\n" -" dest is a directory, copies are put in that directory. If dest is\n" -" a file, there can only be one source.\n" +" Mark dest as copies of sources; mark sources for deletion. If dest\n" +" is a directory, copies are put in that directory. If dest is a\n" +" file, there can only be one source.\n" "\n" " By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect at the next commit. To undo a rename\n" @@ -6474,14 +6398,20 @@ "\n" " This command will cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" -" resolve all unresolved files, use the -a switch.\n" -"\n" -" This command will also allow listing resolved files and manually\n" -" marking and unmarking files as resolved.\n" -"\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" resolve all unresolved files, use the -a/--all switch.\n" +"\n" +" If a conflict is resolved manually, please note that the changes\n" +" will be overwritten if the merge is retried with resolve. The\n" +" -m/--mark switch should be used to mark the file as resolved.\n" +"\n" +" This command also allows listing resolved files and manually\n" +" indicating whether or not files are resolved. All files must be\n" +" marked as resolved before a commit is permitted.\n" +"\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" @@ -6496,11 +6426,12 @@ "nessun file o directory specificata; usare --all per rieffettuare il merge " "di tutti i file" -msgid "" -"restore individual files or dirs to an earlier state\n" -"\n" -" (use update -r to check out earlier revisions, revert does not\n" -" change the working dir parents)\n" +#, fuzzy +msgid "" +"restore individual files or directories to an earlier state\n" +"\n" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)\n" "\n" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" @@ -6509,10 +6440,10 @@ " working directory has two parents, you must explicitly specify the\n" " revision to revert to.\n" "\n" -" Using the -r option, revert the given files or directories to their\n" -" contents as of a specific revision. This can be helpful to \"roll\n" -" back\" some or all of an earlier change.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" Using the -r/--rev option, revert the given files or directories\n" +" to their contents as of a specific revision. This can be helpful\n" +" to \"roll back\" some or all of an earlier change. See 'hg help\n" +" dates' for a list of formats valid for -d/--date.\n" "\n" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" @@ -6520,8 +6451,8 @@ " directory, the reverted files will thus appear modified\n" " afterwards.\n" "\n" -" If a file has been deleted, it is restored. If the executable\n" -" mode of a file was changed, it is reset.\n" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset.\n" "\n" " If names are given, all files matching the names are reverted.\n" " If no arguments are given, no files are reverted.\n" @@ -6600,18 +6531,20 @@ msgid "no changes needed to %s\n" msgstr "nessuna modifica richiesta per %s\n" +#, fuzzy msgid "" "roll back the last transaction\n" "\n" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" -" any dirstate changes since that time.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -6655,8 +6588,9 @@ " repository potrebbe fallire se viene effettuato un rollback.\n" " " -msgid "" -"print the root (top) of the current working dir\n" +#, fuzzy +msgid "" +"print the root (top) of the current working directory\n" "\n" " Print the root directory of the current repository.\n" " " @@ -6666,13 +6600,15 @@ " Stampa la directory radice del repository corrente.\n" " " +#, fuzzy msgid "" "export the repository via HTTP\n" "\n" " Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" -" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" +" files.\n" " " msgstr "" "esporta il repository via HTTP\n" @@ -6693,12 +6629,13 @@ "\n" " Show status of files in the repository. If names are given, only\n" " files that match are shown. Files that are clean or ignored or\n" -" source of a copy/move operation, are not listed unless -c (clean),\n" -" -i (ignored), -C (copies) or -A is given. Unless options described\n" -" with \"show only ...\" are given, the options -mardu are used.\n" +" the source of a copy/move operation, are not listed unless\n" +" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" +" Unless options described with \"show only ...\" are given, the\n" +" options -mardu are used.\n" "\n" " Option -q/--quiet hides untracked (unknown and ignored) files\n" -" unless explicitly requested with -u/--unknown or -i/-ignored.\n" +" unless explicitly requested with -u/--unknown or -i/--ignored.\n" "\n" " NOTE: status may appear to disagree with diff if permissions have\n" " changed or a merge has occurred. The standard diff format does not\n" @@ -6706,20 +6643,122 @@ " to one merge parent.\n" "\n" " If one revision is given, it is used as the base revision.\n" -" If two revisions are given, the difference between them is shown.\n" -"\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = deleted, but still tracked\n" -" ? = not tracked\n" -" I = ignored\n" -" = the previous added file was copied from here\n" +" If two revisions are given, the differences between them are\n" +" shown.\n" +"\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" +" " +msgstr "" + +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 "" +#, fuzzy +msgid " (empty repository)" +msgstr "repository·%s" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "nessuna revisione specificata" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "genitore: %d:%s\n" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "branch: %s\n" + +#, fuzzy, python-format +msgid "%d added" +msgstr "%s non aggiunto!\n" + +#, fuzzy, python-format +msgid "%d modified" +msgstr "è modificato" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "rimossi" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, fuzzy, python-format +msgid "%d ignored" +msgstr "ignorato" + +#, fuzzy, python-format +msgid "%d unknown" +msgstr "base sconosciuta" + +#, fuzzy, python-format +msgid "%d unresolved" +msgstr "non risolti" + +#, fuzzy +msgid " (merge)" +msgstr "merge" + +#, fuzzy +msgid " (new branch)" +msgstr "mostra le branch" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "convert: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, fuzzy, python-format +msgid "update: %d new changesets (update)\n" +msgstr "%s: %d nuovi changeset" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "remoto: " + +#, fuzzy +msgid "remote: (synced)\n" +msgstr "remoto: " + +#, fuzzy msgid "" "add one or more tags for the current or given revision\n" "\n" @@ -6729,8 +6768,8 @@ " very useful to compare different revisions, to go back to significant\n" " earlier versions or to mark branch points as releases, etc.\n" "\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out.\n" "\n" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" @@ -6778,27 +6817,24 @@ msgid "tag '%s' does not exist" msgstr "la tag '%s' non esiste" -#, python-format -msgid "tag '%s' is not a %s tag" +#, fuzzy, python-format +msgid "tag '%s' is not a global tag" msgstr "la tag '%s' non è una tag %s" -#, python-format -msgid "Removed tag %s" -msgstr "Rimossa tag %s" +#, fuzzy, python-format +msgid "tag '%s' is not a local tag" +msgstr "la tag '%s' non è una tag %s" #, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "la tag '%s' esiste già (usare -f per forzare)" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "Aggiunta tag %s per il changeset %s" - +#, fuzzy msgid "" "list repository tags\n" "\n" -" This lists both regular and local tags. When the -v/--verbose switch\n" -" is used, a third column \"local\" is printed for local tags.\n" +" This lists both regular and local tags. When the -v/--verbose\n" +" switch is used, a third column \"local\" is printed for local tags.\n" " " msgstr "" "elenca le tag del repository\n" @@ -6808,12 +6844,13 @@ " una terza colonna \"local\" viene stampata per le tag locali.\n" " " +#, fuzzy msgid "" "show the tip revision\n" "\n" -" The tip revision (usually just called the tip) is the most\n" -" recently added changeset in the repository, the most recently\n" -" changed head.\n" +" The tip revision (usually just called the tip) is the changeset\n" +" most recently added to the repository (and therefore the most\n" +" recently changed head).\n" "\n" " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" @@ -6847,32 +6884,37 @@ " comando bundle.\n" " " +#, fuzzy msgid "" "update working directory\n" "\n" -" Update the repository's working directory to the specified revision,\n" -" or the tip of the current branch if none is specified. Use null as\n" -" the revision to remove the working copy (like 'hg clone -U').\n" -"\n" -" When the working dir contains no uncommitted changes, it will be\n" -" replaced by the state of the requested revision from the repo. When\n" -" the requested revision is on a different branch, the working dir\n" -" will additionally be switched to that branch.\n" -"\n" -" When there are uncommitted changes, use option -C to discard them,\n" -" forcibly replacing the state of the working dir with the requested\n" -" revision.\n" -"\n" -" When there are uncommitted changes and option -C is not used, and\n" -" the parent revision and requested revision are on the same branch,\n" -" and one of them is an ancestor of the other, then the new working\n" -" directory will contain the requested revision merged with the\n" -" uncommitted changes. Otherwise, the update will fail with a\n" -" suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use revert.\n" -"\n" -" See 'hg help dates' for a list of formats valid for --date.\n" +" Update the repository's working directory to the specified\n" +" revision, or the tip of the current branch if none is specified.\n" +" Use null as the revision to remove the working copy (like 'hg\n" +" clone -U').\n" +"\n" +" When the working directory contains no uncommitted changes, it\n" +" will be replaced by the state of the requested revision from the\n" +" repository. When the requested revision is on a different branch,\n" +" the working directory will additionally be switched to that\n" +" branch.\n" +"\n" +" When there are uncommitted changes, use option -C/--clean to\n" +" discard them, forcibly replacing the state of the working\n" +" directory with the requested revision. Alternately, use -c/--check\n" +" to abort.\n" +"\n" +" When there are uncommitted changes and option -C/--clean is not\n" +" used, and the parent revision and requested revision are on the\n" +" same branch, and one of them is an ancestor of the other, then the\n" +" new working directory will contain the requested revision merged\n" +" with the uncommitted changes. Otherwise, the update will fail with\n" +" a suggestion to use 'merge' or 'update -C' instead.\n" +"\n" +" If you want to update just one file to an older revision, use\n" +" revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "aggiorna la directory di lavoro\n" @@ -6906,6 +6948,14 @@ " Vedere 'hg help dates' per un elenco di formati validi per --date.\n" " " +#, fuzzy +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "non è possibile specificare sia una revisione sia una base" + +#, fuzzy +msgid "uncommitted local changes" +msgstr "sovrascrivi ogni modifica locale" + msgid "" "verify the integrity of the repository\n" "\n" @@ -6946,7 +6996,8 @@ "Non c'è alcuna garanzia; neppure di COMMERCIABILITÀ o IDONEITÀ AD UNO\n" "SCOPO PARTICOLARE.\n" -msgid "repository root directory or symbolic path name" +#, fuzzy +msgid "repository root directory or name of overlay bundle file" msgstr "directory radice del repository o nome del percorso simbolico" msgid "change working directory" @@ -6976,9 +7027,6 @@ msgid "set the charset encoding mode" msgstr "imposta la modalità di codifica dei caratteri" -msgid "print improved command execution profile" -msgstr "stampa il profilo di esecuzione dei comandi migliorato" - msgid "print traceback on exception" msgstr "stampa un traceback in seguito ad eccezioni" @@ -7018,7 +7066,8 @@ msgid "record datecode as commit date" msgstr "registra il datecode come data del commit" -msgid "record user as committer" +#, fuzzy +msgid "record the specified user as committer" msgstr "registra l'utente come committente" msgid "display using template map file" @@ -7142,6 +7191,9 @@ msgstr "" "mostra solo le branch che hanno head di cui non si è effettuato il merge" +msgid "show normal and closed branches" +msgstr "" + msgid "[-a]" msgstr "[-a]" @@ -7227,12 +7279,6 @@ msgid "FILE" msgstr "FILE" -msgid "parent" -msgstr "genitore" - -msgid "file list" -msgstr "elenco dei file" - msgid "revision to rebuild to" msgstr "revisione alla quale ricostruire" @@ -7254,6 +7300,10 @@ msgid "[OPTION]..." msgstr "[OPZIONI]..." +#, fuzzy +msgid "revision to check" +msgstr "revisione di cui effettuare il backout" + msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." msgstr "[OPZIONI]... [-r REV1 [-r REV2]] [FILE]..." @@ -7277,7 +7327,8 @@ msgid "ignore case when matching" msgstr "ignora il case quando si cercano corrispondenze" -msgid "print only filenames and revs that match" +#, fuzzy +msgid "print only filenames and revisions that match" msgstr "stampa solo i nomi dei file e le revisioni che corrispondono" msgid "print matching line numbers" @@ -7289,19 +7340,26 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[OPZIONI]... PATTERN [FILE]..." -msgid "show only heads which are descendants of rev" +#, fuzzy +msgid "show only heads which are descendants of REV" msgstr "mostra solo le head che sono discendenti della revisione" -msgid "show only the active heads from open branches" +#, fuzzy +msgid "show only the active branch heads from open branches" msgstr "mostra solo le head attive dalle branch aperte" -msgid "[-r REV] [REV]..." +msgid "show normal and closed branch heads" +msgstr "" + +#, fuzzy +msgid "[-r STARTREV] [REV]..." msgstr "[-r REV] [REV]..." msgid "[TOPIC]" msgstr "[ARGOMENTO]" -msgid "identify the specified rev" +#, fuzzy +msgid "identify the specified revision" msgstr "identifica la revisione specificata" msgid "show local revision number" @@ -7319,9 +7377,10 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [SORGENTE]" -msgid "" -"directory strip option for patch. This has the same\n" -"meaning as the corresponding patch option" +#, fuzzy +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" msgstr "" "opzione di rimozione della directory per patch. Questa ha lo stesso\n" "significato dell'opzione corrispondente di patch" @@ -7339,7 +7398,8 @@ msgid "apply patch to the nodes from which it was generated" msgstr "applica la patch al nodo da cui è stata generata" -msgid "Use any branch information in patch (implied by --exact)" +#, fuzzy +msgid "use any branch information in patch (implied by --exact)" msgstr "" "Usa qualunque informazione sulla branch nella patch (implicato da --exact)" @@ -7361,7 +7421,8 @@ msgid "[-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-e CMD] [--remotecmd CMD] [DEST]" -msgid "search the repository as it stood at rev" +#, fuzzy +msgid "search the repository as it stood at REV" msgstr "cerca nel repository per come era alla revisione rev" msgid "end filenames with NUL, for use with xargs" @@ -7376,7 +7437,8 @@ msgid "only follow the first parent of merge changesets" msgstr "segui solo il primo genitore di un changeset di merge" -msgid "show revs matching date spec" +#, fuzzy +msgid "show revisions matching date spec" msgstr "mostra le revisioni che corrispondono ad una data fornita" msgid "show copied files" @@ -7385,13 +7447,15 @@ msgid "do case-insensitive search for a keyword" msgstr "effettua una ricerca case-insensitive di una parola chiave" -msgid "include revs where files were removed" +#, fuzzy +msgid "include revisions where files were removed" msgstr "include le revisioni in cui sono stati rimossi dei file" msgid "show only merges" msgstr "mostra solo i merge" -msgid "revs committed by user" +#, fuzzy +msgid "revisions committed by user" msgstr "commit delle revisioni effettuato dall'utente" msgid "show only changesets within the given named branch" @@ -7415,6 +7479,9 @@ msgid "revision to merge" msgstr "revisione di cui fare il merge" +msgid "review revisions to merge (no merge is performed)" +msgstr "" + msgid "[-f] [[-r] REV]" msgstr "[-f] [[-r] REV]" @@ -7424,11 +7491,13 @@ msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgid "show parents from the specified rev" +#, fuzzy +msgid "show parents from the specified revision" msgstr "mostra i genitori della revisione specificata" -msgid "hg parents [-r REV] [FILE]" -msgstr "hg parents [-r REV] [FILE]" +#, fuzzy +msgid "[-r REV] [FILE]" +msgstr "[-r REV] FILE" msgid "[NAME]" msgstr "[NOME]" @@ -7499,10 +7568,12 @@ msgid "prefix path to serve from (default: server root)" msgstr "prefisso del percorso da cui servire (default: radice del server)" -msgid "name to show in web pages (default: working dir)" +#, fuzzy +msgid "name to show in web pages (default: working directory)" msgstr "nome da mostrare nelle pagine web (default: la directory di lavoro)" -msgid "name of the webdir config file (serve more than one repo)" +#, fuzzy +msgid "name of the webdir config file (serve more than one repository)" msgstr "nome del file di configurazione webdir (serve più di un repository)" msgid "for remote clients" @@ -7526,6 +7597,9 @@ msgid "[-u] [NAME]..." msgstr "[-u] [NOME]..." +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "mostra lo stato di tutti i file" @@ -7586,52 +7660,27 @@ msgid "overwrite locally modified files (no backup)" msgstr "sovrascrivi file modificati localmente (nessun backup)" +#, fuzzy +msgid "check for uncommitted changes" +msgstr "" +"salta il controllo di modifiche pendenti di cui non si è effettuato il commit" + msgid "[-C] [-d DATE] [[-r] REV]" msgstr "[-C] [-d DATA] [[-r] REV]" +#, fuzzy, python-format +msgid "config error at %s:%d: '%s'" +msgstr "impossibile avviare il server a '%s:%d': %s" + msgid "not found in manifest" msgstr "non trovato nel manifesto" msgid "branch name not in UTF-8!" msgstr "il nome della branch non è in UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " sto cercando copie fino alla revisione %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" -" file non corrispondenti in locale:\n" -" %s\n" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" -" file non corrispondenti in altro:\n" -" %s\n" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr " trovate tutte le copie (* = per merge, ! = divergenti):\n" - -#, python-format -msgid " %s -> %s %s\n" -msgstr " %s -> %s %s\n" - -msgid " checking for directory renames\n" -msgstr " sto controllando directory rinominate\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " dir %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " file %s -> %s\n" +#, fuzzy +msgid "working directory state appears damaged!" +msgstr "(directory di lavoro non tip)\n" #, python-format msgid "'\\n' and '\\r' disallowed in filenames: %r" @@ -7649,6 +7698,10 @@ msgid "not in dirstate: %s\n" msgstr "non nel dirstate: %s\n" +#, fuzzy +msgid "unknown" +msgstr "base sconosciuta" + msgid "character device" msgstr "device a caratteri" @@ -7664,8 +7717,8 @@ msgid "directory" msgstr "directory" -#, python-format -msgid "%s: unsupported file type (type is %s)\n" +#, fuzzy, python-format +msgid "unsupported file type (type is %s)" msgstr "%s: tipo di file non supportato (il tipo è %s)\n" #, python-format @@ -7673,6 +7726,10 @@ msgstr "abortito: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -7701,10 +7758,6 @@ msgstr "hg %s: %s\n" #, python-format -msgid "hg: %s\n" -msgstr "hg: %s\n" - -#, python-format msgid "abort: %s!\n" msgstr "abortito: %s!\n" @@ -7755,7 +7808,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** incontrata eccezione sconosciuta, seguono dettagli\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +#, fuzzy +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "** riportare dettagli del bug a http://www.selenic.com/mercurial/bts\n" msgid "** or mercurial@selenic.com\n" @@ -7770,6 +7824,18 @@ msgstr "** Estensioni caricate: %s\n" #, python-format +msgid "no definition for alias '%s'\n" +msgstr "" + +#, fuzzy, python-format +msgid "alias '%s' resolves to unknown command '%s'\n" +msgstr "la tag '%s' si riferisce ad un nodo sconosciuto" + +#, python-format +msgid "alias '%s' resolves to ambiguous command '%s'\n" +msgstr "" + +#, python-format msgid "malformed --config option: %s" msgstr "opzione --config malformata: %s" @@ -7784,7 +7850,7 @@ msgstr "Non si può abbreviare l'opzione --cwd!" msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" @@ -7799,8 +7865,9 @@ msgid "invalid arguments" msgstr "argomenti non validi" -msgid "exception raised - generating profile anyway\n" -msgstr "eccezione sollevata - genero comunque il profilo\n" +#, python-format +msgid "unrecognized profiling format '%s' - Ignored\n" +msgstr "" msgid "" "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" @@ -7832,20 +7899,16 @@ msgstr "il tool %s richiede una GUI\n" #, 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?" msgstr "" -msgid "[lo]" -msgstr "[lo]" - -msgid "l" -msgstr "l" +msgid "&Local" +msgstr "" + +msgid "&Other" +msgstr "" #, python-format msgid "merging %s and %s to %s\n" @@ -7856,23 +7919,16 @@ msgstr "sto effettuando il merge di %s\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "mio %s altro %s antenato %s\n" - -msgid " premerge successful\n" -msgstr " premerge eseguito con successo\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" msgstr "" -msgid "[yn]" -msgstr "[yn]" - -msgid "n" -msgstr "n" +msgid "&No" +msgstr "" + +msgid "&Yes" +msgstr "" #, python-format msgid "merging %s failed!\n" @@ -7886,443 +7942,51 @@ msgid "unknown bisect kind %s" msgstr "" +#, fuzzy +msgid "disabled extensions:" +msgstr "" +"\n" +"estensioni abilitate:\n" +"\n" + msgid "Date Formats" msgstr "Formati della data" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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). offset\n" -" is the offset of the local timezone, in seconds west of UTC (negative\n" -" 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 "" - msgid "File Name Patterns" msgstr "Pattern dei Nomi dei File" -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 only\n" -" match 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 of\n" -" 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 "Variabili d'ambiente" -msgid "" -"\n" -"HG::\n" -" Path to the 'hg' executable, automatically passed when running hooks,\n" -" extensions or external tools. If unset or empty, this is the hg\n" -" executable's name if it's frozen, or an executable named 'hg'\n" -" (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" -" * if it's a directory, all directories ending with .rc are added\n" -" * otherwise, the directory 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\n" -" for a user to modify, for example when writing commit messages.\n" -" The 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 set\n" -" appropriately if this Mercurial is not installed system-wide.\n" -" " -msgstr "" - msgid "Specifying Single Revisions" msgstr "" -msgid "" -"\n" -" Mercurial supports several ways to specify individual\n" -" revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative\n" -" integers are treated as topological offsets from the tip, with\n" -" -1 denoting the tip. As such, negative numbers are only useful\n" -" if you've memorized your local tree numbers and want to save\n" -" typing a single digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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.\n" -" If an uncommitted merge is in progress, \".\" is the revision of\n" -" the first parent.\n" -" " -msgstr "" - msgid "Specifying Multiple Revisions" msgstr "Specificare Revisioni Multiple" -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\n" -" means \"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 "Formati di diff" -msgid "" -"\n" -" Mercurial's default format for showing changes between two versions\n" -" of a file is compatible with the unified format of GNU diff, which\n" -" can be 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\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 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\n" -" --git option available for many commands, or set 'git = True' in the\n" -" [diff] 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 "Template Usage" msgstr "" -msgid "" -"\n" -" Mercurial allows you to customize output of commands through\n" -" templates. You can either pass in a template from the command line,\n" -" via the --template option, or select an existing template-style (--" -"style).\n" -"\n" -" You can customize output for any \"log-like\" command: log, outgoing,\n" -" 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. Usage:\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" A template is a piece of text, with markup to invoke variable " -"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 keywords\n" -" 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 default.\n" -" - date: Date information. The date when the changeset was committed.\n" -" - desc: String. The text of the changeset description.\n" -" - diffstat: String. Statistics of changes with the following format:\n" -" \"modified files: +added/-removed lines\"\n" -" - files: List of strings. All files modified, added, or removed by\n" -" 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 40-character\n" -" hexadecimal string.\n" -" - parents: List of strings. The parents of the changeset.\n" -" - rev: Integer. The repository-local changeset revision number.\n" -" - tags: List of strings. Any tags associated with the 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 it.\n" -" Filters are functions which return a string based on the input " -"variable.\n" -" You can also use a chain of filters to get the desired 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing seprators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\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 email\n" -" address, and extracts just the domain component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an email\n" -" address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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" -" - obfuscate: Any text. Returns the input text rendered as a sequence\n" -" 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\n" -" in email headers.\n" -" - short: Changeset hash. Returns the short form of a changeset hash,\n" -" 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 the\n" -" first starting with a tab character.\n" -" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\".\n" -" - user: Any text. Returns the user portion of an email address.\n" -" " -msgstr "" - -msgid "Url Paths" +#, fuzzy +msgid "URL Paths" msgstr "Percorsi url" -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" -"\n" -" Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the\n" -" remote Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\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.\n" -" Use an extra slash at the start of a path to specify an absolute " -"path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" You can then use the alias for any command that uses a url (for example\n" -" '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 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-\n" -" and pull-like commands (including in and out).\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 "" +#, fuzzy +msgid "Using additional features" +msgstr "abilita output aggiuntivo" + +msgid "can only share local repositories" +msgstr "" + +#, fuzzy +msgid "destination already exists" +msgstr "la destinazione '%s' esiste già" + +msgid "updating working directory\n" +msgstr "sto aggiornando la directory di lavoro\n" #, python-format msgid "destination directory: %s\n" @@ -8332,6 +7996,10 @@ msgid "destination '%s' already exists" msgstr "la destinazione '%s' esiste già" +#, fuzzy, python-format +msgid "destination '%s' is not empty" +msgstr "la destinazione %s non è una directory" + msgid "" "src repository does not support revision lookup and so doesn't support clone " "by revision" @@ -8340,30 +8008,21 @@ msgid "clone from remote to remote not supported" msgstr "clone da remoto a remoto non supportato" -msgid "updating working directory\n" -msgstr "sto aggiornando la directory di lavoro\n" - -msgid "updated" -msgstr "aggiornati" - -msgid "merged" -msgstr "merge" - -msgid "removed" -msgstr "rimossi" - -msgid "unresolved" -msgstr "non risolti" - -#, python-format -msgid "%d files %s" -msgstr "%d file %s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "sto aggiornando la cache delle branch\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 "usa 'hg resolve' per riprovare i merge sui file non risolti\n" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +#, fuzzy +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "" "usa 'hg resolve' per riprovare i merge sui file non risolti o\n" @@ -8379,7 +8038,8 @@ msgid "SSL support is unavailable" msgstr "Supporto SSL non disponibile" -msgid "IPv6 not available on this system" +#, fuzzy +msgid "IPv6 is not available on this system" msgstr "IPv6 non disponibile su questo sistema" #, python-format @@ -8441,32 +8101,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "componente URL non supportato: \"%s\"" -#, python-format -msgid "using %s\n" -msgstr "sto usando %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "funzionalità: %s\n" - msgid "operation not supported over http" msgstr "operazione non supportata su http" -#, python-format -msgid "sending %s command\n" -msgstr "sto inviando il comando %s\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "sto inviando %s byte\n" - msgid "authorization failed" msgstr "autorizzazione fallita" -#, python-format -msgid "http error while sending %s command\n" -msgstr "errore http durante l'invio del comando %s\n" - msgid "http error, possibly caused by proxy setting" msgstr "errore http, probabilmente causato dalle impostazioni del proxy" @@ -8475,10 +8115,6 @@ msgstr "il vero URL è %s\n" #, python-format -msgid "Requested URL: '%s'\n" -msgstr "URL richiesto: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' non sembra essere un repository hg" @@ -8513,7 +8149,7 @@ msgstr "impossibile creare un nuovo repository http" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -8533,6 +8169,10 @@ msgstr "requisito '%s' non supportato" #, python-format +msgid ".hg/sharedpath points to nonexistent directory %s" +msgstr "" + +#, python-format msgid "%r cannot be used in a tag name" msgstr "" @@ -8541,29 +8181,14 @@ "la copia di lavoro di .hgtags è cambiata (si prega di effettuare il commit " "manuale di .hgtags)" -#, python-format -msgid "%s, line %s: %s\n" -msgstr "%s, linea %s: %s\n" - -msgid "cannot parse entry" -msgstr "impossibile parsificare la entry" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "il nodo '%s' non è ben formato" - -#, python-format -msgid "tag '%s' refers to unknown node" -msgstr "la tag '%s' si riferisce ad un nodo sconosciuto" +#, fuzzy, python-format +msgid "working directory has unknown parent '%s'!" +msgstr "directory di lavoro di %s" #, python-format msgid "unknown revision '%s'" msgstr "revisione sconosciuta '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "sto filtrando %s attraverso %s\n" - msgid "journal already exists - run hg recover" msgstr "il journal esiste già - eseguire hg recover" @@ -8595,37 +8220,32 @@ msgid "working directory of %s" msgstr "directory di lavoro di %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 "" -#, python-format -msgid "%s not tracked!\n" -msgstr "%s non è tracciato!\n" +#, fuzzy +msgid "file not found!" +msgstr "file %s non trovato!" + +#, fuzzy +msgid "no match under directory!" +msgstr "nessuna corrispondenza sotto la directory %s!" + +#, fuzzy +msgid "file not tracked!" +msgstr "il file %s non è tracciato!" msgid "unresolved merge conflicts (see hg resolve)" msgstr "" -msgid "nothing changed\n" -msgstr "nulla è cambiato\n" +#, fuzzy, python-format +msgid "committing subrepository %s\n" +msgstr "repository·%s" #, python-format msgid "trouble committing %s!\n" msgstr "" -msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "" - -msgid "empty commit message" -msgstr "messaggio di commit vuoto" - #, python-format msgid "%s does not exist!\n" msgstr "%s non esiste!\n" @@ -8657,6 +8277,10 @@ msgstr "" #, python-format +msgid "%s not tracked!\n" +msgstr "%s non è tracciato!\n" + +#, python-format msgid "%s not removed!\n" msgstr "" @@ -8667,41 +8291,6 @@ msgid "searching for changes\n" msgstr "sto cercando modifiche\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "branch già trovata\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "trovata branch incompleta %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "trovato nuovo changeset %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -8711,16 +8300,6 @@ msgid "repository is unrelated" msgstr "il repository non è imparentato" -msgid "found new changesets starting at " -msgstr "trovati nuovi changeset a partire da " - -#, python-format -msgid "%d total queries\n" -msgstr "%d query totali\n" - -msgid "common changesets up to " -msgstr "changeset comuni fino a " - msgid "requesting all changes\n" msgstr "sto richiedendo tutte le modifiche\n" @@ -8729,6 +8308,10 @@ "changegroupsubset." msgstr "" +#, fuzzy, python-format +msgid "abort: push creates new remote branch '%s'!\n" +msgstr "abortito: push crea nuove head remote!\n" + msgid "abort: push creates new remote heads!\n" msgstr "abortito: push crea nuove head remote!\n" @@ -8743,17 +8326,10 @@ msgid "%d changesets found\n" msgstr "%d changeset trovati\n" -msgid "list of changesets:\n" -msgstr "elenco dei changeset:\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "revlog vuoto o mancante per %s" -#, python-format -msgid "add changeset %s\n" -msgstr "aggiungo changeset %s\n" - msgid "adding changesets\n" msgstr "sto aggiungendo i changeset\n" @@ -8766,10 +8342,6 @@ msgid "adding file changes\n" msgstr "sto aggiungendo le modifiche ai file\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "sto aggiungendo %s revisioni\n" - msgid "received file revlog group is empty" msgstr "il gruppo di file revlog ricevuto è vuoto" @@ -8781,9 +8353,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "aggiunti %d changeset con %d modifiche a %d file%s\n" -msgid "updating the branch cache\n" -msgstr "sto aggiornando la cache delle branch\n" - msgid "Unexpected response from remote server:" msgstr "Risposta inaspettata dal server remoto:" @@ -8804,10 +8373,6 @@ msgstr "%d file da trasferire, %s di dati\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "sto aggiungendo %s (%s)\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "trasferiti %s in %.1f secondi (%s/sec)\n" @@ -8851,9 +8416,6 @@ msgid "invalid local address: %s" msgstr "" -msgid "'\\n' and '\\r' disallowed in filenames" -msgstr "" - #, python-format msgid "failed to remove %s from manifest" msgstr "" @@ -8872,33 +8434,35 @@ msgid "case-folding collision between %s and %s" msgstr "" -msgid "resolving manifests\n" -msgstr "sto risolvendo i manifesti\n" - -#, python-format -msgid " overwrite %s partial %s\n" -msgstr "sovrascrivi %s parziale %s\n" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "antenato %s locale %s remoto %s\n" - #, python-format msgid "" " conflicting flags for %s\n" "(n)one, e(x)ec or sym(l)ink?" msgstr "" +#, fuzzy +msgid "&None" +msgstr "fatto\n" + +msgid "E&xec" +msgstr "" + +msgid "Sym&link" +msgstr "" + +msgid "resolving manifests\n" +msgstr "sto risolvendo i manifesti\n" + #, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" msgstr "" -msgid "[cd]" -msgstr "" - -msgid "c" +msgid "&Changed" +msgstr "" + +msgid "&Delete" msgstr "" #, python-format @@ -8907,8 +8471,7 @@ "use (c)hanged version or leave (d)eleted?" msgstr "" -#, python-format -msgid "preserving %s for resolve of %s\n" +msgid "&Deleted" msgstr "" #, python-format @@ -8938,6 +8501,10 @@ msgstr "" "niente di cui effettuare il merge (usare 'hg update' ocontrollare 'hg heads')" +#, fuzzy +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "ci sono modifiche in sospeso di cui non si è effettuato il commit" + msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" msgstr "" @@ -8956,13 +8523,6 @@ msgstr "impossibile creare %s: impossibile creare la directory di destinazione" #, python-format -msgid "found patch at byte %d\n" -msgstr "" - -msgid "patch generated by hg export\n" -msgstr "patch generata da hg export\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "" @@ -8983,7 +8543,11 @@ msgstr "" #, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" +msgstr "" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" msgstr "" #, python-format @@ -9024,9 +8588,13 @@ msgid "patch command failed: %s" msgstr "comando patch fallito: %s" -#, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "" +#, fuzzy, python-format +msgid "Unsupported line endings type: %s" +msgstr "%s: tipo di file non supportato (il tipo è %s)\n" + +#, fuzzy, python-format +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" +msgstr "%d file, %d changeset, %d revisioni totali\n" #, python-format msgid "exited with status %d" @@ -9037,13 +8605,6 @@ msgstr "ucciso dal segnale %d" #, python-format -msgid "stopped by signal %d" -msgstr "terminato dal segnale %d" - -msgid "invalid exit code" -msgstr "codice d'uscita non valido" - -#, python-format msgid "saving bundle to %s\n" msgstr "sto salvando il bundle in %s\n" @@ -9070,6 +8631,10 @@ msgid "index %s unknown format %d" msgstr "" +#, fuzzy, python-format +msgid "index %s is corrupted" +msgstr "interrotto" + msgid "no node" msgstr "nessun nodo" @@ -9110,12 +8675,12 @@ msgid "could not create remote repo" msgstr "non è stato possibile creare il repository remoto" +msgid "no suitable response from remote hg" +msgstr "nessuna risposta accettabile dall'hg remoto" + msgid "remote: " msgstr "remoto: " -msgid "no suitable response from remote hg" -msgstr "nessuna risposta accettabile dall'hg remoto" - #, python-format msgid "push refused: %s" msgstr "push rifiutato: %s" @@ -9133,93 +8698,102 @@ msgid "invalid entry in fncache, line %s" msgstr "voce non valida in fncache, linea %s" -msgid "scanning\n" -msgstr "sto effettuando la scansione\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "sto inviando %s (%d byte)\n" +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +#, fuzzy +msgid "&Remote" +msgstr "remoto: " + +#, python-format +msgid "" +" local changed subrepository %s which remote removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, python-format +msgid "" +" remote changed subrepository %s which local removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, fuzzy, python-format +msgid "removing subrepo %s\n" +msgstr "sto rimuovendo %s\n" + +#, fuzzy, python-format +msgid "pulling subrepo %s\n" +msgstr "sto facendo pull da %s\n" + +#, fuzzy, python-format +msgid "pushing subrepo %s\n" +msgstr "sto effettuando il push verso %s\n" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "%s, linea %s: %s\n" + +msgid "cannot parse entry" +msgstr "impossibile parsificare la entry" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "il nodo '%s' non è ben formato" msgid "unmatched quotes" msgstr "" +#, fuzzy, python-format +msgid "error expanding '%s%%%s'" +msgstr "errore di lettura di %s/.hg/hgrc: %s\n" + +#, fuzzy, python-format +msgid "unknown filter '%s'" +msgstr "revisione sconosciuta '%s'" + #, python-format msgid "style not found: %s" msgstr "stile non trovato: %s" #, python-format -msgid "%s:%s: parse error" -msgstr "" - -#, python-format msgid "template file %s: %s" msgstr "" -#, python-format -msgid "Error expanding '%s%%%s'" +msgid "cannot use transaction when it is already committed/aborted" +msgstr "" + +#, python-format +msgid "failed to truncate %s\n" msgstr "" msgid "transaction abort!\n" msgstr "transazione abortita!\n" -#, python-format -msgid "failed to truncate %s\n" -msgstr "" - msgid "rollback completed\n" msgstr "rollback completato\n" +#, fuzzy +msgid "rollback failed - please run hg recover\n" +msgstr "il journal esiste già - eseguire hg recover" + #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" msgstr "" #, python-format -msgid "" -"Failed to parse %s\n" -"%s" -msgstr "" -"Fallita la parsificazione di %s\n" -"%s" - -#, python-format msgid "Ignored: %s\n" msgstr "Ignorato: %s\n" -#, python-format -msgid "unable to open %s: %s" -msgstr "impossibile aprire %s: %s" - -#, python-format -msgid "" -"failed to parse %s\n" -"%s" -msgstr "" -"fallita la parsificazione di %s\n" -"%s" - -#, python-format -msgid "" -"Error in configuration section [%s] parameter '%s':\n" -"%s" -msgstr "" -"Errore nella sezione di configurazione [%s] parametro '%s':\n" -"%s" - -#, python-format -msgid "Ignoring untrusted configuration option %s.%s = %s\n" +#, fuzzy, python-format +msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "Ignoro l'opzione di configurazione non affidabile %s.%s = %s\n" #, python-format -msgid "" -"Error in configuration section [%s]:\n" -"%s" -msgstr "" -"Errore nella sezione di configurazione [%s]:\n" -"%s" +msgid "%s.%s not a boolean ('%s')" +msgstr "" msgid "enter a commit username:" msgstr "inserire uno username per il commit:" @@ -9235,12 +8809,12 @@ msgid "username %s contains a newline\n" msgstr "lo username %s contiene un carattere di fine riga\n" +msgid "response expected" +msgstr "risposta attesa" + msgid "unrecognized response\n" msgstr "risposta non riconosciuta\n" -msgid "response expected" -msgstr "risposta attesa" - msgid "password: " msgstr "password: " @@ -9265,18 +8839,10 @@ msgstr "utente:" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "usando proxy attraverso http://%s:%s\n" - -#, python-format msgid "http auth: user %s, password %s\n" msgstr "autenticazione http: utente %s, password %s\n" #, python-format -msgid "%s, please check your locale settings" -msgstr "%s, si prega di controllare le impostazioni di localizzazione" - -#, python-format msgid "command '%s' failed: %s" msgstr "comando '%s' fallito: %s" @@ -9381,8 +8947,12 @@ msgid "warning: `%s' uses revlog format 0" msgstr "attenzione: `%s' usa il formato di revlog 0" -#, python-format -msgid "rev %d point to %s changeset %d" +#, fuzzy, python-format +msgid "rev %d points to nonexistent changeset %d" +msgstr "rev %d punta a %s changeset %d" + +#, fuzzy, python-format +msgid "rev %d points to unexpected changeset %d" msgstr "rev %d punta a %s changeset %d" #, python-format @@ -9419,6 +8989,10 @@ msgid "checking manifests\n" msgstr "sto controllando i manifesti\n" +#, fuzzy, python-format +msgid "%s not in changesets" +msgstr "%s non è nei manifesti" + msgid "file without name in manifest" msgstr "file senza nome nel manifesto" @@ -9467,11 +9041,15 @@ msgstr "sto spacchettando %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 "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format @@ -9505,6 +9083,3 @@ msgid "user name not available - set USERNAME environment variable" msgstr "" "nome utente non disponibile - impostare la variabile d'ambiente USERNAME" - -#~ msgid "%s %s to %s\n" -#~ msgstr "%s %s in %s\n"
--- a/i18n/ja.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/ja.po Sat Nov 07 14:13:15 2009 -0600 @@ -97,8 +97,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-07-01 11:25+0900\n" -"PO-Revision-Date: 2009-07-01 18:00+0900\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:47+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -117,8 +117,11 @@ msgid "COMMANDS" msgstr "" -msgid " options:\n" -msgstr "" +#, fuzzy +msgid "" +" options:\n" +"\n" +msgstr "オプション:\n" #, python-format msgid "" @@ -128,6 +131,897 @@ " 別名: %s\n" "\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" +" 以下のコマンドで日時指定が可能です:\n" +" * backout, commit, import, tag: コミット日時の指定\n" +" * log, revert, update: 日時によるリビジョンの指定\n" +"\n" +" 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n" +" \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n" +" \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n" +" \"Dec 6\" (「午前0時」を想定)\n" +" \"13:18\" (「本日」を想定)\n" +" \"3:39\" (「3:39AM」を想定)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (ISO 8601 形式)\n" +" \"2006-12-6 13:18\"\n" +" \"2006-12-6\"\n" +" \"12-6\"\n" +" \"12/6\"\n" +" \"12/6/6\" (2006年12月6日)\n" +"\n" +" 最後に、Mercurial 固有の内部形式を示します。\n" +"\n" +" \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n" +"\n" +" これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n" +" 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n" +" (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n" +"\n" +" log コマンドには、日時範囲指定可能です:\n" +"\n" +" \"<{date}\" - 指定日時以前(指定日時含む)\n" +" \">{date}\" - 指定日時以後(指定日時含む)\n" +" \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n" +" \"-{days}\" - 本日から指定日数以内\n" +" " + +#, fuzzy +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 "" +"\n" +" 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n" +" GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n" +" 標準的なツールで使用できるものです。\n" +"\n" +" この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n" +"\n" +" - 実行可否および権限設定\n" +" - 複製／改名情報\n" +" - バイナリファイルの変更\n" +" - 空ファイルの作成／削除\n" +"\n" +" Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n" +" 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n" +" 但し、普及しているツールの幾つかが git 差分形式に対応していないため、\n" +" Mercurial は指定が無い場合はこの形式では出力しません。\n" +"\n" +" つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n" +" 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n" +" ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n" +" 十分注意する必要があります。push や pull のように、Mercurial の\n" +" 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n" +" ことから、情報の欠落に関しては心配する必要はありません。\n" +"\n" +" Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n" +" 対して --git を指定するか、設定ファイルの [diff] セクションに\n" +" 'git = True' 記述を追加してください。hg import や mq エクステンションを\n" +" 使用する場合は、この指定は不要です。\n" +" " + +#, fuzzy +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 "" +"\n" +"HG::\n" +" 'hg' コマンドへのパス。フック／エクステンションないし外部ツールの起動の\n" +" 際に自動的に設定されます。未設定や空の場合は、frozen 形式の\n" +" hg 実行可能ファイルの名前か設定されるか、'hg' という名前の実行可能\n" +" ファイルが検索されます(Windows の場合、PATHEXT 環境変数に設定された\n" +" COM/EXE/BAT/CMD 等の拡張子付き)。\n" +"\n" +"HGEDITOR::\n" +" コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n" +" についても参照してください。\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"HGENCODING::\n" +" Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n" +" コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n" +" 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n" +" 使用により、更に上書きすることが出来ます。\n" +"\n" +"HGENCODINGMODE::\n" +" ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n" +" 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n" +" 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n" +" されたものとみなします。他には、「未知の文字の置き換え」を意味する\n" +" \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" +" 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n" +" 使用により、更に上書きすることが出来ます。\n" +"\n" +"HGMERGE::\n" +" マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n" +" 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n" +" ファイルを表す3つの引数が指定されます。\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"HGRCPATH::\n" +" 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n" +" 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n" +" HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n" +" 読み込み先から読み込まれます。空の値が設定されている場合、\n" +" 現リポジトリの .hg/hgrc のみが読み込まれます。\n" +"\n" +" 指定された一覧の各要素に対して、以下のように振舞います:\n" +" * ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n" +" * ファイルなら、そのファイル自身を読み込む\n" +"\n" +"HGUSER::\n" +" チェンジセット作成者としてコミット時に記録する名前の指定。\n" +" 作成者名として採用される値の決定順序は以下の通りです。\n" +"\n" +" * HGUSER 環境変数値(推奨されません)\n" +" * (HGRCPATH 環境変数で指定される)設定ファイル中の設定\n" +" * EMAIL 環境変数値\n" +" * 対話的な入力\n" +" * LOGNAME 環境変数値('@hostname' が付与されます)\n" +"\n" +" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" +"\n" +"EMAIL::\n" +" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n" +" 詳細は HGUSER の記述を参照してください。\n" +"\n" +"LOGNAME::\n" +" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n" +" 詳細は HGUSER の記述を参照してください。\n" +"\n" +"VISUAL::\n" +" コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n" +" についても参照してください。\n" +"\n" +"EDITOR::\n" +" コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n" +" 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n" +" あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" +" 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n" +" (あるいは空)の場合は、'vi' が使用されます。\n" +"\n" +"PYTHONPATH::\n" +" Mercurial が当該システムの共有領域にインストールされていない場合、\n" +" Python が必要なモジュールを読み込むためには、この環境変数の設定が\n" +" 必要です。\n" +" " + +#, fuzzy +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 "" +"\n" +" Mercurial には、新規機能を「エクステンション」という機構を用いて\n" +" 追加する仕組みが備わっています。エクステンションでは、コマンドの\n" +" 新規追加、既存コマンドへのオプションの追加、コマンドの挙動の変更、\n" +" フックの実装といったことが可能です。\n" +"\n" +" 様々な事情から、特に指定の無い場合にはエクステンションは読み込まれ\n" +" ません。付加的な読み込みは、起動時間の増加を意味します。上級用途\n" +" 限定のものもあります。(履歴の破壊や改変などの)潜在的な危険性を持つ\n" +" 場合もあります。実験的なものであるかもしれません。これまでの\n" +" Mercurial の振る舞いを変えてしまうかもしれません。エクステンションを\n" +" 必要に応じて有効化するのは利用者の責務です。\n" +"\n" +" \"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n" +" ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n" +" において以下のような記述が必要です。\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" エクステンションへのフルパスを記述することも可能です。\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" 明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n" +" パス指定の冒頭に '!' を付与します。\n" +"\n" +" [extensions]\n" +" # /path/to/extension/bar.py にあるエクステンション bar の無効化\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # こちらはパス指定無しでの baz エクステンションの無効化\n" +" hgext.baz = !\n" +" " + +#, fuzzy +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 "" +"\n" +" Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n" +" 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n" +" 記号にした範囲指定による方法があります。\n" +"\n" +" 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n" +" 部分にはそれぞれリビジョン識別用の情報が記述されます。\n" +" \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n" +" 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n" +" \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n" +" 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n" +"\n" +" \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n" +" とみなされます。\n" +"\n" +" 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n" +" 3, 4, 5 の指定と等価です。同様に 9:6 という指定は 9, 8, 7, 6 の指定と\n" +" 等価です。\n" +" " + +#, fuzzy +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 "" +"\n" +" Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n" +"\n" +" 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n" +" shell 形式の拡張ワイルドカード合致を行います。\n" +"\n" +" 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n" +"\n" +" パターン合致を行わずに、指定された名前をそのまま使用する場合、\n" +" 名前の前に \"path:\" を記述します。この形式を使用する場合、\n" +" リポジトリのルートからのパスと完全に一致しなければなりません。\n" +"\n" +" 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n" +" 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n" +" 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n" +"\n" +" ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n" +" \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n" +"\n" +" Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n" +" 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n" +" パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n" +" 「されません」ので注意が必要です)。\n" +"\n" +" パターン合致未使用例:\n" +"\n" +" path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n" +" path:path:name \"path:name\" という名前\n" +"\n" +" ワイルドカード指定例:\n" +"\n" +" glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" **.c 現ディレクトリないしその配下のディレクトリにおいて、\n" +" 名前が \".c\" で終わるもの\n" +" foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n" +" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n" +" 名前が \".c\" で終わるもの\n" +"\n" +" 正規表現指定例:\n" +"\n" +" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n" +"\n" +" " + +#, fuzzy +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 "" +"\n" +" Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n" +"\n" +" 整数値は、「リビジョン番号」とみなされます。負値は、tip からの距離を\n" +" 表し、-1 は tip 自身を表します。負値の指定は、手元のリポジトリ中の\n" +" 履歴遷移を把握している際に、入力を省力化したい場合にのみ有効です。\n" +" 負値の利用はあまりお勧めできません。\n" +"\n" +" 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n" +"\n" +" 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n" +" みなされます。短縮形式の識別子は、厳密に1つの完全長の識別子とだけ\n" +" 前方一致する場合にのみ有効です。\n" +"\n" +" それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n" +" みなされます。タグ名は \":\" を含んでいないかもしれない。\n" +"\n" +" 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n" +" されています。\n" +"\n" +" 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n" +" されており、リビジョン 0 の親は \"null\" リビジョンです。\n" +"\n" +" 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n" +" 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n" +" 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n" +" " + +#, fuzzy +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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 "" +"\n" +" Mercurial では、テンプレート機能によってコマンドの出力をカスタマイズ\n" +" することができます。コマンドラインからの指定では、--template による\n" +" テンプレート指定と、--style によるスタイル指定の両方が使用できます。\n" +"\n" +" 「log 的」な出力を行う以下のコマンドの出力をカスタマイズ可能です:\n" +" log, outgoing, incoming, tip, parents, heads, glog\n" +"\n" +" Mercurial には(明示的な指定が無い場合に使用される)default、compact\n" +" および changelog の3つのスタイル設定が同梱されています。利用方法は:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" テンプレートとは、変数展開マークアップ機能を備えたテキストです。\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" 波括弧で囲まれた部分は「キーワード」と呼ばれます。キーワード利用の\n" +" 可否は、テンプレートの利用される状況に依存します。以下のキーワードは\n" +" log 的なコマンドでのテンプレート利用の際には常に使用可能です。\n" +"\n" +" - author: 文字列。リビジョンの作者名(記録情報そのまま)。\n" +" - branches: 文字列。リビジョンの属するブランチ名。所属ブランチが\n" +" default の場合は空文字列。\n" +" - date: 日時情報。リビジョンが記録された日時。\n" +" - desc: 文字列。リビジョンのコミットメッセージ。\n" +" - diffstat: 文字列。以下の形式での変更概要。\n" +" \"変更対象ファイル: +追加行数/-削除行数\"\n" +" - files: 文字列列挙。当該リビジョンでの、変更／追加登録ないし\n" +" 登録除外ファイルの一覧。\n" +" - file_adds: 文字列列挙。当該リビジョンでの追加ファイル一覧。\n" +" - file_mods: 文字列列挙。当該リビジョンでの変更ファイル一覧。\n" +" - file_dels: 文字列列挙。当該リビジョンでの登録除外ファイル一覧。\n" +" - node: 文字列。リビジョン識別用の 40 桁 16 進数ハッシュ値。\n" +" - parents: 文字列列挙。リビジョンの親。\n" +" - rev: 整数。各リポジトリ固有のリビジョン番号。\n" +" - tags: 文字列列挙。当該リビジョンに付与されたタグの一覧。\n" +"\n" +" \"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n" +" 含めたい場合、可読化するために「フィルター」を使用します。\n" +" 「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n" +" フィルターを連ねることで、様々な出力を得ることができます。\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" フィルター一覧(入力と、それに対する出力):\n" +"\n" +" - addbreaks: 文字列。最終行を除く各行の行末に XHTML の \n" +" \"<br />\" タグを追加します。\n" +" - age: 日時情報。与えられた日時と、現在日時との差分を表す\n" +" 可読形式の文字列を生成します。\n" +" - basename: 文字列。与えられた文字列をパスとみなし、パス区切りで\n" +" 区切られた最後の要素だけを取り出します(末尾パス\n" +" 区切りは無視されます)。例えば、\"foo/bar/baz\" は\n" +" \"baz\" に、\"foo/bar//\" は \"bar\" になります。\n" +" - stripdir: 文字列。与えられた文字列をパスとみなし、ディレクトリ\n" +" 要素があればそれを取り除きます。例えば、\"foo\"\n" +" および \"foo/bar\" は \"foo\" となります。\n" +" - date: 日時情報。タイムゾーンを含んだ、Unix の date コマンド\n" +" 形式で可読化します: \"Mon Sep 04 15:13:13 2006 0700\"\n" +" - domain: 文字列。メールアドレスと思しき最初の文字列部分から\n" +" ドメイン部分だけを取り出します。例えば、\n" +" 'User <user@example.com>' は 'example.com' です。\n" +" - email: 文字列。メールアドレスと思しき最初の部分を取り出します。\n" +" 例えば 'User <user@example.com>' は\n" +" 'user@example.com' となります。\n" +" - escape: 文字列。XML/XHTML の特殊文字である \"&\"、\"<\" および\n" +" \">\" を XML のエンティティ形式に変換します。\n" +" - fill68: 文字列。68 桁に収まるように文字列を折り返します。\n" +" - fill76: 文字列。76 桁に収まるように文字列を折り返します。\n" +" - firstline: 文字列。最初の行のみを取り出します。\n" +" - nonempty: 文字列。与えられた文字列が空の場合 '(none)'となります。\n" +" - hgdate: 日時情報。Unix タイムスタンプとタイムゾーンオフセット\n" +" による数値対形式で可読化します: \"1157407993 25200\"\n" +" - isodate: 日時情報。ISO 8601 形式で可読化します。\n" +" - localdate: 日時情報。ローカル日時で可読化します。\n" +" - obfuscate: 文字列。全ての文字を XML エンティティ形式に変換します。\n" +" - person: 文字列。メールアドレス直前の部分だけを取り出します。\n" +" - rfc822date:日時情報。メールのヘッダと同形式で可読化します。\n" +" - short: リビジョンハッシュ 値。12 桁程度の短縮形式にします。\n" +" - shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。\n" +" - strip: 文字列。先頭／末尾の空白文字を取り除きます。\n" +" - tabindent: 文字列。先頭行以外をタブ文字で字下げします。\n" +" - urlescape: 文字列。全ての「特殊」文字を変換します。\n" +" 例えば \"foo bar\" は \"foo%20bar\" となります。\n" +" - user: 文字列。メールアドレスのユーザ名部分を取り出します。\n" +" " + +#, fuzzy +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 "" +"\n" +" 有効な URL 指定は以下の形式です:\n" +"\n" +" local/filesystem/path (ないし file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n" +" バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n" +" 構いません。\n" +"\n" +" 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n" +" することで、特定のブランチ、タグないしチェンジセットを指定することが\n" +" 出来ます。\n" +"\n" +" http:// や https:// 形式の URL で指定される連携先への push の様な\n" +" 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n" +" 利用可能になっている場合に限り使用可能です。\n" +"\n" +" Mercurial と SSH を併用する場合の注意点:\n" +" - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n" +" hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n" +" 場合は、--remotecmd で明示的に指定してください。\n" +" - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n" +" からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n" +" 更にスラッシュ('/')を付与してください。\n" +" 例: ssh://example.com//tmp/repository\n" +" - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n" +" ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n" +" --ssh に対して、'ssh -C' を指定する方法もあります。\n" +"\n" +" 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n" +" することが出来ます。\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n" +" (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n" +"\n" +" コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n" +" 重要な別名が2つあります。\n" +"\n" +" default:\n" +" 'hg clone' によって複製した場合、新規リポジトリの 'default' として\n" +" 複製元リポジトリの URL が保存されます。\n" +" 以後、連携先を省略して 'hg push' や 'hg pull' に類するコマンドを\n" +" 実行した際には、この URL が連携先として使用されます。\n" +"\n" +" default-push:\n" +" 'hg push' は、'default-push' の別名で定義される URL を探します。\n" +" 'default' が定義されている場合でも、'default-push' が定義されていれば\n" +" こちらが優先されます。\n" +" " + msgid "" "hooks for controlling repository access\n" "\n" @@ -145,7 +1039,7 @@ "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" +"To use this hook, configure the acl extension in your hgrc like this::\n" "\n" " [extensions]\n" " hgext.acl =\n" @@ -158,10 +1052,10 @@ " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" " sources = serve\n" "\n" -"The allow and deny sections take a subtree pattern as key (with a\n" -"glob syntax by default), and a comma separated list of users as\n" -"the corresponding value. The deny list is checked before the allow\n" -"list is.\n" +"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" @@ -177,52 +1071,28 @@ msgstr "" #, python-format -msgid "acl: %s not enabled\n" -msgstr "" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "" - -#, 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 "" "track a line of development with movable markers\n" "\n" "Bookmarks are local movable markers to changesets. Every bookmark\n" "points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it,\n" -"the bookmark shifts to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup\n" -"(e.g. hg merge, hg update).\n" +"changeset that is based on a changeset that has a bookmark on it, the\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" "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" +"your .hgrc::\n" "\n" " [bookmarks]\n" " track.current = True\n" @@ -297,65 +1167,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" @@ -368,7 +1259,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" @@ -376,8 +1267,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" @@ -386,7 +1278,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" @@ -504,6 +1396,7 @@ msgid "generating stats: %d%%" msgstr "統計作業中: %d%%" +#, fuzzy msgid "" "histogram of changes to the repository\n" "\n" @@ -517,7 +1410,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" @@ -532,12 +1425,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" -" <alias email> <actual email>\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" +" <alias email> <actual email>\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 "" "リポジトリにおける変更の統計分布表示\n" @@ -575,10 +1468,6 @@ " 直下に .hgchurn というファイルがあれば、これが使用されます。\n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "画面の横幅を %i 文字と仮定\n" - msgid "count rate for the specified revision or range" msgstr "処理対象とする特定リビジョン／範囲の指定" @@ -620,39 +1509,40 @@ "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" -"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" +#, fuzzy +msgid "don't colorize output (DEPRECATED)" msgstr "出力を色づけ市内" #, python-format @@ -666,6 +1556,7 @@ "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" @@ -677,6 +1568,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -688,23 +1580,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 <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" <source ID> <destination ID>\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" @@ -718,7 +1615,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" @@ -728,11 +1625,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" @@ -757,7 +1654,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" @@ -782,43 +1679,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" @@ -864,7 +1749,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -990,10 +1874,6 @@ msgstr "要求されたツール '%s' を見つけることができません" #, python-format -msgid "running: %s\n" -msgstr "実行しています: %s\n" - -#, python-format msgid "%s error:\n" msgstr "%s エラー:\n" @@ -1071,18 +1951,10 @@ msgid "--sourcesort is not supported by this data source" msgstr "指定の変換元では --sourcesort を指定できません" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "警告: 外部 cvsps は Mercurial 1.4 でサポート打ち切り予定です\n" - -#, python-format -msgid "revision %s is not a patchset number or date" +#, fuzzy, python-format +msgid "revision %s is not a patchset number" msgstr "%s はリビジョン名でも日付でもありません" -msgid "using builtin cvsps\n" -msgstr "組み込み cvsps を使用します\n" - #, python-format msgid "connecting to %s\n" msgstr "%s へ接続中\n" @@ -1090,8 +1962,10 @@ msgid "CVS pserver authentication failed" msgstr "CVS pserver の認証に失敗" -msgid "server sucks" -msgstr "サーバ応答が不正です" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "" #, python-format msgid "%d bytes missing from remote file" @@ -1124,10 +1998,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 ファイルはワーキングファイル情報を伴う筈です" @@ -1141,10 +2011,6 @@ msgstr "リビジョン情報は日付情報を伴う筈です" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "%s で合成リビジョン %r を検出\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "cvs ログキャッシュ %s の書き込み中\n" @@ -1170,13 +2036,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 "Python の ElementTree モジュールが利用できません" -#, python-format -msgid "cleaning up %s\n" -msgstr "%s を整理中\n" - msgid "internal calling inconsistency" msgstr "内部不整合" @@ -1211,22 +2077,6 @@ msgstr "未登録アーカイブ %s の参照によりツリー解析を中断...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "リビジョン %s の適用中...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "%s と %s との間のチェンジセットを算出中...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "リビジョン %s の取得中...\n" - -#, python-format -msgid "analyzing revision %s...\n" -msgstr "リビジョン %s の解析中...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "リビジョン %s の cat-log の解析に失敗" @@ -1238,12 +2088,6 @@ msgid "initializing destination %s repository\n" msgstr "変換先リポジトリ %s の初期化中\n" -msgid "run hg sink pre-conversion action\n" -msgstr "変換先での前処理を実施\n" - -msgid "run hg sink post-conversion action\n" -msgstr "変換先での後処理を実施\n" - #, python-format msgid "pulling from %s into %s\n" msgstr "%s から %s に取り込み中\n" @@ -1262,12 +2106,6 @@ msgid "ignoring: %s\n" msgstr "例外を無視します: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "変換元での前処理を実施\n" - -msgid "run hg source post-conversion action\n" -msgstr "変換元での後処理を実施\n" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s は monotone のリポジトリとは思われません" @@ -1282,6 +2120,9 @@ msgid "collecting p4 changelists\n" msgstr "p4 チェンジリストの収集中\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "Subversion python バインディングが読み込めません" @@ -1332,69 +2173,22 @@ msgstr "リビジョン %d にタグはありません\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "外部ブランチ %r を無視します\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "リビジョン %s は %d までのりビジョンに見当たりません" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "ブランチ %s から %s への %d における改名\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "%s へのリペアレント\n" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "%s に %s@%s から複製\n" - -#, python-format -msgid "gone from %s\n" -msgstr "%s を去ります\n" - -#, python-format -msgid "entry %s\n" -msgstr "エントリ=%s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "リビジョン %d に未知のパス: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "%s を %s:%d 由来とみなす\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "リビジョン %d の解析中(%d 件の変更)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "ブランチ %s の親を %d:%s で検出\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "複製元パスが不明なため、対処不能\n" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "\"%s\" の変更履歴(%d から %d)の先読み中\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "リビジョン %d はエントリを持っていません\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: ブランチにはリビジョン %s がありません" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r は %r 配下にないため無視します\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "svn リポジトリ %r の初期化中\n" @@ -1414,14 +2208,14 @@ msgid "" "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 diff\n" -"programs are called with a configurable set of options and two\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" -"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" @@ -1437,14 +2231,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 "" @@ -1460,14 +2253,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "--rev と --change は同時には指定出来ません" -#, 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 "一時ディレクトリの整理をしています\n" @@ -1503,6 +2288,21 @@ 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 "" @@ -1570,10 +2370,6 @@ msgstr "%d とマージしています:%s\n" #, python-format -msgid "Automated merge with %s" -msgstr "" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" @@ -1645,10 +2441,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "チェンジセット %s の署名を追加しました" - msgid "unknown signature version" msgstr "未知の署名バージョン" @@ -1735,38 +2527,38 @@ msgid "" "hooks for integrating with the CIA.vc notification service\n" "\n" -"This is meant to be run as a changegroup or incoming hook.\n" -"To configure it, set the following options in your hgrc:\n" -"\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" +"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 @@ -1776,12 +2568,6 @@ msgid "email.from must be defined when sending by email" msgstr "" -msgid "cia: no user specified" -msgstr "cia: ユーザが指定されていません" - -msgid "cia: no project specified" -msgstr "cia: プロジェクトが指定されていません" - msgid "" "browse the repository in a graphical way\n" "\n" @@ -1797,19 +2583,19 @@ "\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" @@ -1899,10 +2685,10 @@ "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"There is a single configuration option:\n" -"\n" -"[web]\n" -"pygments_style = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" msgstr "" @@ -1945,9 +2731,6 @@ msgid "(found dead inotify server socket; removing it)\n" msgstr "(終了した inotify サーバのソケットを検出したので削除します)\n" -msgid "(starting inotify server)\n" -msgstr "(inotify サーバの起動中)\n" - #, python-format msgid "could not start inotify server: %s\n" msgstr "inotify サーバの起動に失敗: %s\n" @@ -1956,9 +2739,6 @@ msgid "could not talk to new inotify server: %s\n" msgstr "inotify サーバとの連携に失敗: %s\n" -msgid "(inotify server not running)\n" -msgstr "(inotify サーバは起動されていません)\n" - #, python-format msgid "failed to contact inotify server: %s\n" msgstr "inotify サーバとの連携に失敗: %s\n" @@ -2016,10 +2796,6 @@ msgstr "%r 配下のディレクトリを監視\n" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "status: %r dir(%d) -> %s\n" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "status: %r %s -> %s\n" @@ -2085,15 +2861,16 @@ msgid "finished setup\n" msgstr "セットアップを終了しました\n" +#, fuzzy msgid "" "expand expressions into changelog and summaries\n" "\n" -"This extension allows the use of a special syntax in summaries,\n" -"which will be automatically expanded into links or any other\n" -"arbitrary expression, much like InterWiki does.\n" -"\n" -"A few example patterns (link to bug tracking, etc.) that may\n" -"be used in your hgrc:\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" @@ -2123,6 +2900,7 @@ msgid "interhg: invalid regexp for %s: %s\n" msgstr "interhg: %s の正規表現が不正です: %s\n" +#, fuzzy msgid "" "expand keywords in tracked files\n" "\n" @@ -2136,20 +2914,22 @@ "Configuration is done in the [keyword] and [keywordmaps] sections of\n" "hgrc files.\n" "\n" -"Example:\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repositories.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" "\n" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" @@ -2168,8 +2948,8 @@ "have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" msgstr "" "構成管理対象ファイル中のキーワード展開\n" "\n" @@ -2230,16 +3010,19 @@ msgid "no [keyword] patterns configured" msgstr "[keyword] でのパターン設定がありません" +#, fuzzy msgid "" "print [keywordmaps] configuration and an expansion example\n" "\n" " Show current, custom, or default keyword template maps and their\n" " expansions.\n" "\n" -" Extend current configuration by specifying maps as arguments and\n" -" optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" "[keywordmaps] での設定内容および展開例の表示\n" @@ -2257,18 +3040,50 @@ msgid "creating temporary repository at %s\n" msgstr "一時リポジトリ %s の作成中\n" -#, python-format -msgid "" -"\n" -"\tconfig using %s keyword template maps\n" +#, fuzzy +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" +"\n" +"\t%s をキーワードのテンプレートマップとして使用\n" + +#, fuzzy +msgid "\textending current template maps\n" msgstr "" "\n" "\t%s をキーワードのテンプレートマップとして使用\n" -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +#, fuzzy +msgid "\toverriding default template maps\n" +msgstr "デフォルトのテンプレートマップで表示" + +#, fuzzy +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" +"\n" +"\t%s をキーワードのテンプレートマップとして使用\n" + +#, fuzzy +msgid "\tdisabling current template maps\n" +msgstr "" +"\n" +"\t%s をキーワードのテンプレートマップとして使用\n" + +#, fuzzy +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" +"\n" +"\t%s をキーワードのテンプレートマップとして使用\n" + +#, fuzzy, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" "\n" "%sキーワードを %s に書き込みました:\n" @@ -2276,22 +3091,14 @@ msgid "unhooked all commit hooks\n" msgstr "全ての commit フックを無効化\n" -#, python-format -msgid "" -"\n" -"\t%s keywords expanded%s\n" +#, fuzzy +msgid "" +"\n" +"\tkeywords expanded\n" msgstr "" "\n" "%s キーワードを展開: %s\n" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" -"\n" -"一時リポジトリ %s の削除中\n" - msgid "" "expand keywords in the working directory\n" "\n" @@ -2307,6 +3114,7 @@ " 指定されたファイルに未コミット変更がある場合、実行は中断されます。\n" " " +#, fuzzy msgid "" "show files configured for keyword expansion\n" "\n" @@ -2314,20 +3122,19 @@ " [keyword] configuration patterns.\n" "\n" " Useful to prevent inadvertent keyword expansion and to speed up\n" -" execution by including only files that are actual candidates\n" -" for expansion.\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" "\n" " 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" -" of files are:\n" -" K = keyword expansion candidate\n" -" k = keyword expansion candidate (untracked)\n" -" I = ignored\n" -" i = ignored (untracked)\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" "キーワード展開設定のあるファイルの表示\n" @@ -2387,7 +3194,16 @@ msgid "show files excluded from expansion" msgstr "キーワード展開対象外のファイルを表示" -msgid "additionally show untracked files" +#, fuzzy +msgid "only show unknown (not tracked) files" +msgstr "構成管理対象外のファイルを表示" + +#, fuzzy +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "全ファイルのキーワード展開設定を表示" + +#, fuzzy +msgid "only show untracked files (DEPRECATED)" msgstr "未登録ファイルの表示" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2396,6 +3212,7 @@ msgid "hg kwshrink [OPTION]... [FILE]..." msgstr "hg kwshrink [OPTION]... [FILE]..." +#, fuzzy msgid "" "manage a stack of patches\n" "\n" @@ -2406,19 +3223,18 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" "パッチ併用の管理\n" "\n" @@ -2461,10 +3277,6 @@ msgstr "ガード %r 中に不適切な文字があります: %r" #, python-format -msgid "active guards: %s\n" -msgstr "有効なガード: %s\n" - -#, python-format msgid "guard %r too short" msgstr "ガード名 %r は短過ぎます" @@ -2677,6 +3489,10 @@ msgid "deletions found between repo revs" msgstr "リビジョン間で削除が検出されました" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "%s を適用中\n" + msgid "patch queue now empty\n" msgstr "全てのパッチの適用が解除されました\n" @@ -2801,9 +3617,15 @@ msgid "print the patches already applied" msgstr "適用中のパッチ一覧の表示" +msgid "only one patch applied\n" +msgstr "単一のパッチだけが適用中です\n" + msgid "print the patches not yet applied" msgstr "未適用のパッチ一覧の表示" +msgid "all patches applied\n" +msgstr "全てのパッチが適用中です\n" + msgid "" "import a patch\n" "\n" @@ -2931,15 +3753,9 @@ msgid "print the name of the next patch" msgstr "現行パッチの「次」の既知のパッチの名前表示" -msgid "all patches applied\n" -msgstr "全てのパッチが適用中です\n" - msgid "print the name of the previous patch" msgstr "現行パッチの「前」の既知のパッチの名前表示" -msgid "only one patch applied\n" -msgstr "単一のパッチだけが適用中です\n" - msgid "" "create a new patch\n" "\n" @@ -3379,7 +4195,12 @@ msgid "print first line of patch header" msgstr "パッチヘッダの最初の行を表示" -msgid "hg qapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the last patch" +msgstr "追加登録されたファイルを表示" + +#, fuzzy +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" @@ -3496,7 +4317,8 @@ msgid "queue name to pop" msgstr "パッチ解除先のパッチ管理領域名" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "作業領域中の変更を破棄" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3523,16 +4345,18 @@ msgid "refresh only files already in the patch and specified files" msgstr "パッチ対象か、明示指定のあったファイルのみを処理対象にする" -msgid "add/update \"From: <current user>\" in patch" -msgstr "パッチ中の \"From:\" を「現行ユーザ」で更新(ないし追加)" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "パッチ中の \"From:\" を指定ユーザで更新(ないし追加)" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "パッチ中の \"Date:\" を現在日時で更新" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +#, fuzzy +msgid "add/update date field in patch with current date" +msgstr "パッチ中の \"Date:\" を指定日時で更新" + +#, fuzzy +msgid "add/update date field in patch with given date" msgstr "パッチ中の \"Date:\" を指定日時で更新" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3601,7 +4425,12 @@ msgid "hg qtop [-s]" msgstr "hg qtop [-s]" -msgid "hg qunapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the first patch" +msgstr "追加登録されたファイルを表示" + +#, fuzzy +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" @@ -3613,65 +4442,67 @@ msgid "" "hooks for sending email notifications at commit/push time\n" "\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repository root.\n" -"\n" -" if you like, you can put notify config file in repository that users\n" -" can push changes to, they can manage their own subscriptions." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -3697,17 +4528,13 @@ 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 "" "browse command output with an external pager\n" "\n" -"To set the pager that should be used, set the application variable:\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" @@ -3716,19 +4543,19 @@ "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" "\n" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting:\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend:\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" @@ -3745,20 +4572,21 @@ "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" "\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" +#, fuzzy msgid "" "command to send changesets as (a series of) patch emails\n" "\n" @@ -3769,11 +4597,9 @@ "first line of the changeset description as the subject text. The\n" "message contains two or three body parts:\n" "\n" -" The changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3784,7 +4610,7 @@ "you are sending the right changes.\n" "\n" "To configure other defaults, add a section like this to your hgrc\n" -"file:\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3807,13 +4633,13 @@ "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt:\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out:\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" @@ -3823,7 +4649,7 @@ "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" "directly from the commandline. See the [email] and [smtp] sections in\n" -"hgrc(5) for details." +"hgrc(5) for details.\n" msgstr "" "電子メールによる変更内容パッチ送付のコマンド\n" "\n" @@ -3888,6 +4714,10 @@ "直接パッチ爆弾を送信することも可能です。これらのセクションに関する詳細は\n" "設定ファイルに関するドキュメント(hgrc(5))を参照してください。" +#, fuzzy, python-format +msgid "%sPlease enter a valid value" +msgstr "適切な値を入力してください。\n" + msgid "Please enter a valid value.\n" msgstr "適切な値を入力してください。\n" @@ -3897,6 +4727,7 @@ msgid "diffstat rejected" msgstr "差分統計が却下されました" +#, fuzzy msgid "" "send changesets by email\n" "\n" @@ -3925,23 +4756,24 @@ " single email containing a binary Mercurial bundle as an attachment\n" " will be sent.\n" "\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -4072,6 +4904,9 @@ msgid "message identifier to reply to" msgstr "返信対象のメッセージID" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "TO 宛先のメールアドレス" @@ -4112,13 +4947,16 @@ " and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -4161,6 +4999,7 @@ msgid "hg purge [OPTION]... [DIR]..." msgstr "hg purge [OPTION]... [DIR]...\"" +#, fuzzy msgid "" "command to move sets of revisions to a different ancestor\n" "\n" @@ -4168,7 +5007,7 @@ "repository.\n" "\n" "For more information:\n" -"http://mercurial.selenic.com/wiki/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" "一連のリビジョンを異なる履歴ツリー上の位置に移動させるコマンド\n" "\n" @@ -4178,9 +5017,6 @@ "詳細は以下を参照してください:\n" "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgid "first revision, do not change ancestor\n" -msgstr "初期リビジョンのため、祖先を変更しません\n" - msgid "" "move changeset (and descendants) to a different branch\n" "\n" @@ -4234,60 +5070,17 @@ msgid "%d revisions have been skipped\n" msgstr "%d 個のリビジョンをスキップ\n" -msgid " set parents\n" -msgstr " 親リビジョンの設定\n" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr " %d:%s のリベース中\n" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr " リベース後の親リビジョンは %d と %d\n" - -#, python-format -msgid " update to %d:%s\n" -msgstr " %d:%s へと更新\n" - -msgid " already in target\n" -msgstr " 既に対象内\n" - -#, python-format -msgid " merge against %d:%s\n" -msgstr " %d:%s に対してマージ\n" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr " 'hg resolve' で衝突解消してから 'hg rebase --continue' してください" -msgid "resuming interrupted rebase\n" -msgstr "中断されたリベースの再開中\n" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "変更がないので、リビジョン %d をスキップ\n" #, python-format -msgid "next revision set to %s\n" -msgstr "次のリビジョンを %s に設定\n" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "親リビジョンが 3 つになるので、リビジョン %d をベースにできません" -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "リビジョン %d は MQ パッチ(%s)なので、通常リビジョン化\n" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "MQ パッチ %d(%s) の取り込み\n" - -msgid "rebase status stored\n" -msgstr "リベース状態が保存されました\n" - -msgid "rebase status resumed\n" -msgstr "リベース状態を復旧しました\n" - msgid "no rebase in progress" msgstr "進行中のリベース状態はありません" @@ -4300,28 +5093,17 @@ msgid "cannot rebase onto an applied mq patch" msgstr "MQ パッチ上へのリベースはできません" -msgid "cannot rebase an ancestor" -msgstr "先祖へのリベースはできません" - -msgid "cannot rebase a descendant" -msgstr "子孫へのリベースはできません" - -msgid "already working on current\n" -msgstr "既に現行位置で作業中\n" - -msgid "already working on the current branch\n" -msgstr "既に現行ブランチで作業中\n" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "%d へのリベースを %d から開始\n" +#, fuzzy +msgid "source is ancestor of destination" +msgstr "作業元もしくは作業先を指定していません" + +#, fuzzy +msgid "source is descendant of destination" +msgstr "リポジトリのルートを作成先に指定することはできません" msgid "unable to collapse, there is more than one external parent" msgstr "複数の親との関係から、--collapse は指定できません" -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "--update と --rebase は非互換のため、--update は無視します\n" - msgid "rebase working directory to branch head" msgstr "作業領域をブランチヘッドにリベース" @@ -4334,13 +5116,16 @@ msgid "rebase onto a given revision" msgstr "リベース先リビジョンの指定" -msgid "collapse the rebased revisions" +#, fuzzy +msgid "collapse the rebased changesets" msgstr "リベース後にリビジョンを一体化" -msgid "keep original revisions" -msgstr "元リビジョンの維持" - -msgid "keep original branches" +#, fuzzy +msgid "keep original changesets" +msgstr "元ブランチの維持" + +#, fuzzy +msgid "keep original branch names" msgstr "元ブランチの維持" msgid "continue an interrupted rebase" @@ -4396,30 +5181,9 @@ msgid "&?" msgstr "&?" -msgid "y" -msgstr "y" - -msgid "?" -msgstr "?" - msgid "y - record this change" msgstr "y - この変更を記録します" -msgid "s" -msgstr "s" - -msgid "f" -msgstr "f" - -msgid "d" -msgstr "d" - -msgid "a" -msgstr "a" - -msgid "q" -msgstr "q" - msgid "user quit" msgstr "ユーザの指示により終了します" @@ -4430,6 +5194,9 @@ msgid " and " msgstr " と " +msgid "y" +msgstr "y" + #, python-format msgid "record this change to %r?" msgstr "この変更を %r に記録しますか?" @@ -4438,6 +5205,7 @@ msgid "record change %d/%d to %r?" msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか?" +#, fuzzy msgid "" "interactively select changes to commit\n" "\n" @@ -4449,19 +5217,19 @@ " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" "コミットする内容を対話的に選択します\n" "\n" @@ -4494,20 +5262,9 @@ msgid "no changes to record\n" msgstr "記録可能な変更がありません\n" -#, python-format -msgid "backup %r as %r\n" -msgstr "%r を %r としてバックアップします\n" - -msgid "applying patch\n" -msgstr "パッチを適用中\n" - msgid "patch failed to apply" msgstr "パッチの適用に失敗" -#, python-format -msgid "restoring %r to %r\n" -msgstr "%r から %r に復元中\n" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPTION]... [FILE]..." @@ -4600,14 +5357,15 @@ msgid "apply changeset? [ynmpcq?]:" msgstr "チェンジセットを適用しますか? [ynmpcq?]:" +#, fuzzy msgid "" "transplant changesets from another branch\n" "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" @@ -4720,6 +5478,7 @@ msgstr "" "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +#, fuzzy msgid "" "allow the use of MBCS paths with problematic encodings\n" "\n" @@ -4731,19 +5490,22 @@ "operation.\n" "\n" "This extension is useful for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ASCII chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" "\n" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" @@ -4778,45 +5540,42 @@ "パス名の文字コード変換は、unicode と、ロケール設定ないし HGENCODING\n" "環境変数によって Mercurial が決定する文字コードとの間で行なわれます。\n" -#, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +#, fuzzy, python-format +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "[win32mbcs] 文字コード '%s' との間での変換に失敗\n" msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "[win32mbcs] このプラットフォームでは実行できません。\n" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "[win32mbcs] 文字コード %s との間での変換を有効化\n" - +#, fuzzy msgid "" "perform automatic newline conversion\n" "\n" -"To perform automatic newline conversion, use:\n" -"\n" -"[extensions]\n" -"hgext.win32text =\n" -"[encode]\n" -"** = cleverencode:\n" -"# or ** = macencode:\n" -"\n" -"[decode]\n" -"** = cleverdecode:\n" -"# or ** = macdecode:\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" "\n" "If not doing conversion, to make sure you do not commit CRLF/CR by " -"accident:\n" -"\n" -"[hooks]\n" -"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" "\n" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled:\n" -"\n" -"[hooks]\n" -"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" "改行形式の自動変換\n" "\n" @@ -4906,15 +5665,15 @@ "without knowing their actual IP address.\n" "\n" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -5150,6 +5909,10 @@ msgid "HG: branch '%s'" msgstr "HG: ブランチ '%s'" +#, fuzzy, python-format +msgid "HG: subrepo %s" +msgstr "HG: %s を削除" + #, python-format msgid "HG: added %s" msgstr "HG: %s を追加" @@ -5192,6 +5955,7 @@ " ファイル名指定が無い場合、作業領域中の全ファイルが対象となります。\n" " " +#, fuzzy msgid "" "add all new files, delete all missing files\n" "\n" @@ -5203,11 +5967,11 @@ " commit.\n" "\n" " Use the -s/--similarity option to detect renamed files. With a\n" -" parameter > 0, this compares every removed file with every added\n" -" file and records those similar enough as renames. This option\n" -" takes a percentage between 0 (disabled) and 100 (files must be\n" -" identical) as its parameter. Detecting renamed files this way can\n" -" be expensive.\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" "新規ファイルの追加登録、および不在ファイルの登録除外\n" @@ -5267,6 +6031,7 @@ msgid "%s: binary file\n" msgstr "%s: バイナリファイルです\n" +#, fuzzy msgid "" "create an unversioned archive of a repository revision\n" "\n" @@ -5274,14 +6039,14 @@ " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -5384,10 +6149,6 @@ msgstr "非マージリビジョンには --parent を指定できません" #, python-format -msgid "Backed out changeset %s" -msgstr "リビジョン %s の打ち消し" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "リビジョン %s はリビジョン %s を打ち消します\n" @@ -5468,10 +6229,6 @@ msgstr "不正な引数の組み合わせです" #, python-format -msgid "cannot find executable: %s" -msgstr "実行可能ファイル '%s' が見つかりません" - -#, python-format msgid "failed to execute %s" msgstr "%s の実行に失敗" @@ -5483,10 +6240,11 @@ msgid "Changeset %d:%s: %s\n" msgstr "リビジョン %d:%s: %s\n" -#, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +#, fuzzy, python-format +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "リビジョン %s:%s を検証中(検証残 %s、検証済み %s)\n" +#, fuzzy msgid "" "set or show the current branch name\n" "\n" @@ -5503,7 +6261,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" "ブランチ名の設定、ないし現ブランチ名の表示\n" @@ -5534,13 +6293,16 @@ msgid "marked working directory as branch %s\n" msgstr "作業領域をブランチ %s に設定\n" +#, fuzzy msgid "" "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If -a/--active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -5609,6 +6371,7 @@ msgid "unknown bundle type specified with --type" msgstr "--type に未知のバンドル種別が指定されました" +#, fuzzy msgid "" "output the current or given revision of files\n" "\n" @@ -5618,11 +6381,11 @@ "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" "指定されたリビジョン時点のファイル内容の出力\n" @@ -5640,6 +6403,7 @@ " %p 対象ファイルのリポジトリルートからの相対パス\n" " " +#, fuzzy msgid "" "make a copy of an existing repository\n" "\n" @@ -5675,7 +6439,7 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -5685,7 +6449,6 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" " " msgstr "" "既存リポジトリの複製\n" @@ -5772,6 +6535,9 @@ " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " +msgid "nothing changed\n" +msgstr "変更なし\n" + msgid "created new head\n" msgstr "新規ヘッドが増えました\n" @@ -6049,6 +6815,7 @@ " 'hg help diffs' を参照してください。\n" " " +#, fuzzy msgid "" "dump the header and diffs for one or more changesets\n" "\n" @@ -6062,16 +6829,16 @@ " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -6192,27 +6959,31 @@ msgid "grep: invalid match pattern: %s\n" msgstr "grep: '%s' は不正なパターンです\n" +#, fuzzy msgid "" "show current repository heads or show branch heads\n" "\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.\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 "" "現時点でのリポジトリ(ないしブランチ)のヘッド表示\n" @@ -6236,6 +7007,9 @@ " のみが表示されます。\n" " " +msgid "you must specify a branch to use --closed" +msgstr "" + #, python-format msgid "no open branch heads on branch %s\n" msgstr "ブランチ %s にはオープンなヘッドがありません\n" @@ -6310,8 +7084,10 @@ msgid "no help text available" msgstr "ヘルプはありません" -#, python-format -msgid "%s extension - %s\n" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" msgstr "%s エクステンション - %s\n" msgid "Mercurial Distributed SCM\n" @@ -6435,14 +7211,6 @@ msgid "no diffs found" msgstr "差分がありません" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"メッセージ:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "Mercurial 向けのパッチではありません" @@ -6851,6 +7619,7 @@ " 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n" " " +#, fuzzy msgid "" "remove the specified files on the next commit\n" "\n" @@ -6864,15 +7633,15 @@ "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" @@ -6951,6 +7720,7 @@ " 前に改名操作を取り消す方法は 'hg help revert' を参照してください。\n" " " +#, fuzzy msgid "" "retry file merges from a merge or update\n" "\n" @@ -6966,9 +7736,10 @@ " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" "\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" "merge や update におけるファイルマージの再実施\n" @@ -7097,6 +7868,7 @@ msgid "no changes needed to %s\n" msgstr "%s には改変の必要がありません\n" +#, fuzzy msgid "" "roll back the last transaction\n" "\n" @@ -7109,7 +7881,7 @@ " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -7185,6 +7957,7 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n" +#, fuzzy msgid "" "show changed files in the working directory\n" "\n" @@ -7207,15 +7980,16 @@ " If two revisions are given, the differences between them are\n" " shown.\n" "\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = missing (deleted by non-hg command, but still tracked)\n" -" ? = not tracked\n" -" I = ignored\n" -" = origin of the previous file listed as A (added)\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "作業領域のファイル操作状況の表示\n" @@ -7250,6 +8024,105 @@ " " 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 "" + +#, fuzzy +msgid " (empty repository)" +msgstr "パッチ管理リポジトリを複製中\n" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "作業領域が未更新です" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "親: %d:%s\n" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "ブランチ: %s\n" + +#, fuzzy, python-format +msgid "%d added" +msgstr "%s は追加登録されません\n" + +#, fuzzy, python-format +msgid "%d modified" +msgstr "ファイルが変更されています" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "削除" + +#, fuzzy, python-format +msgid "%d deleted" +msgstr "&Deleted" + +#, fuzzy, python-format +msgid "%d ignored" +msgstr "無視しました" + +#, fuzzy, python-format +msgid "%d unknown" +msgstr "未知" + +#, fuzzy, python-format +msgid "%d unresolved" +msgstr "衝突未解決" + +#, fuzzy +msgid " (merge)" +msgstr "マージ" + +#, fuzzy +msgid " (new branch)" +msgstr "ブランチ名を表示" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "変換: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, fuzzy, python-format +msgid "update: %d new changesets (update)\n" +msgstr "%s: %d 件の新しいチェンジセット" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "遠隔ホスト: " + +#, fuzzy +msgid "remote: (synced)\n" +msgstr "遠隔ホスト: " + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -7312,17 +8185,9 @@ msgstr "タグ '%s' はローカルなタグではありません" #, python-format -msgid "Removed tag %s" -msgstr "タグ %s の削除" - -#, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "タグ '%s' は存在します(強行する場合は -f を指定してください)" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "リビジョン %s へタグ %s を付与" - msgid "" "list repository tags\n" "\n" @@ -7433,6 +8298,10 @@ " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " +#, fuzzy +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "--soruce と --base は併用できません" + msgid "uncommitted local changes" msgstr "作業領域に未コミットの変更があります" @@ -7474,7 +8343,8 @@ "本製品はフリーソフトウェアです。頒布／改変の際はライセンス条項をお読み\n" "ください。市場適合性や特定用途への可否を含め、本製品は無保証です。\n" -msgid "repository root directory or symbolic path name" +#, fuzzy +msgid "repository root directory or name of overlay bundle file" msgstr "リポジトリのルート位置、ないしパス定義名" msgid "change working directory" @@ -7666,6 +8536,10 @@ msgid "show only branches that have unmerged heads" msgstr "未マージなヘッドを持つブランチのみを表示" +#, fuzzy +msgid "show normal and closed branches" +msgstr "通常の閉じたヘッドを表示" + msgid "[-a]" msgstr "[-a]" @@ -7810,10 +8684,12 @@ msgid "show only heads which are descendants of REV" msgstr "当該リビジョンの子孫となるヘッドのみを表示" -msgid "show only the active heads from open branches" +#, fuzzy +msgid "show only the active branch heads from open branches" msgstr "アクティブなブランチのヘッドのみを表示" -msgid "show normal and closed heads" +#, fuzzy +msgid "show normal and closed branch heads" msgstr "通常の閉じたヘッドを表示" msgid "[-r STARTREV] [REV]..." @@ -8046,6 +8922,9 @@ msgid "[-u] [NAME]..." msgstr "[-u] [NAME]..." +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "全ての状態を表示" @@ -8122,40 +9001,6 @@ msgid "branch name not in UTF-8!" msgstr "ブランチ名が UTF-8 ではありません!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "リビジョン %d まで遡ってコピーを探索中\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" -" ローカルで照合に失敗したファイル:\n" -" %s\n" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" -" 連携先で照合に失敗したファイル:\n" -" %s\n" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr " 全コピー発見 (* = マージ, ! = 分岐):\n" - -msgid " checking for directory renames\n" -msgstr " ディレクトリ名の変更を確認しています\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " ディレクトリ %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " ファイル %s -> %s\n" - msgid "working directory state appears damaged!" msgstr "作業領域の状態管理に問題があります!" @@ -8202,6 +9047,10 @@ msgstr "中止: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -8210,10 +9059,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 "%s のロック解放待ちを断念" @@ -8311,10 +9156,6 @@ msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました\n" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "別名 '%s' は既存のコマンドを隠します\n" - -#, python-format msgid "malformed --config option: %s" msgstr "不正な --config 指定: %s" @@ -8380,10 +9221,6 @@ msgstr "ツール %s は GUI が必要です\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "%s のマージ用に '%s' が選択(バイナリ %s シンボリックリンク %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -8397,9 +9234,6 @@ msgid "&Other" msgstr "&Other" -msgid "l" -msgstr "l" - #, python-format msgid "merging %s and %s to %s\n" msgstr "%s と %s を %s にマージ中\n" @@ -8409,13 +9243,6 @@ msgstr "%s をマージ中\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "作業領域 %s マージ対象 %s 共通祖先 %s\n" - -msgid " premerge successful\n" -msgstr " 事前マージ成功\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -8429,9 +9256,6 @@ msgid "&Yes" msgstr "&Yes" -msgid "n" -msgstr "n" - #, python-format msgid "merging %s failed!\n" msgstr "%s のマージに失敗!\n" @@ -8444,915 +9268,33 @@ msgid "unknown bisect kind %s" msgstr "未知の分岐種類 %s" -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\n" -" advanced usage only; they may provide potentially dangerous\n" -" abilities (such as letting you destroy or modify history); they\n" -" might not be ready for prime time; or they may alter some\n" -" usual behaviors of stock Mercurial. It is thus up to the user to\n" -" activate extensions as needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial\n" -" or in the Python search path, create an entry for it in your\n" -" hgrc, like 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 "" -"\n" -" Mercurial には、新規機能を「エクステンション」という機構を用いて\n" -" 追加する仕組みが備わっています。エクステンションでは、コマンドの\n" -" 新規追加、既存コマンドへのオプションの追加、コマンドの挙動の変更、\n" -" フックの実装といったことが可能です。\n" -"\n" -" 様々な事情から、特に指定の無い場合にはエクステンションは読み込まれ\n" -" ません。付加的な読み込みは、起動時間の増加を意味します。上級用途\n" -" 限定のものもあります。(履歴の破壊や改変などの)潜在的な危険性を持つ\n" -" 場合もあります。実験的なものであるかもしれません。これまでの\n" -" Mercurial の振る舞いを変えてしまうかもしれません。エクステンションを\n" -" 必要に応じて有効化するのは利用者の責務です。\n" -"\n" -" \"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n" -" ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n" -" において以下のような記述が必要です。\n" -"\n" -" [extensions]\n" -" foo =\n" -"\n" -" エクステンションへのフルパスを記述することも可能です。\n" -"\n" -" [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" -" 明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n" -" パス指定の冒頭に '!' を付与します。\n" -"\n" -" [extensions]\n" -" # /path/to/extension/bar.py にあるエクステンション bar の無効化\n" -" hgext.bar = !/path/to/extension/bar.py\n" -" # こちらはパス指定無しでの baz エクステンションの無効化\n" -" hgext.baz = !\n" -" " - msgid "disabled extensions:" msgstr "無効化されているエクステンション:" msgid "Date Formats" msgstr "日時表記" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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" -" 以下のコマンドで日時指定が可能です:\n" -" * backout, commit, import, tag: コミット日時の指定\n" -" * log, revert, update: 日時によるリビジョンの指定\n" -"\n" -" 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n" -" \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n" -" \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n" -" \"Dec 6\" (「午前0時」を想定)\n" -" \"13:18\" (「本日」を想定)\n" -" \"3:39\" (「3:39AM」を想定)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (ISO 8601 形式)\n" -" \"2006-12-6 13:18\"\n" -" \"2006-12-6\"\n" -" \"12-6\"\n" -" \"12/6\"\n" -" \"12/6/6\" (2006年12月6日)\n" -"\n" -" 最後に、Mercurial 固有の内部形式を示します。\n" -"\n" -" \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n" -"\n" -" これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n" -" 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n" -" (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n" -"\n" -" log コマンドには、日時範囲指定可能です:\n" -"\n" -" \"<{date}\" - 指定日時以前(指定日時含む)\n" -" \">{date}\" - 指定日時以後(指定日時含む)\n" -" \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n" -" \"-{days}\" - 本日から指定日数以内\n" -" " - msgid "File Name Patterns" msgstr "ファイル名パターン" -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 only\n" -" match 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 of\n" -" 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 には、ファイルを特定するパターン指定方法が複数あります。\n" -"\n" -" 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n" -" shell 形式の拡張ワイルドカード合致を行います。\n" -"\n" -" 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n" -"\n" -" パターン合致を行わずに、指定された名前をそのまま使用する場合、\n" -" 名前の前に \"path:\" を記述します。この形式を使用する場合、\n" -" リポジトリのルートからのパスと完全に一致しなければなりません。\n" -"\n" -" 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n" -" 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n" -" 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n" -"\n" -" ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n" -" \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n" -"\n" -" Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n" -" 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n" -" パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n" -" 「されません」ので注意が必要です)。\n" -"\n" -" パターン合致未使用例:\n" -"\n" -" path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n" -" path:path:name \"path:name\" という名前\n" -"\n" -" ワイルドカード指定例:\n" -"\n" -" glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" -" *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n" -" **.c 現ディレクトリないしその配下のディレクトリにおいて、\n" -" 名前が \".c\" で終わるもの\n" -" foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n" -" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n" -" 名前が \".c\" で終わるもの\n" -"\n" -" 正規表現指定例:\n" -"\n" -" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n" -"\n" -" " - msgid "Environment Variables" msgstr "環境変数" -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" -" * 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 "" -"\n" -"HG::\n" -" 'hg' コマンドへのパス。フック／エクステンションないし外部ツールの起動の\n" -" 際に自動的に設定されます。未設定や空の場合は、frozen 形式の\n" -" hg 実行可能ファイルの名前か設定されるか、'hg' という名前の実行可能\n" -" ファイルが検索されます(Windows の場合、PATHEXT 環境変数に設定された\n" -" COM/EXE/BAT/CMD 等の拡張子付き)。\n" -"\n" -"HGEDITOR::\n" -" コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n" -" についても参照してください。\n" -"\n" -" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" -"\n" -"HGENCODING::\n" -" Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n" -" コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n" -" 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n" -" 使用により、更に上書きすることが出来ます。\n" -"\n" -"HGENCODINGMODE::\n" -" ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n" -" 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n" -" 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n" -" されたものとみなします。他には、「未知の文字の置き換え」を意味する\n" -" \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" -" 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n" -" 使用により、更に上書きすることが出来ます。\n" -"\n" -"HGMERGE::\n" -" マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n" -" 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n" -" ファイルを表す3つの引数が指定されます。\n" -"\n" -" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" -"\n" -"HGRCPATH::\n" -" 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n" -" 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n" -" HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n" -" 読み込み先から読み込まれます。空の値が設定されている場合、\n" -" 現リポジトリの .hg/hgrc のみが読み込まれます。\n" -"\n" -" 指定された一覧の各要素に対して、以下のように振舞います:\n" -" * ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n" -" * ファイルなら、そのファイル自身を読み込む\n" -"\n" -"HGUSER::\n" -" チェンジセット作成者としてコミット時に記録する名前の指定。\n" -" 作成者名として採用される値の決定順序は以下の通りです。\n" -"\n" -" * HGUSER 環境変数値(推奨されません)\n" -" * (HGRCPATH 環境変数で指定される)設定ファイル中の設定\n" -" * EMAIL 環境変数値\n" -" * 対話的な入力\n" -" * LOGNAME 環境変数値('@hostname' が付与されます)\n" -"\n" -" (推奨されない環境変数。設定ファイル経由で指定してください。)\n" -"\n" -"EMAIL::\n" -" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n" -" 詳細は HGUSER の記述を参照してください。\n" -"\n" -"LOGNAME::\n" -" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n" -" 詳細は HGUSER の記述を参照してください。\n" -"\n" -"VISUAL::\n" -" コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n" -" についても参照してください。\n" -"\n" -"EDITOR::\n" -" コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n" -" 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n" -" あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n" -" 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n" -" (あるいは空)の場合は、'vi' が使用されます。\n" -"\n" -"PYTHONPATH::\n" -" Mercurial が当該システムの共有領域にインストールされていない場合、\n" -" Python が必要なモジュールを読み込むためには、この環境変数の設定が\n" -" 必要です。\n" -" " - msgid "Specifying Single Revisions" msgstr "単一リビジョンの指定" -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 topological offsets from the tip, with -1 denoting\n" -" the tip. As such, negative numbers are only useful if you've\n" -" memorized your local tree numbers and want to save typing a single\n" -" digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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 は、個々のリビジョンを識別する記法を幾つか用意しています。\n" -"\n" -" 整数値は、「リビジョン番号」とみなされます。負値は、tip からの距離を\n" -" 表し、-1 は tip 自身を表します。負値の指定は、手元のリポジトリ中の\n" -" 履歴遷移を把握している際に、入力を省力化したい場合にのみ有効です。\n" -" 負値の利用はあまりお勧めできません。\n" -"\n" -" 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n" -"\n" -" 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n" -" みなされます。短縮形式の識別子は、厳密に1つの完全長の識別子とだけ\n" -" 前方一致する場合にのみ有効です。\n" -"\n" -" それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n" -" みなされます。タグ名は \":\" を含んでいないかもしれない。\n" -"\n" -" 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n" -" されています。\n" -"\n" -" 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n" -" されており、リビジョン 0 の親は \"null\" リビジョンです。\n" -"\n" -" 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n" -" 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n" -" 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n" -" " - msgid "Specifying Multiple Revisions" msgstr "複数リビジョンの指定" -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" -" Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n" -" 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n" -" 記号にした範囲指定による方法があります。\n" -"\n" -" 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n" -" 部分にはそれぞれリビジョン識別用の情報が記述されます。\n" -" \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n" -" 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n" -" \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n" -" 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n" -"\n" -" \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n" -" とみなされます。\n" -"\n" -" 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n" -" 3, 4, 5 の指定と等価です。同様に 9:6 という指定は 9, 8, 7, 6 の指定と\n" -" 等価です。\n" -" " - 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 "" -"\n" -" 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n" -" GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n" -" 標準的なツールで使用できるものです。\n" -"\n" -" この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n" -"\n" -" - 実行可否および権限設定\n" -" - 複製／改名情報\n" -" - バイナリファイルの変更\n" -" - 空ファイルの作成／削除\n" -"\n" -" Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n" -" 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n" -" 但し、普及しているツールの幾つかが git 差分形式に対応していないため、\n" -" Mercurial は指定が無い場合はこの形式では出力しません。\n" -"\n" -" つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n" -" 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n" -" ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n" -" 十分注意する必要があります。push や pull のように、Mercurial の\n" -" 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n" -" ことから、情報の欠落に関しては心配する必要はありません。\n" -"\n" -" Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n" -" 対して --git を指定するか、設定ファイルの [diff] セクションに\n" -" 'git = True' 記述を追加してください。hg import や mq エクステンションを\n" -" 使用する場合は、この指定は不要です。\n" -" " - msgid "Template Usage" msgstr "テンプレートの利用" -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 default.\n" -" - date: Date information. The date when the changeset was 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 by\n" -" 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 number.\n" -" - tags: List of strings. Any tags associated with the 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing separators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\n" -" - stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an\n" -" email address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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\n" -" in email headers.\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 address.\n" -" " -msgstr "" -"\n" -" Mercurial では、テンプレート機能によってコマンドの出力をカスタマイズ\n" -" することができます。コマンドラインからの指定では、--template による\n" -" テンプレート指定と、--style によるスタイル指定の両方が使用できます。\n" -"\n" -" 「log 的」な出力を行う以下のコマンドの出力をカスタマイズ可能です:\n" -" log, outgoing, incoming, tip, parents, heads, glog\n" -"\n" -" Mercurial には(明示的な指定が無い場合に使用される)default、compact\n" -" および changelog の3つのスタイル設定が同梱されています。利用方法は:\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" テンプレートとは、変数展開マークアップ機能を備えたテキストです。\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" 波括弧で囲まれた部分は「キーワード」と呼ばれます。キーワード利用の\n" -" 可否は、テンプレートの利用される状況に依存します。以下のキーワードは\n" -" log 的なコマンドでのテンプレート利用の際には常に使用可能です。\n" -"\n" -" - author: 文字列。リビジョンの作者名(記録情報そのまま)。\n" -" - branches: 文字列。リビジョンの属するブランチ名。所属ブランチが\n" -" default の場合は空文字列。\n" -" - date: 日時情報。リビジョンが記録された日時。\n" -" - desc: 文字列。リビジョンのコミットメッセージ。\n" -" - diffstat: 文字列。以下の形式での変更概要。\n" -" \"変更対象ファイル: +追加行数/-削除行数\"\n" -" - files: 文字列列挙。当該リビジョンでの、変更／追加登録ないし\n" -" 登録除外ファイルの一覧。\n" -" - file_adds: 文字列列挙。当該リビジョンでの追加ファイル一覧。\n" -" - file_mods: 文字列列挙。当該リビジョンでの変更ファイル一覧。\n" -" - file_dels: 文字列列挙。当該リビジョンでの登録除外ファイル一覧。\n" -" - node: 文字列。リビジョン識別用の 40 桁 16 進数ハッシュ値。\n" -" - parents: 文字列列挙。リビジョンの親。\n" -" - rev: 整数。各リポジトリ固有のリビジョン番号。\n" -" - tags: 文字列列挙。当該リビジョンに付与されたタグの一覧。\n" -"\n" -" \"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n" -" 含めたい場合、可読化するために「フィルター」を使用します。\n" -" 「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n" -" フィルターを連ねることで、様々な出力を得ることができます。\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" フィルター一覧(入力と、それに対する出力):\n" -"\n" -" - addbreaks: 文字列。最終行を除く各行の行末に XHTML の \n" -" \"<br />\" タグを追加します。\n" -" - age: 日時情報。与えられた日時と、現在日時との差分を表す\n" -" 可読形式の文字列を生成します。\n" -" - basename: 文字列。与えられた文字列をパスとみなし、パス区切りで\n" -" 区切られた最後の要素だけを取り出します(末尾パス\n" -" 区切りは無視されます)。例えば、\"foo/bar/baz\" は\n" -" \"baz\" に、\"foo/bar//\" は \"bar\" になります。\n" -" - stripdir: 文字列。与えられた文字列をパスとみなし、ディレクトリ\n" -" 要素があればそれを取り除きます。例えば、\"foo\"\n" -" および \"foo/bar\" は \"foo\" となります。\n" -" - date: 日時情報。タイムゾーンを含んだ、Unix の date コマンド\n" -" 形式で可読化します: \"Mon Sep 04 15:13:13 2006 0700\"\n" -" - domain: 文字列。メールアドレスと思しき最初の文字列部分から\n" -" ドメイン部分だけを取り出します。例えば、\n" -" 'User <user@example.com>' は 'example.com' です。\n" -" - email: 文字列。メールアドレスと思しき最初の部分を取り出します。\n" -" 例えば 'User <user@example.com>' は\n" -" 'user@example.com' となります。\n" -" - escape: 文字列。XML/XHTML の特殊文字である \"&\"、\"<\" および\n" -" \">\" を XML のエンティティ形式に変換します。\n" -" - fill68: 文字列。68 桁に収まるように文字列を折り返します。\n" -" - fill76: 文字列。76 桁に収まるように文字列を折り返します。\n" -" - firstline: 文字列。最初の行のみを取り出します。\n" -" - nonempty: 文字列。与えられた文字列が空の場合 '(none)'となります。\n" -" - hgdate: 日時情報。Unix タイムスタンプとタイムゾーンオフセット\n" -" による数値対形式で可読化します: \"1157407993 25200\"\n" -" - isodate: 日時情報。ISO 8601 形式で可読化します。\n" -" - localdate: 日時情報。ローカル日時で可読化します。\n" -" - obfuscate: 文字列。全ての文字を XML エンティティ形式に変換します。\n" -" - person: 文字列。メールアドレス直前の部分だけを取り出します。\n" -" - rfc822date:日時情報。メールのヘッダと同形式で可読化します。\n" -" - short: リビジョンハッシュ 値。12 桁程度の短縮形式にします。\n" -" - shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。\n" -" - strip: 文字列。先頭／末尾の空白文字を取り除きます。\n" -" - tabindent: 文字列。先頭行以外をタブ文字で字下げします。\n" -" - urlescape: 文字列。全ての「特殊」文字を変換します。\n" -" 例えば \"foo bar\" は \"foo%20bar\" となります。\n" -" - user: 文字列。メールアドレスのユーザ名部分を取り出します。\n" -" " - msgid "URL Paths" msgstr "URLのパス指定" -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\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" -" - 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 " -"path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [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" -" 有効な URL 指定は以下の形式です:\n" -"\n" -" local/filesystem/path (ないし file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n" -" バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n" -" 構いません。\n" -"\n" -" 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n" -" することで、特定のブランチ、タグないしチェンジセットを指定することが\n" -" 出来ます。\n" -"\n" -" http:// や https:// 形式の URL で指定される連携先への push の様な\n" -" 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n" -" 利用可能になっている場合に限り使用可能です。\n" -"\n" -" Mercurial と SSH を併用する場合の注意点:\n" -" - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n" -" hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n" -" 場合は、--remotecmd で明示的に指定してください。\n" -" - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n" -" からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n" -" 更にスラッシュ('/')を付与してください。\n" -" 例: ssh://example.com//tmp/repository\n" -" - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n" -" ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -" あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n" -" --ssh に対して、'ssh -C' を指定する方法もあります。\n" -"\n" -" 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n" -" することが出来ます。\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n" -" (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n" -"\n" -" コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n" -" 重要な別名が2つあります。\n" -"\n" -" default:\n" -" 'hg clone' によって複製した場合、新規リポジトリの 'default' として\n" -" 複製元リポジトリの URL が保存されます。\n" -" 以後、連携先を省略して 'hg push' や 'hg pull' に類するコマンドを\n" -" 実行した際には、この URL が連携先として使用されます。\n" -"\n" -" default-push:\n" -" 'hg push' は、'default-push' の別名で定義される URL を探します。\n" -" 'default' が定義されている場合でも、'default-push' が定義されていれば\n" -" こちらが優先されます。\n" -" " - msgid "Using additional features" msgstr "付加機能の使用" @@ -9385,27 +9327,21 @@ msgid "clone from remote to remote not supported" msgstr "リモートからリモートの複製はサポートしていません" -msgid "updated" -msgstr "更新" - -msgid "merged" -msgstr "マージ" - -msgid "removed" -msgstr "削除" - -msgid "unresolved" -msgstr "衝突未解決" - -#, python-format -msgid "%d files %s" -msgstr "%d 個のファイルが%s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "ブランチのキャッシュを更新中\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 "'hg resolve' でマージの衝突を解消してください\n" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +#, fuzzy +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " "abandon\n" msgstr "'hg resolve' で再度衝突解消するか、'hg up --clean' で変更破棄を。\n" @@ -9481,32 +9417,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "URL 要素 \"%s\" はサポートされていません" -#, python-format -msgid "using %s\n" -msgstr "%s を用います\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "機能: %s\n" - msgid "operation not supported over http" msgstr "http リポジトリでは使用できない機能を必要としています" -#, python-format -msgid "sending %s command\n" -msgstr "コマンド %s 送信中\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "%s バイトのデータ送信中\n" - msgid "authorization failed" msgstr "認証に失敗" -#, python-format -msgid "http error while sending %s command\n" -msgstr "コマンド %s 送信中の HTTP エラー\n" - msgid "http error, possibly caused by proxy setting" msgstr "HTTP エラー(おそらくプロキシー設定に起因)" @@ -9515,10 +9431,6 @@ msgstr "実際の URL: %s\n" #, python-format -msgid "requested URL: '%s'\n" -msgstr "要求 URL: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' は Mercurial リポジトリ形式とは思われません" @@ -9552,8 +9464,8 @@ msgid "cannot create new http repository" msgstr "http リポジトリの新規作成はできません" -#, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +#, fuzzy, python-format +msgid "ignoring invalid syntax '%s'" msgstr "%s: 文法不正の '%s' を無視します\n" #, python-format @@ -9584,17 +9496,6 @@ msgstr "作業領域の .hgtags が変更されています（手動でコミットしてください）" #, python-format -msgid "%s, line %s: %s\n" -msgstr "%s %s行目: %s\n" - -msgid "cannot parse entry" -msgstr "エントリを読み込めません" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "'%s' というノードはフォーマットが不適切です" - -#, python-format msgid "working directory has unknown parent '%s'!" msgstr "作業領域の親 '%s' が未知のディレクトリです!" @@ -9602,10 +9503,6 @@ msgid "unknown revision '%s'" msgstr "'%s' は未知のリビジョンです" -#, python-format -msgid "filtering %s through %s\n" -msgstr "%s を %s で処理中\n" - msgid "journal already exists - run hg recover" msgstr "ジャーナルが既に存在しています。 hg recoverを実行してください" @@ -9637,14 +9534,6 @@ msgid "working directory of %s" msgstr "%s の作業領域" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr "%s: コピー時点の %s を検索中\n" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr "%s: コピー %s:%s\n" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "マージの部分コミットはできません(ファイル名／パターンは指定できません)" @@ -9657,9 +9546,6 @@ msgid "file not tracked!" msgstr "ファイルは未登録です!" -msgid "nothing changed\n" -msgstr "変更なし\n" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "未解決の衝突が残っています （hg resolveを参照してください）" @@ -9714,41 +9600,6 @@ msgid "searching for changes\n" msgstr "変更点を探索中\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "%s:%s をチェックしています\n" - -msgid "branch already found\n" -msgstr "ブランチはすでに見つかっています\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "不完全なブランチ: %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "新しいチェンジセット '%s' を発見\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "リクエスト %d: %s\n" - -#, python-format -msgid "received %s:%s\n" -msgstr "%s:%s を受信\n" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "%d:%d %s を探索中\n" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "新しいブランチのチェンジセット %s を発見\n" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "ブランチの探索を %s:%s へ絞りました\n" - msgid "already have changeset " msgstr "既にチェンジセットがあります " @@ -9758,16 +9609,6 @@ msgid "repository is unrelated" msgstr "無関係なリポジトリです" -msgid "found new changesets starting at " -msgstr "以下を起点とする新規変更の検出: " - -#, python-format -msgid "%d total queries\n" -msgstr "合計 %d のクエリ\n" - -msgid "common changesets up to " -msgstr "以下を終点とする共通履歴: " - msgid "requesting all changes\n" msgstr "全チェンジセットを取得中\n" @@ -9793,17 +9634,10 @@ msgid "%d changesets found\n" msgstr "%d 個のチェンジセット\n" -msgid "list of changesets:\n" -msgstr "チェンジセット一覧：\n" - #, python-format msgid "empty or missing revlog for %s" msgstr "%s に対するリビジョンログが空ないし不在です" -#, python-format -msgid "add changeset %s\n" -msgstr "チェンジセット %s を追加\n" - msgid "adding changesets\n" msgstr "チェンジセットを追加中\n" @@ -9816,10 +9650,6 @@ msgid "adding file changes\n" msgstr "ファイルの変更を追加中\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "%s 個のリビジョンを追加中\n" - msgid "received file revlog group is empty" msgstr "ファイルのリビジョンログが空です" @@ -9831,9 +9661,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "%d のチェンジセット(%d の変更を %d ファイルに適用)を追加%s\n" -msgid "updating the branch cache\n" -msgstr "ブランチのキャッシュを更新中\n" - msgid "Unexpected response from remote server:" msgstr "連携先のサーバから予期しない返信: " @@ -9854,10 +9681,6 @@ msgstr "%d 個のファイル転送(データ量 %s)\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "%s を追加しています（%s）\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "%s を %.1f 秒で送信しました（%s/秒）\n" @@ -9940,14 +9763,6 @@ msgstr "管理ファイル一覧を解決しています\n" #, python-format -msgid " overwrite %s partial %s\n" -msgstr " 上書き:%s, 対象限定:%s\n" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr " 祖先 %s ローカル %s リモート %s\n" - -#, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" @@ -9961,9 +9776,6 @@ msgid "&Delete" msgstr "&Delete" -msgid "c" -msgstr "c" - #, python-format msgid "" "remote changed %s which local deleted\n" @@ -9976,10 +9788,6 @@ msgstr "&Deleted" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "%s の保存中(%s の衝突解消用)\n" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "%s の削除に失敗: %s!\n" @@ -10026,13 +9834,6 @@ msgstr "%s を作成できません: ディレクトリを作成できません" #, python-format -msgid "found patch at byte %d\n" -msgstr "%d バイト目にパッチが見つかりました\n" - -msgid "patch generated by hg export\n" -msgstr "hg export にてパッチを生成しました\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "パッチ適用対象の '%s' が不在です\n" @@ -10102,9 +9903,9 @@ msgid "Unsupported line endings type: %s" msgstr "未サポートの行末種別: %s" -#, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "有効なハンクがありません: %r で再試行中\n" +#, fuzzy, python-format +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" +msgstr "%d 個のファイル、%d 件のチェンジセット、合計 %d 件のリビジョン\n" #, python-format msgid "exited with status %d" @@ -10115,13 +9916,6 @@ msgstr "%d のシグナルで強制終了しました" #, python-format -msgid "stopped by signal %d" -msgstr "%d のシグナルで停止しました" - -msgid "invalid exit code" -msgstr "終了コードが不正です" - -#, python-format msgid "saving bundle to %s\n" msgstr "バンドルを %s に保存中\n" @@ -10192,12 +9986,12 @@ msgid "could not create remote repo" msgstr "遠隔ホストとの連携に失敗" +msgid "no suitable response from remote hg" +msgstr "遠隔ホストの応答が不適切" + msgid "remote: " msgstr "遠隔ホスト: " -msgid "no suitable response from remote hg" -msgstr "遠隔ホストの応答が不適切" - #, python-format msgid "push refused: %s" msgstr "履歴反映が拒否されました: %s" @@ -10215,17 +10009,6 @@ msgid "invalid entry in fncache, line %s" msgstr "ファイル名キャッシュに不正なエントリ: %s 行目" -msgid "scanning\n" -msgstr "走査中\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "%d 個のファイル、%d バイトの送信\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "%s の送信中(%d バイト)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -10235,9 +10018,6 @@ msgid "&Remote" msgstr "&Remote" -msgid "r" -msgstr "" - #, python-format msgid "" " local changed subrepository %s which remote removed\n" @@ -10266,6 +10046,17 @@ msgid "pushing subrepo %s\n" msgstr "副リポジトリを %s へ反映中\n" +#, python-format +msgid "%s, line %s: %s\n" +msgstr "%s %s行目: %s\n" + +msgid "cannot parse entry" +msgstr "エントリを読み込めません" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "'%s' というノードはフォーマットが不適切です" + msgid "unmatched quotes" msgstr "引用符の対応関係が不正です" @@ -10331,12 +10122,12 @@ msgid "username %s contains a newline\n" msgstr "ユーザ名 %s は改行を含んでいます\n" +msgid "response expected" +msgstr "レスポンスがありません" + msgid "unrecognized response\n" msgstr "認識できないレスポンス\n" -msgid "response expected" -msgstr "レスポンスがありません" - msgid "password: " msgstr "パスワード: " @@ -10365,10 +10156,6 @@ msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "プロキシ 'http://%s:%s' を経由しています\n" - -#, python-format msgid "command '%s' failed: %s" msgstr "コマンド '%s' 失敗: %s" @@ -10565,12 +10352,16 @@ msgid "unpacking %s" msgstr "%s の展開中" +#, fuzzy, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "警告: %s@%s: 複製元リビジョンが nullid %s:%s" + #, python-format msgid "empty or missing copy source revlog %s:%s" msgstr "複製元 revlog %s:%s は、空か見つかりません" -#, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +#, fuzzy, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "警告: %s@%s: 複製元リビジョンが nullid %s:%s" #, python-format @@ -10601,5 +10392,6 @@ msgid "(first damaged changeset appears to be %d)\n" msgstr "(最初の不整合は %d の模様)\n" +#, fuzzy msgid "user name not available - set USERNAME environment variable" msgstr "ユーザ名が利用できません - 環境変数 USERNAME を設定してください"
--- a/i18n/pt_BR.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/pt_BR.po Sat Nov 07 14:13:15 2009 -0600 @@ -11,7 +11,7 @@ # archive pacote # branch ramificar (v.), ramo (s.) # bundle bundle -# changeset changeset +# changeset revisão # commit consolidar (v.), consolidação (s.) # default default (branch ou path), padrão # diff diff @@ -32,7 +32,7 @@ "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" "POT-Creation-Date: 2009-06-08 11:30-0300\n" -"PO-Revision-Date: 2009-04-16 14:29-0300\n" +"PO-Revision-Date: 2009-10-20 18:22+0200\n" "Last-Translator: Wagner Bruna <wbruna@yahoo.com>\n" "Language-Team: Brazilian Portuguese\n" "MIME-Version: 1.0\n" @@ -70,6 +70,937 @@ "\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 "" +"Alguns comandos permitem ao usuário especificar uma data, como:\n" +"\n" +"- backout, commit, import, tag: Especificar a data de consolidação.\n" +"- log, revert, update: Selecionar revisões por data.\n" +"\n" +"Muitos formatos de data são válidos. Eis alguns exemplos::\n" +"\n" +" \"Wed Dec 6 13:18:29 2006\" (assumido fuso horário local)\n" +" \"Dec 6 13:18 -0600\" (ano atual, defasagem de horário local\n" +" fornecida)\n" +" \"Dec 6 13:18 UTC\" (UTC e GMT são apelidos para +0000)\n" +" \"Dec 6\" (meia noite)\n" +" \"13:18\" (data corrente assumida)\n" +" \"3:39\" (hora assumida 3:39AM)\n" +" \"3:39pm\" (15:39)\n" +" \"2006-12-06 13:18:29\" (formato ISO 8601)\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" +"E por fim, há um formato interno do Mercurial::\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +"Este é o formato interno de representação de datas. unixtime é\n" +"o número de segundos desde a epoch (1970-01-01 00:00 UTC). offset\n" +"é a defasagem do fuso horário local, em segundos a oeste de UTC\n" +"(negativo para fusos horários a leste de UTC).\n" +"\n" +"O comando log também aceita intervalos de data::\n" +"\n" +" \"<{date}\" - na data fornecida, ou anterior\n" +" \">{date}\" - na data fornecida, ou posterior\n" +" \"{date} to {date}\" - um intervalo de data, incluindo os extremos\n" +" \"-{days}\" - dentro de um certo número de dias contados de hoje\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 "" +"O formato padrão do Mercurial para exibir mudanças entre duas\n" +"versões de um arquivo é compatível com o formato unified do GNU\n" +"diff, que pode ser usado pelo GNU patch e muitos outros\n" +"utilitários padrão.\n" +"\n" +"Apesar de esse formato padrão ser muitas vezes suficiente, ele\n" +"não codifica as seguintes informações:\n" +"\n" +"- bits de execução e permissão\n" +"- informação de cópia ou renomeação\n" +"- mudanças em arquivos binários\n" +"- criação ou remoção de arquivos vazios\n" +"\n" +"O Mercurial também suporta o formato diff estendido do VCS git\n" +"que trata dessas limitações. O formato git diff não é\n" +"produzido por padrão porque há muito poucas ferramentas que\n" +"entendem esse formato.\n" +"\n" +"Isso quer dizer que ao gerar diffs de um repositório do Mercurial\n" +"(por exemplo, com \"hg export\"), você deve tomar cuidado com por\n" +"exemplo cópias e renomeações de arquivos ou outras coisas\n" +"mencionadas acima, porque essa informação extra é perdida ao\n" +"aplicar um diff padrão em um outro repositório. As operações\n" +"internas do Mercurial (como push e pull) não são afetadas por\n" +"isso, porque usam um formato binário interno para comunicar\n" +"mudanças.\n" +"\n" +"Para fazer com que o Mercurial produza o formato estendido git\n" +"diff, use a opção --git disponível para vários comandos, ou\n" +"defina 'git = True' na seção [diff] de seu hgrc. Você não precisa\n" +"definir essa opção para importar diffs nesse formato, nem para\n" +"usá-lo com a extensão mq.\n" + +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 "" +"HG\n" +" Caminho para o executável 'hg', automaticamente passado na\n" +" execução de ganchos, extensões ou ferramentas externas. Se não\n" +" definido ou vazio, um executável chamado 'hg' (com a extensão\n" +" com/exe/bat/cmd no Windows) é procurado.\n" +"\n" +"HGEDITOR\n" +" Este é o nome do editor usado em consolidações. Veja EDITOR.\n" +"\n" +" (obsoleto, use .hgrc)\n" +"\n" +"HGENCODING\n" +" É usado no lugar da configuração padrão de locale detectada\n" +" pelo Mercurial. Essa configuração é usada para converter dados\n" +" como nomes de usuário, descrições de revisões, nomes de\n" +" etiqueta e ramos. Essa configuração pode ser sobreposta com a\n" +" opção --encoding na linha de comando.\n" +"\n" +"HGENCODINGMODE\n" +" Essa configuração ajusta o comportamento do Mercurial no\n" +" tratamento de caracteres desconhecidos, ao codificar entradas do\n" +" usuário. O padrão é \"strict\", o que faz com que o Mercurial\n" +" aborte se ele não puder traduzir um caractere. Outros valores\n" +" incluem \"replace\", que substitui caracteres desconhecidos, e\n" +" \"ignore\", que os descarta. Essa configuração pode ser\n" +" sobreposta com a opção --encodingmode na linha de comando.\n" +"\n" +"HGMERGE\n" +" Um executável a ser usado para solucionar conflitos de mesclagem.\n" +" O programa será executado com três argumentos: arquivo local,\n" +" arquivo remoto, arquivo ancestral.\n" +"\n" +" (obsoleta, use .hgrc)\n" +"\n" +"HGRCPATH\n" +" Uma lista de arquivos ou diretórios onde procurar arquivos hgrc.\n" +" O separador de itens é \":\" em Unix, \";\" no Windows. Se\n" +" HGRCPATH não estiver definido, o caminho de busca padrão da\n" +" plataforma será usado. Se vazio, será lido apenas .hg/hgrc no\n" +" repositório atual.\n" +"\n" +" Para cada elemento em HGRCPATH:\n" +"\n" +" - se for um diretório, todos os arquivos nesse diretório\n" +" terminados por \".rc\" serão adicionados\n" +" - caso contrário, o próprio arquivo será adicionado\n" +"\n" +"HGUSER\n" +" Esta é a string usada para o autor de uma consolidação.\n" +" Se não for definida, valores disponíveis serão considerados na\n" +" seguinte ordem:\n" +"\n" +" - HGUSER (obsoleto)\n" +" - arquivos hgrc no HGRCPATH\n" +" - EMAIL\n" +" - consulta interativa\n" +" - LOGNAME (com '@hostname' anexado)\n" +"\n" +" (obsoleto, use .hgrc)\n" +"\n" +"EMAIL\n" +" Pode ser usado como autor de consolidações; veja HGUSER.\n" +"\n" +"LOGNAME\n" +" Pode ser usado como autor de consolidações; veja HGUSER.\n" +"\n" +"VISUAL\n" +" Este é o nome do editor a ser usado em consolidações. Veja\n" +" EDITOR.\n" +"\n" +"EDITOR\n" +" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n" +" texto para ser modificado por um usuário, por exemplo ao escrever\n" +" mensagens de consolidação. O editor usado é determinado pela\n" +" consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n" +" nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n" +" estiverem vazios, o editor será o 'vi'.\n" +"\n" +"PYTHONPATH\n" +" Isto é usado pelo Python para localizar módulos importados, e\n" +" pode precisar ser ajustado apropriadamente se o Mercurial não\n" +" estiver instalado para o sistema todo.\n" + +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 "" +"O Mercurial possui um mecanismo para adicionar novas\n" +"funcionalidades através do uso de extensões. Extensões podem\n" +"adicionar novos comandos, adicionar novas opções a comandos\n" +"existentes ou implementar ganchos.\n" +"\n" +"Extensões não são carregadas por padrão por diversas razões:\n" +"elas podem aumentar o tempo de início ou execução; podem ser\n" +"destinadas apenas a uso avançado; podem fornecer funcionalidade\n" +"potencialmente perigosa (por exemplo, modificar ou destruir o\n" +"histórico); podem ainda não estar prontas para uso geral; ou\n" +"podem alterar o comportamento padrão do Mercurial. Cabe ao\n" +"usuário ativar extensões como desejar.\n" +"\n" +"Para habilitar a extensão \"foo\", tanto se for distribuída com\n" +"o Mercurial como estiver no caminho de busca do Python, crie uma\n" +"entrada para ela em seu hgrc, da seguinte forma::\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +"Você também pode especificar o caminho completo para uma\n" +"extensão::\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +"Para desabilitar explicitamente uma extensão habilitada em um\n" +"hgrc de escopo mais amplo, prefixe seu caminho com !::\n" +"\n" +" [extensions]\n" +" # desabilita a extensão bar localizada em\n" +" # /caminho/para/extensao/bar.py\n" +" hgext.bar = !/caminho/para/extensao/bar.py\n" +" # o mesmo, se um caminho não foi fornecido para a\n" +" # extensão baz\n" +" hgext.baz = !\n" + +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 "" +"Quando o Mercurial aceita mais de uma revisão, elas podem ser\n" +"especificadas individualmente, ou fornecidas como uma seqüência\n" +"topologicamente contínua, separadas pelo caractere \":\".\n" +"\n" +"A sintaxe da notação de seqüência é [INÍCIO]:[FIM], onde INÍCIO\n" +"e FIM são identificadores de revisão. Tanto INÍCIO como FIM são\n" +"opcionais. Se INÍCIO não for especificado, terá como valor padrão\n" +"a revisão número 0. Se FIM não for especificado, terá como valor\n" +"padrão a revisão tip. A seqüência \":\" portanto significa\n" +"\"todas as revisões\".\n" +"\n" +"Se INÍCIO for maior que FIM, as revisões são tratadas na ordem\n" +"inversa.\n" +"\n" +"Uma seqüência age como um intervalo fechado. Isso quer dizer que\n" +"uma seqüência 3:5 nos dá 3, 4 e 5. De forma semelhante, uma\n" +"seqüência 4:2 nos dá 4, 3, e 2.\n" + +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 "" +"O Mercurial aceita diversas notações para identificar um ou mais\n" +"arquivos de uma vez.\n" +"\n" +"Por padrão, o Mercurial trata nomes de arquivo como padrões\n" +"estendidos de glob do shell.\n" +"\n" +"Notações alternativas de padrões devem ser especificadas\n" +"explicitamente.\n" +"\n" +"Para usar um nome simples de caminho sem qualquer casamento de\n" +"padrões, comece o nome com ``path:``. Estes nomes de caminho\n" +"devem bater completamente, a partir da raiz do repositório\n" +"atual.\n" +"\n" +"Para usar um glob estendido, comece um nome com ``glob:``. Globs\n" +"têm como raiz o diretório corrente; um glob como ``*.c`` baterá\n" +"apenas com arquivos terminados em ``.c`` no diretório corrente.\n" +"\n" +"As sintaxes de extensão do glob suportadas são ``**`` para bater\n" +"com qualquer string incluindo separadores de caminho, e ``{a,b}``\n" +"para significar \"a ou b\".\n" +"\n" +"Para usar uma expressão regular Perl/Python, comece um nome com\n" +"``re:``. O casamento de padrões por expressão regular é feito a\n" +"partir do raiz do repositório.\n" +"\n" +"Exemplos de caminhos simples::\n" +"\n" +" path:foo/bar o nome bar em um diretório chamado foo no raiz do\n" +" repositório\n" +" path:path:name um arquivo ou diretório chamado \"path:name\"\n" +"\n" +"Exemplos de glob::\n" +"\n" +" glob:*.c qualquer nome terminado por \".c\" no diretório\n" +" atual\n" +" *.c qualquer nome terminado por \".c\" no diretório\n" +" atual\n" +" **.c qualquer nome terminado por \".c\" no diretório\n" +" atual ou em qualquer subdiretório\n" +" foo/*.c qualquer nome terminado por \".c\" no diretório\n" +" foo\n" +" foo/**.c qualquer nome terminado por \".c\" no diretório\n" +" foo ou em qualquer subdiretório\n" +"\n" +"Exemplos de expressão regular::\n" +"\n" +" re:.*\\.c$ qualquer nome terminado por \".c\", em qualquer\n" +" lugar no repositório\n" + +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 "" +"O Mercurial aceita diversas notações para identificar revisões\n" +"individuais.\n" +"\n" +"Um simples inteiro é tratado como um número de revisão. Inteiros\n" +"negativos são contados a partir da tip, com -1 denotando a tip,\n" +"-2 denotando a revisão anterior à tip, e assim por diante.\n" +"\n" +"Uma string hexadecimal de 40 dígitos é tratada como um\n" +"identificador único de revisão.\n" +"\n" +"Uma string hexadecimal de menos de 40 caracteres é tratada como\n" +"um identificador único de revisão, chamado de identificador\n" +"curto. Um identificador curto é válido apenas se for o prefixo\n" +"de um identificador completo.\n" +"\n" +"Qualquer outra string é tratada como um nome de etiqueta ou\n" +"ramo. Um nome de etiqueta é um nome simbólico associado a um\n" +"identificador de revisão. Um nome de ramo denota a revisão mais\n" +"recente de tal ramo. Nomes de etiqueta ou de ramo não podem\n" +"conter o caractere \":\".\n" +"\n" +"O nome reservado \"tip\" é uma etiqueta especial que sempre\n" +"identifica a revisão mais recente.\n" +"\n" +"O nome reservado \"null\" indica a revisão nula. Essa é a revisão\n" +"de um repositório vazio, e a revisão pai da revisão 0.\n" +"\n" +"O nome reservado \".\" indica a revisão pai do diretório de\n" +"trabalho. Se nenhum diretório de trabalho estiver selecionado,\n" +"será equivalente a null. Se uma mesclagem estiver em progresso,\n" +"\".\" será a revisão do primeiro pai.\n" + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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 "" +"O Mercurial permite que você personalize a saída de comandos\n" +"usando modelos. Você pode tanto passar um modelo pela linha de\n" +"comando, usando a opção --template, como selecionar um\n" +"modelo-estilo existente (--style).\n" +"\n" +"Você pode personalizar a saída de qualquer comando semelhante\n" +"ao log: log, outgoing, incoming, tip, parents, heads e glog.\n" +"\n" +"Três estilos são incluídos na distribuição do Mercurial: default\n" +"(o estilo usado quando nenhuma preferência for passada), compact\n" +"e changelog. Uso::\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +"Um modelo é um texto com marcações que invocam expansão de\n" +"variáveis::\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +"Strings entre chaves são chamadas palavras chave. A\n" +"disponibilidade de palavras chave depende do contexto exato do\n" +"modelador. Estas palavras chave estão comumente disponíveis para\n" +"modelar comandos semelhantes ao log:\n" +"\n" +":author: String. O autor da revisão, sem modificações.\n" +":branches: String. O nome do ramo no qual a revisão foi\n" +" consolidada. Será vazio se o nome do ramo for default.\n" +":date: Informação de data. A data de consolidação da revisão.\n" +":desc: String. O texto da descrição da revisão.\n" +":diffstat: String. Estatísticas de mudanças no seguinte\n" +" formato: \"modified files: +added/-removed lines\"\n" +":files: Lista de strings. Todos os arquivos modificados,\n" +" adicionados ou removidos por esta revisão.\n" +":file_adds: Lista de strings. Arquivos adicionados por esta\n" +" revisão.\n" +":file_mods: Lista de strings. Arquivos modificados por esta\n" +" revisão.\n" +":file_dels: Lista de strings. Arquivos removidos por esta\n" +" revisão.\n" +":node: String. O hash de identificação da revisão, como uma\n" +" string hexadecimal de 40 caracteres.\n" +":parents: Lista de strings. Os pais da revisão.\n" +":rev: Inteiro. O número de ordem da revisão no\n" +" repositório local.\n" +":tags: Lista de strings. Quaisquer etiquetas associadas à\n" +" revisão.\n" +":latesttag: String. A etiqueta global mais recente nos ancestrais desta\n" +" revisão.\n" +":latesttagdistance: Inteiro. O caminho mais longo para a latesttag.\n" +"\n" +"A palavra chave \"date\" não produz saída legível para humanos.\n" +"Se você quiser usar uma data em sua saída, você pode usar um\n" +"filtro para processá-la. Filtros são funções que devolvem uma\n" +"string baseada na variável de entrada. Você também pode encadear\n" +"filtros para obter a saída desejada::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +"Lista de filtros:\n" +"\n" +":addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n" +" antes do fim de cada linha, exceto a última.\n" +":age: Data. Devolve uma diferença de data/tempo legível entre\n" +" a data/hora dada e a data/hora atual.\n" +":basename: Qualquer texto. Trata o texto como um caminho, e\n" +" devolve o último componente do caminho após quebrá-lo\n" +" usando o separador de caminhos (ignorando separadores à\n" +" direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n" +" e \"foo/bar//\" se torna \"bar\".\n" +":date: Data. Devolve uma data em um formato de data Unix,\n" +" incluindo a diferença de fuso horário:\n" +" \"Mon Sep 04 15:13:13 2006 0700\".\n" +":stripdir: Trata o texto como um caminho e remove um nível\n" +" de diretório, se possível. Por exemplo, \"foo\" e\n" +" \"foo/bar\" se tornam \"foo\".\n" +":domain: Qualquer texto. Encontra a primeira string que se\n" +" pareça com um endereço de e-mail, e extrai apenas a parte\n" +" do domínio. Por exemplo:\n" +" 'User <user@example.com>' se torna 'example.com'.\n" +":email: Qualquer texto. Extrai a primeira string que se pareça\n" +" com um endereço de e-mail. Por exemplo:\n" +" 'User <user@example.com>' se torna 'user@example.com'.\n" +":escape: Qualquer texto. Substitui os caracteres especiais\n" +" XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n" +":fill68: Qualquer texto. Quebra o texto para caber em 68\n" +" colunas.\n" +":fill76: Qualquer texto. Quebra o texto para caber em 76\n" +" colunas.\n" +":firstline: Qualquer texto. Devolve a primeira linha do texto.\n" +":nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n" +":hgdate: Data. Devolve a data como um par de números:\n" +" \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n" +":isodate: Data. Devolve a data em formato ISO 8601: \"2009-08-18\n" +" 13:00 +0200\".\n" +":localdate: Data. Converte para data local.\n" +":obfuscate: Qualquer texto. Devolve o texto de entrada\n" +" renderizado como uma seqüência de entidades XML.\n" +":person: Qualquer texto. Devolve o texto antes de um endereço\n" +" de e-mail.\n" +":rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n" +" em cabeçalhos de e-mail:\n" +" \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" +":rfc3339date: Data. Devolve uma data usando o formato de data da\n" +" Internet especificado na RFC 3339:\n" +" \"2009-08-18T13:00:13+02:00\".\n" +":short: Hash da revisão. Devolve a forma curta do hash de\n" +" uma revisão, ou seja, uma string hexadecimal de 12 bytes.\n" +":shortdate: Data. Devolve uma data como \"2006-09-18\".\n" +":strip: Qualquer texto. Remove todos os espaços em branco no\n" +" início e no final do texto.\n" +":tabindent: Qualquer texto. Devolve o texto todo, com a adição\n" +" de um caractere de tabulação ao início de cada linha,\n" +" exceto da primeira.\n" +":urlescape: Qualquer texto. Codifica todos os caracteres\n" +" \"especiais\". Por exemplo, \"foo bar\" se torna\n" +" \"foo%20bar\".\n" +":user: Qualquer texto. Devolve a parte do usuário de um\n" +" endereço de e-mail.\n" + +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' will be treated as 'hg pull URL1').\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 "" +"URLs válidas são da forma::\n" +"\n" +" caminho/no/sistema/de/arquivos/local[#revisão]\n" +" file://caminho/no/sistema/de/arquivos/local[#revisão]\n" +" http://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" +" https://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" +" ssh://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" +"\n" +"Caminhos no sistema de arquivos local podem tanto apontar para\n" +"repositórios do Mercurial como para arquivos bundle (criados por\n" +"'hg bundle' ou 'hg incoming --bundle').\n" +"\n" +"Um identificador opcional após # indica um ramo, etiqueta ou\n" +"revisão do repositório remoto a ser usado. Veja também 'hg\n" +"help revisions'.\n" +"\n" +"Certas funcionalidades, como o push para URLs http:// e https://\n" +"são possíveis apenas se forem explicitamente habilitadas no\n" +"servidor remoto do Mercurial.\n" +"\n" +"Algumas notas sobre o uso de SSH com o Mercurial:\n" +"\n" +"- o SSH necessita de uma conta shell acessível na máquina de\n" +" destino e uma cópia do hg no caminho de execução remoto ou\n" +" especificado em remotecmd.\n" +"- o caminho é por padrão relativo ao diretório home do usuário\n" +" remoto.\n" +" Use uma barra extra no início de um caminho para especificar um\n" +" caminho absoluto::\n" +"\n" +" ssh://exemplo.com//tmp/repositorio\n" +"\n" +"- o Mercurial não usa sua própria compressão via SSH; a coisa\n" +" certa a fazer é configurá-la em seu ~/.ssh/config, por exemplo::\n" +"\n" +" Host *.minharedelocal.exemplo.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +"\n" +" Alternativamente especifique \"ssh -C\" como seu comando ssh\n" +" em seu hgrc ou pela opção de linha de comando --ssh .\n" +"\n" +"Estas URLs podem ser todas armazenadas em seu hgrc com apelidos\n" +"de caminho na seção [paths] , da seguinte forma::\n" +"\n" +" [paths]\n" +" apelido1 = URL1\n" +" apelido2 = URL2\n" +" ...\n" +"\n" +"Você pode então usar o apelido em qualquer comando que receba uma\n" +"URL (por exemplo 'hg pull apelido1' será tratado como 'hg pull URL1').\n" +"\n" +"Dois apelidos de caminho são especiais por serem usados como\n" +"valores padrão quando você não fornece a URL para um comando:\n" +"\n" +"default:\n" +" Quando você cria um repositório com hg clone, o comando clone\n" +" grava a localização do repositório de origem como o novo\n" +" caminho 'default' do repositório. Ele é então usado quando você\n" +" omitir o caminho de comandos semelhantes ao push e ao pull\n" +" (incluindo incoming e outgoing).\n" +"\n" +"default-push:\n" +" O comando push procurará por um caminho chamado 'default-push',\n" +" e o usará ao invés de 'default' se ambos estiverem definidos.\n" + +msgid "" "hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" @@ -119,10 +1050,10 @@ "ganchos para controlar o acesso a um repositório\n" "\n" "Este gancho possibilita permitir ou recusar acesso de escrita a\n" -"porções de um repositório ao receber changesets.\n" +"porções de um repositório ao receber revisões.\n" "\n" "A autorização é feita com relação ao nome de usuário local no sistema\n" -"onde o gancho é executado, e não ao autor do changeset original (já\n" +"onde o gancho é executado, e não ao autor da revisão original (já\n" "que este é meramente informativo).\n" "\n" "O gancho acl funciona melhor se você usar um shell restrito (como\n" @@ -141,7 +1072,7 @@ " pretxnchangegroup.acl = python:hgext.acl.hook\n" "\n" " [acl]\n" -" # verifica se a origem de changesets está nessa lista\n" +" # verifica se a origem de revisões está nessa lista\n" " # (\"serve\" == ssh ou http, \"push\", \"pull\", \"bundle\")\n" " sources = serve\n" "\n" @@ -165,38 +1096,14 @@ " ** = user6\n" #, python-format -msgid "acl: %s not enabled\n" -msgstr "acl: %s desabilitado\n" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "acl: %s habilitado, %d entradas para o usuário %s\n" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" "erro de configuração - tipo de gancho \"%s\" não pode interromper a chegada " -"dos changesets" - -#, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "acl: mudanças têm origem \"%s\" - omitindo\n" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "acl: usuário %s negado em %s\n" +"das revisões" #, python-format msgid "acl: access denied for changeset %s" -msgstr "acl: acesso negado para o changeset %s" - -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "acl: usuário %s não permitido em %s\n" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "acl: permitindo changeset %s\n" +msgstr "acl: acesso negado para a revisão %s" msgid "" "track a line of development with movable markers\n" @@ -224,15 +1131,15 @@ "rastreia uma linha de desenvolvimento com marcadores móveis\n" "marcadores do Mercurial\n" "\n" -"Marcadores são ponteiros locais móveis para changesets. Todo\n" -"marcador aponta para um changeset identificado por seu hash. Se você\n" -"consolidar um changeset que se baseie em um changeset que contenha um\n" -"marcador, o marcador é transferido para o novo changeset.\n" +"Marcadores são ponteiros locais móveis para revisões. Todo\n" +"marcador aponta para uma revisão identificada por seu hash. Se você\n" +"consolidar uma revisão que se baseie em uma revisão que contenha um\n" +"marcador, o marcador é transferido para a nova revisão.\n" "\n" "É possível utilizar nomes de marcadores em toda referência a revisões\n" "(por exemplo: hg merge, hg update).\n" "\n" -"Por padrão, quando vários marcadores apontam para o mesmo changeset,\n" +"Por padrão, quando vários marcadores apontam para a mesma revisão,\n" "todos serão movidos para a frente juntos. É possível obter um\n" "funcionamento mais semelhante ao do sistema git com a adição das\n" "seguintes opções de configuração ao seu .hgrc::\n" @@ -443,7 +1350,7 @@ "ganchos para integração com um bug tracker Bugzilla\n" "\n" "Essa extensão adiciona comentários a bugs do Bugzilla quando\n" -"forem encontrados changesets que se refiram a esses bugs pelo ID.\n" +"forem encontradas revisões que se refiram a esses bugs pelo ID.\n" "Esse gancho não muda o estado do bug.\n" "\n" "Esse gancho atualiza diretamente o banco de dados do Bugzilla.\n" @@ -453,7 +1360,7 @@ "notificação de alterações de bugs. Esse script muda entre versões do\n" "Bugzilla; o script 'processmail' usado antes da 2.18 é substituído na\n" "2.18 e subseqüentes por 'config/sendbugmail.pl'. Note que esse script\n" -"será executado pelo Mercurial assim que o usuário enviar o changeset;\n" +"será executado pelo Mercurial assim que o usuário enviar a revisão;\n" "você terá que assegurar que as permissões de arquivo da instalação\n" "do Bugzilla estejam configuradas apropriadamente.\n" "\n" @@ -484,7 +1391,7 @@ "\n" "bzuser\n" " Nome de usuário no Bugzilla utilizado para gravar os comentários\n" -" se o autor do changeset não for encontrado como um usuário do\n" +" se o autor da revisão não for encontrado como um usuário do\n" " Bugzilla.\n" "\n" "bzdir\n" @@ -500,7 +1407,7 @@ "\n" "regexp\n" " Expressão regular para encontrar os IDs dos bugs na mensagem de\n" -" consolidação do changeset. Deve conter um grupo de \"()\". A\n" +" consolidação da revisão. Deve conter um grupo de \"()\". A\n" " expressão padrão encontra 'Bug 1234', 'Bug no. 1234', 'Bug number\n" " 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' e variações. A\n" " equivalência não é sensível a maiúsculas e minúsculas.\n" @@ -599,7 +1506,7 @@ #, python-format msgid "bug %d already knows about changeset %s\n" -msgstr "o bug %d já sabe sobre o changeset %s\n" +msgstr "o bug %d já sabe sobre a revisão %s\n" msgid "telling bugzilla to send mail:\n" msgstr "falando para o bugzilla enviar email:\n" @@ -640,7 +1547,7 @@ "details:\n" "\t{desc|tabindent}" msgstr "" -"changeset {node|short} no repositório {root} refere-se ao bug {bug}.\n" +"revisão {node|short} no repositório {root} refere-se ao bug {bug}.\n" "detalhes:\n" "\t{desc|tabindent}" @@ -650,14 +1557,14 @@ #, python-format msgid "hook type %s does not pass a changeset id" -msgstr "gancho do tipo %s não passa um id de changeset" +msgstr "gancho do tipo %s não passa um id de revisão" #, python-format msgid "database error: %s" msgstr "erro de banco de dados: %s" msgid "command to display child changesets" -msgstr "comando para exibir changesets filhos" +msgstr "comando para exibir revisões filhas" msgid "" "show the children of the given or working directory revision\n" @@ -768,10 +1675,6 @@ " de trabalho, se existir.\n" " " -#, python-format -msgid "assuming %i character terminal\n" -msgstr "assumindo terminal de %i caracteres\n" - msgid "count rate for the specified revision or range" msgstr "conta a freqüência para uma revisão ou faixa especificada" @@ -779,13 +1682,13 @@ msgstr "conta a freqüência das revisões que casem com a data especificada" msgid "template to group changesets" -msgstr "modelo para agrupar os changesets" +msgstr "modelo para agrupar as revisões" msgid "strftime-compatible format for grouping by date" msgstr "formato compatível com o strftime para agrupar por data" msgid "count rate by number of changesets" -msgstr "conta a freqüência pelo numero de changesets" +msgstr "conta a freqüência pelo numero de revisões" msgid "sort by key (default: sort by count)" msgstr "ordenar pela chave (padrão: ordenar pela contagem)" @@ -889,8 +1792,8 @@ "quando colorir (\"always\": sempre, \"never\": nunca ou \"auto\": " "automaticamente)" -msgid "don't colorize output" -msgstr "não colore a saída" +msgid "don't colorize output (DEPRECATED)" +msgstr "não colore a saída (OBSOLETA)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" @@ -987,7 +1890,10 @@ " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" -" should be used as the new parents for that node.\n" +" should be used as the new parents for that node. For example, if\n" +" you have merged \"release-1.0\" into \"trunk\", then you should\n" +" specify the revision on \"trunk\" as the first parent and the one on\n" +" the \"release-1.0\" branch as the second.\n" "\n" " The branchmap is a file that allows you to rename a branch when it is\n" " being brought in from whatever external repository. When used in\n" @@ -1026,23 +1932,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" @@ -1062,9 +1953,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" @@ -1212,7 +2104,10 @@ " versão de origem cujos pais devam ser modificados (mesmo formato\n" " de uma chave em .hg/shamap). Os valores são os identificadores de\n" " revisão (no sistema de origem ou no de destino) que devem ser\n" -" usados como os novos pais daquele nó.\n" +" usados como os novos pais daquele nó. Por exemplo, se você mesclou\n" +" \"release-1.0\" em \"trunk\", você deve especificar a revisão em\n" +" \"trunk\" como primeiro pai e a revisão em \"release-1.0\" como\n" +" segundo.\n" "\n" " O branchmap é um arquivo que permite a renomeação de um ramo\n" " quando este for trazido de um repositório externo qualquer. Se\n" @@ -1234,8 +2129,8 @@ " repositórios do Mercurial com revlogs faltando, através da\n" " conversão para outro repositório do Mercurial.\n" " --config convert.hg.saverev=False (booleana)\n" -" armazena o identificador de revisão original no changeset\n" -" (isso força o identificador de destino a mudar)\n" +" armazena o identificador de revisão original na revisão de destino\n" +" (isso força o identificador do destino a mudar)\n" " --config convert.hg.startrev=0 (id de revisão do hg)\n" " converte a revisão inicial e seus descendentes\n" "\n" @@ -1252,31 +2147,16 @@ " início serão convertidos, e que qualquer reorganização na cópia\n" " local do CVS é ignorada.\n" "\n" -" Como o CVS não possui changesets, é necessário coletar commits\n" -" individuais do CVS e mesclá-los em changesets. A origem CVS usa\n" -" seu código interno de mesclagem por padrão, mas pode ser\n" -" configurada para chamar o utilitário externo 'cvsps' definindo::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" Esta opção é obsoleta e será removida no Mercurial 1.4.\n" -"\n" " As opções exibidas são os valores padrão.\n" "\n" -" O cvsps interno é selecionado com::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" e possui algumas outras opções de configuração:\n" -"\n" " --config convert.cvsps.cache=True (booleana)\n" " Defina como False para desabilitar o cache do log\n" " remoto, para teste ou depuração.\n" " --config convert.cvsps.fuzz=60 (inteiro)\n" " Especifica o tempo máximo (em segundos) permitido entre\n" -" commits com usuário e mensagem de log em um único\n" -" changeset. Se arquivos muito grandes forem armazenados\n" -" como parte de um changeset, o padrão pode não ser\n" +" commits com usuário e mensagem de log em uma única\n" +" revisão. Se arquivos muito grandes forem armazenados\n" +" como parte de uma revisão, o padrão pode não ser\n" " suficiente.\n" " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" " Especifica uma expressão regular com a qual mensagens de\n" @@ -1288,12 +2168,13 @@ " Especifica uma expressão regular com a qual mensagens de\n" " log de commit são verificadas. Se um casamento for\n" " encontrado, a conversão inserirá a revisão mais recente\n" -" do ramo indicado na expressão regular como segundo pai do\n" -" changeset.\n" -"\n" -" O script hgext/convert/cvsps permite que o código de mesclagem\n" +" do ramo indicado na expressão regular como segundo pai da\n" +" revisão.\n" +"\n" +" O comando \"debugcvsps\" do Mercurial permite que o código de mesclagem\n" " interno seja executado fora do processo de conversão. Seus\n" " parâmetros e saída são semelhantes aos do cvsps 2.1.\n" +" Veja a ajuda do comando para mais detalhes.\n" "\n" " Origem Subversion\n" " -----------------\n" @@ -1365,7 +2246,7 @@ " series of changesets based on matching commit log entries and\n" " dates." msgstr "" -"cria uma informação de changeset do CVS\n" +"cria uma informação de revisão do CVS\n" "\n" " Esse comando serve como ferramenta de depuração para o conversor\n" " do CVS para o Mercurial e pode ser usado como um substituto\n" @@ -1373,7 +2254,7 @@ "\n" " Hg debugcvsps lê o rlog do CVS para o diretório atual (ou\n" " qualquer diretório nomeado) no repositório do CVS e converte o\n" -" log em uma série de changesets baseado na correspondência das\n" +" log em uma série de revisões baseadas na correspondência das\n" " entradas no log de commit e datas." msgid "username mapping filename" @@ -1398,19 +2279,19 @@ msgstr "muda nomes de ramos durante a conversão" msgid "try to sort changesets by branches" -msgstr "tenta ordenar os changesets por ramos" +msgstr "tenta ordenar as revisões por ramos" msgid "try to sort changesets by date" -msgstr "tenta ordenar os changesets por data" +msgstr "tenta ordenar as revisões por data" msgid "preserve source changesets order" -msgstr "preserva a ordem de changesets da origem" +msgstr "preserva a ordem de revisões da origem" msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "hg convert [OPÇÃO]... ORIGEM [DESTINO [REVMAP]]" msgid "only return changes on specified branches" -msgstr "só retorna changesets no ramo especificado" +msgstr "só retorna revisões no ramo especificado" msgid "prefix to remove from file names" msgstr "prefixo para remover dos nomes dos arquivos" @@ -1431,10 +2312,10 @@ msgstr "especifica o cvsroot" msgid "show parent changesets" -msgstr "exibe os pais do changesets" +msgstr "exibe as revisões pais" msgid "show current changeset in ancestor branches" -msgstr "exibe o changeset atual nos ramos ancestrais" +msgstr "exibe a revisão atual nos ramos ancestrais" msgid "ignored for compatibility" msgstr "ignorada para compatibilidade" @@ -1469,10 +2350,6 @@ msgstr "não foi possível encontrar ferramenta \"%s\" necessária" #, python-format -msgid "running: %s\n" -msgstr "executando: %s\n" - -#, python-format msgid "%s error:\n" msgstr "erro no comando %s:\n" @@ -1550,19 +2427,9 @@ msgid "--sourcesort is not supported by this data source" msgstr "--sourcesort não é suportado para esta origem de dados" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" -msgstr "" -"aviso: o suporte para o cvsps externo é obsoleto e será removido no " -"Mercurial 1.4\n" - -#, python-format -msgid "revision %s is not a patchset number or date" -msgstr "revisão %s não é um número de patchset ou data" - -msgid "using builtin cvsps\n" -msgstr "usando cvsps interno\n" +#, python-format +msgid "revision %s is not a patchset number" +msgstr "revisão %s não é um número de patchset" #, python-format msgid "connecting to %s\n" @@ -1608,10 +2475,6 @@ msgid "running %s\n" msgstr "executando %s\n" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "prefixo=%r diretório=%r raiz=%r\n" - msgid "RCS file must be followed by working file" msgstr "arquivo RCS deve ser seguido de um arquivo de trabalho" @@ -1625,10 +2488,6 @@ msgstr "revisão deve ser seguida por uma linha de data" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "revisão sintética encontrada em %s:%r\n" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "escrevendo cache do log do CVS %s\n" @@ -1637,10 +2496,10 @@ msgstr "%d entradas de log\n" msgid "creating changesets\n" -msgstr "criando changesets\n" +msgstr "criando revisões\n" msgid "synthetic changeset cannot have multiple parents" -msgstr "um changeset sintético não pode ter múltiplos pais" +msgstr "uma revisão sintética não pode ter múltiplos pais" #, python-format msgid "" @@ -1652,7 +2511,7 @@ #, python-format msgid "%d changeset entries\n" -msgstr "%d entradas de changeset\n" +msgstr "%d entradas de revisão\n" #, python-format msgid "darcs version 2.1 or newer needed (found %r)" @@ -1661,10 +2520,6 @@ msgid "Python ElementTree module is not available" msgstr "módulo ElementTree do Python não está disponível" -#, python-format -msgid "cleaning up %s\n" -msgstr "limpando %s\n" - msgid "internal calling inconsistency" msgstr "inconsistência interna de chamadas" @@ -1700,22 +2555,6 @@ "s...\n" #, python-format -msgid "applying revision %s...\n" -msgstr "aplicando revisão %s...\n" - -#, python-format -msgid "computing changeset between %s and %s...\n" -msgstr "computando changeset entre %s e %s...\n" - -#, python-format -msgid "obtaining revision %s...\n" -msgstr "obtendo revisão %s...\n" - -#, python-format -msgid "analyzing revision %s...\n" -msgstr "analisando revisão %s...\n" - -#, python-format msgid "could not parse cat-log of %s" msgstr "não foi possível decodificar cat-log de %s" @@ -1727,12 +2566,6 @@ msgid "initializing destination %s repository\n" msgstr "iniciando repositório de destino %s\n" -msgid "run hg sink pre-conversion action\n" -msgstr "executa ação pré-conversão do destino hg\n" - -msgid "run hg sink post-conversion action\n" -msgstr "executa ação pós-conversão do destino hg\n" - #, python-format msgid "pulling from %s into %s\n" msgstr "trazendo de %s para %s\n" @@ -1751,12 +2584,6 @@ msgid "ignoring: %s\n" msgstr "ignorando: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "executa ação pré-conversão da origem hg\n" - -msgid "run hg source post-conversion action\n" -msgstr "executa ação pós-conversão da origem hg\n" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s não parece um repositório do Monotone" @@ -1771,6 +2598,11 @@ msgid "collecting p4 changelists\n" msgstr "coletando changelists do p4\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" +"Mercurial falhou ao executar a si próprio, veja se o executável hg está no " +"PATH" + msgid "Subversion python bindings could not be loaded" msgstr "Os módulos Python para o Subversion não puderam ser carregados" @@ -1825,69 +2657,22 @@ msgstr "nenhuma tag encontrada na revisão %d\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "ignorado ramo estrangeiro %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "%s não encontrado até revisão %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "ramo renomeado de %s para %s em %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "pai mudado para %s\n" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "copiado para %s a partir de %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "ido de %s\n" - -#, python-format -msgid "entry %s\n" -msgstr "entrada %s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "caminho desconhecido na revisão %d: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "marcador %s veio de %s:%d\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "decodificando revisão %d (%d mudanças)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "encontrado pai do ramo %s em %d: %s\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "sem caminho copyfrom, não sei o que fazer.\n" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "obtendo log da revisão para \"%s\" de %d até %d\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "revisão %d não tem entradas\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: ramo não tem a revisão %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r não está abaixo de %r, ignorando\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "iniciando repositório svn %r\n" @@ -1991,16 +2776,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "não é possível especificar simultaneamente --rev e --change" -#, python-format -msgid "running %r in %s\n" -msgstr "executando %r no %s\n" - -#, python-format -msgid "file changed while diffing. Overwriting: %s (src: %s)\n" -msgstr "" -"arquivo modificado durante execução do diff. Sobrescrevendo: %s (origem: %" -"s)\n" - msgid "cleaning up temp directory\n" msgstr "limpando o diretório temporário\n" @@ -2168,7 +2943,7 @@ #, python-format msgid "new changeset %d:%s merges remote changes with local\n" -msgstr "novo changeset %d:%s mescla alterações remotas com local\n" +msgstr "nova revisão %d:%s mescla alterações remotas com local\n" msgid "a specific revision you would like to pull" msgstr "uma revisão específica que você gostaria de trazer" @@ -2186,7 +2961,7 @@ msgstr "hg fetch [ORIGEM]" msgid "commands to sign and verify changesets" -msgstr "comando para assinar e verificar changesets" +msgstr "comando para assinar e verificar revisões" msgid "error while verifying signature" msgstr "erro verificando assinatura" @@ -2204,7 +2979,7 @@ msgstr "%s Nota: Esta chave expirou (assinada por: \"%s\")\n" msgid "list signed changesets" -msgstr "lista os changesets assinados" +msgstr "lista as revisões assinadas" #, python-format msgid "%s:%d node does not exist\n" @@ -2414,12 +3189,6 @@ msgid "email.from must be defined when sending by email" msgstr "email.from deve estar definido ao enviar por e-mail" -msgid "cia: no user specified" -msgstr "cia: nenhum usuário especificado" - -msgid "cia: no project specified" -msgstr "cia: nenhum projeto especificado" - msgid "" "browse the repository in a graphical way\n" "\n" @@ -2622,9 +3391,6 @@ msgid "(found dead inotify server socket; removing it)\n" msgstr "(encontrado socket de um servidor inotify morto; removendo-o)\n" -msgid "(starting inotify server)\n" -msgstr "(iniciando servidor inotify)\n" - #, python-format msgid "could not start inotify server: %s\n" msgstr "não foi possível iniciar servidor inotify: %s\n" @@ -2633,9 +3399,6 @@ msgid "could not talk to new inotify server: %s\n" msgstr "não foi possível falar com o novo servidor inotify: %s\n" -msgid "(inotify server not running)\n" -msgstr "(servidor inotify não está em execução)\n" - #, python-format msgid "failed to contact inotify server: %s\n" msgstr "falha ao contatar servidor inotify: %s\n" @@ -2904,8 +3667,8 @@ "\n" "Expansões que alcancem mais de uma linha, e expansões incrementais\n" "como CVS' $Log$, não são suportadas. Um modelo de expansão\n" -"\"Log = {desc}\" expande para a primeira linha da descrição do\n" -"changeset.\n" +"\"Log = {desc}\" expande para a primeira linha da descrição da\n" +"revisão.\n" #, python-format msgid "overwriting %s expanding keywords\n" @@ -3002,14 +3765,6 @@ "\n" "\tpalavras chave expandidas\n" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" -"\n" -"removendo repositório temporário %s\n" - msgid "" "expand keywords in the working directory\n" "\n" @@ -3039,15 +3794,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 "" "mostra arquivos configurados para expansão de palavras chave\n" @@ -3062,9 +3815,7 @@ " Veja \"hg help keyword\" para saber como construir padrões tanto\n" " para inclusão como para exclusão de arquivos.\n" "\n" -" Use -u/--untracked para listar também arquivos não rastreados.\n" -"\n" -" Com -a/--all e -v/--verbose os códigos usados para mostrar o\n" +" Com -A/--all e -v/--verbose os códigos usados para mostrar o\n" " status dos arquivos são::\n" "\n" " K = candidato à expansão de palavras chave\n" @@ -3109,8 +3860,16 @@ msgid "show files excluded from expansion" msgstr "mostra arquivos excluídos da expansão" -msgid "additionally show untracked files" -msgstr "mostra também arquivos não rastreados" +msgid "only show unknown (not tracked) files" +msgstr "mostra apenas arquivos desconhecidos (não rastreados)" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "" +"mostra indicadores de estado de palavras chave para todos os arquivos " +"(OBSOLETA)" + +msgid "only show untracked files (DEPRECATED)" +msgstr "mostra também arquivos não rastreados (OBSOLETA)" msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [OPÇÃO]... [ARQUIVO]..." @@ -3136,7 +3895,6 @@ "\n" " print patch series qseries\n" " print applied patches qapplied\n" -" print name of top applied patch qtop\n" "\n" " add known patch to applied stack qpush\n" " remove patch from applied stack qpop\n" @@ -3151,7 +3909,7 @@ "\n" "Patches conhecidos são representados como arquivos de patch no\n" "diretório .hg/patches . Patches aplicados são tanto arquivos de\n" -"patch como changesets.\n" +"patch como revisões.\n" "\n" "Tarefas comuns (use \"hg help comando\" para mais detalhes)::\n" "\n" @@ -3161,7 +3919,6 @@ "\n" " imprime a série de patches qseries\n" " imprime patches aplicados qapplied\n" -" imprime o nome do patch aplicado do topo qtop\n" "\n" " adiciona um patch conhecido à pilha de aplicados qpush\n" " remove um patch da pilha de aplicados qpop\n" @@ -3183,10 +3940,6 @@ msgstr "caractere inválido na guarda %r: %r" #, python-format -msgid "active guards: %s\n" -msgstr "guardas ativas: %s\n" - -#, python-format msgid "guard %r too short" msgstr "guarda %r muito curta" @@ -3288,7 +4041,7 @@ #, python-format msgid "patch %s finalized without changeset message\n" -msgstr "patch %s finalizado sem a mensagem de changeset\n" +msgstr "patch %s finalizado sem a mensagem de revisão\n" msgid "qdelete requires at least one revision or patch name" msgstr "qdelete exige ao menos uma revisão ou nome de patch" @@ -3529,9 +4282,15 @@ msgid "print the patches already applied" msgstr "imprime os patches já aplicados" +msgid "only one patch applied\n" +msgstr "apenas um patch aplicado\n" + msgid "print the patches not yet applied" msgstr "imprime os patches ainda não aplicados" +msgid "all patches applied\n" +msgstr "todos os patches aplicados\n" + msgid "" "import a patch\n" "\n" @@ -3575,7 +4334,7 @@ " Com -f/--force, um patch existente de mesmo nome será\n" " sobrescrito.\n" "\n" -" Um changeset existente pode ser colocado sob o controle da mq\n" +" Uma revisão existente pode ser colocada sob o controle da mq\n" " com -r/--rev (por exemplo, qimport --rev tip -n patch colocará a\n" " tip sob o controle da mq). Com -g/--git, os patches importados\n" " com --rev usarão o formato git diff. Veja o tópico de ajuda diff\n" @@ -3664,15 +4423,9 @@ msgid "print the name of the next patch" msgstr "imprime o nome do próximo patch" -msgid "all patches applied\n" -msgstr "todos os patches aplicados\n" - msgid "print the name of the previous patch" msgstr "imprime o nome do patch anterior" -msgid "only one patch applied\n" -msgstr "apenas um patch aplicado\n" - msgid "" "create a new patch\n" "\n" @@ -4124,8 +4877,11 @@ msgid "print first line of patch header" msgstr "imprime a primeira linha do cabeçalho do patch" -msgid "hg qapplied [-s] [PATCH]" -msgstr "hg qapplied [-s] [PATCH]" +msgid "show only the last patch" +msgstr "mostra apenas o último patch" + +msgid "hg qapplied [-1] [-s] [PATCH]" +msgstr "hg qapplied [-1] [-s] [PATCH]" msgid "use pull protocol to copy metadata" msgstr "usa o protocolo pull para copiar metadados" @@ -4241,8 +4997,8 @@ msgid "queue name to pop" msgstr "nome da fila para desempilhar" -msgid "forget any local changes" -msgstr "descarta qualquer mudança local" +msgid "forget any local changes to patched files" +msgstr "descarta qualquer mudança local a arquivos modificados pelo patch" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" msgstr "hg qpop [-a] [-n NOME] [-f] [PATCH | ÍNDICE]" @@ -4269,18 +5025,16 @@ msgstr "renova apenas os arquivos especificados ou que já estão no patch" msgid "add/update author field in patch with current user" -msgstr "" +msgstr "adiciona/atualiza a entrada de autor no patch com o usuário atual" msgid "add/update author field in patch with given user" -msgstr "" - -#, fuzzy +msgstr "adiciona/atualiza a entrada de autor no patch com o usuário pedido" + msgid "add/update date field in patch with current date" -msgstr "atualiza \"Date: <data fornecida>\" no patch (se presente)" - -#, fuzzy +msgstr "adiciona/atualiza a entrada de data no patch com a data atual" + msgid "add/update date field in patch with given date" -msgstr "atualiza \"Date: <data fornecida>\" no patch (se presente)" +msgstr "adiciona/atualiza a entrada de data no patch com a data pedida" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTO] [-l ARQUIVO] [-s] [ARQUIVO]..." @@ -4337,7 +5091,7 @@ msgstr "força remoção com mudanças locais" msgid "bundle unrelated changesets" -msgstr "armazena no bundle changesets não relacionados" +msgstr "armazena no bundle revisões não relacionadas" msgid "no backups" msgstr "nenhuma cópia de segurança" @@ -4348,11 +5102,14 @@ msgid "hg qtop [-s]" msgstr "hg qtop [-s]" -msgid "hg qunapplied [-s] [PATCH]" -msgstr "hg qunapplied [-s] [PATCH]" +msgid "show only the first patch" +msgstr "mostra apenas o primeiro patch" + +msgid "hg qunapplied [-1] [-s] [PATCH]" +msgstr "hg qunapplied [-1] [-s] [PATCH]" msgid "finish all applied changesets" -msgstr "encerra todos os changesets aplicados" +msgstr "encerra todas as revisões aplicadas" msgid "hg qfinish [-a] [REV]..." msgstr "hg qfinish [-a] [REV]..." @@ -4397,6 +5154,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" @@ -4433,9 +5191,9 @@ " hgext.notify =\n" "\n" " [hooks]\n" -" # um e-mail para cada changeset que chegar\n" +" # um e-mail para cada revisão que chegar\n" " incoming.notify = python:hgext.notify.hook\n" -" # e-mails em lote quando muitos changesets chegarem de uma vez\n" +" # e-mails em lote quando muitas revisões chegarem de uma vez\n" " changegroup.notify = python:hgext.notify.hook\n" "\n" " [notify]\n" @@ -4461,6 +5219,7 @@ " sources = serve # notifica se a fonte de mudanças recebidas\n" " # estiver nessa lista\n" " # (serve == ssh ou http, push, pull, bundle)\n" +" merge = False # envia notificação de mesclagens (padrão: True)\n" " [email]\n" " from = user@host.com # endereço de e-mail de envio se não houver\n" " [web]\n" @@ -4490,7 +5249,7 @@ #, python-format msgid "%s: %d new changesets" -msgstr "%s: %d novos changesets" +msgstr "%s: %d novas revisões" #, python-format msgid "notify: sending %d subscribers %d changes\n" @@ -4517,12 +5276,8 @@ "\n" #, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "notify: nenhum assinante do repositório %s\n" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "notify: mudanças têm origem \"%s\" - omitindo\n" +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "notify: suprimindo notificação para mesclagem %d:%s\n" msgid "" "browse command output with an external pager\n" @@ -4694,17 +5449,17 @@ "directly from the commandline. See the [email] and [smtp] sections in\n" "hgrc(5) for details.\n" msgstr "" -"comando para enviar changesets como uma série de e-mails de patch\n" +"comando para enviar revisões como uma série de e-mails de patch\n" "\n" "A série é iniciada por uma introdução \"[PATCH 0 of N]\", que\n" "descreve a série como um todo.\n" "\n" "Cada e-mail de patch tem uma linha Assunto com a forma\n" -"\"[PATCH M of N] ...\", usando a primeira linha da descrição do\n" -"changeset como texto do assunto. A mensagem contém dois ou três\n" +"\"[PATCH M of N] ...\", usando a primeira linha da descrição da\n" +"revisão como texto do assunto. A mensagem contém dois ou três\n" "corpos:\n" "\n" -"- A descrição do changeset.\n" +"- A descrição da revisão.\n" "- [Opcional] O resultado da execução de diffstat no patch.\n" "- O patch em si, como gerado por \"hg export\".\n" "\n" @@ -4713,8 +5468,8 @@ "uma seqüência em e-mails organizados por conversação e leitores de\n" "notícias, além de mail archives.\n" "\n" -"Com a opção -d/--diffstat, para cada changeset você será consultado\n" -"interativamente com um resumo do diffstat e o resumo do changeset,\n" +"Com a opção -d/--diffstat, para cada revisão você será consultado\n" +"interativamente com um resumo do diffstat e o resumo da revisão,\n" "para que você tenha certeza de enviar as mudanças corretas.\n" "\n" "Para configurar outros padrões, adicione uma seção como esta em seu\n" @@ -4727,7 +5482,7 @@ " bcc = bcc1, bcc2, ...\n" "\n" "Então você poderá usar o comando \"hg email\" para enviar por e-mail\n" -"uma série de changesets como uma \"patchbomb\".\n" +"uma série de revisões como uma \"patchbomb\".\n" "\n" "Para evitar o envio de patches de forma prematura, é uma boa idéia\n" "executar o comando \"email\" com a opção \"-n\" (somente teste).\n" @@ -4761,11 +5516,15 @@ "Veja as seções [email] e [smtp] na página de manual hgrc(5) para\n" "mais detalhes.\n" +#, python-format +msgid "%s Please enter a valid value" +msgstr "%s Por favor forneça um valor válido" + msgid "Please enter a valid value.\n" msgstr "Por favor, entre um valor válido.\n" -msgid "does the diffstat above look okay? " -msgstr "o diffstat abaixo parece bom? " +msgid "does the diffstat above look okay?" +msgstr "o diffstat abaixo parece bom?" msgid "diffstat rejected" msgstr "diffstat rejeitado" @@ -4821,16 +5580,16 @@ " hgrc. See the [email] section in hgrc(5) for details.\n" " " msgstr "" -"envia changesets por e-mail\n" +"envia revisões por e-mail\n" "\n" " Por padrão, diffs são enviados no formato gerado por hg export,\n" " um por mensagem. A série inicia com uma introdução\n" " \"[PATCH 0 of N]\", que descreve a série como um todo.\n" "\n" " Cada e-mail de patch tem uma linha Assunto com a forma\n" -" \"[PATCH M of N] ...\", usando a primeira linha da descrição do\n" -" changeset como texto do assunto. A mensagem contém duas ou três\n" -" partes. Em primeiro lugar, a descrição do changeset. Em seguida\n" +" \"[PATCH M of N] ...\", usando a primeira linha da descrição da\n" +" revisão como texto do assunto. A mensagem contém duas ou três\n" +" partes. Em primeiro lugar, a descrição da revisão. Em seguida\n" " (opcionalmente), se o programa diffstat estiver instalado e a\n" " opção -d/--diffstat for usada, o resultado da execução de\n" " diffstat no patch. Por fim, o patch em si, como gerado por\n" @@ -4845,7 +5604,7 @@ " encontrados no repositório de destino (ou apenas aqueles que\n" " forem ancestrais das revisões, se estas forem especificadas)\n" "\n" -" Com -b/--bundle, os changesets são selecionados assim como em\n" +" Com -b/--bundle, as revisões são selecionados assim como em\n" " --outgoing, mas um único e-mail contendo em anexo um bundle\n" " binário do Mercurial será enviado.\n" "\n" @@ -4879,7 +5638,7 @@ " " msgid "specify at least one changeset with -r or -o" -msgstr "especifique ao menos um changeset com -r ou -o" +msgstr "especifique ao menos uma revisão com -r ou -o" msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" msgstr "modo é sempre --outgoing com --bundle; não especifique --outgoing novamente" @@ -4956,7 +5715,7 @@ msgstr "identificador de mensagem para a qual responder" msgid "flags to add in subject prefixes" -msgstr "" +msgstr "indicador adicionado no prefixo de assunto" msgid "email addresses of recipients" msgstr "endereços de e-mail dos destinatários" @@ -4980,7 +5739,7 @@ msgstr "executa mesmo se o repositório não for relacionado (com -b/--bundle)" msgid "a base changeset to specify instead of a destination (with -b/--bundle)" -msgstr "um changeset base especificado ao invés de um destino (com -b/--bundle)" +msgstr "uma revisão base especificada ao invés de um destino (com -b/--bundle)" msgid "send an introduction email for a single patch" msgstr "manda um e-mail introdutório para um patch único" @@ -5088,15 +5847,12 @@ msgstr "" "comando para mover conjuntos de revisões para um ancestral diferente\n" "\n" -"Esta extensão lhe permite rebasear changesets em um repositório\n" +"Esta extensão lhe permite rebasear revisões em um repositório\n" "existente do Mercurial.\n" "\n" "Para mais informações:\n" "http://mercurial.selenic.com/wiki/RebaseExtension\n" -msgid "first revision, do not change ancestor\n" -msgstr "primeira revisão, não mude o ancestral\n" - msgid "" "move changeset (and descendants) to a different branch\n" "\n" @@ -5108,9 +5864,9 @@ " continued with --continue/-c or aborted with --abort/-a.\n" " " msgstr "" -"move o changeset (e descendentes) para um ramo diferente\n" -"\n" -" Rebase usa mesclagens repetidamente para migrar changesets de uma\n" +"move a revisão (e descendentes) para um ramo diferente\n" +"\n" +" Rebase usa mesclagens repetidamente para migrar revisões de uma\n" " parte do histórico para outra. Isto pode ser útil para linearizar\n" " mudanças locais relativas a uma árvore mestra de desenvolvimento.\n" "\n" @@ -5141,7 +5897,7 @@ msgstr "mesclagem de rebaseamento completada\n" msgid "warning: new changesets detected on source branch, not stripping\n" -msgstr "aviso: novos changesets detectados no ramo de origem, strip não realizado\n" +msgstr "aviso: novas revisões detectadas no ramo de origem, strip não realizado\n" msgid "rebase completed\n" msgstr "rebaseamento completado\n" @@ -5150,67 +5906,24 @@ msgid "%d revisions have been skipped\n" msgstr "%d revisões foram omitidas\n" -msgid " set parents\n" -msgstr " define pais\n" - -#, python-format -msgid "rebasing %d:%s\n" -msgstr "rebaseando %d:%s\n" - -#, python-format -msgid " future parents are %d and %d\n" -msgstr " futuros pais são %d e %d\n" - -#, python-format -msgid " update to %d:%s\n" -msgstr " atualização para %d:%s\n" - -msgid " already in target\n" -msgstr " já no alvo\n" - -#, python-format -msgid " merge against %d:%s\n" -msgstr " mesclando com %d:%s\n" - msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "" "corrija conflitos não resolvidos com hg resolve e então execute hg rebase --" "continue" -msgid "resuming interrupted rebase\n" -msgstr "retomando rebaseamento interrompido\n" - #, python-format msgid "no changes, revision %d skipped\n" msgstr "nenhuma mudança, revisão %d omitida\n" #, python-format -msgid "next revision set to %s\n" -msgstr "próxima revisão definida como %s\n" - -#, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "não se pode usar a revisão %d como base, o resultado teria 3 pais" -#, python-format -msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "revisão %d é um patch mq (%s), finalize-o.\n" - -#, python-format -msgid "import mq patch %d (%s)\n" -msgstr "importa patch mq %d (%s)\n" - -msgid "rebase status stored\n" -msgstr "estado de rebaseamento armazenado\n" - -msgid "rebase status resumed\n" -msgstr "estado de rebaseamento retomado\n" - msgid "no rebase in progress" msgstr "nenhum rebaseamento em progresso" msgid "warning: new changesets detected on target branch, not stripping\n" -msgstr "aviso: novos changesets detectados no ramo alvo, strip não realizado\n" +msgstr "aviso: novas revisões detectadas no ramo alvo, strip não realizado\n" msgid "rebase aborted\n" msgstr "rebaseamento abortado\n" @@ -5218,28 +5931,15 @@ msgid "cannot rebase onto an applied mq patch" msgstr "não se pode rebasear para um patch mq aplicado" -msgid "cannot rebase an ancestor" -msgstr "não se pode rebasear um ancestral" - -msgid "cannot rebase a descendant" -msgstr "não se pode rebasear um descendente" - -msgid "already working on current\n" -msgstr "já trabalhando no atual\n" - -msgid "already working on the current branch\n" -msgstr "já trabalhando no ramo atual\n" - -#, python-format -msgid "rebase onto %d starting from %d\n" -msgstr "rebaseamento para %d iniciando de %d\n" +msgid "source is ancestor of destination" +msgstr "origem é ancestral do destino" + +msgid "source is descendant of destination" +msgstr "origem é descendente do destino" msgid "unable to collapse, there is more than one external parent" msgstr "incapaz de colapsar, há mais de um pai externo" -msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "--update e --rebase não são compatíveis, opção --update ignorada\n" - msgid "rebase working directory to branch head" msgstr "rebaseia o diretório de trabalho para a cabeça do ramo" @@ -5252,14 +5952,14 @@ msgid "rebase onto a given revision" msgstr "rebaseia para a revisão dada" -msgid "collapse the rebased revisions" +msgid "collapse the rebased changesets" msgstr "colapsa as revisões rebaseadas" -msgid "keep original revisions" +msgid "keep original changesets" msgstr "mantém revisões originais" -msgid "keep original branches" -msgstr "mantém ramos originais" +msgid "keep original branch names" +msgstr "mantém nomes de ramos originais" msgid "continue an interrupted rebase" msgstr "continua um rebaseamento interrompido" @@ -5397,20 +6097,9 @@ msgid "no changes to record\n" msgstr "nenhuma mudança a ser gravada\n" -#, python-format -msgid "backup %r as %r\n" -msgstr "fazendo uma cópia de segurança de %r em %r\n" - -msgid "applying patch\n" -msgstr "aplicando patch\n" - msgid "patch failed to apply" msgstr "aplicação do patch falhou" -#, python-format -msgid "restoring %r to %r\n" -msgstr "restaurando %r a %r\n" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPÇÃO]... [ARQUIVO]..." @@ -5453,12 +6142,12 @@ "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" "map from a changeset hash to its hash in the source repository.\n" msgstr "" -"comando para transplantar changesets de um outro ramo\n" +"comando para transplantar revisões de um outro ramo\n" "\n" "Esta extensão lhe permite transplantar patches de outro ramo.\n" "\n" "Patches transplantados são gravados em .hg/transplant/transplants,\n" -"como um mapeamento de um hash de changeset para seu hash no\n" +"como um mapeamento de um hash de revisão para seu hash no\n" "repositório de origem.\n" #, python-format @@ -5467,7 +6156,7 @@ #, python-format msgid "skipping merge changeset %s:%s\n" -msgstr "omitindo changeset de mesclagem %s:%s\n" +msgstr "omitindo revisão de mesclagem %s:%s\n" #, python-format msgid "%s merged at %s\n" @@ -5489,7 +6178,7 @@ #, python-format msgid "%s: empty changeset" -msgstr "%s: changeset vazio" +msgstr "%s: revisão vazia" msgid "Fix up the merge and run hg transplant --continue" msgstr "Conserte a mesclagem e execute hg transplant --continue" @@ -5509,7 +6198,7 @@ msgstr "falha ao consolidar" msgid "apply changeset? [ynmpcq?]:" -msgstr "aplicar changeset? [ynmpcq?]:" +msgstr "aplicar revisão? [ynmpcq?]:" msgid "" "transplant changesets from another branch\n" @@ -5548,10 +6237,10 @@ " --continue/-c.\n" " " msgstr "" -"transplanta changesets de outro ramo\n" -"\n" -" Os changesets selecionados serão aplicados sobre o diretório de\n" -" trabalho atual com o log do changeset original. Se --log for\n" +"transplanta revisões de outro ramo\n" +"\n" +" As revisões selecionadas serão aplicadas sobre o diretório de\n" +" trabalho atual com a descrição da revisão original. Se --log for\n" " especificado, mensagens de log terão anexado um comentário da\n" " forma::\n" "\n" @@ -5561,27 +6250,27 @@ " --filter . Seu argumento será chamado com a mensagem atual de\n" " changelog em $1 e o patch em $2.\n" "\n" -" Se --source/-s for especificado, seleciona changesets do\n" +" Se --source/-s for especificado, seleciona revisões do\n" " repositório pedido. Se --branch/-b for especificado, seleciona\n" -" changesets do ramo que contém a revisão especificada, até essa\n" -" revisão. Se --all/-a for especificado, todos os changesets do\n" -" ramo serão transplantados, de outro modo os changesets a serem\n" -" transplantados serão pedidos interativamente.\n" +" revisões do ramo que contém a revisão especificada, até essa\n" +" revisão. Se --all/-a for especificado, todas as revisões do\n" +" ramo serão transplantadas, de outro modo as revisões a serem\n" +" transplantadas serão pedidas interativamente.\n" "\n" " hg transplant --branch REVISÃO --all irá reposicionar o ramo\n" " selecionado (até a revisão pedida) no seu diretório de trabalho\n" " atual.\n" "\n" -" Você pode opcionalmente marcar os changesets selecionados para\n" -" transplante como changesets de mesclagem. Os ancestrais de um\n" +" Você pode opcionalmente marcar as revisões selecionadas para\n" +" transplante como revisões de mesclagem. Os ancestrais de um\n" " transplante de mesclagem não serão pedidos interativamente, e\n" " você pode mesclar descendentes dele normalmente ao invés de\n" " transplantá-los.\n" "\n" " Se mesclagens ou revisões não forem fornecidas, hg transplant\n" -" irá iniciar um visualizador interativo de changesets.\n" -"\n" -" Se a aplicação de um changeset falhar, você pode corrigir\n" +" irá iniciar um visualizador interativo de revisões.\n" +"\n" +" Se a aplicação de uma revisão falhar, você pode corrigir\n" " a mesclagem manualmente e em seguida usar hg transplant\n" " -c/--continue para retomar o transplante.\n" " " @@ -5614,7 +6303,7 @@ msgstr "traz patches do ramo RAMO" msgid "pull all changesets up to BRANCH" -msgstr "traz todos os changesets até RAMO" +msgstr "traz todas as revisões até RAMO" msgid "skip over REV" msgstr "omite revisão REV" @@ -5629,7 +6318,7 @@ msgstr "continua a última sessão de transplante após reparos" msgid "filter changesets through FILTER" -msgstr "filtra changesets através de FILTRO" +msgstr "filtra revisões através de FILTRO" msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "hg transplant [-s REPOSITÓRIO] [-b RAMO [-a]] [-p REV] [-m REV] [REV]..." @@ -5706,10 +6395,6 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "[win32mbcs] não se pode ativar nesta plataforma.\n" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "[win32mbcs] ativado com codificação: %s\n" - msgid "" "perform automatic newline conversion\n" "\n" @@ -5997,7 +6682,7 @@ #, python-format msgid "changeset: %d:%s\n" -msgstr "changeset: %d:%s\n" +msgstr "revisão: %d:%s\n" #, python-format msgid "branch: %s\n" @@ -6201,7 +6886,7 @@ " nor desirable.\n" " " msgstr "" -"mostra informação de changeset por linha para cada arquivo\n" +"mostra informação de revisão por linha para cada arquivo\n" "\n" " Lista as mudanças em arquivos, mostrando o identificador de\n" " revisão responsável por cada linha\n" @@ -6301,17 +6986,17 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"anula o efeito de um changeset anterior\n" -"\n" -" Consolida a anulação das mudanças como um novo changeset. O novo\n" -" changeset é um filho do changeset anulado.\n" -"\n" -" Se você anular um changeset diferente da tip, uma nova cabeça é\n" -" criada. Esta cabeça será a nova tip e você deve mesclar esse\n" -" changeset de anulação com outra cabeça.\n" +"anula o efeito de uma revisão anterior\n" +"\n" +" Consolida a anulação das mudanças como uma nova revisão. Essa nova\n" +" revisão é uma filha da revisão anulada.\n" +"\n" +" Se você anular uma revisão diferente da tip, uma nova cabeça é\n" +" criada. Esta cabeça será a nova tip e você deve mesclar essa\n" +" revisão de anulação com outra cabeça.\n" "\n" " A opção --merge lembra do pai do diretório de trabalho antes do\n" -" início da anulação, e mescla a nova cabeça com esse changeset\n" +" início da anulação, e mescla a nova cabeça com essa revisão\n" " logo em seguida. Isso poupa o trabalho de fazer uma mesclagem\n" " manual. O resultado da mesclagem não é gravado, assim como em uma\n" " mesclagem normal.\n" @@ -6333,25 +7018,25 @@ msgstr "não se pode anular uma mudança sem pais" msgid "cannot backout a merge changeset without --parent" -msgstr "não se pode anular um changeset de mesclagem sem --parent" +msgstr "não se pode anular uma revisão de mesclagem sem --parent" #, python-format msgid "%s is not a parent of %s" msgstr "%s não é um pai de %s" msgid "cannot use --parent on non-merge changeset" -msgstr "não se pode usar --parent num changeset que não seja uma mesclagem" +msgstr "não se pode usar --parent numa revisão que não seja uma mesclagem" #, python-format msgid "changeset %s backs out changeset %s\n" -msgstr "o changeset %s anula o changeset %s\n" +msgstr "a revisão %s anula a revisão %s\n" #, python-format msgid "merging with changeset %s\n" -msgstr "mesclando com changeset %s\n" +msgstr "mesclando com revisão %s\n" msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "o changeset de anulação é uma nova cabeça - não esqueça de mesclar\n" +msgstr "a revisão de anulação é uma nova cabeça - não esqueça de mesclar\n" msgid "(use \"backout --merge\" if you want to auto-merge)\n" msgstr "(use \"backout --merge\" se você quiser mesclar automaticamente)\n" @@ -6378,17 +7063,17 @@ " non-zero exit status means the revision is bad.\n" " " msgstr "" -"busca changesets por subdivisão\n" -"\n" -" Este comando ajuda a encontrar changesets que introduziram\n" -" problemas. Para usá-lo, marque como ruim o changeset mais antigo\n" -" que apresentar o problema, e como bom o mais recente que não\n" +"busca revisões por subdivisão\n" +"\n" +" Este comando ajuda a encontrar revisões que introduziram\n" +" problemas. Para usá-lo, marque como ruim a revisão mais antiga\n" +" que apresentar o problema, e como boa a mais recente que não\n" " apresentar o problema. O comando bisect irá atualizar seu\n" " diretório de trabalho para uma revisão a ser testada (a não ser\n" " que a opção -U/--noupdate seja especificada). Uma vez que você\n" " tenha realizado os testes, marque o diretório de trabalho como\n" -" ruim ou bom e bisect irá ou atualizar para outro changeset\n" -" candidato ou informar que encontrou a revisão ruim.\n" +" ruim ou bom e bisect irá ou atualizar para outra revisão\n" +" candidata ou informar que encontrou a revisão ruim.\n" "\n" " Como um atalho, você pode também usar o parâmetro de revisão para\n" " marcar uma revisão como boa ou ruim sem obtê-la primeiro.\n" @@ -6430,10 +7115,6 @@ msgstr "argumentos incompatíveis" #, python-format -msgid "cannot find executable: %s" -msgstr "não foi possível encontrar executável: %s" - -#, python-format msgid "failed to execute %s" msgstr "falhou ao executar %s" @@ -6443,11 +7124,11 @@ #, python-format msgid "Changeset %d:%s: %s\n" -msgstr "Changeset %d:%s: %s\n" +msgstr "Revisão %d:%s: %s\n" #, python-format msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" -msgstr "Testando o changeset %d:%s (%d changesets restando, ~%d testes)\n" +msgstr "Testando a revisão %d:%s (%d revisões restando, ~%d testes)\n" msgid "" "set or show the current branch name\n" @@ -6549,14 +7230,14 @@ " permissions, copy/rename information, and revision history.\n" " " msgstr "" -"cria um arquivo de changegroup (coleção de changesets)\n" -"\n" -" Gera um arquivo de changegroup contendo changesets não\n" -" encontrados no outro repositório.\n" +"cria um arquivo de changegroup (coleção de revisões)\n" +"\n" +" Gera um arquivo de changegroup contendo revisões não\n" +" encontradas no outro repositório.\n" "\n" " Se um repositório de destino não for especificado, assume que o\n" " destino tem todos os nós especificados por um ou mais parâmetros\n" -" --base. Para criar um bundle contendo todos os changesets, use\n" +" --base. Para criar um bundle contendo todas as revisões, use\n" " -a/--all (ou --base null).\n" "\n" " Você pode mudar o método de compressão aplicado com a opção\n" @@ -6570,7 +7251,7 @@ " push e pull não estiver disponível ou se exportar um repositório\n" " completo não for desejável.\n" "\n" -" A aplicação de um bundle preserva todo o conteúdo dos changesets,\n" +" A aplicação de um bundle preserva todo o conteúdo das revisões,\n" " incluindo permissões, informação de cópia/renomeação, e histórico\n" " de revisões.\n" " " @@ -6758,7 +7439,7 @@ #, python-format msgid "committed changeset %d:%s\n" -msgstr "consolidado o changeset %d:%s\n" +msgstr "consolidada a revisão %d:%s\n" msgid "" "mark files as copied for the next commit\n" @@ -7073,16 +7754,16 @@ " second parent. It can be useful to review a merge.\n" " " msgstr "" -"exibe o cabeçalho e diffs para um ou mais changesets\n" -"\n" -" Imprime o cabeçalho de changeset e diffs para uma ou mais\n" +"exibe o cabeçalho e diffs para uma ou mais revisões\n" +"\n" +" Imprime o cabeçalho de revisão e diffs para uma ou mais\n" " revisões.\n" "\n" -" A informação exibida no cabeçalho de changeset é: autor, hash do\n" -" changeset, pai(s) e comentário de consolidação.\n" -"\n" -" NOTA: export pode gerar saída de diff inesperada para changesets\n" -" de mesclagem, já que irá comparar o changeset de mesclagem apenas\n" +" A informação exibida no cabeçalho de revisão é: autor, hash da\n" +" revisão, pai(s) e comentário de consolidação.\n" +"\n" +" NOTA: export pode gerar saída de diff inesperada para revisões\n" +" de mesclagem, já que irá comparar a revisão de mesclagem apenas\n" " com seu primeiro pai.\n" "\n" " A saída pode ser gerada em um arquivo, e nesse caso o nome do\n" @@ -7090,13 +7771,13 @@ " formatação são como segue::\n" "\n" " %% caractere \"%\" literal\n" -" %H hash do changeset (40 bytes hexadecimais)\n" +" %H hash da revisão (40 bytes hexadecimais)\n" " %N número de patches gerados\n" -" %R número de revisão do changeset\n" +" %R número de ordem da revisão\n" " %b nome base do repositório onde o export é realizado\n" -" %h hash de forma curta do changeset (12 bytes hexadecimais)\n" +" %h hash de forma curta da revisão (12 bytes hexadecimais)\n" " %n número seqüencial completado com zeros, começando em 1\n" -" %r número de revisão do changeset completado com zeros\n" +" %r número de ordem da revisão completado com zeros\n" "\n" " Sem a opção -a/--text, export evitará gerar diffs de arquivos\n" " detectados como binários. Com -a, export gerará um diff de\n" @@ -7110,7 +7791,7 @@ " " msgid "export requires at least one changeset" -msgstr "export exige ao menos um changeset" +msgstr "export exige ao menos uma revisão" msgid "exporting patches:\n" msgstr "exportando patches:\n" @@ -7218,8 +7899,8 @@ "\n" " Sem argumentos, mostra todas as cabeças do repositório.\n" "\n" -" \"Cabeças\" do repositório são revisões que não têm nenhuma\n" -" revisão filha. Elas são onde o desenvolvimento geralmente\n" +" \"Cabeças\" do repositório são revisões que não têm revisões\n" +" filhas. Elas são onde o desenvolvimento geralmente\n" " acontece e são os alvos costumeiros para operações update e\n" " merge.\n" "\n" @@ -7338,6 +8019,9 @@ "comandos básicos:\n" "\n" +msgid "DEPRECATED" +msgstr "OBSOLETO" + msgid "" "\n" "additional help topics:\n" @@ -7380,7 +8064,8 @@ msgid "" "import an ordered set of patches\n" "\n" -" Import a list of patches and commit them individually.\n" +" Import a list of patches and commit them individually (unless\n" +" --no-commit is specified).\n" "\n" " If there are outstanding changes in the working directory, import\n" " will abort unless given the -f/--force flag.\n" @@ -7413,7 +8098,8 @@ msgstr "" "importa um conjunto ordenado de patches\n" "\n" -" Importa uma lista de patches e consolida cada um individualmente.\n" +" Importa uma lista de patches e consolida cada um individualmente\n" +" (se --no-commit não for especificado).\n" "\n" " Se houver mudanças não gravadas no diretório de trabalho, import\n" " irá abortar, a não ser que a opção -f/--force seja passada.\n" @@ -7433,7 +8119,7 @@ "\n" " Se --exact for especificado, import irá posicionar o diretório de\n" " trabalho no pai de cada patch antes de aplicá-lo, e irá abortar\n" -" se o changeset resultante tiver um ID diferente do gravado no\n" +" se a revisão resultante tiver um ID diferente do gravado no\n" " patch. Isso pode acontecer por problemas de conjunto de\n" " caracteres ou outras deficiências no formato de texto de patch.\n" "\n" @@ -7452,14 +8138,6 @@ msgid "no diffs found" msgstr "nenhum diff encontrado" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" -"mensagem:\n" -"%s\n" - msgid "not a Mercurial patch" msgstr "não é um patch do Mercurial" @@ -7479,14 +8157,14 @@ " See pull for valid source format details.\n" " " msgstr "" -"mostra novos changesets encontrados na origem\n" -"\n" -" Mostra novos changesets encontrados no caminho/URL especificado\n" -" ou na localização de pull padrão. Estes são os changesets que\n" -" seriam trazidos se um pull fosse executado.\n" -"\n" -" Para repositórios remotos, a opção --bundle evita baixar os\n" -" changesets duas vezes se o comando incoming for seguido por um\n" +"mostra novas revisões encontradas na origem\n" +"\n" +" Mostra novas revisões encontradas no caminho/URL especificado\n" +" ou na localização de pull padrão. Estas são as revisões que\n" +" seriam trazidas se um pull fosse executado.\n" +"\n" +" Para repositórios remotos, a opção --bundle evita baixar as\n" +" revisões duas vezes se o comando incoming for seguido por um\n" " pull.\n" "\n" " Veja pull para detalhes sobre formatos válidos da origem.\n" @@ -7602,14 +8280,14 @@ " Veja 'hg help dates' para uma lista de formatos válidos para\n" " -d/--date.\n" "\n" -" Por padrão este comando mostra o número e identificador do\n" -" changeset, etiquetas, pais não triviais, usuário, data e hora,\n" +" Por padrão este comando mostra o número e identificador da\n" +" revisão, etiquetas, pais não triviais, usuário, data e hora,\n" " e um resumo de cada consolidação. Se a opção -v/--verbose for\n" " usada, são mostradas a lista de arquivos modificados e a\n" " mensagem de consolidação completa.\n" "\n" " NOTA: log -p/--patch pode gerar saídas de diff inesperadas para\n" -" mesclagens, pois irá comparar o changeset de mesclagem apenas\n" +" mesclagens, pois irá comparar a revisão de mesclagem apenas\n" " com seu primeiro pai. Além disso, apenas arquivos diferentes de\n" " AMBOS os pais aparecerão na lista de arquivos.\n" "\n" @@ -7706,11 +8384,11 @@ " See pull for valid destination format details.\n" " " msgstr "" -"mostra changesets não encontrados no destino\n" -"\n" -" Mostra changesets não encontrados no repositório de destino\n" -" especificado ou na localização padrão de push. Estes são os\n" -" changesets que seriam enviados se um push fosse pedido.\n" +"mostra revisões não encontradas no destino\n" +"\n" +" Mostra revisões não encontrados no repositório de destino\n" +" especificado ou na localização padrão de push. Estas são as\n" +" revisões que seriam enviadas se um push fosse pedido.\n" "\n" " Veja pull para detalhes do formato do destino.\n" " " @@ -7808,8 +8486,8 @@ "\n" " Use hg incoming se você quiser ver o que seria adicionado pelo\n" " comando pull. Se você então decidir adicionar tais mudanças ao\n" -" repositório, você deve usar 'pull -r X', onde X é o último\n" -" changeset listado por hg incoming.\n" +" repositório, você deve usar 'pull -r X', onde X é a última\n" +" revisão listada por hg incoming.\n" "\n" " Se ORIGEM for omitida, o caminho 'default' será usado. Veja\n" " 'hg help urls' para mais informações.\n" @@ -7986,7 +8664,7 @@ msgid "" "retry file merges from a merge or update\n" "\n" -" This command will cleanly retry unresolved file merges using file\n" +" This command can cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" " resolve all unresolved files, use the -a/--all switch.\n" "\n" @@ -8006,7 +8684,7 @@ msgstr "" "tenta mesclar novamente arquivos em uma mesclagem ou atualização\n" "\n" -" Este comando irá de forma limpa tentar mesclar novamente arquivos\n" +" Este comando pode de forma limpa tentar mesclar novamente arquivos\n" " não resolvidos usando revisões de arquivo preservadas do último\n" " update ou merge. Para tentar resolver todos os arquivos não\n" " resolvidos, use a opção -a/--all.\n" @@ -8177,7 +8855,7 @@ " o diretório de trabalho.\n" "\n" " Transações são usadas para encapsular os efeitos de todos os comandos\n" -" que criam novos changesets ou propagam changesets existentes para o\n" +" que criam novas revisões ou propagam revisões existentes para o\n" " repositório. Por exemplo, os seguintes comandos são transacionais,\n" " e seus efeitos podem ser revertidos com rollback::\n" "\n" @@ -8300,6 +8978,109 @@ " " 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 "" +"sumariza o estado do diretório de trabalho\n" +"\n" +" Isto gera um breve sumário do estado do diretório de trabalho,\n" +" incluindo pais, ramo, status de consolidação e atualizações\n" +" disponíveis.\n" +"\n" +" Com a opção --remote, isto verificará no caminho default mudanças ainda\n" +" não sincronizadas. Isto pode levar algum tempo.\n" +" " + +msgid " (empty repository)" +msgstr " (repositório vazio)" + +msgid " (no revision checked out)" +msgstr " (nenhuma revisão na cópia de trabalho)" + +#, python-format +msgid "parent: %d:%s %s\n" +msgstr "pai: %d:%s %s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "ramo: %s\n" + +#, python-format +msgid "%d added" +msgstr "%d adicionados" + +#, python-format +msgid "%d modified" +msgstr "%d modificados" + +#, python-format +msgid "%d removed" +msgstr "%d removidos" + +#, python-format +msgid "%d deleted" +msgstr "%d apagados" + +#, python-format +msgid "%d ignored" +msgstr "%d ignorados" + +#, python-format +msgid "%d unknown" +msgstr "%d desconhecidos" + +#, python-format +msgid "%d unresolved" +msgstr "%d não resolvidos" + +msgid " (merge)" +msgstr " (mesclagem)" + +msgid " (new branch)" +msgstr " (novo ramo)" + +msgid " (clean)" +msgstr " (limpo)" + +msgid " (new branch head)" +msgstr " (nova cabeça de ramo)" + +#, python-format +msgid "commit: %s\n" +msgstr "consolidação: %s\n" + +msgid "update: (current)\n" +msgstr "atualizações: (atual)\n" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "atualizações: %d novas revisões (update)\n" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "atualizações: %d novas revisões, %d cabeças de ramo (merge)\n" + +msgid "1 or more incoming" +msgstr "1 ou mais de entrada" + +#, python-format +msgid "%d outgoing" +msgstr "%d de saída" + +#, python-format +msgid "remote: %s\n" +msgstr "remoto: %s\n" + +msgid "remote: (synced)\n" +msgstr "remoto: (sincronizado)\n" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -8406,8 +9187,8 @@ " Se você acabou de fazer uma consolidação, essa consolidação será\n" " a tip. Se você acabou de trazer revisões de outro repositório, a\n" " tip desse repositório será a tip do atual. A etiqueta \"tip\" é\n" -" especial e não pode ser renomeada ou atribuída a outro\n" -" changeset.\n" +" especial e não pode ser renomeada ou atribuída a outra\n" +" revisão.\n" " " msgid "" @@ -8532,8 +9313,8 @@ "há garantias, nem mesmo de adequação para qualquer propósito em\n" "particular.\n" -msgid "repository root directory or symbolic path name" -msgstr "diretório raiz do repositório ou nome de caminho simbólico" +msgid "repository root directory or name of overlay bundle file" +msgstr "diretório raiz do repositório ou nome de arquivo de bundle para sobreposição" msgid "change working directory" msgstr "muda o diretório de trabalho" @@ -8634,6 +9415,9 @@ msgid "number of lines of context to show" msgstr "número de linhas de contexto a serem mostradas" +msgid "output diffstat-style summary of changes" +msgstr "imprime sumário de mudanças no estilo diffstat" + msgid "guess renamed files by similarity (0<=s<=100)" msgstr "infere arquivos renomeados por similaridade (0<=s<=100)" @@ -8656,7 +9440,7 @@ msgstr "lista o número de revisão (padrão)" msgid "list the changeset" -msgstr "lista o changeset" +msgstr "lista a revisão" msgid "show line number at the first appearance" msgstr "exibe números de linha na primeira ocorrência" @@ -8695,16 +9479,16 @@ msgstr "reinicia estado do bisect" msgid "mark changeset good" -msgstr "marca changeset bom" +msgstr "marca revisão boa" msgid "mark changeset bad" -msgstr "marca changeset ruim" +msgstr "marca revisão ruim" msgid "skip testing changeset" -msgstr "descartando changeset de teste" +msgstr "descartando revisão de teste" msgid "use command to check changeset state" -msgstr "usa o comando para verificar o estado do changeset" +msgstr "usa o comando para verificar o estado da revisão" msgid "do not update to target" msgstr "não atualiza para o alvo" @@ -8734,13 +9518,13 @@ msgstr "execute mesmo se o repositório remoto não for relacionado" msgid "a changeset up to which you would like to bundle" -msgstr "um changeset até o qual você gostaria de armazenar no bundle" +msgstr "uma revisão até a qual você gostaria de armazenar no bundle" msgid "a base changeset to specify instead of a destination" -msgstr "um changeset base a ser especificado ao invés de um destino" +msgstr "uma revisão base a ser especificada ao invés de um destino" msgid "bundle all changesets in the repository" -msgstr "cria um bundle com todos os changesets no repositório" +msgstr "cria um bundle com todas as revisões no repositório" msgid "bundle compression type to use" msgstr "tipo de compressão de bundle a ser usada" @@ -8764,7 +9548,7 @@ msgstr "o clone irá conter apenas um repositório (sem cópia de trabalho)" msgid "a changeset you would like to have after cloning" -msgstr "um changeset que você gostaria de ter após a clonagem" +msgstr "uma revisão que você gostaria de ter após a clonagem" msgid "[OPTION]... SOURCE [DEST]" msgstr "[OPÇÃO]... ORIGEM [DEST]" @@ -8854,8 +9638,8 @@ msgid "follow changeset history, or file history across copies and renames" msgstr "" -"acompanha histórico de changeset, ou histórico de arquivo através de cópias " -"e renomeações" +"acompanha histórico de revisões, ou histórico de arquivo através de cópias e " +"renomeações" msgid "ignore case when matching" msgstr "ignora maiúsculas/minúsculas ao casar" @@ -8936,8 +9720,8 @@ msgid "file to store the bundles into" msgstr "arquivo no qual armazenar os bundles" -msgid "a specific revision up to which you would like to pull" -msgstr "uma revisão específica até a qual você gostaria de trazer" +msgid "a specific remote revision up to which you would like to pull" +msgstr "uma revisão remota específica até a qual você gostaria de trazer" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle ARQUIVO] [ORIGEM]" @@ -8958,7 +9742,7 @@ msgstr "[OPÇÃO]... [PADRÃO]..." msgid "only follow the first parent of merge changesets" -msgstr "acompanha apenas o primeiro pai de changesets de mesclagem" +msgstr "acompanha apenas o primeiro pai de revisões de mesclagem" msgid "show revisions matching date spec" msgstr "mostra revisões que casem com a especificação de data" @@ -8979,7 +9763,7 @@ msgstr "revisões de autoria do usuário" msgid "show only changesets within the given named branch" -msgstr "mostra apenas changesets dentro do ramo nomeado especificado" +msgstr "mostra apenas revisões dentro do ramo nomeado especificado" msgid "do not display revision or any of its ancestors" msgstr "não exibe revisão ou qualquer de seus ancestrais" @@ -9021,7 +9805,7 @@ msgstr "[NOME]" msgid "update to new tip if changesets were pulled" -msgstr "atualiza para nova tip se changesets forem trazidos" +msgstr "atualiza para nova tip se revisões forem trazidas" msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [ORIGEM]" @@ -9056,6 +9840,9 @@ msgid "unmark files as resolved" msgstr "desmarca arquivos como solucionados" +msgid "hide status prefix" +msgstr "esconde prefixo de status" + msgid "revert all changes when no arguments given" msgstr "se parâmetros não forem fornecidos, reverte todas as mudanças" @@ -9115,6 +9902,9 @@ msgid "[-u] [NAME]..." msgstr "[-u] [NOME]..." +msgid "check for push and pull" +msgstr "verifica push e pull" + msgid "show status of all files" msgstr "mostra status de todos os arquivos" @@ -9139,9 +9929,6 @@ msgid "show only ignored files" msgstr "mostra apenas arquivos ignorados" -msgid "hide status prefix" -msgstr "esconde prefixo de status" - msgid "show source of copied files" msgstr "mostra a origem de arquivos copiados" @@ -9167,7 +9954,7 @@ msgstr "[-p]" msgid "update to new tip if changesets were unbundled" -msgstr "atualiza para nova tip se changesets forem extraídos do bundle" +msgstr "atualiza para nova tip se revisões forem extraídas do bundle" msgid "[-u] FILE..." msgstr "[-u] ARQUIVO..." @@ -9191,40 +9978,6 @@ msgid "branch name not in UTF-8!" msgstr "nome do ramo não está em UTF-8!" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr " procurando por cópias para trás até a revisão %d\n" - -#, python-format -msgid "" -" unmatched files in local:\n" -" %s\n" -msgstr "" -" arquivo não encontrado localmente:\n" -" %s\n" - -#, python-format -msgid "" -" unmatched files in other:\n" -" %s\n" -msgstr "" -" arquivos não encontrados no outro:\n" -" %s\n" - -msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr " todas as cópias encontradas (* = para mesclar, ! = divergente):\n" - -msgid " checking for directory renames\n" -msgstr " procurando por diretórios renomeados\n" - -#, python-format -msgid " dir %s -> %s\n" -msgstr " dir %s -> %s\n" - -#, python-format -msgid " file %s -> %s\n" -msgstr " arquivo %s -> %s\n" - msgid "working directory state appears damaged!" msgstr "estado do diretório de trabalho parece danificado!" @@ -9271,6 +10024,10 @@ msgstr "abortado: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" @@ -9279,10 +10036,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 "tempo limite excedido esperando por trava de %s" @@ -9380,10 +10133,6 @@ msgstr "apelido '%s' indica comando ambíguo '%s'\n" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "apelido '%s' oculta o comando\n" - -#, python-format msgid "malformed --config option: %s" msgstr "opção --config mal formada: %s" @@ -9451,10 +10200,6 @@ msgstr "a ferramenta %s requer uma interface gráfica (GUI)\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "escolhida ferramenta '%s' para %s (binário %s link simbólico %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -9477,13 +10222,6 @@ msgstr "mesclando %s\n" #, python-format -msgid "my %s other %s ancestor %s\n" -msgstr "meu %s outro %s ancestral %s\n" - -msgid " premerge successful\n" -msgstr " prémesclagem com sucesso\n" - -#, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" @@ -9509,1004 +10247,33 @@ msgid "unknown bisect kind %s" msgstr "tipo desconhecido de bisect %s" -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 "" -"\n" -" O Mercurial possui um mecanismo para adicionar novas\n" -" funcionalidades através do uso de extensões. Extensões podem\n" -" adicionar novos comandos, adicionar novas opções a comandos\n" -" existentes ou implementar ganchos.\n" -"\n" -" Extensões não são carregadas por padrão por diversas razões:\n" -" elas podem aumentar o tempo de início ou execução; podem ser\n" -" destinadas apenas a uso avançado; podem fornecer funcionalidade\n" -" potencialmente perigosa (por exemplo, modificar ou destruir o\n" -" histórico); podem ainda não estar prontas para uso geral; ou\n" -" podem alterar o comportamento padrão do Mercurial. Cabe ao\n" -" usuário ativar extensões como desejar.\n" -"\n" -" Para habilitar a extensão \"foo\", tanto se for distribuída com\n" -" o Mercurial como estiver no caminho de busca do Python, crie uma\n" -" entrada para ela em seu hgrc, da seguinte forma::\n" -"\n" -" [extensions]\n" -" foo =\n" -"\n" -" Você também pode especificar o caminho completo para uma\n" -" extensão::\n" -"\n" -" [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" -" Para desabilitar explicitamente uma extensão habilitada em um\n" -" hgrc de escopo mais amplo, prefixe seu caminho com !::\n" -"\n" -" [extensions]\n" -" # desabilita a extensão bar localizada em\n" -" # /caminho/para/extensao/bar.py\n" -" hgext.bar = !/caminho/para/extensao/bar.py\n" -" # o mesmo, se um caminho não foi fornecido para a\n" -" # extensão baz\n" -" hgext.baz = !\n" -" " - msgid "disabled extensions:" msgstr "extensões desabilitadas:" msgid "Date Formats" msgstr "Formatos de datas" -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" -" Alguns comandos permitem ao usuário especificar uma data, como:\n" -"\n" -" - backout, commit, import, tag: Especificar a data de consolidação.\n" -" - log, revert, update: Selecionar revisões por data.\n" -"\n" -" Muitos formatos de data são válidos. Eis alguns exemplos::\n" -"\n" -" \"Wed Dec 6 13:18:29 2006\" (assumido fuso horário local)\n" -" \"Dec 6 13:18 -0600\" (ano atual, defasagem de horário local\n" -" fornecida)\n" -" \"Dec 6 13:18 UTC\" (UTC e GMT são apelidos para +0000)\n" -" \"Dec 6\" (meia noite)\n" -" \"13:18\" (data corrente assumida)\n" -" \"3:39\" (hora assumida 3:39AM)\n" -" \"3:39pm\" (15:39)\n" -" \"2006-12-06 13:18:29\" (formato ISO 8601)\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" -" E por fim, há um formato interno do Mercurial::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" -" Este é o formato interno de representação de datas. unixtime é\n" -" o número de segundos desde a epoch (1970-01-01 00:00 UTC). offset\n" -" é a defasagem do fuso horário local, em segundos a oeste de UTC\n" -" (negativo para fusos horários a leste de UTC).\n" -"\n" -" O comando log também aceita intervalos de data::\n" -"\n" -" \"<{date}\" - na data fornecida, ou anterior\n" -" \">{date}\" - na data fornecida, ou posterior\n" -" \"{date} to {date}\" - um intervalo de data, incluindo os extremos\n" -" \"-{days}\" - dentro de um certo número de dias contados de hoje\n" -" " - msgid "File Name Patterns" msgstr "Padrões de nome de arquivo" -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" -" O Mercurial aceita diversas notações para identificar um ou mais\n" -" arquivos de uma vez.\n" -"\n" -" Por padrão, o Mercurial trata nomes de arquivo como padrões\n" -" estendidos de glob do shell.\n" -"\n" -" Notações alternativas de padrões devem ser especificadas\n" -" explicitamente.\n" -"\n" -" Para usar um nome simples de caminho sem qualquer casamento de\n" -" padrões, comece o nome com \"path:\". Estes nomes de caminho\n" -" devem bater completamente, a partir da raiz do repositório\n" -" atual.\n" -"\n" -" Para usar um glob estendido, comece um nome com \"glob:\". Globs\n" -" têm como raiz o diretório corrente; um glob como \"``*.c``\" baterá\n" -" com arquivos terminados em \".c\" apenas no diretório corrente.\n" -"\n" -" As sintaxes de extensão do glob suportadas são \"``**``\" para bater\n" -" com qualquer string incluindo separadores de caminho, e \"{a,b}\"\n" -" para significar \"a ou b\".\n" -"\n" -" Para usar uma expressão regular Perl/Python, comece um nome com\n" -" \"re:\". O casamento de padrões por expressão regular é feito a\n" -" partir do raiz do repositório.\n" -"\n" -" Exemplos simples::\n" -"\n" -" path:foo/bar o nome bar em um diretório chamado foo no raiz do\n" -" repositório\n" -" path:path:name um arquivo ou diretório chamado \"path:name\"\n" -"\n" -" Exemplos de glob::\n" -"\n" -" glob:*.c qualquer nome terminado por \".c\" no diretório\n" -" atual\n" -" *.c qualquer nome terminado por \".c\" no diretório\n" -" atual\n" -" **.c qualquer nome terminado por \".c\" no diretório\n" -" atual ou em qualquer subdiretório\n" -" foo/*.c qualquer nome terminado por \".c\" no diretório\n" -" foo\n" -" foo/**.c qualquer nome terminado por \".c\" no diretório\n" -" foo ou em qualquer subdiretório\n" -"\n" -" Exemplos de expressão regular::\n" -"\n" -" re:.*\\.c$ qualquer nome terminado por \".c\", em qualquer\n" -" lugar no repositório\n" -"\n" -" " - msgid "Environment Variables" msgstr "Variáveis de ambiente" -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 "" -"\n" -"HG\n" -" Caminho para o executável 'hg', automaticamente passado na\n" -" execução de ganchos, extensões ou ferramentas externas. Se não\n" -" definido ou vazio, um executável chamado 'hg' (com a extensão\n" -" com/exe/bat/cmd no Windows) é procurado.\n" -"\n" -"HGEDITOR\n" -" Este é o nome do editor usado em consolidações. Veja EDITOR.\n" -"\n" -" (obsoleto, use .hgrc)\n" -"\n" -"HGENCODING\n" -" É usado no lugar da configuração padrão de locale detectada\n" -" pelo Mercurial. Essa configuração é usada para converter dados\n" -" como nomes de usuário, descrições de changesets, nomes de\n" -" etiqueta e ramos. Essa configuração pode ser sobreposta com a\n" -" opção --encoding na linha de comando.\n" -"\n" -"HGENCODINGMODE\n" -" Essa configuração ajusta o comportamento do Mercurial no\n" -" tratamento de caracteres desconhecidos, ao codificar entradas do\n" -" usuário. O padrão é \"strict\", o que faz com que o Mercurial\n" -" aborte se ele não puder traduzir um caractere. Outros valores\n" -" incluem \"replace\", que substitui caracteres desconhecidos, e\n" -" \"ignore\", que os descarta. Essa configuração pode ser\n" -" sobreposta com a opção --encodingmode na linha de comando.\n" -"\n" -"HGMERGE\n" -" Um executável a ser usado para solucionar conflitos de mesclagem.\n" -" O programa será executado com três argumentos: arquivo local,\n" -" arquivo remoto, arquivo ancestral.\n" -"\n" -" (obsoleta, use .hgrc)\n" -"\n" -"HGRCPATH\n" -" Uma lista de arquivos ou diretórios onde procurar arquivos hgrc.\n" -" O separador de itens é \":\" em Unix, \";\" no Windows. Se\n" -" HGRCPATH não estiver definido, o caminho de busca padrão da\n" -" plataforma será usado. Se vazio, será lido apenas .hg/hgrc no\n" -" repositório atual.\n" -"\n" -" Para cada elemento em HGRCPATH:\n" -"\n" -" - se for um diretório, todos os arquivos nesse diretório\n" -" terminados por \".rc\" serão adicionados\n" -" - caso contrário, o próprio arquivo será adicionado\n" -"\n" -"HGUSER\n" -" Esta é a string usada para o autor de uma consolidação.\n" -" Se não for definida, valores disponíveis serão considerados na\n" -" seguinte ordem:\n" -"\n" -" - HGUSER (obsoleto)\n" -" - arquivos hgrc no HGRCPATH\n" -" - EMAIL\n" -" - consulta interativa\n" -" - LOGNAME (com '@hostname' anexado)\n" -"\n" -" (obsoleto, use .hgrc)\n" -"\n" -"EMAIL\n" -" Pode ser usado como autor de consolidações; veja HGUSER.\n" -"\n" -"LOGNAME\n" -" Pode ser usado como autor de consolidações; veja HGUSER.\n" -"\n" -"VISUAL\n" -" Este é o nome do editor a ser usado em consolidações. Veja\n" -" EDITOR.\n" -"\n" -"EDITOR\n" -" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n" -" texto para ser modificado por um usuário, por exemplo ao escrever\n" -" mensagens de consolidação. O editor usado é determinado pela\n" -" consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n" -" nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n" -" estiverem vazios, o editor será o 'vi'.\n" -"\n" -"PYTHONPATH\n" -" Isto é usado pelo Python para localizar módulos importados, e\n" -" pode precisar ser ajustado apropriadamente se o Mercurial não\n" -" estiver instalado para o sistema todo.\n" -" " - msgid "Specifying Single Revisions" msgstr "Especificação de revisões únicas" -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" -" O Mercurial aceita diversas notações para identificar revisões\n" -" individuais.\n" -"\n" -" Um simples inteiro é tratado como um número de revisão. Inteiros\n" -" negativos são contados a partir da tip, com -1 denotando a tip,\n" -" -2 denotando a revisão anterior à tip, e assim por diante.\n" -"\n" -" Uma string hexadecimal de 40 dígitos é tratada como um\n" -" identificador único de revisão.\n" -"\n" -" Uma string hexadecimal de menos de 40 caracteres é tratada como\n" -" um identificador único de revisão, chamado de identificador\n" -" curto. Um identificador curto é válido apenas se for o prefixo\n" -" de um identificador completo.\n" -"\n" -" Qualquer outra string é tratada como um nome de etiqueta ou\n" -" ramo. Um nome de etiqueta é um nome simbólico associado a um\n" -" identificador de revisão. Um nome de ramo denota a revisão mais\n" -" recente de tal ramo. Nomes de etiqueta ou de ramo não podem\n" -" conter o caractere \":\".\n" -"\n" -" O nome reservado \"tip\" é uma etiqueta especial que sempre\n" -" identifica a revisão mais recente.\n" -"\n" -" O nome reservado \"null\" indica a revisão nula. Essa é a revisão\n" -" de um repositório vazio, e a revisão pai da revisão 0.\n" -"\n" -" O nome reservado \".\" indica a revisão pai do diretório de\n" -" trabalho. Se nenhum diretório de trabalho estiver selecionado,\n" -" será equivalente a null. Se uma mesclagem estiver em progresso,\n" -" \".\" será a revisão do primeiro pai.\n" -" " - msgid "Specifying Multiple Revisions" msgstr "Especificação de múltiplas revisões" -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" -" Quando o Mercurial aceita mais de uma revisão, elas podem ser\n" -" especificadas individualmente, ou fornecidas como uma seqüência\n" -" topologicamente contínua, separadas pelo caractere \":\".\n" -"\n" -" A sintaxe da notação de seqüência é [INÍCIO]:[FIM], onde INÍCIO\n" -" e FIM são identificadores de revisão. Tanto INÍCIO como FIM são\n" -" opcionais. Se INÍCIO não for especificado, terá como valor padrão\n" -" a revisão número 0. Se FIM não for especificado, terá como valor\n" -" padrão a revisão tip. A seqüência \":\" portanto significa\n" -" \"todas as revisões\".\n" -"\n" -" Se INÍCIO for maior que FIM, as revisões são tratadas na ordem\n" -" inversa.\n" -"\n" -" Uma seqüência age como um intervalo fechado. Isso quer dizer que\n" -" uma seqüência 3:5 nos dá 3, 4 e 5. De forma semelhante, uma\n" -" seqüência 4:2 nos dá 4, 3, e 2.\n" -" " - msgid "Diff Formats" msgstr "Formatos de diff" -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 "" -"\n" -" O formato padrão do Mercurial para exibir mudanças entre duas\n" -" versões de um arquivo é compatível com o formato unified do GNU\n" -" diff, que pode ser usado pelo GNU patch e muitos outros\n" -" utilitários padrão.\n" -"\n" -" Apesar de esse formato padrão ser muitas vezes suficiente, ele\n" -" não codifica as seguintes informações:\n" -"\n" -" - bits de execução e permissão\n" -" - informação de cópia ou renomeação\n" -" - mudanças em arquivos binários\n" -" - criação ou remoção de arquivos vazios\n" -"\n" -" O Mercurial também suporta o formato diff estendido do VCS git\n" -" que trata dessas limitações. O formato git diff não é\n" -" produzido por padrão porque há muito poucas ferramentas que\n" -" entendem esse formato.\n" -"\n" -" Isso quer dizer que ao gerar diffs de um repositório do Mercurial\n" -" (por exemplo, com \"hg export\"), você deve tomar cuidado com por\n" -" exemplo cópias e renomeações de arquivos ou outras coisas\n" -" mencionadas acima, porque essa informação extra é perdida ao\n" -" aplicar um diff padrão em um outro repositório. As operações\n" -" internas do Mercurial (como push e pull) não são afetadas por\n" -" isso, porque usam um formato binário interno para comunicar\n" -" mudanças.\n" -"\n" -" Para fazer com que o Mercurial produza o formato estendido git\n" -" diff, use a opção --git disponível para vários comandos, ou\n" -" defina 'git = True' na seção [diff] de seu hgrc. Você não precisa\n" -" definir essa opção para importar diffs nesse formato, nem para\n" -" usá-lo com a extensão mq.\n" -" " - msgid "Template Usage" msgstr "Uso de modelos" -#, fuzzy -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 \"<br />\" 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 <user@example.com>' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User <user@example.com>'\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 "" -"\n" -" O Mercurial permite que você personalize a saída de comandos\n" -" usando modelos. Você pode tanto passar um modelo pela linha de\n" -" comando, usando a opção --template, como selecionar um\n" -" modelo-estilo existente (--style).\n" -"\n" -" Você pode personalizar a saída de qualquer comando semelhante\n" -" ao log: log, outgoing, incoming, tip, parents, heads e glog.\n" -"\n" -" Três estilos são incluídos na distribuição do Mercurial: default\n" -" (o estilo usado quando nenhuma preferência for passada), compact\n" -" e changelog. Uso::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" Um modelo é um texto com marcações que invocam expansão de\n" -" variáveis::\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" Strings entre chaves são chamadas palavras chave. A\n" -" disponibilidade de palavras chave depende do contexto exato do\n" -" modelador. Estas palavras chave estão comumente disponíveis para\n" -" modelar comandos semelhantes ao log:\n" -"\n" -" :author: String. O autor do changeset, sem modificações.\n" -" :branches: String. O nome do ramo no qual o changeset foi\n" -" consolidado. Será vazio se o nome do ramo for default.\n" -" :date: Informação de data. A data de consolidação do changeset.\n" -" :desc: String. O texto da descrição do changeset.\n" -" :diffstat: String. Estatísticas de mudanças no seguinte\n" -" formato: \"modified files: +added/-removed lines\"\n" -" :files: Lista de strings. Todos os arquivos modificados,\n" -" adicionados ou removidos por este changeset.\n" -" :file_adds: Lista de strings. Arquivos adicionados por este\n" -" changeset.\n" -" :file_mods: Lista de strings. Arquivos modificados por este\n" -" changeset.\n" -" :file_dels: Lista de strings. Arquivos removidos por este\n" -" changeset.\n" -" :node: String. O hash de identificação do changeset, como uma\n" -" string hexadecimal de 40 caracteres.\n" -" :parents: Lista de strings. Os pais do changeset.\n" -" :rev: Inteiro. O número de revisão do changeset no\n" -" repositório local.\n" -" :tags: Lista de strings. Quaisquer etiquetas associadas ao\n" -" changeset.\n" -"\n" -" A palavra chave \"date\" não produz saída legível para humanos.\n" -" Se você quiser usar uma data em sua saída, você pode usar um\n" -" filtro para processá-la. Filtros são funções que devolvem uma\n" -" string baseada na variável de entrada. Você também pode encadear\n" -" filtros para obter a saída desejada::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" Lista de filtros:\n" -"\n" -" :addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n" -" antes do fim de cada linha, exceto a última.\n" -" :age: Data. Devolve uma diferença de data/tempo legível entre\n" -" a data/hora dada e a data/hora atual.\n" -" :basename: Qualquer texto. Trata o texto como um caminho, e\n" -" devolve o último componente do caminho após quebrá-lo\n" -" usando o separador de caminhos (ignorando separadores à\n" -" direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n" -" e \"foo/bar//\" se torna \"bar\".\n" -" :date: Data. Devolve uma data em um formato de data Unix,\n" -" incluindo a diferença de fuso horário:\n" -" \"Mon Sep 04 15:13:13 2006 0700\".\n" -" :stripdir: Trata o texto como um caminho e remove um nível\n" -" de diretório, se possível. Por exemplo, \"foo\" e\n" -" \"foo/bar\" se tornam \"foo\".\n" -" :domain: Qualquer texto. Encontra a primeira string que se\n" -" pareça com um endereço de e-mail, e extrai apenas a parte\n" -" do domínio. Por exemplo:\n" -" 'User <user@example.com>' se torna 'example.com'.\n" -" :email: Qualquer texto. Extrai a primeira string que se pareça\n" -" com um endereço de e-mail. Por exemplo:\n" -" 'User <user@example.com>' se torna 'user@example.com'.\n" -" :escape: Qualquer texto. Substitui os caracteres especiais\n" -" XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n" -" :fill68: Qualquer texto. Quebra o texto para caber em 68\n" -" colunas.\n" -" :fill76: Qualquer texto. Quebra o texto para caber em 76\n" -" colunas.\n" -" :firstline: Qualquer texto. Devolve a primeira linha do texto.\n" -" :nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n" -" :hgdate: Data. Devolve a data como um par de números:\n" -" \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n" -" :isodate: Data. Devolve a data em formato ISO 8601: \"2009-08-18\n" -" 13:00 +0200\".\n" -" :localdate: Data. Converte para data local.\n" -" :obfuscate: Qualquer texto. Devolve o texto de entrada\n" -" renderizado como uma seqüência de entidades XML.\n" -" :person: Qualquer texto. Devolve o texto antes de um endereço\n" -" de e-mail.\n" -" :rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n" -" em cabeçalhos de e-mail: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" -" :rfc3339date: Data. Devolve uma data usando o formato de data da Internet\n" -" especificado na RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" -" :short: Hash do changeset. Devolve a forma curta do hash de\n" - -" um changeset, ou seja, uma string hexadecimal de 12 bytes.\n" -" :shortdate: Data. Devolve uma data como \"2006-09-18\".\n" -" :strip: Qualquer texto. Remove todos os espaços em branco no\n" -" início e no final do texto.\n" -" :tabindent: Qualquer texto. Devolve o texto todo, com a adição\n" -" de um caractere de tabulação ao início de cada linha,\n" -" exceto da primeira.\n" -" :urlescape: Qualquer texto. Codifica todos os caracteres\n" -" \"especiais\". Por exemplo, \"foo bar\" se torna\n" -" \"foo%20bar\".\n" -" :user: Qualquer texto. Devolve a parte do usuário de um\n" -" endereço de e-mail.\n" -" " - msgid "URL Paths" msgstr "Caminhos URL" -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" -" URLs válidas são da forma::\n" -"\n" -" caminho/no/sistema/de/arquivos/local[#revisão]\n" -" file://caminho/no/sistema/de/arquivos/local[#revisão]\n" -" http://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" -" https://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" -" ssh://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" -"\n" -" Caminhos no sistema de arquivos local podem tanto apontar para\n" -" repositórios do Mercurial como para arquivos bundle (criados por\n" -" 'hg bundle' ou 'hg incoming --bundle').\n" -"\n" -" Um identificador opcional após # indica um ramo, etiqueta ou\n" -" changeset do repositório remoto a ser usado. Veja também 'hg\n" -" help revisions'.\n" -"\n" -" Certas funcionalidades, como o push para URLs http:// e https://\n" -" são possíveis apenas se forem explicitamente habilitadas no\n" -" servidor remoto do Mercurial.\n" -"\n" -" Algumas notas sobre o uso de SSH com o Mercurial:\n" -"\n" -" - o SSH necessita de uma conta shell acessível na máquina de\n" -" destino e uma cópia do hg no caminho de execução remoto ou\n" -" especificado em remotecmd.\n" -" - o caminho é por padrão relativo ao diretório home do usuário\n" -" remoto.\n" -" Use uma barra extra no início de um caminho para especificar um\n" -" caminho absoluto::\n" -"\n" -" ssh://exemplo.com//tmp/repositorio\n" -"\n" -" - o Mercurial não usa sua própria compressão via SSH; a coisa\n" -" certa a fazer é configurá-la em seu ~/.ssh/config, por exemplo::\n" -"\n" -" Host *.minharedelocal.exemplo.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -"\n" -" Alternativamente especifique \"ssh -C\" como seu comando ssh\n" -" em seu hgrc ou pela opção de linha de comando --ssh .\n" -"\n" -" Estas URLs podem ser todas armazenadas em seu hgrc com apelidos\n" -" de caminho na seção [paths] , da seguinte forma::\n" -"\n" -" [paths]\n" -" apelido1 = URL1\n" -" apelido2 = URL2\n" -" ...\n" -"\n" -" Você pode então usar o apelido em qualquer comando que receba uma\n" -" URL (por exemplo 'hg pull apelido1' iria trazer revisões do\n" -" caminho 'alias1').\n" -"\n" -" Dois apelidos de caminho são especiais por serem usados como\n" -" valores padrão quando você não fornece a URL para um comando:\n" -"\n" -" default:\n" -" Quando você cria um repositório com hg clone, o comando clone\n" -" grava a localização do repositório de origem como o novo\n" -" caminho 'default' do repositório. Ele é então usado quando você\n" -" omitir o caminho de comandos semelhantes ao push e ao pull\n" -" (incluindo incoming e outgoing).\n" -"\n" -" default-push:\n" -" O comando push procurará por um caminho chamado 'default-push',\n" -" e o usará ao invés de 'default' se ambos estiverem definidos.\n" -" " - msgid "Using additional features" msgstr "Usando funcionalidades adicionais" @@ -10541,31 +10308,25 @@ msgid "clone from remote to remote not supported" msgstr "clone de origem remota para destino remoto não suportado" -msgid "updated" -msgstr "atualizados" - -msgid "merged" -msgstr "mesclados" - -msgid "removed" -msgstr "removidos" - -msgid "unresolved" -msgstr "não resolvidos" - -#, python-format -msgid "%d files %s" -msgstr "%d arquivos %s" +#, python-format +msgid "updating to branch %s\n" +msgstr "atualizando para o ramo %s\n" + +#, python-format +msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "" +"%d arquivos atualizados, %d arquivos mesclados, %d arquivos removidos, %d " +"arquivos não resolvidos\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "use 'hg resolve' para mesclar novamente arquivos não resolvidos\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 "" -"use 'hg resolve' para mesclar novamente arquivos não resolvidos ou 'hg up --" -"clean' para abandonar\n" +"use 'hg resolve' para mesclar novamente arquivos não resolvidos ou 'hg " +"update -C' para abandonar\n" msgid "(branch merge, don't forget to commit)\n" msgstr "(mesclagem de ramo, não esqueça de consolidar)\n" @@ -10639,32 +10400,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "componente de URL não suportado: \"%s\"" -#, python-format -msgid "using %s\n" -msgstr "usando %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "funcionalidades: %s\n" - msgid "operation not supported over http" msgstr "operação não suportada sobre http" -#, python-format -msgid "sending %s command\n" -msgstr "enviando comando %s\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "enviando %s bytes\n" - msgid "authorization failed" msgstr "autorização falhou" -#, python-format -msgid "http error while sending %s command\n" -msgstr "erro http ao enviar comando %s\n" - msgid "http error, possibly caused by proxy setting" msgstr "erro http, possivelmente causado pela configuração de proxy" @@ -10673,10 +10414,6 @@ msgstr "URL real é %s\n" #, python-format -msgid "requested URL: '%s'\n" -msgstr "URL pedida: '%s'\n" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' não parece ser um repositório hg" @@ -10751,10 +10488,6 @@ msgid "unknown revision '%s'" msgstr "revisão desconhecida '%s'" -#, python-format -msgid "filtering %s through %s\n" -msgstr "filtrando %s através de %s\n" - msgid "journal already exists - run hg recover" msgstr "journal já existe - execute hg recover" @@ -10786,14 +10519,6 @@ msgid "working directory of %s" msgstr "diretório de trabalho de %s" -#, python-format -msgid " %s: searching for copy revision for %s\n" -msgstr " %s: procurando por revisão de cópia para %s\n" - -#, python-format -msgid " %s: copy %s:%s\n" -msgstr " %s: cópia %s:%s\n" - msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" "não é possível consolidar parcialmente uma mesclagem (não especifique " @@ -10862,43 +10587,8 @@ msgid "searching for changes\n" msgstr "procurando por mudanças\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "examinando %s:%s\n" - -msgid "branch already found\n" -msgstr "ramo já encontrado\n" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "encontrado ramo incompleto %s:%s\n" - -#, python-format -msgid "found new changeset %s\n" -msgstr "encontrado novo changeset %s\n" - -#, python-format -msgid "request %d: %s\n" -msgstr "pedido %d: %s\n" - -#, python-format -msgid "received %s:%s\n" -msgstr "recebido %s:%s\n" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "estreitando %d:%d %s\n" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "encontrado novo changeset de ramo %s\n" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "estreitou a busca de ramos para %s:%s\n" - msgid "already have changeset " -msgstr "já possui o changeset " +msgstr "já possui a revisão " msgid "warning: repository is unrelated\n" msgstr "aviso: repositório não é relacionado\n" @@ -10906,16 +10596,6 @@ msgid "repository is unrelated" msgstr "repositório não é relacionado" -msgid "found new changesets starting at " -msgstr "encontrados novos changesets com início em " - -#, python-format -msgid "%d total queries\n" -msgstr "%d consultas no total\n" - -msgid "common changesets up to " -msgstr "changesets comuns até " - msgid "requesting all changes\n" msgstr "pedindo todas as mudanças\n" @@ -10941,21 +10621,14 @@ #, python-format msgid "%d changesets found\n" -msgstr "%d changesets encontrados\n" - -msgid "list of changesets:\n" -msgstr "lista de changesets:\n" +msgstr "%d revisões encontradas\n" #, python-format msgid "empty or missing revlog for %s" msgstr "revlog vazio ou não encontrado para %s" -#, python-format -msgid "add changeset %s\n" -msgstr "adicionando changeset %s\n" - msgid "adding changesets\n" -msgstr "adicionando changesets\n" +msgstr "adicionando revisões\n" msgid "received changelog group is empty" msgstr "grupo de changelogs recebido é vazio" @@ -10966,10 +10639,6 @@ msgid "adding file changes\n" msgstr "adicionando mudanças em arquivos\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "adicionando %s revisões\n" - msgid "received file revlog group is empty" msgstr "grupo recebido de arquivos revlog vazio" @@ -10979,10 +10648,7 @@ #, python-format msgid "added %d changesets with %d changes to %d files%s\n" -msgstr "adicionados %d changesets com %d mudanças em %d arquivos%s\n" - -msgid "updating the branch cache\n" -msgstr "atualizando o cache de ramos\n" +msgstr "adicionadas %d revisões com %d mudanças em %d arquivos%s\n" msgid "Unexpected response from remote server:" msgstr "Resposta inesperada do servidor remoto:" @@ -11004,10 +10670,6 @@ msgstr "%d arquivos para transferir, %s de dados\n" #, python-format -msgid "adding %s (%s)\n" -msgstr "adicionando %s (%s)\n" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "transferidos %s em %.1f segundos (%s/s)\n" @@ -11094,14 +10756,6 @@ msgstr "examinando manifestos\n" #, python-format -msgid " overwrite %s partial %s\n" -msgstr " sobrescrito %s parcial %s\n" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr " ancestral %s local %s remoto %s\n" - -#, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" @@ -11127,10 +10781,6 @@ msgstr "(&D) apagada" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "preservando %s para resolução de %s\n" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "update falhou ao remover %s: %s!\n" @@ -11179,13 +10829,6 @@ msgstr "impossível criar %s: impossível criar diretório de destino" #, python-format -msgid "found patch at byte %d\n" -msgstr "encontrado patch no byte %d\n" - -msgid "patch generated by hg export\n" -msgstr "patch criado por hg export\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "incapaz de localizar '%s' para modificação\n" @@ -11256,10 +10899,6 @@ msgstr "Tipo de quebra de linha não suportado: %s" #, python-format -msgid "no valid hunks found; trying with %r instead\n" -msgstr "nenhum trecho válido encontrado; tentando com %r\n" - -#, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "%d arquivos modificados, %d inserções(+), %d remoções(-)\n" @@ -11272,13 +10911,6 @@ msgstr "morto pelo sinal %d" #, python-format -msgid "stopped by signal %d" -msgstr "parado pelo sinal %d" - -msgid "invalid exit code" -msgstr "código de saída inválido" - -#, python-format msgid "saving bundle to %s\n" msgstr "salvando bundle em %s\n" @@ -11349,12 +10981,12 @@ msgid "could not create remote repo" msgstr "não foi possível criar repositório remoto" +msgid "no suitable response from remote hg" +msgstr "nenhuma resposta adequada do hg remoto" + msgid "remote: " msgstr "remoto: " -msgid "no suitable response from remote hg" -msgstr "nenhuma resposta adequada do hg remoto" - #, python-format msgid "push refused: %s" msgstr "envio recusado: %s" @@ -11372,17 +11004,6 @@ msgid "invalid entry in fncache, line %s" msgstr "entrada inválida na fncache, linha %s" -msgid "scanning\n" -msgstr "lendo\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "%d arquivos, %d bytes para transferir\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "enviando %s (%d bytes)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -11532,10 +11153,6 @@ msgstr "autenticação http: usuário %s, senha %s\n" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "usando proxy através de http://%s:%s\n" - -#, python-format msgid "command '%s' failed: %s" msgstr "falha ao executar o comando '%s' : %s" @@ -11642,11 +11259,11 @@ #, python-format msgid "rev %d points to nonexistent changeset %d" -msgstr "revisão %d aponta para changeset inexistente %d" +msgstr "rev %d aponta para revisão inexistente %d" #, python-format msgid "rev %d points to unexpected changeset %d" -msgstr "revisão %d aponta para changeset inesperado %d" +msgstr "rev %d aponta para revisão inesperada %d" #, python-format msgid " (expected %s)" @@ -11673,18 +11290,18 @@ msgstr "repositório utiliza revlog no formato %d\n" msgid "checking changesets\n" -msgstr "checando changesets\n" +msgstr "checando revisões\n" #, python-format msgid "unpacking changeset %s" -msgstr "desempacotando changeset %s" +msgstr "desempacotando revisão %s" msgid "checking manifests\n" msgstr "checando manifestos\n" #, python-format msgid "%s not in changesets" -msgstr "%s não está em changesets" +msgstr "%s não está em revisões" msgid "file without name in manifest" msgstr "arquivo sem nome no manifesto" @@ -11694,17 +11311,17 @@ msgstr "lendo alterações no manifesto %s" msgid "crosschecking files in changesets and manifests\n" -msgstr "checagem cruzada de arquivos no changeset e no manifesto\n" +msgstr "checagem cruzada de arquivos em revisões e no manifesto\n" #, python-format msgid "changeset refers to unknown manifest %s" -msgstr "changeset se refere a manifesto desconhecido %s" +msgstr "revisão se refere a manifesto desconhecido %s" msgid "in changeset but not in manifest" -msgstr "no changeset mas não no manifesto" +msgstr "na revisão mas não no manifesto" msgid "in manifest but not in changeset" -msgstr "no manifesto mas não no changeset" +msgstr "no manifesto mas não na revisão" msgid "checking files\n" msgstr "checando arquivos\n" @@ -11733,6 +11350,10 @@ msgstr "descompactando %s" #, python-format +msgid "warning: copy source of '%s' not in parents of %s" +msgstr "aviso: a origem da cópia de '%s' não está nos pais de %s" + +#, python-format msgid "empty or missing copy source revlog %s:%s" msgstr "revlog de origem %s:%s vazio ou faltando" @@ -11754,7 +11375,7 @@ #, python-format msgid "%d files, %d changesets, %d total revisions\n" -msgstr "%d arquivos, %d changesets, %d revisões ao todo\n" +msgstr "%d arquivos, %d revisões, %d mudanças em arquivos\n" #, python-format msgid "%d warnings encountered!\n" @@ -11766,7 +11387,7 @@ #, python-format msgid "(first damaged changeset appears to be %d)\n" -msgstr "(primeiro changeset danificado parece ser %d)\n" +msgstr "(primeira revisão danificada parece ser %d)\n" msgid "user name not available - set USERNAME environment variable" msgstr "nome de usuário indisponível - defina a variável de ambiente USERNAME"
--- a/i18n/sv.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/sv.po Sat Nov 07 14:13:15 2009 -0600 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-08-18 20:47+0200\n" -"PO-Revision-Date: 2009-08-21 19:38+0200\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-11-04 22:12+0100\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -23,24 +23,488 @@ #, python-format msgid " (default: %s)" -msgstr "" +msgstr " (standard: %s)" msgid "OPTIONS" -msgstr "" +msgstr "FLAGGOR" msgid "COMMANDS" -msgstr "" +msgstr "KOMMANDON" msgid "" " options:\n" "\n" msgstr "" +" flaggor:\n" +"\n" #, python-format msgid "" " aliases: %s\n" "\n" msgstr "" +" alias: %s\n" +"\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 "" + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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" @@ -91,37 +555,13 @@ msgstr "" #, python-format -msgid "acl: %s not enabled\n" -msgstr "" - -#, python-format -msgid "acl: %s enabled, %d entries for user %s\n" -msgstr "" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "" - msgid "" "track a line of development with movable markers\n" "\n" @@ -469,10 +909,6 @@ " " msgstr "" -#, python-format -msgid "assuming %i character terminal\n" -msgstr "" - msgid "count rate for the specified revision or range" msgstr "" @@ -546,8 +982,8 @@ msgid "when to colorize (always, auto, or never)" msgstr "när färgläggning ska ske (always, auto eller never)" -msgid "don't colorize output" -msgstr "färglägg inte utmatning" +msgid "don't colorize output (DEPRECATED)" +msgstr "färglägg inte utmatning (FÖRLEGAD)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" @@ -683,23 +1119,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" @@ -719,9 +1140,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" @@ -884,10 +1306,6 @@ msgstr "" #, python-format -msgid "running: %s\n" -msgstr "" - -#, python-format msgid "%s error:\n" msgstr "" @@ -965,16 +1383,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 @@ -1020,10 +1430,6 @@ msgid "running %s\n" msgstr "" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "" - msgid "RCS file must be followed by working file" msgstr "" @@ -1037,10 +1443,6 @@ msgstr "" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1071,10 +1473,6 @@ msgid "Python ElementTree module is not available" msgstr "" -#, python-format -msgid "cleaning up %s\n" -msgstr "" - msgid "internal calling inconsistency" msgstr "" @@ -1109,22 +1507,6 @@ msgstr "" #, 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 "" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1136,12 +1518,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 "" @@ -1160,12 +1536,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 "" @@ -1180,6 +1550,9 @@ msgid "collecting p4 changelists\n" msgstr "" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1230,69 +1603,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 "entry %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 "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 "" @@ -1357,14 +1683,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 "" @@ -1605,10 +1923,10 @@ #, python-format msgid "comparing with %s\n" -msgstr "" +msgstr "jämför med %s\n" msgid "no changes found\n" -msgstr "" +msgstr "inga ändringar hittades\n" msgid "show the revision DAG" msgstr "" @@ -1669,12 +1987,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" @@ -1834,9 +2146,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 "" @@ -1845,9 +2154,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 "" @@ -2117,12 +2423,6 @@ "\tkeywords expanded\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" - msgid "" "expand keywords in the working directory\n" "\n" @@ -2145,15 +2445,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 "" @@ -2185,8 +2483,14 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" -msgstr "" +msgid "only show unknown (not tracked) files" +msgstr "visa bara okända (ospårade) filer" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "visa statusflaggor för alla filer (FÖRLEGAD)" + +msgid "only show untracked files (DEPRECATED)" +msgstr "visa bara ospårade filer (FÖRLEGAD)" msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "" @@ -2212,7 +2516,6 @@ "\n" " print patch series qseries\n" " print applied patches qapplied\n" -" print name of top applied patch qtop\n" "\n" " add known patch to applied stack qpush\n" " remove patch from applied stack qpop\n" @@ -2235,10 +2538,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2569,9 +2868,15 @@ msgid "print the patches already applied" msgstr "" +msgid "only one patch applied\n" +msgstr "" + msgid "print the patches not yet applied" msgstr "" +msgid "all patches applied\n" +msgstr "" + msgid "" "import a patch\n" "\n" @@ -2655,15 +2960,9 @@ msgid "print the name of the next patch" msgstr "" -msgid "all patches applied\n" -msgstr "" - msgid "print the name of the previous patch" msgstr "" -msgid "only one patch applied\n" -msgstr "" - msgid "" "create a new patch\n" "\n" @@ -2965,7 +3264,10 @@ msgid "print first line of patch header" msgstr "" -msgid "hg qapplied [-s] [PATCH]" +msgid "show only the last patch" +msgstr "visa bara den sista patchen" + +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "" msgid "use pull protocol to copy metadata" @@ -3082,7 +3384,7 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" +msgid "forget any local changes to patched files" msgstr "" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3187,7 +3489,10 @@ msgid "hg qtop [-s]" msgstr "" -msgid "hg qunapplied [-s] [PATCH]" +msgid "show only the first patch" +msgstr "visa bara den första patchen" + +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "" msgid "finish all applied changesets" @@ -3236,6 +3541,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" @@ -3284,11 +3590,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 "" @@ -3411,6 +3713,10 @@ "hgrc(5) for details.\n" msgstr "" +#, python-format +msgid "%sPlease enter a valid value" +msgstr "" + msgid "Please enter a valid value.\n" msgstr "" @@ -3544,6 +3850,9 @@ msgid "message identifier to reply to" msgstr "" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "" @@ -3646,9 +3955,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" @@ -3692,60 +3998,17 @@ msgid "%d revisions have been skipped\n" msgstr "" -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 "" - -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 "" @@ -3758,28 +4021,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" +msgid "source is ancestor of destination" +msgstr "" + +msgid "source is descendant of destination" msgstr "" 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 "" @@ -3792,13 +4042,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 "" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -3911,20 +4161,9 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "" - -msgid "applying patch\n" -msgstr "" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" @@ -4137,10 +4376,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" @@ -4360,31 +4595,31 @@ #, python-format msgid "changeset: %d:%s\n" -msgstr "" +msgstr "ändring: %d:%s\n" #, python-format msgid "branch: %s\n" -msgstr "" +msgstr "gren: %s\n" #, python-format msgid "tag: %s\n" -msgstr "" +msgstr "märke: %s\n" #, python-format msgid "parent: %d:%s\n" -msgstr "" +msgstr "förälder: %d:%s\n" #, python-format msgid "manifest: %d:%s\n" -msgstr "" +msgstr "manifest: %d:%s\n" #, python-format msgid "user: %s\n" -msgstr "" +msgstr "användare: %s\n" #, python-format msgid "date: %s\n" -msgstr "" +msgstr "datum: %s\n" msgid "files+:" msgstr "" @@ -4397,22 +4632,22 @@ #, python-format msgid "files: %s\n" -msgstr "" +msgstr "filer: %s\n" #, python-format msgid "copies: %s\n" -msgstr "" +msgstr "kopior: %s\n" #, python-format msgid "extra: %s=%s\n" msgstr "" msgid "description:\n" -msgstr "" +msgstr "beskrivning:\n" #, python-format msgid "summary: %s\n" -msgstr "" +msgstr "kortfattat: %s\n" #, python-format msgid "%s: no key named '%s'" @@ -4701,10 +4936,6 @@ msgstr "" #, python-format -msgid "cannot find executable: %s" -msgstr "" - -#, python-format msgid "failed to execute %s" msgstr "" @@ -5323,23 +5554,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 "" @@ -5503,12 +5736,6 @@ msgid "no diffs found" msgstr "" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" - msgid "not a Mercurial patch" msgstr "" @@ -5774,7 +6001,7 @@ " See 'hg help urls' for more information.\n" " " msgstr "" -"dra ändringar från den specificerade källan" +"dra ändringar från den specificerade källan\n" "\n" " Drar ändringar från ett annat arkiv till ett lokalt.\n" "\n" @@ -5813,7 +6040,7 @@ " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" -"tryck ändringar till den specificerade destinationen" +"tryck ändringar till den specificerade destinationen\n" "\n" " Trycker ändringar från det lokala arkivet till den givna destinationen.\n" "\n" @@ -5879,13 +6106,15 @@ "\n" " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" " projektets historik. -A/--after kan användas för att bara ta bort filer\n" -" som redan raderats, -f/--force kan användas för att tvinga radering, och\n" +" som redan raderats, -f/--force kan användas för att tvinga radering, " +"och\n" " -Af kan ta bort filer från nästa revision utan att radera dem från\n" " arbetskopian.\n" "\n" " Följande tabell visar hur remove uppför sig för olika filstatus\n" " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" -" Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n" +" Modifierad [M] och Saknad [!] (som rapporteras av hg status). " +"Aktionerna\n" " är Varna, Radera (från gren) och Ta bort (från disk)::\n" "\n" " A C M !\n" @@ -6131,7 +6360,8 @@ " Flaggan -q/--quiet döljer ospårade (okända och ignorerade) filer om det\n" " inte bes om explicit med -u/--unknown eller -i/--ignored.\n" "\n" -" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller en\n" +" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller " +"en\n" " sammanfogning har utförts. Det vanliga diff-formatet rapporterar inte\n" " förändringar av tillstånd och diff rapporterar bara ändringar relativt\n" " till en förälder vid sammanfogningar.\n" @@ -6149,6 +6379,108 @@ " " 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 "" +"sammanfatta arbetskatalogens tillstånd\n" +"\n" +" Detta skapar en kort sammanfattning av arbetskatalogens tillstånd,\n" +" inklusive föräldrar, gren, arkivstatus, och tillgängliga uppdateringar.\n" +"\n" +" Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" +" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n" +" " + +msgid " (empty repository)" +msgstr " (tomt arkiv)" + +msgid " (no revision checked out)" +msgstr " (ingen revision uthämtad)" + +#, python-format +msgid "parent: %d:%s %s\n" +msgstr "förälder: %d:%s %s\n" + +#, python-format +msgid "branch: %s\n" +msgstr "gren: %s\n" + +#, python-format +msgid "%d added" +msgstr "%d tillagd" + +#, python-format +msgid "%d modified" +msgstr "%d modifierad" + +#, python-format +msgid "%d removed" +msgstr "%d borttagen" + +#, python-format +msgid "%d deleted" +msgstr "%d raderad" + +#, python-format +msgid "%d ignored" +msgstr "%d ignorerad" + +#, python-format +msgid "%d unknown" +msgstr "%d okänd" + +#, python-format +msgid "%d unresolved" +msgstr "%d olöst" + +msgid " (merge)" +msgstr " (sammanfogning)" + +msgid " (new branch)" +msgstr " (ny gren)" + +msgid " (clean)" +msgstr " (ren)" + +msgid " (new branch head)" +msgstr " (nytt grenhuvud)" + +#, python-format +msgid "commit: %s\n" +msgstr "arkivera: %s\n" + +msgid "update: (current)\n" +msgstr "uppdatera: (aktuell)\n" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "uppdatera: %d nya ändringar (uppdatera)\n" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "uppdatera: %d nya ändringar, %d grenhuvuden (sammanfoga)\n" + +msgid "1 or more incoming" +msgstr "1 eller fler inkommande" + +#, python-format +msgid "%d outgoing" +msgstr "%d utgående" + +#, python-format +msgid "remote: %s\n" +msgstr "fjärran: %s\n" + +msgid "remote: (synced)\n" +msgstr "fjärran: (synkad)\n" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -6273,7 +6605,8 @@ " kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n" " revisionen. Alternativt, använd -c/--check för att avbryta.\n" "\n" -" När det finns oarkiverade ändringar och flaggan -C/--clean inte används,\n" +" När det finns oarkiverade ändringar och flaggan -C/--clean inte " +"används,\n" " och föräldrarevisionen och den begärda revisionen är på samma gren, och\n" " en av dem är en anfäder till den andre, kommer arbetskatalogen att\n" " innehålla den begärda revisionen sammanfogad med de oarkiverade\n" @@ -6285,6 +6618,9 @@ " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" " " +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" + msgid "uncommitted local changes" msgstr "" @@ -6314,8 +6650,8 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -msgid "repository root directory or symbolic path name" -msgstr "arkivrotkatalog eller symbolisk sökväg" +msgid "repository root directory or name of overlay bundle file" +msgstr "arkivrotkatalog eller namn på påläggsbuntfil" msgid "change working directory" msgstr "ändra arbetskatalog" @@ -6633,7 +6969,8 @@ msgstr "" msgid "follow changeset history, or file history across copies and renames" -msgstr "följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" +msgstr "" +"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" msgid "ignore case when matching" msgstr "" @@ -6889,6 +7226,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "sök efter inkommande och utgående ändringar" + msgid "show status of all files" msgstr "visa status för alla filer" @@ -6965,36 +7305,6 @@ msgid "branch name not in UTF-8!" msgstr "" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "" - -#, 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 "" - -#, python-format -msgid " dir %s -> %s\n" -msgstr "" - -#, python-format -msgid " file %s -> %s\n" -msgstr "" - msgid "working directory state appears damaged!" msgstr "" @@ -7041,16 +7351,16 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" msgstr "" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "" @@ -7146,10 +7456,6 @@ msgstr "" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "" - -#, python-format msgid "malformed --config option: %s" msgstr "" @@ -7213,10 +7519,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?" @@ -7237,13 +7539,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)?" @@ -7267,510 +7562,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 "" msgid "Date Formats" msgstr "" -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 "" - msgid "File Name Patterns" msgstr "" -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 "" -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 "" -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 "" -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 "" -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 \"<br />\" 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 <user@example.com>' becomes\n" -" 'example.com'.\n" -" :email: Any text. Extracts the first string that looks like\n" -" an email address. Example: 'User <user@example.com>'\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" -" :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.\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 "" -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 "" @@ -7803,27 +7621,20 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updated" -msgstr "" - -msgid "merged" -msgstr "" - -msgid "removed" -msgstr "" - -msgid "unresolved" -msgstr "" - -#, python-format -msgid "%d files %s" +#, python-format +msgid "updating to branch %s\n" +msgstr "" + +#, 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 "" 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 "" @@ -7899,32 +7710,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 "" @@ -7933,10 +7724,6 @@ msgstr "" #, python-format -msgid "requested URL: '%s'\n" -msgstr "" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -8009,10 +7796,6 @@ msgid "unknown revision '%s'" msgstr "" -#, python-format -msgid "filtering %s through %s\n" -msgstr "" - msgid "journal already exists - run hg recover" msgstr "" @@ -8044,14 +7827,6 @@ msgid "working directory of %s" msgstr "" -#, 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 "" @@ -8114,42 +7889,7 @@ msgstr "" msgid "searching for changes\n" -msgstr "" - -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "" - -#, python-format -msgid "found new changeset %s\n" -msgstr "" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" +msgstr "söker efter ändringar\n" msgid "already have changeset " msgstr "" @@ -8160,16 +7900,6 @@ msgid "repository is unrelated" msgstr "" -msgid "found new changesets starting at " -msgstr "" - -#, python-format -msgid "%d total queries\n" -msgstr "" - -msgid "common changesets up to " -msgstr "" - msgid "requesting all changes\n" msgstr "" @@ -8195,17 +7925,10 @@ msgid "%d changesets found\n" msgstr "" -msgid "list of changesets:\n" -msgstr "" - #, python-format msgid "empty or missing revlog for %s" msgstr "" -#, python-format -msgid "add changeset %s\n" -msgstr "" - msgid "adding changesets\n" msgstr "" @@ -8218,10 +7941,6 @@ msgid "adding file changes\n" msgstr "" -#, python-format -msgid "adding %s revisions\n" -msgstr "" - msgid "received file revlog group is empty" msgstr "" @@ -8233,9 +7952,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "" @@ -8256,10 +7972,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -8340,14 +8052,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?" @@ -8369,10 +8073,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -8419,13 +8119,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 "" @@ -8496,10 +8189,6 @@ msgstr "" #, 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 "" @@ -8512,13 +8201,6 @@ msgstr "" #, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" - -#, python-format msgid "saving bundle to %s\n" msgstr "" @@ -8589,12 +8271,12 @@ msgid "could not create remote repo" msgstr "" +msgid "no suitable response from remote hg" +msgstr "" + msgid "remote: " msgstr "" -msgid "no suitable response from remote hg" -msgstr "" - #, python-format msgid "push refused: %s" msgstr "" @@ -8612,17 +8294,6 @@ 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 "" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -8766,10 +8437,6 @@ msgstr "" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -8904,17 +8571,17 @@ #, python-format msgid "repository uses revlog format %d\n" -msgstr "" +msgstr "arkivet använder revlog-format %d\n" msgid "checking changesets\n" -msgstr "" +msgstr "kontrollerar ändringar\n" #, python-format msgid "unpacking changeset %s" msgstr "" msgid "checking manifests\n" -msgstr "" +msgstr "kontrollerar manifest\n" #, python-format msgid "%s not in changesets" @@ -8928,7 +8595,7 @@ msgstr "" msgid "crosschecking files in changesets and manifests\n" -msgstr "" +msgstr "korskontrollerar filer i ändringar och manifest\n" #, python-format msgid "changeset refers to unknown manifest %s" @@ -8941,7 +8608,7 @@ msgstr "" msgid "checking files\n" -msgstr "" +msgstr "kontrollerar filer\n" #, python-format msgid "cannot decode filename '%s'" @@ -8967,6 +8634,10 @@ msgstr "" #, 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 "" @@ -8988,7 +8659,7 @@ #, python-format msgid "%d files, %d changesets, %d total revisions\n" -msgstr "" +msgstr "%d filer, %d ändringar, %d totala revisioner\n" #, python-format msgid "%d warnings encountered!\n"
--- a/i18n/zh_CN.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/zh_CN.po Sat Nov 07 14:13:15 2009 -0600 @@ -50,8 +50,8 @@ msgstr "" "Project-Id-Version: Mercurial 1.3\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-24 10:03+0800\n" -"PO-Revision-Date: 2009-03-31 20:38+0200\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:49+0100\n" "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -71,7 +71,10 @@ msgid "COMMANDS" msgstr "命令" -msgid " options:\n" +#, fuzzy +msgid "" +" options:\n" +"\n" msgstr " 选项:\n" #, python-format @@ -83,7 +86,635 @@ "\n" msgid "" -"control access to a repository using simple hooks\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 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 "" + +#, fuzzy +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 "" +"\n" +" 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" +" GNU patch 和许多标准工具。\n" +"\n" +" 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" +"\n" +" - 可执行状态和其它权限位\n" +" - 复制或改名信息\n" +" - 二进制文件的修改\n" +" - 创建或删除空文件\n" +"\n" +" 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" +" 此格式，所以它不是默认格式。\n" +"\n" +" 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用" +"标\n" +" 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" +" 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" +" 响。\n" +"\n" +" 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" +" 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" +" 或在 mq 扩展中使用时，不需要设置此选项。\n" +" " + +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 "" + +#, fuzzy +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 "" +"\n" +" 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" +" 范围格式提供。\n" +"\n" +" 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" +" 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" +"\"\n" +" 意味着全部版本。\n" +"\n" +" 如果 'BEGIN' 大于 'END'，版本视为反序。\n" +"\n" +" 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n" +" '8'，'7' 和 '6'。\n" +" " + +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 "" + +#, fuzzy +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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 "" +"\n" +" 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" +" 来使用模版，或者选择已有的模版样式(--style)。\n" +"\n" +" 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" +" tip，parents，heads 和 glog。\n" +"\n" +" 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" 模版是文本片断，其中的标记用于变量扩展:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" +" 可用于输出与日志信息类似的命令:\n" +"\n" +" - author: 字符串。修改集的作者。\n" +" - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" +" - date: 日期信息。修改集的日期。\n" +" - desc: 字符串。修改集的描述。\n" +" - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" +" - file_adds: 字符串列表。修改集中被增加的文件。\n" +" - file_mods: 字符串列表。修改集中被修改的文件\n" +" - file_dels: 字符串列表。修改集中被删除的文件\n" +" - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" +" - parents: 字符串列表。修改集的父亲。\n" +" - rev: 整数。本地版本库的修改集的版本号。\n" +" - tags: 字符串列表。修改集的标签。\n" +"\n" +" 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使" +"用\n" +" 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" +" 链来产生理想的输出:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" 过滤器列表:\n" +"\n" +" - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" +" \"<br />\"。\n" +" - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n" +" - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n" +" 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz" +"\"，\n" +" \"foo/bar//\" 成为 \"bar\"。\n" +" - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n" +" \"Mon Sep 04 15:13:13 2006 0700\"。\n" +" - domain: 输入任意文本。找到第一个 email 地址，返回其域名。例如: \n" +" 'User <user@example.com>' 成为 'example.com'。\n" +" - email: 输入任意文本。返回第一个 email 地址。例如: \n" +" 'User <user@example.com>' 成为 'user@example.com'。\n" +" - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n" +" \"<\" 和 \">\"。\n" +" - fill68: 输入任意文本。格式化为 68 列文本。\n" +" - fill76: 输入任意文本。格式化为 76 列文本。\n" +" - firstline: 输入任意文本。返回首行。\n" +" - hgdate: 输入日期。返回一对数字:\n" +" \"1157407993 25200\" (Unix 时戳，时区偏移)。\n" +" - isodate: 输入日期。返回 ISO 8601 格式的日期。\n" +" - obfuscate: 输入任意文本。返回其 XML 实体序列。\n" +" - person: 输入任意文本。返回 email 地址前的文本。\n" +" - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n" +" - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n" +" 字符串。\n" +" - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n" +" - strip: 输入任意文本。删除全部行首与行尾空白。\n" +" - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n" +" - urlescape: 输入任意文本。封装全部特殊字符。例如\n" +" \"foo bar\" 成为 \"foo%20bar\"。\n" +" - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" +" " + +#, fuzzy +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 "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 " +"'default'。\n" +" " + +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" @@ -99,7 +730,7 @@ "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" +"To use this hook, configure the acl extension in your hgrc like this::\n" "\n" " [extensions]\n" " hgext.acl =\n" @@ -112,10 +743,10 @@ " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" " sources = serve\n" "\n" -"The allow and deny sections take a subtree pattern as key (with a\n" -"glob syntax by default), and a comma separated list of users as\n" -"the corresponding value. The deny list is checked before the allow\n" -"list is.\n" +"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" @@ -131,52 +762,28 @@ msgstr "" #, 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" - -#, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集" #, 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 "" "track a line of development with movable markers\n" "\n" "Bookmarks are local movable markers to changesets. Every bookmark\n" "points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it,\n" -"the bookmark shifts to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup\n" -"(e.g. hg merge, hg update).\n" +"changeset that is based on a changeset that has a bookmark on it, the\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" "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" +"your .hgrc::\n" "\n" " [bookmarks]\n" " track.current = True\n" @@ -235,7 +842,7 @@ msgstr "" msgid "" -"integrate Mercurial with a Bugzilla bug tracker\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" @@ -251,65 +858,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" @@ -322,7 +950,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" @@ -330,8 +958,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" @@ -340,7 +969,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" @@ -420,7 +1049,7 @@ msgstr "" #, fuzzy -msgid "display children changesets" +msgid "command to display child changesets" msgstr "列出修改集" #, fuzzy @@ -448,7 +1077,7 @@ msgid "hg children [-r REV] [FILE]" msgstr "" -msgid "display statistics about repository history" +msgid "command to display statistics about repository history" msgstr "" #, python-format @@ -472,7 +1101,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" @@ -487,19 +1116,15 @@ " 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" -" <alias email> <actual email>\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" +" <alias email> <actual email>\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 "" -#, python-format -msgid "assuming %i character terminal\n" -msgstr "" - msgid "count rate for the specified revision or range" msgstr "" @@ -542,48 +1167,54 @@ "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" -"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 "import from foreign VCS repositories into Mercurial" +#, fuzzy +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" @@ -595,6 +1226,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -606,23 +1238,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 <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" <source ID> <destination ID>\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" @@ -636,7 +1273,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" @@ -646,11 +1283,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" @@ -675,7 +1312,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" @@ -700,43 +1337,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" @@ -782,7 +1407,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -900,18 +1524,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 "" @@ -985,17 +1601,9 @@ 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" -msgstr "" +#, fuzzy, python-format +msgid "revision %s is not a patchset number" +msgstr "svn: 版本 %s 不是整数" #, python-format msgid "connecting to %s\n" @@ -1004,7 +1612,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 @@ -1038,10 +1648,6 @@ msgid "running %s\n" msgstr "" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "" - msgid "RCS file must be followed by working file" msgstr "" @@ -1054,10 +1660,6 @@ msgid "revision must be followed by date line" msgstr "" -#, fuzzy, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "版本 %d 有未知路径: %s\n" - #, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1082,13 +1684,13 @@ msgid "%d changeset entries\n" msgstr "" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "" -#, python-format -msgid "cleaning up %s\n" -msgstr "" - msgid "internal calling inconsistency" msgstr "" @@ -1123,22 +1725,6 @@ msgstr "" #, 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 "" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1150,12 +1736,6 @@ msgid "initializing destination %s repository\n" msgstr "初始化目标版本库 %s\n" -msgid "run hg sink pre-conversion action\n" -msgstr "执行动作 hg sink pre-conversion\n" - -msgid "run hg sink post-conversion action\n" -msgstr "执行动作 hg sink post-conversion action\n" - #, python-format msgid "pulling from %s into %s\n" msgstr "自 %s 拉到 %s\n" @@ -1174,12 +1754,6 @@ msgid "ignoring: %s\n" msgstr "忽略: %s\n" -msgid "run hg source pre-conversion action\n" -msgstr "执行动作 hg source pre-conversion\n" - -msgid "run hg source post-conversion action\n" -msgstr "执行动作 hg source post-conversion\n" - #, python-format msgid "%s does not look like a monotone repo" msgstr "%s 不像是单纯的 monotone 版本库" @@ -1194,6 +1768,9 @@ msgid "collecting p4 changelists\n" msgstr "正在搜索 p4 修改集\n" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "不能加载 svn 的 python 绑定" @@ -1245,69 +1822,22 @@ msgstr "在版本 %d 没有发现标签\n" #, python-format -msgid "ignoring foreign branch %r\n" -msgstr "忽略外部分支 %r\n" - -#, python-format msgid "%s not found up to revision %d" msgstr "没有发现 %s，一直到版本 %d" #, python-format -msgid "branch renamed from %s to %s at %d\n" -msgstr "分支从 %s 改名为 %s，在 %d\n" - -#, python-format -msgid "reparent to %s\n" -msgstr "" - -#, python-format -msgid "copied to %s from %s@%s\n" -msgstr "复制到 %s，自 %s@%s\n" - -#, python-format -msgid "gone from %s\n" -msgstr "离开 %s\n" - -#, fuzzy, python-format -msgid "entry %s\n" -msgstr "基本，入口 %s %s\n" - -#, python-format -msgid "unknown path in revision %d: %s\n" -msgstr "版本 %d 有未知路径: %s\n" - -#, python-format -msgid "mark %s came from %s:%d\n" -msgstr "标记 %s 来自 %s:%d\n" - -#, python-format -msgid "parsing revision %d (%d changes)\n" -msgstr "解析版本 %d (%d 个改变)\n" - -#, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "发现分支 %s 的父亲，在 %d: %s\n" -msgid "no copyfrom path, don't know what to do.\n" -msgstr "没有 copyfrom 路径，不知道该怎么办。\n" - #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" msgstr "为 \"%s\" 获取版本日志，自 %d 到 %d\n" #, python-format -msgid "revision %d has no entries\n" -msgstr "版本 %d 没有入口\n" - -#, python-format msgid "svn: branch has no revision %s" msgstr "svn: 分支没有版本 %s" #, python-format -msgid "%r is not under %r, ignoring\n" -msgstr "%r 不在 %r 之下，忽略之\n" - -#, python-format msgid "initializing svn repo %r\n" msgstr "初始化 svn 版本库 %r\n" @@ -1325,16 +1855,16 @@ msgstr "" msgid "" -"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 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" -"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" @@ -1350,13 +1880,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 "" @@ -1372,14 +1902,6 @@ msgid "cannot specify --rev and --change at the same time" msgstr "不能同时指定 '--rev' 和 '--change'" -#, 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 "" @@ -1415,6 +1937,21 @@ 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 "" @@ -1482,10 +2019,6 @@ msgstr "" #, python-format -msgid "Automated merge with %s" -msgstr "" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n" @@ -1505,7 +2038,7 @@ msgstr "" #, fuzzy -msgid "sign and verify changesets" +msgid "commands to sign and verify changesets" msgstr "正在增加修改集\n" msgid "error while verifying signature" @@ -1558,10 +2091,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1590,7 +2119,7 @@ msgstr "" msgid "" -"show revision graphs in terminals\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" @@ -1635,40 +2164,40 @@ msgstr "" msgid "" -"integrate Mercurial with a CIA notification service\n" -"\n" -"This is meant to be run as a changegroup or incoming hook.\n" -"To configure it, set the following options in your hgrc:\n" -"\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 @@ -1678,12 +2207,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" @@ -1699,19 +2222,19 @@ "\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" @@ -1771,7 +2294,7 @@ msgid "hg debug-config" msgstr "" -msgid "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" msgstr "" msgid "ignored" @@ -1792,26 +2315,24 @@ msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting for hgweb\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" -"There is a single configuration option:\n" -"\n" -"[web]\n" -"pygments_style = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "accelerate status report using system level services" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" msgstr "" msgid "start an inotify server for this repository" @@ -1839,15 +2360,12 @@ msgid "name of file to write process ID to" msgstr "写入进程标识符的文件名称" -msgid "hg inserve [OPT]..." +msgid "hg inserve [OPTION]..." msgstr "" 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 "" @@ -1856,9 +2374,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 "" @@ -1916,10 +2431,6 @@ msgstr "" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "" @@ -1988,12 +2499,12 @@ msgid "" "expand expressions into changelog and summaries\n" "\n" -"This extension allows the use of a special syntax in summaries,\n" -"which will be automatically expanded into links or any other\n" -"arbitrary expression, much like InterWiki does.\n" -"\n" -"A few example patterns (link to bug tracking, etc.) that may\n" -"be used in your hgrc:\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" @@ -2023,20 +2534,22 @@ "Configuration is done in the [keyword] and [keywordmaps] sections of\n" "hgrc files.\n" "\n" -"Example:\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repositories.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" "\n" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" @@ -2055,8 +2568,8 @@ "have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" msgstr "" #, python-format @@ -2079,41 +2592,59 @@ " Show current, custom, or default keyword template maps and their\n" " expansions.\n" "\n" -" Extend current configuration by specifying maps as arguments and\n" -" optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" -#, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - #, fuzzy, python-format msgid "creating temporary repository at %s\n" msgstr "" "\n" "正在删除临时版本库 %s\n" -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +#, fuzzy +msgid "\tdisabling current template maps\n" +msgstr "使用指定的样式显示" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, fuzzy, python-format -msgid "" -"\n" -"removing temporary repository %s\n" -msgstr "" -"\n" -"正在删除临时版本库 %s\n" +msgid "" +"\n" +"\tkeywords expanded\n" +msgstr "" msgid "" "expand keywords in the working directory\n" @@ -2125,11 +2656,25 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2161,7 +2706,15 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +#, fuzzy +msgid "only show unknown (not tracked) files" +msgstr "只显示未知(未被跟踪)文件的状态" + +#, fuzzy +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "显示全部文件的状态" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2171,7 +2724,7 @@ msgstr "" msgid "" -"work with a stack of patches\n" +"manage a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" @@ -2180,19 +2733,18 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" #, python-format @@ -2211,10 +2763,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2427,6 +2975,10 @@ msgid "deletions found between repo revs" msgstr "" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "使用 %s\n" + msgid "patch queue now empty\n" msgstr "" @@ -2434,7 +2986,8 @@ msgstr "" msgid "" -"refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2531,11 +3084,9 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is\n" -" required.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory.\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." @@ -2544,9 +3095,15 @@ msgid "print the patches already applied" msgstr "" +msgid "only one patch applied\n" +msgstr "" + msgid "print the patches not yet applied" msgstr "" +msgid "all patches applied\n" +msgstr "" + #, fuzzy msgid "" "import a patch\n" @@ -2656,15 +3213,9 @@ msgid "print the name of the next patch" msgstr "" -msgid "all patches applied\n" -msgstr "" - msgid "print the name of the previous patch" msgstr "" -msgid "only one patch applied\n" -msgstr "" - msgid "" "create a new patch\n" "\n" @@ -3003,7 +3554,11 @@ msgid "print first line of patch header" msgstr "" -msgid "hg qapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the last patch" +msgstr "只显示已增加文件的状态" + +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "" msgid "use pull protocol to copy metadata" @@ -3123,7 +3678,8 @@ msgid "queue name to pop" msgstr "操作的队列名称" -msgid "forget any local changes" +#, fuzzy +msgid "forget any local changes to patched files" msgstr "丢弃本地修改" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -3150,16 +3706,18 @@ msgid "refresh only files already in the patch and specified files" msgstr "仅当文件已经在补丁或指定文件中时才更新" -msgid "add/update \"From: <current user>\" in patch" -msgstr "在补丁中增加/更新 \"From: <current user>\"" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "在补丁中增加/更新 \"From: <given user>\"" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "在补丁中更新 \"Date: <current date>\" (如果存在)" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +#, fuzzy +msgid "add/update date field in patch with current date" +msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)" + +#, fuzzy +msgid "add/update date field in patch with given date" msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3229,75 +3787,83 @@ msgid "hg qtop [-s]" msgstr "" -msgid "hg qunapplied [-s] [PATCH]" +#, fuzzy +msgid "show only the first patch" +msgstr "只显示已增加文件的状态" + +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "" msgid "finish all applied changesets" msgstr "" -msgid "hg qfinish [-a] [REV...]" -msgstr "" - -msgid "" -"send e-mail notifications for commits/pushes\n" -"\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +msgid "hg qfinish [-a] [REV]..." +msgstr "" + +msgid "" +"hooks for sending email notifications at commit/push time\n" +"\n" +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repository root.\n" -"\n" -" if you like, you can put notify config file in repository that users\n" -" can push changes to, they can manage their own subscriptions." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -3323,17 +3889,13 @@ 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 "" "browse command output with an external pager\n" "\n" -"To set the pager that should be used, set the application variable:\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" @@ -3342,19 +3904,19 @@ "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" "\n" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting:\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend:\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" @@ -3371,22 +3933,22 @@ "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" "\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" msgid "" -"send Mercurial changesets as a series of patch e-mails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3395,11 +3957,9 @@ "first line of the changeset description as the subject text. The\n" "message contains two or three body parts:\n" "\n" -" The changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3410,7 +3970,7 @@ "you are sending the right changes.\n" "\n" "To configure other defaults, add a section like this to your hgrc\n" -"file:\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3433,13 +3993,13 @@ "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt:\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out:\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" @@ -3449,7 +4009,11 @@ "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" "directly from the commandline. See the [email] and [smtp] sections in\n" -"hgrc(5) for details." +"hgrc(5) for details.\n" +msgstr "" + +#, python-format +msgid "%sPlease enter a valid value" msgstr "" msgid "Please enter a valid value.\n" @@ -3489,23 +4053,24 @@ " single email containing a binary Mercurial bundle as an attachment\n" " will be sent.\n" "\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -3584,6 +4149,9 @@ msgid "message identifier to reply to" msgstr "" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "" @@ -3615,7 +4183,7 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" -msgid "delete files not tracked from the working directory" +msgid "command to delete untracked files from the working directory" msgstr "" msgid "" @@ -3625,13 +4193,16 @@ " and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -3676,16 +4247,13 @@ msgstr "" msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgstr "" - -msgid "first revision, do not change ancestor\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" msgid "" @@ -3731,60 +4299,17 @@ msgid "%d revisions have been skipped\n" msgstr "" -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 "" - -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 "" @@ -3797,28 +4322,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" +msgid "source is ancestor of destination" +msgstr "" + +msgid "source is descendant of destination" msgstr "" 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 "" @@ -3831,13 +4343,15 @@ msgid "rebase onto a given revision" msgstr "" -msgid "collapse the rebased revisions" -msgstr "" - -msgid "keep original revisions" -msgstr "" - -msgid "keep original branches" +#, fuzzy +msgid "collapse the rebased changesets" +msgstr "打包不相关的修改集" + +#, fuzzy +msgid "keep original changesets" +msgstr "列出修改集" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -3847,11 +4361,11 @@ msgstr "" msgid "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | " -"[-c] | [-a]" -msgstr "" - -msgid "interactively select which sets of changes to commit/qrefresh" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" +msgstr "" + +msgid "commands to interactively select changes for commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3893,30 +4407,9 @@ msgid "&?" msgstr "" -msgid "y" -msgstr "" - -msgid "?" -msgstr "" - msgid "y - record this change" msgstr "" -msgid "s" -msgstr "" - -msgid "f" -msgstr "" - -msgid "d" -msgstr "" - -msgid "a" -msgstr "" - -msgid "q" -msgstr "" - msgid "user quit" msgstr "用户退出" @@ -3927,6 +4420,9 @@ msgid " and " msgstr "" +msgid "y" +msgstr "" + #, python-format msgid "record this change to %r?" msgstr "" @@ -3946,19 +4442,19 @@ " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -3970,20 +4466,9 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "" - -msgid "applying patch\n" -msgstr "" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" @@ -4011,7 +4496,7 @@ msgstr "" msgid "" -"transplant changesets from another branch\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -4074,9 +4559,9 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" @@ -4157,7 +4642,7 @@ msgstr "" msgid "" -"allow the use of MBCS paths with problematic encoding\n" +"allow the use of MBCS paths with problematic encodings\n" "\n" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" @@ -4167,19 +4652,22 @@ "operation.\n" "\n" "This extension is useful for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ASCII chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" "\n" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" @@ -4187,43 +4675,40 @@ msgstr "" #, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" 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" -"To perform automatic newline conversion, use:\n" -"\n" -"[extensions]\n" -"hgext.win32text =\n" -"[encode]\n" -"** = cleverencode:\n" -"# or ** = macencode:\n" -"\n" -"[decode]\n" -"** = cleverdecode:\n" -"# or ** = macdecode:\n" -"\n" -"If not doing conversion, to make sure you do not commit CRLF/CR by accident:\n" -"\n" -"[hooks]\n" -"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" "\n" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled:\n" -"\n" -"[hooks]\n" -"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" -"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" #, python-format @@ -4269,15 +4754,15 @@ "without knowing their actual IP address.\n" "\n" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -4512,6 +4997,10 @@ msgid "HG: branch '%s'" msgstr "" +#, fuzzy, python-format +msgid "HG: subrepo %s" +msgstr "已删除" + #, python-format msgid "HG: added %s" msgstr "" @@ -4565,11 +5054,11 @@ " commit.\n" "\n" " Use the -s/--similarity option to detect renamed files. With a\n" -" parameter > 0, this compares every removed file with every added\n" -" file and records those similar enough as renames. This option\n" -" takes a percentage between 0 (disabled) and 100 (files must be\n" -" identical) as its parameter. Detecting renamed files this way can\n" -" be expensive.\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" @@ -4622,14 +5111,14 @@ " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -4692,10 +5181,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -4757,10 +5242,6 @@ msgstr "" #, python-format -msgid "cannot find executable: %s" -msgstr "" - -#, python-format msgid "failed to execute %s" msgstr "" @@ -4773,7 +5254,7 @@ msgstr "修改集: %d:%s\n" #, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" msgid "" @@ -4792,7 +5273,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -4811,9 +5293,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -4830,8 +5314,8 @@ " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" -" To change the compression method applied, use the -t/--type\n" -" option. The available compression methods are: none, bzip2, and\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" " gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" @@ -4859,11 +5343,11 @@ "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" @@ -4902,7 +5386,7 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -4912,7 +5396,6 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" " " msgstr "" @@ -4949,6 +5432,9 @@ " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" " " +msgid "nothing changed\n" +msgstr "没有改变\n" + msgid "created new head\n" msgstr "已经创建新顶点\n" @@ -5097,13 +5583,13 @@ msgstr "" msgid "" -" (Current patch tool may be incompatible with patch, or misconfigured. Please " -"check your .hgrc file)\n" -msgstr "" - -msgid "" -" Internal patcher failure, please report this error to http://www.selenic.com/" -"mercurial/bts\n" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5206,16 +5692,16 @@ " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -5315,25 +5801,31 @@ "\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 children 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.\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 "" +msgid "you must specify a branch to use --closed" +msgstr "" + #, fuzzy, python-format msgid "no open branch heads on branch %s\n" msgstr "svn: 分支没有版本 %s" @@ -5406,9 +5898,11 @@ msgid "no help text available" msgstr "没有可用的帮助信息" -#, python-format -msgid "%s extension - %s\n" -msgstr "" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" +msgstr "** 已加载的扩展: %s\n" msgid "Mercurial Distributed SCM\n" msgstr "分布式软件配置管理工具 - 水银\n" @@ -5474,7 +5968,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5485,12 +5980,6 @@ msgid "no diffs found" msgstr "" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" - #, fuzzy msgid "not a Mercurial patch" msgstr "%s 不是本地的水银版本库" @@ -5829,15 +6318,15 @@ "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" @@ -5913,9 +6402,10 @@ " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" "\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" @@ -6005,7 +6495,7 @@ " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -6075,15 +6565,16 @@ " If two revisions are given, the differences between them are\n" " shown.\n" "\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = missing (deleted by non-hg command, but still tracked)\n" -" ? = not tracked\n" -" I = ignored\n" -" = origin of the previous file listed as A (added)\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "显示工作目录中已改变的文件\n" @@ -6114,6 +6605,103 @@ " " 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 "" + +#, fuzzy +msgid " (empty repository)" +msgstr "创建队列版本库" + +#, fuzzy +msgid " (no revision checked out)" +msgstr "要合并的版本" + +#, fuzzy, python-format +msgid "parent: %d:%s %s\n" +msgstr "父亲: %d:%s\n" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "分支: %s\n" + +#, python-format +msgid "%d added" +msgstr "" + +#, python-format +msgid "%d modified" +msgstr "" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "已删除" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, python-format +msgid "%d ignored" +msgstr "" + +#, python-format +msgid "%d unknown" +msgstr "" + +#, fuzzy, python-format +msgid "%d unresolved" +msgstr "未解决" + +#, fuzzy +msgid " (merge)" +msgstr "已合并" + +msgid " (new branch)" +msgstr "" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, fuzzy, python-format +msgid "commit: %s\n" +msgstr "中止: %s\n" + +msgid "update: (current)\n" +msgstr "" + +#, fuzzy, python-format +msgid "update: %d new changesets (update)\n" +msgstr "如果有新的修改集，就更新到最新版本" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "领域: %s\n" + +msgid "remote: (synced)\n" +msgstr "" + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -6158,17 +6746,9 @@ msgstr "非本地版本库 '%s'" #, python-format -msgid "Removed tag %s" -msgstr "" - -#, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "" - msgid "" "list repository tags\n" "\n" @@ -6252,6 +6832,9 @@ " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" " " +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" + #, fuzzy msgid "uncommitted local changes" msgstr "提交修改集 %d:%s\n" @@ -6286,7 +6869,8 @@ "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n" "特定目的的隐含的担保。\n" -msgid "repository root directory or symbolic path name" +#, fuzzy +msgid "repository root directory or name of overlay bundle file" msgstr "版本库的根目录或符号路径名称" msgid "change working directory" @@ -6479,6 +7063,10 @@ msgid "show only branches that have unmerged heads" msgstr "" +#, fuzzy +msgid "show normal and closed branches" +msgstr "只显示已增加文件的状态" + msgid "[-a]" msgstr "" @@ -6625,11 +7213,12 @@ msgid "show only heads which are descendants of REV" msgstr "" -msgid "show only the active heads from open branches" -msgstr "" +#, fuzzy +msgid "show only the active branch heads from open branches" +msgstr "svn: 分支没有版本 %s" #, fuzzy -msgid "show normal and closed heads" +msgid "show normal and closed branch heads" msgstr "只显示已增加文件的状态" msgid "[-r STARTREV] [REV]..." @@ -6869,6 +7458,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "显示全部文件的状态" @@ -6946,36 +7538,6 @@ msgid "branch name not in UTF-8!" msgstr "" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "" - -#, 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 "" - -#, python-format -msgid " dir %s -> %s\n" -msgstr "" - -#, python-format -msgid " file %s -> %s\n" -msgstr "" - msgid "working directory state appears damaged!" msgstr "" @@ -7022,16 +7584,16 @@ msgstr "中止: %s\n" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" msgstr "" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "" @@ -7102,7 +7664,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** 遇到了未知异常，详细信息如下\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +#, fuzzy +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n" msgid "** or mercurial@selenic.com\n" @@ -7128,12 +7691,6 @@ msgid "alias '%s' resolves to ambiguous command '%s'\n" msgstr "" -#, fuzzy, python-format -msgid "alias '%s' shadows command\n" -msgstr "" -"命令列表:\n" -"\n" - #, python-format msgid "malformed --config option: %s" msgstr "非法 '--config' 选项: %s" @@ -7201,10 +7758,6 @@ msgstr "工具 '%s' 需要 GUI\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "选择工具 '%s'，用于 %s(二进制 %s 符号链接 %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -7218,9 +7771,6 @@ msgid "&Other" msgstr "" -msgid "l" -msgstr "" - #, python-format msgid "merging %s and %s to %s\n" msgstr "" @@ -7230,13 +7780,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)?" @@ -7248,9 +7791,6 @@ msgid "&Yes" msgstr "" -msgid "n" -msgstr "" - #, python-format msgid "merging %s failed!\n" msgstr "" @@ -7263,44 +7803,6 @@ 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\n" -" advanced usage only; they may provide potentially dangerous\n" -" abilities (such as letting you destroy or modify history); they\n" -" might not be ready for prime time; or they may alter some\n" -" usual behaviors of stock Mercurial. It is thus up to the user to\n" -" activate extensions as needed.\n" -"\n" -" To enable the \"foo\" extension, either shipped with Mercurial\n" -" or in the Python search path, create an entry for it in your\n" -" hgrc, like 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 "" - #, fuzzy msgid "disabled extensions:" msgstr "" @@ -7311,614 +7813,29 @@ msgid "Date Formats" msgstr "" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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 "" - msgid "File Name Patterns" msgstr "" -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 only\n" -" match 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 of\n" -" 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 "" -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" -" * 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 "" -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 topological offsets from the tip, with -1 denoting\n" -" the tip. As such, negative numbers are only useful if you've\n" -" memorized your local tree numbers and want to save typing a single\n" -" digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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 "指定多个版本" -#, fuzzy -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" -" 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" -" 范围格式提供。\n" -"\n" -" 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" -" 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" -"\"\n" -" 意味着全部版本。\n" -"\n" -" 如果 'BEGIN' 大于 'END'，版本视为反序。\n" -"\n" -" 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n" -" '8'，'7' 和 '6'。\n" -" " - msgid "Diff Formats" msgstr "差异格式" -#, fuzzy -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 "" -"\n" -" 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" -" GNU patch 和许多标准工具。\n" -"\n" -" 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" -"\n" -" - 可执行状态和其它权限位\n" -" - 复制或改名信息\n" -" - 二进制文件的修改\n" -" - 创建或删除空文件\n" -"\n" -" 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" -" 此格式，所以它不是默认格式。\n" -"\n" -" 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n" -" 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" -" 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" -" 响。\n" -"\n" -" 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" -" 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" -" 或在 mq 扩展中使用时，不需要设置此选项。\n" -" " - msgid "Template Usage" msgstr "模版用法" #, fuzzy -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 default.\n" -" - date: Date information. The date when the changeset was 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 by\n" -" 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 number.\n" -" - tags: List of strings. Any tags associated with the 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing separators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar\".\n" -" - stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an\n" -" email address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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\n" -" in email headers.\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 address.\n" -" " -msgstr "" -"\n" -" 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" -" 来使用模版，或者选择已有的模版样式(--style)。\n" -"\n" -" 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" -" tip，parents，heads 和 glog。\n" -"\n" -" 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" 模版是文本片断，其中的标记用于变量扩展:\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" -" 可用于输出与日志信息类似的命令:\n" -"\n" -" - author: 字符串。修改集的作者。\n" -" - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" -" - date: 日期信息。修改集的日期。\n" -" - desc: 字符串。修改集的描述。\n" -" - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" -" - file_adds: 字符串列表。修改集中被增加的文件。\n" -" - file_mods: 字符串列表。修改集中被修改的文件\n" -" - file_dels: 字符串列表。修改集中被删除的文件\n" -" - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" -" - parents: 字符串列表。修改集的父亲。\n" -" - rev: 整数。本地版本库的修改集的版本号。\n" -" - tags: 字符串列表。修改集的标签。\n" -"\n" -" 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使用\n" -" 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" -" 链来产生理想的输出:\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" 过滤器列表:\n" -"\n" -" - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" -" \"<br />\"。\n" -" - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n" -" - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n" -" 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz" -"\"，\n" -" \"foo/bar//\" 成为 \"bar\"。\n" -" - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n" -" \"Mon Sep 04 15:13:13 2006 0700\"。\n" -" - domain: 输入任意文本。找到第一个 email 地址，返回其域名。例如: \n" -" 'User <user@example.com>' 成为 'example.com'。\n" -" - email: 输入任意文本。返回第一个 email 地址。例如: \n" -" 'User <user@example.com>' 成为 'user@example.com'。\n" -" - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n" -" \"<\" 和 \">\"。\n" -" - fill68: 输入任意文本。格式化为 68 列文本。\n" -" - fill76: 输入任意文本。格式化为 76 列文本。\n" -" - firstline: 输入任意文本。返回首行。\n" -" - hgdate: 输入日期。返回一对数字:\n" -" \"1157407993 25200\" (Unix 时戳，时区偏移)。\n" -" - isodate: 输入日期。返回 ISO 8601 格式的日期。\n" -" - obfuscate: 输入任意文本。返回其 XML 实体序列。\n" -" - person: 输入任意文本。返回 email 地址前的文本。\n" -" - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n" -" - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n" -" 字符串。\n" -" - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n" -" - strip: 输入任意文本。删除全部行首与行尾空白。\n" -" - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n" -" - urlescape: 输入任意文本。封装全部特殊字符。例如\n" -" \"foo bar\" 成为 \"foo%20bar\"。\n" -" - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" -" " - -#, fuzzy msgid "URL Paths" msgstr "统一资源定位路径" #, fuzzy -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\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" -" - 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 path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [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" -" 有效的位置格式:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" -" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" -"\n" -" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" -" 修改集。\n" -"\n" -" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" -"\n" -" 在水银中使用 SSH 的一些提示:\n" -" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" -" hg，或者有指定的远程命令。\n" -" - 默认 'path' 是相对于远程主机上的用户家目录。\n" -" 可以在路径前增加一个斜线指定绝对路径:\n" -" ssh://example.com//tmp/repository\n" -" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" -" SSH 执行压缩，例如:\n" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\n" -" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" -" 用于命令行参数 '--ssh' 中。\n" -"\n" -" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" -" [paths]\n" -" alias1 = URL1\n" -" alias2 = URL2\n" -" ...\n" -"\n" -" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" -" 会从 'alias1' 定义的路径取得指定版本)。\n" -"\n" -" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" -"\n" -" default:\n" -" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" -" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" -" 的命令省略路径(包含进和出)。\n" -"\n" -" default-push:\n" -" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" -" " - -#, fuzzy msgid "Using additional features" msgstr "启用额外的输出" @@ -7953,27 +7870,20 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updated" -msgstr "已更新" - -msgid "merged" -msgstr "已合并" - -msgid "removed" -msgstr "已删除" - -msgid "unresolved" -msgstr "未解决" - -#, python-format -msgid "%d files %s" -msgstr "%d 个文件%s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "正在更新标签\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 "" 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 "" @@ -8049,32 +7959,12 @@ msgid "unsupported URL component: \"%s\"" msgstr "" -#, python-format -msgid "using %s\n" -msgstr "使用 %s\n" - -#, python-format -msgid "capabilities: %s\n" -msgstr "" - msgid "operation not supported over http" msgstr "" -#, python-format -msgid "sending %s command\n" -msgstr "发送命令 '%s'\n" - -#, python-format -msgid "sending %s bytes\n" -msgstr "发送 %s 字节\n" - msgid "authorization failed" msgstr "授权失败" -#, python-format -msgid "http error while sending %s command\n" -msgstr "" - msgid "http error, possibly caused by proxy setting" msgstr "" @@ -8082,10 +7972,6 @@ msgid "real URL is %s\n" msgstr "实际 URL 是 '%s'\n" -#, fuzzy, python-format -msgid "requested URL: '%s'\n" -msgstr "请求的 URL: '%s'\n" - #, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' 似乎不是水银版本库" @@ -8121,7 +8007,7 @@ msgstr "" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -8152,17 +8038,6 @@ msgstr "" #, python-format -msgid "%s, line %s: %s\n" -msgstr "" - -msgid "cannot parse entry" -msgstr "" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "" - -#, python-format msgid "working directory has unknown parent '%s'!" msgstr "" @@ -8170,10 +8045,6 @@ msgid "unknown revision '%s'" msgstr "" -#, python-format -msgid "filtering %s through %s\n" -msgstr "" - msgid "journal already exists - run hg recover" msgstr "" @@ -8205,14 +8076,6 @@ msgid "working directory of %s" msgstr "" -#, 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 "" @@ -8228,9 +8091,6 @@ msgid "file not tracked!" msgstr "%s 没有被跟踪!\n" -msgid "nothing changed\n" -msgstr "没有改变\n" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "未解决的合并冲突(参见 'hg resolve')" @@ -8283,41 +8143,6 @@ msgid "searching for changes\n" msgstr "正在搜索修改\n" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "" - -#, python-format -msgid "found new changeset %s\n" -msgstr "" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -8327,16 +8152,6 @@ msgid "repository is unrelated" msgstr "" -msgid "found new changesets starting at " -msgstr "" - -#, python-format -msgid "%d total queries\n" -msgstr "" - -msgid "common changesets up to " -msgstr "" - msgid "requesting all changes\n" msgstr "正在请求全部修改\n" @@ -8362,17 +8177,10 @@ msgid "%d changesets found\n" msgstr "已发现 %d 个修改集\n" -msgid "list of changesets:\n" -msgstr "" - #, python-format msgid "empty or missing revlog for %s" msgstr "" -#, python-format -msgid "add changeset %s\n" -msgstr "" - msgid "adding changesets\n" msgstr "正在增加修改集\n" @@ -8385,10 +8193,6 @@ msgid "adding file changes\n" msgstr "正在增加文件改变\n" -#, python-format -msgid "adding %s revisions\n" -msgstr "" - msgid "received file revlog group is empty" msgstr "" @@ -8400,9 +8204,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "已增加 %d 个修改集，包含 %d 个改变，修改了 %d 个文件%s\n" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "" @@ -8423,10 +8224,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -8508,14 +8305,6 @@ msgstr "正在解析清单\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?" @@ -8527,9 +8316,6 @@ msgid "&Delete" msgstr "" -msgid "c" -msgstr "" - #, python-format msgid "" "remote changed %s which local deleted\n" @@ -8540,10 +8326,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -8590,13 +8372,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 "" @@ -8667,7 +8442,7 @@ msgstr "" #, python-format -msgid "no valid hunks found; trying with %r instead\n" +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "" #, python-format @@ -8679,13 +8454,6 @@ msgstr "" #, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" - -#, python-format msgid "saving bundle to %s\n" msgstr "" @@ -8756,12 +8524,12 @@ msgid "could not create remote repo" msgstr "" +msgid "no suitable response from remote hg" +msgstr "" + msgid "remote: " msgstr "" -msgid "no suitable response from remote hg" -msgstr "" - #, python-format msgid "push refused: %s" msgstr "" @@ -8779,17 +8547,6 @@ msgid "invalid entry in fncache, line %s" msgstr "" -msgid "scanning\n" -msgstr "正在扫描\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "需要传输 %d 个文件，%d 字节\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "正在发送 %s (%d 字节)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -8799,9 +8556,6 @@ msgid "&Remote" msgstr "" -msgid "r" -msgstr "" - #, python-format msgid "" " local changed subrepository %s which remote removed\n" @@ -8826,6 +8580,17 @@ msgid "pushing subrepo %s\n" msgstr "正在推到 %s\n" +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + msgid "unmatched quotes" msgstr "不匹配的引号" @@ -8891,12 +8656,12 @@ msgid "username %s contains a newline\n" msgstr "" +msgid "response expected" +msgstr "" + msgid "unrecognized response\n" msgstr "" -msgid "response expected" -msgstr "" - msgid "password: " msgstr "密码: " @@ -8925,10 +8690,6 @@ msgstr "" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -9126,11 +8887,15 @@ msgstr "" #, 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 "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format
--- a/i18n/zh_TW.po Sat Nov 07 14:12:08 2009 -0600 +++ b/i18n/zh_TW.po Sat Nov 07 14:13:15 2009 -0600 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-10 22:09+0800\n" -"PO-Revision-Date: 2009-06-18 21:12+0200\n" +"POT-Creation-Date: 2009-10-25 12:38+0100\n" +"PO-Revision-Date: 2009-10-25 12:50+0100\n" "Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>\n" "Language-Team: Traditional Chinese\n" "MIME-Version: 1.0\n" @@ -25,7 +25,10 @@ msgid "COMMANDS" msgstr "命令" -msgid " options:\n" +#, fuzzy +msgid "" +" options:\n" +"\n" msgstr " 選項: \n" #, python-format @@ -36,12 +39,512 @@ " 別名: %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" +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 "" + +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 \"<br />\" 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 <user@example.com>' becomes\n" +" 'example.com'.\n" +":email: Any text. Extracts the first string that looks like\n" +" an email address. Example: 'User <user@example.com>'\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 @@ -49,52 +552,38 @@ msgstr "" #, python-format -msgid "acl: changes have source \"%s\" - skipping\n" -msgstr "" - -#, python-format -msgid "acl: user %s denied on %s\n" -msgstr "" - -#, python-format msgid "acl: access denied for changeset %s" msgstr "" -#, python-format -msgid "acl: user %s not allowed on %s\n" -msgstr "" - -#, python-format -msgid "acl: allowing changeset %s\n" -msgstr "" - -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" @@ -139,7 +628,7 @@ msgstr "" 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" @@ -155,65 +644,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" @@ -226,7 +736,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" @@ -234,8 +744,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" @@ -244,7 +755,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" @@ -323,6 +834,9 @@ msgid "database error: %s" msgstr "" +msgid "command to display child changesets" +msgstr "" + msgid "" "show the children of the given or working directory revision\n" "\n" @@ -340,7 +854,7 @@ msgid "hg children [-r REV] [FILE]" msgstr "" -msgid "command to show certain statistics about revision history" +msgid "command to display statistics about repository history" msgstr "" #, python-format @@ -352,15 +866,19 @@ msgstr "" msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template\n" -" or alternatively by date, if dateformat is used. In this case it\n" -" will override template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" -"\n" -" Examples:\n" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" +"\n" +" Examples::\n" "\n" " # display count of changed lines for every committer\n" " hg churn -t '{author|email}'\n" @@ -374,17 +892,14 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" -"\n" -" <alias email> <actual email>\n" -"\n" -" By default .hgchurn in the working directory root will be used, if\n" -" it exists. Use the --aliases option to override this.\n" -" " -msgstr "" - -#, python-format -msgid "assuming %i character terminal\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format::\n" +"\n" +" <alias email> <actual email>\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 "" msgid "count rate for the specified revision or range" @@ -415,7 +930,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" @@ -428,52 +943,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" @@ -485,6 +1001,7 @@ " - Perforce [p4]\n" "\n" " Accepted destination formats [identifiers]:\n" +"\n" " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" @@ -496,23 +1013,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 <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so:\n" -" <source ID> <destination ID>\n" +" revision, like so::\n" +"\n" +" <source ID> <destination ID>\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" @@ -526,7 +1048,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" @@ -536,11 +1058,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" @@ -565,7 +1087,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" @@ -590,43 +1112,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" @@ -672,7 +1182,6 @@ " --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" -"\n" " Mercurial Destination\n" " ---------------------\n" "\n" @@ -790,18 +1299,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 "" @@ -875,16 +1376,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 @@ -894,7 +1387,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 @@ -928,10 +1423,6 @@ msgid "running %s\n" msgstr "" -#, python-format -msgid "prefix=%r directory=%r root=%r\n" -msgstr "" - msgid "RCS file must be followed by working file" msgstr "" @@ -945,10 +1436,6 @@ msgstr "" #, python-format -msgid "found synthetic revision in %s: %r\n" -msgstr "" - -#, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -972,13 +1459,13 @@ msgid "%d changeset entries\n" msgstr "" +#, python-format +msgid "darcs version 2.1 or newer needed (found %r)" +msgstr "" + msgid "Python ElementTree module is not available" msgstr "" -#, python-format -msgid "cleaning up %s\n" -msgstr "" - msgid "internal calling inconsistency" msgstr "" @@ -1013,22 +1500,6 @@ msgstr "" #, 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 "" - -#, python-format msgid "could not parse cat-log of %s" msgstr "" @@ -1040,12 +1511,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 "" @@ -1064,12 +1529,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 "" @@ -1084,6 +1543,9 @@ msgid "collecting p4 changelists\n" msgstr "" +msgid "Mercurial failed to run itself, check hg executable is in PATH" +msgstr "" + msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1134,84 +1596,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 "" @@ -1229,20 +1629,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" @@ -1258,14 +1654,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 "" @@ -1281,14 +1676,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 "" @@ -1324,10 +1711,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 "" @@ -1391,10 +1793,6 @@ msgstr "" #, python-format -msgid "Automated merge with %s" -msgstr "" - -#, python-format msgid "new changeset %d:%s merges remote changes with local\n" msgstr "" @@ -1413,6 +1811,9 @@ msgid "hg fetch [SOURCE]" msgstr "" +msgid "commands to sign and verify changesets" +msgstr "" + msgid "error while verifying signature" msgstr "" @@ -1463,10 +1864,6 @@ "force)" msgstr "" -#, python-format -msgid "Added signature for changeset %s" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1495,7 +1892,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" @@ -1540,40 +1937,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 @@ -1583,14 +1980,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" @@ -1599,36 +1990,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" @@ -1688,7 +2067,7 @@ msgid "hg debug-config" msgstr "" -msgid "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" msgstr "" msgid "ignored" @@ -1709,31 +2088,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 = <style>\n" +"There is a single configuration option::\n" +"\n" +" [web]\n" +" pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "inotify-based status acceleration for Linux systems\n" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" msgstr "" msgid "start an inotify server for this repository" @@ -1761,15 +2133,12 @@ msgid "name of file to write process ID to" msgstr "" -msgid "hg inserve [OPT]..." +msgid "hg inserve [OPTION]..." msgstr "" 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 "" @@ -1778,9 +2147,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 "" @@ -1838,10 +2204,6 @@ msgstr "" #, python-format -msgid "status: %r dir(%d) -> %s\n" -msgstr "" - -#, python-format msgid "status: %r %s -> %s\n" msgstr "" @@ -1907,6 +2269,23 @@ msgid "finished setup\n" msgstr "" +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries, which\n" +"will be automatically expanded into links or any other arbitrary\n" +"expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may be used\n" +"in your hgrc::\n" +"\n" +" [interhg]\n" +" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" +msgstr "" + #, python-format msgid "interhg: invalid pattern for %s: %s\n" msgstr "" @@ -1916,7 +2295,7 @@ msgstr "" msgid "" -"keyword expansion in local repositories\n" +"expand keywords in tracked files\n" "\n" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" "tracked text files selected by your configuration.\n" @@ -1928,20 +2307,22 @@ "Configuration is done in the [keyword] and [keywordmaps] sections of\n" "hgrc files.\n" "\n" -"Example:\n" +"Example::\n" "\n" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" " x* = ignore\n" "\n" -"Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repositories.\n" +"NOTE: the more specific you are in your filename patterns the less you\n" +"lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\".\n" -"\n" -"An additional date template filter {date|utcdate} is provided.\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"available templates and filters.\n" +"\n" +"An additional date template filter {date|utcdate} is provided. It\n" +"returns a date like \"2006/09/18 15:13:13\".\n" "\n" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" @@ -1960,8 +2341,8 @@ "have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" -"like CVS' $Log$, are not supported. A keyword template map\n" -"\"Log = {desc}\" expands to the first line of the changeset description.\n" +"like CVS' $Log$, are not supported. A keyword template map \"Log =\n" +"{desc}\" expands to the first line of the changeset description.\n" msgstr "" #, python-format @@ -1984,36 +2365,55 @@ " Show current, custom, or default keyword template maps and their\n" " expansions.\n" "\n" -" Extend current configuration by specifying maps as arguments and\n" -" optionally by reading from an additional hgrc file.\n" -"\n" -" Override current keyword template maps with \"default\" option.\n" -" " -msgstr "" - -#, python-format -msgid "" -"\n" -"\t%s\n" +" Extend the current configuration by specifying maps as arguments\n" +" and using -f/--rcfile to source an external hgrc file.\n" +"\n" +" Use -d/--default to disable current configuration.\n" +"\n" +" See \"hg help templates\" for information on templates and filters.\n" +" " msgstr "" #, python-format msgid "creating temporary repository at %s\n" msgstr "" -#, python-format -msgid "" -"\n" -"%s keywords written to %s:\n" +msgid "" +"\n" +"\tconfiguration using custom keyword template maps\n" +msgstr "" + +msgid "\textending current template maps\n" +msgstr "" + +msgid "\toverriding default template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using default keyword template maps\n" +msgstr "" + +msgid "\tdisabling current template maps\n" +msgstr "" + +msgid "" +"\n" +"\tconfiguration using current keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"keywords written to %s:\n" msgstr "" msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repository %s\n" +msgid "" +"\n" +"\tkeywords expanded\n" msgstr "" msgid "" @@ -2026,11 +2426,25 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates for\n" +" expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\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 (not tracked)\n" +" I = ignored\n" +" i = ignored (not tracked)\n" " " msgstr "" @@ -2062,7 +2476,13 @@ msgid "show files excluded from expansion" msgstr "" -msgid "additionally show untracked files" +msgid "only show unknown (not tracked) files" +msgstr "" + +msgid "show keyword status flags of all files (DEPRECATED)" +msgstr "" + +msgid "only show untracked files (DEPRECATED)" msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." @@ -2072,7 +2492,7 @@ msgstr "" msgid "" -"patch management and development\n" +"manage a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" @@ -2081,19 +2501,18 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use \"hg help command\" for more details):\n" -"\n" -"prepare repository to work with patches qinit\n" -"create new patch qnew\n" -"import existing patch qimport\n" -"\n" -"print patch series qseries\n" -"print applied patches qapplied\n" -"print name of top applied patch qtop\n" -"\n" -"add known patch to applied stack qpush\n" -"remove patch from applied stack qpop\n" -"refresh contents of top applied patch qrefresh\n" +"Common tasks (use \"hg help command\" for more details)::\n" +"\n" +" prepare repository to work with patches qinit\n" +" create new patch qnew\n" +" import existing patch qimport\n" +"\n" +" print patch series qseries\n" +" print applied patches qapplied\n" +"\n" +" add known patch to applied stack qpush\n" +" remove patch from applied stack qpop\n" +" refresh contents of top applied patch qrefresh\n" msgstr "" #, python-format @@ -2112,10 +2531,6 @@ msgstr "" #, python-format -msgid "active guards: %s\n" -msgstr "" - -#, python-format msgid "guard %r too short" msgstr "" @@ -2182,7 +2597,7 @@ msgstr "" #, python-format -msgid "Unable to read %s\n" +msgid "unable to read %s\n" msgstr "" #, python-format @@ -2213,6 +2628,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "" +#, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2322,6 +2741,10 @@ msgid "deletions found between repo revs" msgstr "" +#, fuzzy, python-format +msgid "popping %s\n" +msgstr "合併 %s 中\n" + msgid "patch queue now empty\n" msgstr "" @@ -2427,24 +2850,26 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to the\n" -" -r/--rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular Mercurial changesets). The qfinish command should\n" -" be used as an alternative for qdelete -r, as the latter option is\n" -" deprecated.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory." +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" msgstr "" +msgid "only one patch applied\n" +msgstr "" + msgid "print the patches not yet applied" msgstr "" +msgid "all patches applied\n" +msgstr "" + msgid "" "import a patch\n" "\n" @@ -2528,15 +2953,9 @@ msgid "print the name of the next patch" msgstr "" -msgid "all patches applied\n" -msgstr "" - msgid "print the name of the previous patch" msgstr "" -msgid "only one patch applied\n" -msgstr "" - msgid "" "create a new patch\n" "\n" @@ -2838,7 +3257,10 @@ msgid "print first line of patch header" msgstr "" -msgid "hg qapplied [-s] [PATCH]" +msgid "show only the last patch" +msgstr "" + +msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "" msgid "use pull protocol to copy metadata" @@ -2865,7 +3287,7 @@ msgid "keep patch file" msgstr "" -msgid "stop managing a revision" +msgid "stop managing a revision (DEPRECATED)" msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -2955,7 +3377,7 @@ msgid "queue name to pop" msgstr "" -msgid "forget any local changes" +msgid "forget any local changes to patched files" msgstr "" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" @@ -2982,16 +3404,16 @@ msgid "refresh only files already in the patch and specified files" msgstr "" -msgid "add/update \"From: <current user>\" in patch" -msgstr "" - -msgid "add/update \"From: <given user>\" in patch" -msgstr "" - -msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "" - -msgid "update \"Date: <given date>\" in patch (if present)" +msgid "add/update author field in patch with current user" +msgstr "" + +msgid "add/update author field in patch with given user" +msgstr "" + +msgid "add/update date field in patch with current date" +msgstr "" + +msgid "add/update date field in patch with given date" msgstr "" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." @@ -3060,77 +3482,82 @@ msgid "hg qtop [-s]" msgstr "" -msgid "hg qunapplied [-s] [PATCH]" +msgid "show only the first patch" +msgstr "" + +msgid "hg qunapplied [-1] [-s] [PATCH]" msgstr "" msgid "finish all applied changesets" msgstr "" -msgid "hg qfinish [-a] [REV...]" -msgstr "" - -msgid "" -"hook extension to email notifications on commits/pushes\n" -"\n" -"Subscriptions can be managed through hgrc. Default mode is to print\n" -"messages to stdout, for testing and configuring.\n" -"\n" -"To use, configure notify extension and enable in hgrc like this:\n" -"\n" -" [extensions]\n" -" hgext.notify =\n" -"\n" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook\n" -"\n" -" [notify]\n" -" # config items go in here\n" -"\n" -" config items:\n" -"\n" -" REQUIRED:\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -" OPTIONAL:\n" -" test = True # print messages to stdout for testing\n" -" strip = 3 # number of slashes to strip for url paths\n" -" domain = example.com # domain to use if committer missing domain\n" -" style = ... # style file to use when formatting email\n" -" template = ... # template to use when formatting email\n" -" incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" -" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" -" maxsubject = 67 # truncate subject line longer than this\n" -" diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " +msgid "hg qfinish [-a] [REV]..." +msgstr "" + +msgid "" +"hooks for sending email notifications at commit/push time\n" +"\n" +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go here\n" +"\n" +"Required configuration items::\n" +"\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +"Optional configuration items::\n" +"\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " "list\n" -" # (serve == ssh or http, push, pull, bundle)\n" -" [email]\n" -" from = user@host.com # email address to send as if none given\n" -" [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" -" notify config file has same format as regular hgrc. it has two\n" -" sections so you can express subscriptions in whatever way is handier\n" -" for you.\n" -"\n" -" [usersubs]\n" -" # key is subscriber email, value is \",\"-separated list of glob " -"patterns\n" -" user@host = pattern\n" -"\n" -" [reposubs]\n" -" # key is glob pattern, value is \",\"-separated list of subscriber " -"emails\n" -" pattern = user@host\n" -"\n" -" glob patterns are matched against path to repository root.\n" -"\n" -" if you like, you can put notify config file in repository that users\n" -" can push changes to, they can manage their own subscriptions." +" # (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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you.\n" +"\n" +"::\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host\n" +"\n" +"Glob patterns are matched against path to repository root.\n" +"\n" +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -3156,17 +3583,13 @@ msgstr "" #, python-format -msgid "notify: no subscribers to repository %s\n" -msgstr "" - -#, python-format -msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" - -msgid "" -"browse command output with external pager\n" -"\n" -"To set the pager that should be used, set the application variable:\n" +msgid "notify: suppressing notification for merge %d:%s\n" +msgstr "" + +msgid "" +"browse command output with an external pager\n" +"\n" +"To set the pager that should be used, set the application variable::\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" @@ -3175,19 +3598,19 @@ "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" "\n" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting:\n" +"setting::\n" "\n" " [pager]\n" " quiet = True\n" "\n" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list:\n" +"pager.ignore list::\n" "\n" " [pager]\n" " ignore = version, help, update\n" "\n" "You can also enable the pager only for certain commands using\n" -"pager.attend:\n" +"pager.attend::\n" "\n" " [pager]\n" " attend = log\n" @@ -3199,27 +3622,27 @@ msgstr "" msgid "" -"use suffixes to refer to ancestor revisions\n" +"interpret suffixes to refer to ancestor revisions\n" "\n" "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" "\n" -"For example, if you can refer to a revision as \"foo\", then:\n" -"\n" -"- foo^N = Nth parent of foo\n" +"For example, if you can refer to a revision as \"foo\", then::\n" +"\n" +" foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" " foo^ = foo^1\n" "\n" -"- foo~N = Nth first grandparent of foo\n" +" foo~N = Nth first grandparent of foo\n" " foo~0 = foo\n" " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3228,11 +3651,9 @@ "first line of the changeset description as the subject text. The\n" "message contains two or three body parts:\n" "\n" -" The changeset description.\n" -"\n" -" [Optional] The result of running diffstat on the patch.\n" -"\n" -" The patch itself, as generated by \"hg export\".\n" +"- The changeset description.\n" +"- [Optional] The result of running diffstat on the patch.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3242,13 +3663,8 @@ "with a diffstat summary and the changeset summary, so you can be sure\n" "you are sending the right changes.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" "To configure other defaults, add a section like this to your hgrc\n" -"file:\n" +"file::\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3271,13 +3687,13 @@ "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt:\n" +"files, e.g. with mutt::\n" "\n" " % mutt -R -f mbox\n" "\n" -"When you are previewing the patchbomb messages, you can use `formail'\n" +"When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out:\n" +"package), to send each message out::\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" @@ -3287,7 +3703,11 @@ "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" "directly from the commandline. See the [email] and [smtp] sections in\n" -"hgrc(5) for details." +"hgrc(5) for details.\n" +msgstr "" + +#, python-format +msgid "%sPlease enter a valid value" msgstr "" msgid "Please enter a valid value.\n" @@ -3327,23 +3747,24 @@ " single email containing a binary Mercurial bundle as an attachment\n" " will be sent.\n" "\n" -" Examples:\n" -"\n" -" hg email -r 3000 # send patch 3000 only\n" -" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" -" hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" -" hg email -o # send all patches not in default\n" -" hg email -o DEST # send all patches not in DEST\n" -" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" -" hg email -b # send bundle of all patches not in default\n" -" hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +" Examples::\n" +"\n" +" hg email -r 3000 # send patch 3000 only\n" +" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" +" hg email -r 3000:3005 # send patches 3000 through 3005\n" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" hg email -b # send bundle of all patches not in default\n" +" hg email -b DEST # send bundle of all patches not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " "default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -3422,6 +3843,9 @@ msgid "message identifier to reply to" msgstr "" +msgid "flags to add in subject prefixes" +msgstr "" + msgid "email addresses of recipients" msgstr "" @@ -3452,6 +3876,9 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" +msgid "command to delete untracked files from the working directory" +msgstr "" + msgid "" "removes files not tracked by Mercurial\n" "\n" @@ -3459,13 +3886,16 @@ " and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" +"\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" +"\n" " But it will leave untouched:\n" -" - Modified and unmodified tracked files\n" -" - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" +"\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -3509,16 +3939,13 @@ msgstr "" msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgstr "" - -msgid "first revision, do not change ancestor\n" +"http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" msgid "" @@ -3564,60 +3991,17 @@ msgid "%d revisions have been skipped\n" msgstr "" -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 "" - -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 "" @@ -3630,28 +4014,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" +msgid "source is ancestor of destination" +msgstr "" + +msgid "source is descendant of destination" msgstr "" 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 "" @@ -3664,13 +4035,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 "" + +msgid "keep original branch names" msgstr "" msgid "continue an interrupted rebase" @@ -3684,7 +4055,7 @@ "| [-c] | [-a]" msgstr "" -msgid "interactive change selection during commit or qrefresh" +msgid "commands to interactively select changes for commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3724,30 +4095,9 @@ msgid "&?" msgstr "" -msgid "y" -msgstr "" - -msgid "?" -msgstr "" - msgid "y - record this change" msgstr "" -msgid "s" -msgstr "" - -msgid "f" -msgstr "" - -msgid "d" -msgstr "" - -msgid "a" -msgstr "" - -msgid "q" -msgstr "" - msgid "user quit" msgstr "" @@ -3758,6 +4108,9 @@ msgid " and " msgstr "" +msgid "y" +msgstr "" + #, python-format msgid "record this change to %r?" msgstr "" @@ -3777,19 +4130,19 @@ " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible:\n" -"\n" -" y - record this change\n" -" n - skip this change\n" -"\n" -" s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" -" d - done, skip remaining changes and files\n" -" a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" possible::\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -3801,26 +4154,18 @@ msgid "no changes to record\n" msgstr "" -#, python-format -msgid "backup %r as %r\n" -msgstr "" - -msgid "applying patch\n" -msgstr "" - msgid "patch failed to apply" msgstr "" -#, python-format -msgid "restoring %r to %r\n" -msgstr "" - msgid "hg record [OPTION]... [FILE]..." msgstr "" msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" +msgid "share a common history between several working directories" +msgstr "" + msgid "" "create a new shared repository (experimental)\n" "\n" @@ -3839,7 +4184,7 @@ msgstr "" msgid "" -"patch transplanting tool\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -3902,9 +4247,9 @@ "\n" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form:\n" -"\n" -" (transplanted from CHANGESETHASH)\n" +" specified, log messages will have a comment appended of the form::\n" +"\n" +" (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" @@ -3985,7 +4330,7 @@ msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" +"allow the use of MBCS paths with problematic encodings\n" "\n" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" @@ -3995,40 +4340,63 @@ "operation.\n" "\n" "This extension is useful for:\n" -" * Japanese Windows users using shift_jis encoding.\n" -" * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" +"\n" +"- Japanese Windows users using shift_jis encoding.\n" +"- Chinese Windows users using big5 encoding.\n" +"- All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ASCII chars in path.\n" -" * Any user who do not use any of problematic encodings.\n" +"\n" +"- Any user who use only ASCII chars in path.\n" +"- Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" -" * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" -"\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" +"\n" +"- You should use single encoding in one repository.\n" +"- You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" "\n" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" -"\n" -msgstr "" - -#, python-format -msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion failed with %s encoding\n" msgstr "" msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -#, python-format -msgid "[win32mbcs] activated with encoding: %s\n" +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use::\n" +"\n" +" [extensions]\n" +" hgext.win32text =\n" +" [encode]\n" +" ** = cleverencode:\n" +" # or ** = macencode:\n" +"\n" +" [decode]\n" +" ** = cleverdecode:\n" +" # or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident::\n" +"\n" +" [hooks]\n" +" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled::\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" msgstr "" #, python-format @@ -4067,28 +4435,22 @@ msgstr "" msgid "" -"zeroconf support for Mercurial repositories\n" +"discover and advertise repositories on the local network\n" "\n" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" "without knowing their actual IP address.\n" "\n" -"To use the zeroconf extension add the following entry to your hgrc\n" -"file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository.\n" -"\n" -" $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\".\n" -"\n" -" $ hg paths\n" -" zc-test = http://example.com:8000/test\n" +"in your repository::\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgstr "" msgid "archive prefix contains illegal components" @@ -4324,6 +4686,10 @@ msgstr "" #, python-format +msgid "HG: subrepo %s" +msgstr "" + +#, python-format msgid "HG: added %s" msgstr "" @@ -4341,6 +4707,7 @@ msgid "empty commit message" msgstr "" +#, fuzzy msgid "" "add the specified files on the next commit\n" "\n" @@ -4348,7 +4715,7 @@ " repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -4363,6 +4730,7 @@ " 如果沒有指定檔案，則會將所有的檔案都標示為加到 repository。\n" " " +#, fuzzy msgid "" "add all new files, delete all missing files\n" "\n" @@ -4374,11 +4742,11 @@ " commit.\n" "\n" " Use the -s/--similarity option to detect renamed files. With a\n" -" parameter > 0, this compares every removed file with every added\n" -" file and records those similar enough as renames. This option\n" -" takes a percentage between 0 (disabled) and 100 (files must be\n" -" identical) as its parameter. Detecting renamed files this way can\n" -" be expensive.\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" +" option takes a percentage between 0 (disabled) and 100 (files must\n" +" be identical) as its parameter. Detecting renamed files this way\n" +" can be expensive.\n" " " msgstr "" "新增所有未受版本控制的檔案，並刪除所有消失的檔案。\n" @@ -4441,6 +4809,7 @@ msgid "%s: binary file\n" msgstr "" +#, fuzzy msgid "" "create an unversioned archive of a repository revision\n" "\n" @@ -4448,14 +4817,14 @@ " directory; use -r/--rev to specify a different revision.\n" "\n" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" -"\n" -" \"files\" (default): a directory full of files\n" -" \"tar\": tar archive, uncompressed\n" -" \"tbz2\": tar archive, compressed using bzip2\n" -" \"tgz\": tar archive, compressed using gzip\n" -" \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" +" types are::\n" +"\n" +" \"files\" (default): a directory full of files\n" +" \"tar\": tar archive, uncompressed\n" +" \"tbz2\": tar archive, compressed using bzip2\n" +" \"tgz\": tar archive, compressed using gzip\n" +" \"uzip\": zip archive, uncompressed\n" +" \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" " using a format string; see 'hg help export' for details.\n" @@ -4557,10 +4926,6 @@ msgstr "" #, python-format -msgid "Backed out changeset %s" -msgstr "" - -#, python-format msgid "changeset %s backs out changeset %s\n" msgstr "" @@ -4642,10 +5007,6 @@ msgstr "" #, python-format -msgid "cannot find executable: %s" -msgstr "" - -#, python-format msgid "failed to execute %s" msgstr "" @@ -4658,9 +5019,10 @@ msgstr "" #, python-format -msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" -msgstr "" - +msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" +msgstr "" + +#, fuzzy msgid "" "set or show the current branch name\n" "\n" @@ -4677,7 +5039,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" "設定或顯示目前的 branch 名稱\n" @@ -4709,13 +5072,16 @@ msgid "marked working directory as branch %s\n" msgstr "" +#, fuzzy msgid "" "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -4730,6 +5096,7 @@ " Use the command 'hg update' to switch to an existing branch.\n" " " +#, fuzzy msgid "" "create a changegroup file\n" "\n" @@ -4739,9 +5106,11 @@ " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null). To change the compression method\n" -" applied, use the -t/--type option (by default, bundles are\n" -" compressed using bz2).\n" +" -a/--all (or --base null).\n" +"\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -4779,6 +5148,7 @@ msgid "unknown bundle type specified with --type" msgstr "" +#, fuzzy msgid "" "output the current or given revision of files\n" "\n" @@ -4788,11 +5158,11 @@ "\n" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:\n" -"\n" -" %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repository root\n" -" %p root-relative path name of file being printed\n" +" for the export command, with the following additions::\n" +"\n" +" %s basename of file being printed\n" +" %d dirname of file being printed, or '.' if in repository root\n" +" %p root-relative path name of file being printed\n" " " msgstr "" "輸出目前或是特定 revision 的檔案內容\n" @@ -4810,6 +5180,7 @@ " %p root-relative path name of file being printed\n" " " +#, fuzzy msgid "" "make a copy of an existing repository\n" "\n" @@ -4845,7 +5216,7 @@ " avoid hardlinking.\n" "\n" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with\n" +" using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -4855,7 +5226,6 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" -"\n" " " msgstr "" "對已存在的 repository 複製一份\n" @@ -4942,6 +5312,9 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "" + msgid "created new head\n" msgstr "" @@ -5121,8 +5494,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5214,6 +5587,7 @@ " format. For more information, read 'hg help diffs'.\n" " " +#, fuzzy msgid "" "dump the header and diffs for one or more changesets\n" "\n" @@ -5227,16 +5601,16 @@ " first parent only.\n" "\n" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows:\n" -"\n" -" %% literal \"%\" character\n" -" %H changeset hash (40 bytes of hexadecimal)\n" -" %N number of patches being generated\n" -" %R changeset revision number\n" -" %b basename of the exporting repository\n" -" %h short-form changeset hash (12 bytes of hexadecimal)\n" -" %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" +" given using a format string. The formatting rules are as follows::\n" +"\n" +" %% literal \"%\" character\n" +" %H changeset hash (40 bytes of hexadecimal)\n" +" %N number of patches being generated\n" +" %R changeset revision number\n" +" %b basename of the exporting repository\n" +" %h short-form changeset hash (12 bytes of hexadecimal)\n" +" %n zero-padded sequence number, starting at 1\n" +" %r zero-padded changeset revision number\n" "\n" " Without the -a/--text option, export will avoid generating diffs\n" " of files it detects as binary. With -a, export will generate a\n" @@ -5293,6 +5667,27 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" @@ -5329,27 +5724,31 @@ msgid "grep: invalid match pattern: %s\n" msgstr "" +#, fuzzy msgid "" "show current repository heads or show branch heads\n" "\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 children 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.\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 "" "顯示目前的 repository heads 或是 branch heads\n" @@ -5374,6 +5773,9 @@ " are descendants of STARTREV will be displayed.\n" " " +msgid "you must specify a branch to use --closed" +msgstr "" + #, python-format msgid "no open branch heads on branch %s\n" msgstr "" @@ -5442,24 +5844,20 @@ msgid "no commands defined\n" msgstr "沒有定義的命令\n" -msgid "" -"\n" -"enabled extensions:\n" -"\n" +#, fuzzy +msgid "enabled extensions:" msgstr "" "\n" "已啟用的擴充套件:\n" "\n" -#, python-format -msgid " %s %s\n" -msgstr "" - msgid "no help text available" msgstr "沒有可用的說明文字" -#, python-format -msgid "%s extension - %s\n" +#, fuzzy, python-format +msgid "" +"%s extension - %s\n" +"\n" msgstr "%s 擴充套件 - %s\n" msgid "Mercurial Distributed SCM\n" @@ -5510,6 +5908,7 @@ " this revision and a branch name for non-default branches.\n" " " +#, fuzzy msgid "" "import an ordered set of patches\n" "\n" @@ -5539,7 +5938,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -5581,12 +5981,6 @@ msgid "no diffs found" msgstr "" -#, python-format -msgid "" -"message:\n" -"%s\n" -msgstr "" - msgid "not a Mercurial patch" msgstr "" @@ -5926,6 +6320,7 @@ " See 'hg help urls' for more information.\n" " " +#, fuzzy msgid "" "push changes to the specified destination\n" "\n" @@ -5945,7 +6340,6 @@ "\n" " Please see 'hg help urls' for important details about ssh://\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" " " msgstr "" "將 changes push 至指定的目的端\n" @@ -5992,6 +6386,7 @@ " suggests it.\n" " " +#, fuzzy msgid "" "remove the specified files on the next commit\n" "\n" @@ -6005,15 +6400,15 @@ "\n" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" -" A C M !\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by hg status). The actions are Warn, Remove (from branch)\n" +" and Delete (from disk)::\n" +"\n" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R\n" "\n" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" @@ -6045,9 +6440,6 @@ " To undo a remove before that, see hg revert.\n" " " -msgid "no files specified" -msgstr "" - #, python-format msgid "not removing %s: file is untracked\n" msgstr "" @@ -6094,6 +6486,7 @@ " before that, see hg revert.\n" " " +#, fuzzy msgid "" "retry file merges from a merge or update\n" "\n" @@ -6109,9 +6502,10 @@ " indicating whether or not files are resolved. All files must be\n" " marked as resolved before a commit is permitted.\n" "\n" -" The codes used to show the status of files are:\n" -" U = unresolved\n" -" R = resolved\n" +" The codes used to show the status of files are::\n" +"\n" +" U = unresolved\n" +" R = resolved\n" " " msgstr "" "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" @@ -6239,18 +6633,20 @@ msgid "no changes needed to %s\n" msgstr "" +#, fuzzy msgid "" "roll back the last transaction\n" "\n" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" -" any dirstate changes since that time.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back:\n" +" and their effects can be rolled back::\n" "\n" " commit\n" " import\n" @@ -6326,6 +6722,7 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "" +#, fuzzy msgid "" "show changed files in the working directory\n" "\n" @@ -6348,15 +6745,16 @@ " If two revisions are given, the differences between them are\n" " shown.\n" "\n" -" The codes used to show the status of files are:\n" -" M = modified\n" -" A = added\n" -" R = removed\n" -" C = clean\n" -" ! = missing (deleted by non-hg command, but still tracked)\n" -" ? = not tracked\n" -" I = ignored\n" -" = origin of the previous file listed as A (added)\n" +" The codes used to show the status of files are::\n" +"\n" +" M = modified\n" +" A = added\n" +" R = removed\n" +" C = clean\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" +" ? = not tracked\n" +" I = ignored\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "顯示 working directory 中已變更的檔案\n" @@ -6392,6 +6790,102 @@ " " 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 "" + +msgid " (no revision checked out)" +msgstr "" + +#, python-format +msgid "parent: %d:%s %s\n" +msgstr "" + +#, fuzzy, python-format +msgid "branch: %s\n" +msgstr "找不到 branch %s" + +#, python-format +msgid "%d added" +msgstr "" + +#, python-format +msgid "%d modified" +msgstr "" + +#, fuzzy, python-format +msgid "%d removed" +msgstr "已移除" + +#, python-format +msgid "%d deleted" +msgstr "" + +#, python-format +msgid "%d ignored" +msgstr "" + +#, fuzzy, python-format +msgid "%d unknown" +msgstr "未知的 base" + +#, fuzzy, python-format +msgid "%d unresolved" +msgstr "已移除" + +#, fuzzy +msgid " (merge)" +msgstr "已合併" + +msgid " (new branch)" +msgstr "" + +msgid " (clean)" +msgstr "" + +msgid " (new branch head)" +msgstr "" + +#, python-format +msgid "commit: %s\n" +msgstr "" + +msgid "update: (current)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets (update)\n" +msgstr "" + +#, python-format +msgid "update: %d new changesets, %d branch heads (merge)\n" +msgstr "" + +msgid "1 or more incoming" +msgstr "" + +#, python-format +msgid "%d outgoing" +msgstr "" + +#, fuzzy, python-format +msgid "remote: %s\n" +msgstr "遠端: " + +#, fuzzy +msgid "remote: (synced)\n" +msgstr "遠端: " + +msgid "" "add one or more tags for the current or given revision\n" "\n" " Name a particular revision using <name>.\n" @@ -6455,17 +6949,9 @@ msgstr "" #, python-format -msgid "Removed tag %s" -msgstr "" - -#, python-format msgid "tag '%s' already exists (use -f to force)" msgstr "" -#, python-format -msgid "Added tag %s for changeset %s" -msgstr "" - msgid "" "list repository tags\n" "\n" @@ -6517,6 +7003,7 @@ " bundle command.\n" " " +#, fuzzy msgid "" "update working directory\n" "\n" @@ -6533,7 +7020,8 @@ "\n" " When there are uncommitted changes, use option -C/--clean to\n" " discard them, forcibly replacing the state of the working\n" -" directory with the requested revision.\n" +" directory with the requested revision. Alternately, use -c/--check\n" +" to abort.\n" "\n" " When there are uncommitted changes and option -C/--clean is not\n" " used, and the parent revision and requested revision are on the\n" @@ -6578,6 +7066,13 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " +msgid "cannot specify both -c/--check and -C/--clean" +msgstr "" + +#, fuzzy +msgid "uncommitted local changes" +msgstr "未同步的變更" + msgid "" "verify the integrity of the repository\n" "\n" @@ -6613,7 +7108,7 @@ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -msgid "repository root directory or symbolic path name" +msgid "repository root directory or name of overlay bundle file" msgstr "" msgid "change working directory" @@ -6805,6 +7300,9 @@ msgid "show only branches that have unmerged heads" msgstr "" +msgid "show normal and closed branches" +msgstr "" + msgid "[-a]" msgstr "" @@ -6949,10 +7447,10 @@ msgid "show only heads which are descendants of REV" msgstr "" -msgid "show only the active heads from open branches" -msgstr "" - -msgid "show normal and closed heads" +msgid "show only the active branch heads from open branches" +msgstr "" + +msgid "show normal and closed branch heads" msgstr "" msgid "[-r STARTREV] [REV]..." @@ -7185,6 +7683,9 @@ msgid "[-u] [NAME]..." msgstr "" +msgid "check for push and pull" +msgstr "" + msgid "show status of all files" msgstr "" @@ -7245,6 +7746,9 @@ msgid "overwrite locally modified files (no backup)" msgstr "" +msgid "check for uncommitted changes" +msgstr "" + msgid "[-C] [-d DATE] [[-r] REV]" msgstr "" @@ -7258,36 +7762,6 @@ msgid "branch name not in UTF-8!" msgstr "" -#, python-format -msgid " searching for copies back to rev %d\n" -msgstr "" - -#, 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 "" - -#, python-format -msgid " dir %s -> %s\n" -msgstr "" - -#, python-format -msgid " file %s -> %s\n" -msgstr "" - msgid "working directory state appears damaged!" msgstr "" @@ -7334,16 +7808,16 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" msgstr "" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "timed out waiting for lock held by %s" msgstr "" @@ -7412,7 +7886,7 @@ msgid "** unknown exception encountered, details follow\n" msgstr "" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "** or mercurial@selenic.com\n" @@ -7439,10 +7913,6 @@ msgstr "" #, python-format -msgid "alias '%s' shadows command\n" -msgstr "" - -#, python-format msgid "malformed --config option: %s" msgstr "" @@ -7457,7 +7927,7 @@ msgstr "" msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" @@ -7506,10 +7976,6 @@ msgstr "%s 工具需要 GUI 環境\n" #, python-format -msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "選用 '%s' 工具來處理 %s (binary %s symlink %s)\n" - -#, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" @@ -7523,9 +7989,6 @@ msgid "&Other" msgstr "" -msgid "l" -msgstr "" - #, python-format msgid "merging %s and %s to %s\n" msgstr "合併 %s 和 %s 至 %s\n" @@ -7535,13 +7998,6 @@ msgstr "合併 %s 中\n" #, 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)?" @@ -7553,9 +8009,6 @@ msgid "&Yes" msgstr "" -msgid "n" -msgstr "" - #, python-format msgid "merging %s failed!\n" msgstr "合併 %s 失敗！\n" @@ -7568,450 +8021,38 @@ msgid "unknown bisect kind %s" msgstr "" +#, fuzzy +msgid "disabled extensions:" +msgstr "" +"\n" +"已啟用的擴充套件:\n" +"\n" + msgid "Date Formats" msgstr "日期格式" -msgid "" -"\n" -" Some commands allow the user to specify a date, e.g.:\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 "" - msgid "File Name Patterns" msgstr "檔案名稱樣式" -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 only\n" -" match 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 of\n" -" 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 "環境變數" -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" -" * 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 "" -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 topological offsets from the tip, with -1 denoting\n" -" the tip. As such, negative numbers are only useful if you've\n" -" memorized your local tree numbers and want to save typing a single\n" -" digit. This editor suggests copy and paste.\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 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 name, which is a symbolic\n" -" name associated with a revision identifier. Tag names may not\n" -" 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 "" -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 "" -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 default.\n" -" - date: Date information. The date when the changeset was 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 by\n" -" 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 number.\n" -" - tags: List of strings. Any tags associated with the 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 \"<br />\" tag before the end of\n" -" every line except the last.\n" -" - age: Date. Returns a human-readable date/time difference between\n" -" the given date/time and the current 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 path\n" -" separator (ignoring trailing separators). For example,\n" -" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" -"\".\n" -" - stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" -" Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an\n" -" email address. Example: 'User <user@example.com>' becomes\n" -" '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" -" - 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\n" -" in email headers.\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 address.\n" -" " -msgstr "" - msgid "URL Paths" msgstr "" -msgid "" -"\n" -" Valid URLs are of the form:\n" -"\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" -"\n" -" Paths in the local filesystem can either point to Mercurial\n" -" repositories or to bundle files (as created by 'hg bundle' or\n" -" 'hg incoming --bundle').\n" -"\n" -" An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\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" -" - 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 " -"path:\n" -" ssh://example.com//tmp/repository\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" -" Host *.mylocalnetwork.example.com\n" -" Compression no\n" -" Host *\n" -" Compression yes\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" -" [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" -" " +msgid "Using additional features" msgstr "" msgid "can only share local repositories" @@ -8043,27 +8084,20 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updated" -msgstr "已更新" - -msgid "merged" -msgstr "已合併" - -msgid "removed" -msgstr "已移除" - -msgid "unresolved" -msgstr "" - -#, python-format -msgid "%d files %s" +#, fuzzy, python-format +msgid "updating to branch %s\n" +msgstr "正在新增 branch\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 "" 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 "" @@ -8139,32 +8173,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 "" @@ -8173,10 +8187,6 @@ msgstr "" #, python-format -msgid "requested URL: '%s'\n" -msgstr "" - -#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "" @@ -8211,7 +8221,7 @@ msgstr "" #, python-format -msgid "%s: ignoring invalid syntax '%s'\n" +msgid "ignoring invalid syntax '%s'" msgstr "" #, python-format @@ -8242,21 +8252,6 @@ msgstr "" #, python-format -msgid "%s, line %s: %s\n" -msgstr "" - -msgid "cannot parse entry" -msgstr "" - -#, python-format -msgid "node '%s' is not well formed" -msgstr "" - -#, python-format -msgid "tag '%s' refers to unknown node" -msgstr "" - -#, python-format msgid "working directory has unknown parent '%s'!" msgstr "" @@ -8264,10 +8259,6 @@ msgid "unknown revision '%s'" msgstr "" -#, python-format -msgid "filtering %s through %s\n" -msgstr "" - msgid "journal already exists - run hg recover" msgstr "" @@ -8299,14 +8290,6 @@ msgid "working directory of %s" msgstr "" -#, 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 "" @@ -8319,9 +8302,6 @@ msgid "file not tracked!" msgstr "" -msgid "nothing changed\n" -msgstr "" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "" @@ -8374,41 +8354,6 @@ msgid "searching for changes\n" msgstr "" -#, python-format -msgid "examining %s:%s\n" -msgstr "" - -msgid "branch already found\n" -msgstr "" - -#, python-format -msgid "found incomplete branch %s:%s\n" -msgstr "" - -#, python-format -msgid "found new changeset %s\n" -msgstr "" - -#, python-format -msgid "request %d: %s\n" -msgstr "" - -#, python-format -msgid "received %s:%s\n" -msgstr "" - -#, python-format -msgid "narrowing %d:%d %s\n" -msgstr "" - -#, python-format -msgid "found new branch changeset %s\n" -msgstr "" - -#, python-format -msgid "narrowed branch search to %s:%s\n" -msgstr "" - msgid "already have changeset " msgstr "" @@ -8418,16 +8363,6 @@ msgid "repository is unrelated" msgstr "" -msgid "found new changesets starting at " -msgstr "" - -#, python-format -msgid "%d total queries\n" -msgstr "" - -msgid "common changesets up to " -msgstr "" - msgid "requesting all changes\n" msgstr "" @@ -8453,17 +8388,10 @@ msgid "%d changesets found\n" msgstr "" -msgid "list of changesets:\n" -msgstr "" - #, python-format msgid "empty or missing revlog for %s" msgstr "" -#, python-format -msgid "add changeset %s\n" -msgstr "" - msgid "adding changesets\n" msgstr "" @@ -8476,10 +8404,6 @@ msgid "adding file changes\n" msgstr "" -#, python-format -msgid "adding %s revisions\n" -msgstr "" - msgid "received file revlog group is empty" msgstr "" @@ -8491,9 +8415,6 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "" -msgid "updating the branch cache\n" -msgstr "" - msgid "Unexpected response from remote server:" msgstr "" @@ -8514,10 +8435,6 @@ msgstr "" #, python-format -msgid "adding %s (%s)\n" -msgstr "" - -#, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "" @@ -8598,14 +8515,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?" @@ -8617,9 +8526,6 @@ msgid "&Delete" msgstr "" -msgid "c" -msgstr "" - #, python-format msgid "" "remote changed %s which local deleted\n" @@ -8630,10 +8536,6 @@ msgstr "" #, python-format -msgid "preserving %s for resolve of %s\n" -msgstr "" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "" @@ -8680,13 +8582,6 @@ msgstr "無法建立 %s: 無法建立目的端目錄" #, python-format -msgid "found patch at byte %d\n" -msgstr "於 byte %d 找到 patch\n" - -msgid "patch generated by hg export\n" -msgstr "經由 hg export 產生的 patch\n" - -#, python-format msgid "unable to find '%s' for patching\n" msgstr "找不到可 patch 的 '%s'\n" @@ -8757,7 +8652,7 @@ msgstr "不支援的行尾結束類型: %s" #, python-format -msgid "no valid hunks found; trying with %r instead\n" +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "" #, python-format @@ -8769,13 +8664,6 @@ msgstr "已被信號 %d 終止" #, python-format -msgid "stopped by signal %d" -msgstr "已被信號 %d 停止" - -msgid "invalid exit code" -msgstr "不合法的 exit code" - -#, python-format msgid "saving bundle to %s\n" msgstr "正在儲存 bundle 至 %s\n" @@ -8846,12 +8734,12 @@ msgid "could not create remote repo" msgstr "無法建立遠端 repo" +msgid "no suitable response from remote hg" +msgstr "" + msgid "remote: " msgstr "遠端: " -msgid "no suitable response from remote hg" -msgstr "" - #, python-format msgid "push refused: %s" msgstr "push 被拒絕: %s" @@ -8869,17 +8757,6 @@ msgid "invalid entry in fncache, line %s" msgstr "" -msgid "scanning\n" -msgstr "掃描中\n" - -#, python-format -msgid "%d files, %d bytes to transfer\n" -msgstr "傳送 %d 檔案，%d bytes\n" - -#, python-format -msgid "sending %s (%d bytes)\n" -msgstr "傳送 %s (%d bytes)\n" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -8889,9 +8766,6 @@ msgid "&Remote" msgstr "" -msgid "r" -msgstr "" - #, python-format msgid "" " local changed subrepository %s which remote removed\n" @@ -8916,6 +8790,17 @@ msgid "pushing subrepo %s\n" msgstr "" +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + msgid "unmatched quotes" msgstr "" @@ -8981,12 +8866,12 @@ msgid "username %s contains a newline\n" msgstr "" +msgid "response expected" +msgstr "" + msgid "unrecognized response\n" msgstr "" -msgid "response expected" -msgstr "" - msgid "password: " msgstr "" @@ -9015,10 +8900,6 @@ msgstr "" #, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -9216,11 +9097,15 @@ msgstr "" #, 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 "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format