Mercurial > hg
changeset 11401:3bc892f740d6
i18n-zh_TW: split messages into paragraphs
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 19 Jun 2010 17:19:15 +0200 |
| parents | e5b7841e0008 |
| children | 367ce8514da0 |
| files | i18n/zh_TW.po |
| diffstat | 1 files changed, 3683 insertions(+), 1954 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/zh_TW.po Sat Jun 19 17:19:15 2010 +0200 +++ b/i18n/zh_TW.po Sat Jun 19 17:19:15 2010 +0200 @@ -2,7 +2,7 @@ # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others # This file is distributed under the same license as the Mercurial package. # Chia-Huan Wu <willie.tw@gmail.com>, 2009. -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" @@ -26,27 +26,25 @@ msgstr "命令" #, fuzzy -msgid "" -" options:\n" -"\n" +msgid " options:" msgstr " 選項: \n" #, python-format -msgid "" -" aliases: %s\n" -"\n" -msgstr "" -" 別名: %s\n" -"\n" - -msgid "" -"Some commands allow the user to specify a date, e.g.:\n" -"\n" +msgid " aliases: %s" +msgstr " 別名: %s" + +msgid "Some commands allow the user to specify a date, e.g.:" +msgstr "" + +msgid "" "- 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" +"- log, revert, update: Select revision(s) by date." +msgstr "" + +msgid "Many date formats are valid. Here are some examples::" +msgstr "" + +msgid "" " \"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" @@ -59,19 +57,26 @@ " \"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" +" \"12/6/6\" (Dec 6 2006)" +msgstr "" + +msgid "Lastly, there is Mercurial's internal format::" +msgstr "" + +msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)" +msgstr "" + +msgid "" "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" +"the timezone is east of UTC)." +msgstr "" + +msgid "The log command also accepts date ranges::" +msgstr "" + +msgid "" " \"<{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" @@ -81,29 +86,39 @@ 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" +"used by GNU patch and many other standard tools." +msgstr "" + +msgid "" "While this standard format is often enough, it does not encode the\n" -"following information:\n" -"\n" +"following information:" +msgstr "" + +msgid "" "- 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" +"- creation or deletion of empty files" +msgstr "" + +msgid "" "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" +"format." +msgstr "" + +msgid "" "This means that when generating diffs from a Mercurial repository\n" "(e.g. with \"hg export\"), you should be careful about things like file\n" "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" +"format for communicating changes." +msgstr "" + +msgid "" "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" @@ -116,74 +131,98 @@ " 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" +" Windows) is searched." +msgstr "" + +msgid "" "HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" This is the name of the editor to run when committing. See EDITOR." +msgstr "" + +msgid " (deprecated, use .hgrc)" +msgstr "" + +msgid "" "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" +" be overridden with the --encoding command-line option." +msgstr "" + +msgid "" "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" +" the --encodingmode command-line option." +msgstr "" + +msgid "" "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" +" ancestor file." +msgstr "" + +msgid "" "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" +" from the current repository is read." +msgstr "" + +msgid " For each element in HGRCPATH:" +msgstr "" + +msgid "" " - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" +" - otherwise, the file itself will be added" +msgstr "" + +msgid "" "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" +" available values will be considered in this order:" +msgstr "" + +msgid "" " - 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" +" - LOGNAME (with '@hostname' appended)" +msgstr "" + +msgid "" "EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" +" This is the name of the editor to use when committing. See EDITOR." +msgstr "" + +msgid "" "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" +" defaults to 'vi'." +msgstr "" + +msgid "" "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" @@ -193,31 +232,44 @@ "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" +"implement hooks." +msgstr "" + +msgid "" "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" +"needed." +msgstr "" + +msgid "" "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" +"this::" +msgstr "" + +msgid "" " [extensions]\n" -" foo =\n" -"\n" -"You may also specify the full path to an extension::\n" -"\n" +" foo =" +msgstr "" + +msgid "You may also specify the full path to an extension::" +msgstr "" + +msgid "" " [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" +" myfeature = ~/.hgext/myfeature.py" +msgstr "" + +msgid "" "To explicitly disable an extension enabled in an hgrc of broader\n" -"scope, prepend its path with !::\n" -"\n" +"scope, prepend its path with !::" +msgstr "" + +msgid "" " [extensions]\n" " # disabling extension bar residing in /path/to/extension/bar.py\n" " bar = !/path/to/extension/bar.py\n" @@ -228,89 +280,126 @@ 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" +"separated by the \":\" character." +msgstr "" + +msgid "" "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" +"it defaults to the tip. The range \":\" thus means \"all revisions\"." +msgstr "" + +msgid "If BEGIN is greater than END, revisions are treated in reverse order." +msgstr "" + +msgid "" "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" +"at a time." +msgstr "" + +msgid "" "By default, Mercurial treats filenames as shell-style extended glob\n" -"patterns.\n" -"\n" -"Alternate pattern notations must be specified explicitly.\n" -"\n" +"patterns." +msgstr "" + +msgid "Alternate pattern notations must be specified explicitly." +msgstr "" + +msgid "" "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" +"current repository root." +msgstr "" + +msgid "" "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" +"in the current directory ending with ``.c``." +msgstr "" + +msgid "" "The supported glob syntax extensions are ``**`` to match any string\n" -"across path separators and ``{a,b}`` to mean \"a or b\".\n" -"\n" +"across path separators and ``{a,b}`` to mean \"a or b\"." +msgstr "" + +msgid "" "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" +"Regexp pattern matching is anchored at the root of the repository." +msgstr "" + +msgid "Plain examples::" +msgstr "" + +msgid "" " 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" +" path:path:name a file or directory named \"path:name\"" +msgstr "" + +msgid "Glob examples::" +msgstr "" + +msgid "" " 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" +" including itself." +msgstr "" + +msgid "Regexp examples::" +msgstr "" + +msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" + +msgid "Mercurial supports several ways to specify individual revisions." +msgstr "" + +msgid "" "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" +"-2 denoting the revision prior to the tip, and so forth." +msgstr "" + +msgid "" "A 40-digit hexadecimal string is treated as a unique revision\n" -"identifier.\n" -"\n" +"identifier." +msgstr "" + +msgid "" "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" +"of exactly one full-length identifier." +msgstr "" + +msgid "" "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" +"not contain the \":\" character." +msgstr "" + +msgid "" "The reserved name \"tip\" is a special tag that always identifies the\n" -"most recent revision.\n" -"\n" +"most recent revision." +msgstr "" + +msgid "" "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" +"revision of an empty repository, and the parent of revision 0." +msgstr "" + +msgid "" "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" @@ -321,27 +410,40 @@ "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" +"template-style (--style)." +msgstr "" + +msgid "" "You can customize output for any \"log-like\" command: log,\n" -"outgoing, incoming, tip, parents, heads and glog.\n" -"\n" +"outgoing, incoming, tip, parents, heads and glog." +msgstr "" + +msgid "" "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" +"Usage::" +msgstr "" + +msgid " $ hg log -r1 --style changelog" +msgstr "" + +msgid "" "A template is a piece of text, with markup to invoke variable\n" -"expansion::\n" -"\n" +"expansion::" +msgstr "" + +msgid "" " $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746" +msgstr "" + +msgid "" "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" +"keywords are usually available for templating a log-like command:" +msgstr "" + +msgid "" ":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" @@ -365,19 +467,26 @@ " 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" +":latesttagdistance: Integer. Longest path to the latest tag." +msgstr "" + +msgid "" "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" +"output::" +msgstr "" + +msgid "" " $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -"List of filters:\n" -"\n" +" 2008-08-21 18:22 +0000" +msgstr "" + +msgid "List of filters:" +msgstr "" + +msgid "" ":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" @@ -433,113 +542,160 @@ " address.\n" msgstr "" -msgid "" -"Valid URLs are of the form::\n" -"\n" +msgid "Valid URLs are of the form::" +msgstr "" + +msgid "" " 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" +" ssh://[user[:pass]@]host[:port]/[path][#revision]" +msgstr "" + +msgid "" "Paths in the local filesystem can either point to Mercurial\n" "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle').\n" -"\n" +"incoming --bundle')." +msgstr "" + +msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" "changeset to use from the remote repository. See also 'hg help\n" -"revisions'.\n" -"\n" +"revisions'." +msgstr "" + +msgid "" "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" +"server." +msgstr "" + +msgid "Some notes about using SSH with Mercurial:" +msgstr "" + +msgid "" "- 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" +" an extra slash at the start of a path to specify an absolute path::" +msgstr "" + +msgid " ssh://example.com//tmp/repository" +msgstr "" + +msgid "" "- 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" +" to do is to configure it in your ~/.ssh/config, e.g.::" +msgstr "" + +msgid "" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" -" Compression yes\n" -"\n" +" Compression yes" +msgstr "" + +msgid "" " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" +" with the --ssh command line option." +msgstr "" + +msgid "" "These URLs can all be stored in your hgrc with path aliases under the\n" -"[paths] section like so::\n" -"\n" +"[paths] section like so::" +msgstr "" + +msgid "" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" -" ...\n" -"\n" +" ..." +msgstr "" + +msgid "" "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" +"example 'hg pull alias1' would pull from the 'alias1' path)." +msgstr "" + +msgid "" "Two path aliases are special because they are used as defaults when\n" -"you do not provide the URL to a command:\n" -"\n" +"you do not provide the URL to a command:" +msgstr "" + +msgid "" "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" +" pull-like commands (including incoming and outgoing)." +msgstr "" + +msgid "" "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" +msgid "hooks for controlling repository access" +msgstr "" + +msgid "" "This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets.\n" -"\n" +"of a repository when receiving incoming changesets." +msgstr "" + +msgid "" "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" +"changeset (since the latter is merely informative)." +msgstr "" + +msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" "preventing authenticating users from doing anything other than\n" "pushing or pulling. The hook is not safe to use if users have\n" "interactive shell access, as they can then disable the hook.\n" "Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them.\n" -"\n" -"To use this hook, configure the acl extension in your hgrc like this::\n" -"\n" +"is no way to distinguish them." +msgstr "" + +msgid "To use this hook, configure the acl extension in your hgrc like this::" +msgstr "" + +msgid "" " [extensions]\n" -" acl =\n" -"\n" +" acl =" +msgstr "" + +msgid "" " [hooks]\n" -" pretxnchangegroup.acl = python:hgext.acl.hook\n" -"\n" +" pretxnchangegroup.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" " [acl]\n" " # Check whether the source of incoming changes is in this list\n" " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" -" sources = serve\n" -"\n" +" sources = serve" +msgstr "" + +msgid "" "The allow and deny sections take a subtree pattern as key (with a glob\n" "syntax by default), and a comma separated list of users as the\n" "corresponding value. The deny list is checked before the allow list\n" -"is. ::\n" -"\n" +"is. ::" +msgstr "" + +msgid "" " [acl.allow]\n" " # If acl.allow is not present, all users are allowed by default.\n" " # An empty acl.allow section means no users allowed.\n" " docs/** = doc_writer\n" -" .hgtags = release_engineer\n" -"\n" +" .hgtags = release_engineer" +msgstr "" + +msgid "" " [acl.deny]\n" " # If acl.deny is not present, no users are refused by default.\n" " # An empty acl.deny section means all users allowed.\n" @@ -555,38 +711,47 @@ msgid "acl: access denied for changeset %s" msgstr "" -msgid "" -"track a line of development with movable markers\n" -"\n" +msgid "track a line of development with movable markers" +msgstr "" + +msgid "" "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 shifts to the new changeset.\n" -"\n" +"bookmark shifts to the new changeset." +msgstr "" + +msgid "" "It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" +"merge, hg update)." +msgstr "" + +msgid "" "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" +"your .hgrc::" +msgstr "" + +msgid "" " [bookmarks]\n" -" track.current = True\n" -"\n" +" track.current = True" +msgstr "" + +msgid "" "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 "" -"track a line of development with movable markers\n" -"\n" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" " deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark.\n" -"\n" +" 'hg update' to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" " You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" @@ -627,117 +792,171 @@ msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" -msgid "" -"hooks for integrating with the Bugzilla bug tracker\n" -"\n" +msgid "hooks for integrating with the Bugzilla bug tracker" +msgstr "" + +msgid "" "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" -"bug status.\n" -"\n" +"bug status." +msgstr "" + +msgid "" "The hook updates the Bugzilla database directly. Only Bugzilla\n" -"installations using MySQL are supported.\n" -"\n" +"installations using MySQL are supported." +msgstr "" + +msgid "" "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" +"ensure the Bugzilla install file permissions are set appropriately." +msgstr "" + +msgid "" "The extension is configured through three different configuration\n" -"sections. These keys are recognized in the [bugzilla] section:\n" -"\n" +"sections. These keys are recognized in the [bugzilla] section:" +msgstr "" + +msgid "" "host\n" -" Hostname of the MySQL server holding the Bugzilla database.\n" -"\n" +" Hostname of the MySQL server holding the Bugzilla database." +msgstr "" + +msgid "" "db\n" -" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -"\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'." +msgstr "" + +msgid "" "user\n" -" Username to use to access MySQL server. Default 'bugs'.\n" -"\n" +" Username to use to access MySQL server. Default 'bugs'." +msgstr "" + +msgid "" "password\n" -" Password to use to access MySQL server.\n" -"\n" +" Password to use to access MySQL server." +msgstr "" + +msgid "" "timeout\n" -" Database connection timeout (seconds). Default 5.\n" -"\n" +" Database connection timeout (seconds). Default 5." +msgstr "" + +msgid "" "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" +" to 2.18." +msgstr "" + +msgid "" "bzuser\n" " Fallback Bugzilla user name to record comments with, if changeset\n" -" committer cannot be found as a Bugzilla user.\n" -"\n" +" committer cannot be found as a Bugzilla user." +msgstr "" + +msgid "" "bzdir\n" " Bugzilla install directory. Used by default notify. Default\n" -" '/var/www/html/bugzilla'.\n" -"\n" +" '/var/www/html/bugzilla'." +msgstr "" + +msgid "" "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" +" %(id)s %(user)s\"." +msgstr "" + +msgid "" "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" +" 1234 and 5678' and variations thereof. Matching is case insensitive." +msgstr "" + +msgid "" "style\n" -" The style file to use when formatting comments.\n" -"\n" +" The style file to use when formatting comments." +msgstr "" + +msgid "" "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" +" extension specifies::" +msgstr "" + +msgid "" " {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" +" {hgweb} Base URL for browsing Mercurial repositories." +msgstr "" + +msgid "" " Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" -"\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'" +msgstr "" + +msgid "" "strip\n" " The number of slashes to strip from the front of {root} to produce\n" -" {webroot}. Default 0.\n" -"\n" +" {webroot}. Default 0." +msgstr "" + +msgid "" "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" +" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section." +msgstr "" + +msgid "" "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" +"\"committer\"=\"Bugzilla user\"" +msgstr "" + +msgid "Finally, the [web] section supports one entry:" +msgstr "" + +msgid "" "baseurl\n" " Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" -"\n" -"Activating the extension::\n" -"\n" +" templates as {hgweb}." +msgstr "" + +msgid "Activating the extension::" +msgstr "" + +msgid "" " [extensions]\n" -" bugzilla =\n" -"\n" +" bugzilla =" +msgstr "" + +msgid "" " [hooks]\n" " # run bugzilla hook on every change pulled or pushed in here\n" -" incoming.bugzilla = python:hgext.bugzilla.hook\n" -"\n" -"Example configuration:\n" -"\n" +" incoming.bugzilla = python:hgext.bugzilla.hook" +msgstr "" + +msgid "Example configuration:" +msgstr "" + +msgid "" "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" +"installation in /opt/bugzilla-3.2. ::" +msgstr "" + +msgid "" " [bugzilla]\n" " host=localhost\n" " password=XYZZY\n" @@ -747,20 +966,28 @@ " template=Changeset {node|short} in {root|basename}.\n" " {hgweb}/{webroot}/rev/{node|short}\\n\n" " {desc}\\n\n" -" strip=5\n" -"\n" +" strip=5" +msgstr "" + +msgid "" " [web]\n" -" baseurl=http://dev.domain.com/hg\n" -"\n" +" baseurl=http://dev.domain.com/hg" +msgstr "" + +msgid "" " [usermap]\n" -" user@emaildomain.com=user.name@bugzilladomain.com\n" -"\n" -"Commits add a comment to the Bugzilla bug record of the form::\n" -"\n" +" user@emaildomain.com=user.name@bugzilladomain.com" +msgstr "" + +msgid "Commits add a comment to the Bugzilla bug record of the form::" +msgstr "" + +msgid "" " Changeset 3b16791d6642 in repository-name.\n" -" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" -"\n" -" Changeset commit comment. Bug 1234.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642" +msgstr "" + +msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format @@ -837,9 +1064,10 @@ msgid "command to display child changesets" msgstr "" -msgid "" -"show the children of the given or working directory revision\n" -"\n" +msgid "show the children of the given or working directory revision" +msgstr "" + +msgid "" " 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" @@ -865,38 +1093,55 @@ msgid "generating stats: %d%%" msgstr "" -msgid "" -"histogram of changes to the repository\n" -"\n" +msgid "histogram of changes to the repository" +msgstr "" + +msgid "" " 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" +" date instead." +msgstr "" + +msgid "" " 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" +" --changesets option is specified." +msgstr "" + +msgid " Examples::" +msgstr "" + +msgid "" " # display count of changed lines for every committer\n" -" hg churn -t '{author|email}'\n" -"\n" +" hg churn -t '{author|email}'" +msgstr "" + +msgid "" " # display daily activity graph\n" -" hg churn -f '%H' -s -c\n" -"\n" +" hg churn -f '%H' -s -c" +msgstr "" + +msgid "" " # display activity of developers by month\n" -" hg churn -f '%Y-%m' -s -c\n" -"\n" +" hg churn -f '%Y-%m' -s -c" +msgstr "" + +msgid "" " # display count of lines changed in every year\n" -" hg churn -f '%Y' -s\n" -"\n" +" hg churn -f '%Y' -s" +msgstr "" + +msgid "" " 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" +" by providing a file using the following format::" +msgstr "" + +msgid " <alias email> <actual email>" +msgstr "" + +msgid "" " 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" " " @@ -929,38 +1174,50 @@ msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" msgstr "" -msgid "" -"colorize output from some commands\n" -"\n" +msgid "colorize output from some commands" +msgstr "" + +msgid "" "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" +"whitespace." +msgstr "" + +msgid "" "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" +"render_text function, which can be used to add effects to any text." +msgstr "" + +msgid "Default effects may be overridden from the .hgrc file::" +msgstr "" + +msgid "" " [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" +" status.ignored = black bold" +msgstr "" + +msgid "" " # 'none' turns off all effects\n" " status.clean = none\n" -" status.copied = none\n" -"\n" +" status.copied = none" +msgstr "" + +msgid "" " qseries.applied = blue bold underline\n" " qseries.unapplied = black bold\n" -" qseries.missing = red bold\n" -"\n" +" qseries.missing = red bold" +msgstr "" + +msgid "" " diff.diffline = bold\n" " diff.extended = cyan bold\n" " diff.file_a = red bold\n" @@ -985,11 +1242,13 @@ 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" +msgid "convert a foreign SCM repository to a Mercurial one." +msgstr "" + +msgid " Accepted source formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -998,72 +1257,103 @@ " - Monotone [mtn]\n" " - GNU Arch [gnuarch]\n" " - Bazaar [bzr]\n" -" - Perforce [p4]\n" -"\n" -" Accepted destination formats [identifiers]:\n" -"\n" +" - Perforce [p4]" +msgstr "" + +msgid " Accepted destination formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" -" - Subversion [svn] (history on branches is not preserved)\n" -"\n" +" - Subversion [svn] (history on branches is not preserved)" +msgstr "" + +msgid "" " 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" +" (given in a format understood by the source)." +msgstr "" + +msgid "" " If no destination directory name is specified, it defaults to the\n" " basename of the source with '-hg' appended. If the destination\n" -" repository doesn't exist, it will be created.\n" -"\n" +" repository doesn't exist, it will be created." +msgstr "" + +msgid "" " 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" +" order. Sort modes have the following effects:" +msgstr "" + +msgid "" " --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" +" the other. It generates more compact repositories." +msgstr "" + +msgid "" " --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" +" --branchsort." +msgstr "" + +msgid "" " --sourcesort try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" -"\n" +" supported by Mercurial sources." +msgstr "" + +msgid "" " 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" -"\n" -" <source ID> <destination ID>\n" -"\n" +" revision, like so::" +msgstr "" + +msgid " <source ID> <destination ID>" +msgstr "" + +msgid "" " 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" +" and can be run repeatedly to copy new commits." +msgstr "" + +msgid "" " 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" +" srcauthor=whatever string you want" +msgstr "" + +msgid "" " 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" -"\n" -" include path/to/file\n" -"\n" -" exclude path/to/file\n" -"\n" -" rename from/file to/file\n" -"\n" +" contain one of the following directives::" +msgstr "" + +msgid " include path/to/file" +msgstr "" + +msgid " exclude path/to/file" +msgstr "" + +msgid " rename from/file to/file" +msgstr "" + +msgid "" " 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\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" +" '.' as the path to rename to." +msgstr "" + +msgid "" " The splicemap is a file that allows insertion of synthetic\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" @@ -1073,8 +1363,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" -"\n" +" should be used as the new parents for that node." +msgstr "" + +msgid "" " 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" @@ -1084,11 +1376,15 @@ " \"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" +" in one repository from \"default\" to a named branch." +msgstr "" + +msgid "" " Mercurial Source\n" -" ----------------\n" -"\n" +" ----------------" +msgstr "" + +msgid "" " --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" @@ -1097,11 +1393,15 @@ " 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" +" convert start revision and its descendants" +msgstr "" + +msgid "" " CVS Source\n" -" ----------\n" -"\n" +" ----------" +msgstr "" + +msgid "" " 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 the\n" @@ -1110,10 +1410,13 @@ " 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" -" The options shown are the defaults.\n" -"\n" +" sandbox is ignored." +msgstr "" + +msgid " The options shown are the defaults." +msgstr "" + +msgid "" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -1131,16 +1434,22 @@ " 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" +" regex as the second parent of the changeset." +msgstr "" + +msgid "" " 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" +" the command help for more details." +msgstr "" + +msgid "" " Subversion Source\n" -" -----------------\n" -"\n" +" -----------------" +msgstr "" + +msgid "" " 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 it\n" @@ -1150,58 +1459,80 @@ " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\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" +" detection." +msgstr "" + +msgid "" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" " --config convert.svn.tags=tags (directory name)\n" " specify the directory containing tags\n" " --config convert.svn.trunk=trunk (directory name)\n" -" specify the name of the trunk branch\n" -"\n" +" specify the name of the trunk branch" +msgstr "" + +msgid "" " Source history can be retrieved starting at a specific revision,\n" " instead of being integrally converted. Only single branch\n" -" conversions are supported.\n" -"\n" +" conversions are supported." +msgstr "" + +msgid "" " --config convert.svn.startrev=0 (svn revision number)\n" -" specify start Subversion revision.\n" -"\n" +" specify start Subversion revision." +msgstr "" + +msgid "" " Perforce Source\n" -" ---------------\n" -"\n" +" ---------------" +msgstr "" + +msgid "" " 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" +" target may be named ...-hg." +msgstr "" + +msgid "" " It is possible to limit the amount of source history to be\n" -" converted by specifying an initial Perforce revision.\n" -"\n" +" converted by specifying an initial Perforce revision." +msgstr "" + +msgid "" " --config convert.p4.startrev=0 (perforce changelist number)\n" -" specify initial Perforce revision.\n" -"\n" +" specify initial Perforce revision." +msgstr "" + +msgid "" " Mercurial Destination\n" -" ---------------------\n" -"\n" +" ---------------------" +msgstr "" + +msgid "" " --config convert.hg.clonebranches=False (boolean)\n" " dispatch source branches in separate clones.\n" " --config convert.hg.tagsbranch=default (branch name)\n" " tag revisions branch name\n" " --config convert.hg.usebranchnames=True (boolean)\n" -" preserve branch names\n" -"\n" -" " -msgstr "" - -msgid "" -"create changeset information from CVS\n" -"\n" +" preserve branch names" +msgstr "" + +msgid " " +msgstr "" + +msgid "create changeset information from CVS" +msgstr "" + +msgid "" " 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" +" cvsps." +msgstr "" + +msgid "" " 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" @@ -1274,9 +1605,7 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" -msgid "" -"warning: lightweight checkouts may cause conversion failures, try with a " -"regular branch instead.\n" +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" @@ -1388,8 +1717,7 @@ msgstr "" #, python-format -msgid "" -"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1495,8 +1823,7 @@ msgstr "" #, python-format -msgid "" -"tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1628,37 +1955,50 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" -msgid "" -"command to allow external programs to compare revisions\n" -"\n" +msgid "command to allow external programs to compare revisions" +msgstr "" + +msgid "" "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" +"files to compare." +msgstr "" + +msgid "" "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" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +msgstr "" + +msgid "" " [extdiff]\n" " # add new command that runs GNU diff(1) in 'context diff' mode\n" " cdiff = gdiff -Nprc5\n" " ## or the old way:\n" " #cmd.cdiff = gdiff\n" -" #opts.cdiff = -Nprc5\n" -"\n" +" #opts.cdiff = -Nprc5" +msgstr "" + +msgid "" " # add new command called vdiff, runs kdiff3\n" -" vdiff = kdiff3\n" -"\n" +" vdiff = kdiff3" +msgstr "" + +msgid "" " # add new command called meld, runs meld (no need to name twice)\n" -" meld =\n" -"\n" +" meld =" +msgstr "" + +msgid "" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\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" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" +msgstr "" + +msgid "" "You can use -I/-X and list of file or directory names like normal \"hg\n" "diff\" command. The extdiff extension makes snapshots of only needed\n" "files, so running the external diff program will actually be pretty\n" @@ -1679,18 +2019,23 @@ msgid "cleaning up temp directory\n" msgstr "" -msgid "" -"use external program to diff repository (or selected files)\n" -"\n" +msgid "use external program to diff repository (or selected files)" +msgstr "" + +msgid "" " Show differences between revisions for the specified files, using\n" " an external program. The default program used is diff, with\n" -" default options \"-Npru\".\n" -"\n" +" default options \"-Npru\"." +msgstr "" + +msgid "" " 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" +" will be passed before the names of the directories to compare." +msgstr "" + +msgid "" " 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" @@ -1711,17 +2056,20 @@ msgstr "" #, python-format -msgid "" -"use %(path)s to diff repository (or selected files)\n" -"\n" +msgid "use %(path)s to diff repository (or selected files)" +msgstr "" + +#, python-format +msgid "" " Show differences between revisions for the specified files, using the\n" -" %(path)s program.\n" -"\n" +" %(path)s program." +msgstr "" + +#, python-format +msgid "" " 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" +" 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 "" @@ -1732,28 +2080,34 @@ msgid "pull, update and merge in one command" msgstr "" -msgid "" -"pull changes from a remote repository, merge new changes if needed.\n" -"\n" +msgid "pull changes from a remote repository, merge new changes if needed." +msgstr "" + +msgid "" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository.\n" -"\n" +" or URL and adds them to the local repository." +msgstr "" + +msgid "" " 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" +" changes." +msgstr "" + +msgid "" " 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" -" order, use --switch-parent.\n" -"\n" +" order, use --switch-parent." +msgstr "" + +msgid "" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -msgid "" -"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" msgid "outstanding uncommitted merge" @@ -1765,23 +2119,18 @@ msgid "working directory is missing some files" msgstr "" -msgid "" -"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" #, python-format msgid "pulling from %s\n" msgstr "" -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" - -#, python-format -msgid "" -"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" -"\" to merge them)\n" +msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." +msgstr "" + +#, python-format +msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" msgstr "" #, python-format @@ -1843,14 +2192,12 @@ msgid "No valid signature for %s\n" msgstr "" -msgid "" -"add a signature for the current or given revision\n" -"\n" +msgid "add a signature for the current or given revision" +msgstr "" + +msgid "" " If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" or tip if no revision is checked out." msgstr "" msgid "uncommitted merge - please provide a specific revision" @@ -1859,9 +2206,7 @@ msgid "Error while signing" msgstr "" -msgid "" -"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" -"force)" +msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" msgstr "" msgid "unknown signature version" @@ -1891,9 +2236,10 @@ msgid "hg sigs" msgstr "" -msgid "" -"command to view revision graphs from a shell\n" -"\n" +msgid "command to view revision graphs from a shell" +msgstr "" + +msgid "" "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" "revision graph is also shown.\n" @@ -1903,12 +2249,15 @@ msgid "--graph option is incompatible with --%s" msgstr "" -msgid "" -"show revision history alongside an ASCII revision graph\n" -"\n" +msgid "show revision history alongside an ASCII revision graph" +msgstr "" + +msgid "" " Print a revision history alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" +" ASCII characters." +msgstr "" + +msgid "" " Nodes printed as an @ character are parents of the working\n" " directory.\n" " " @@ -1936,12 +2285,15 @@ msgid "hg glog [OPTION]... [FILE]" msgstr "" -msgid "" -"hooks for integrating with the CIA.vc notification service\n" -"\n" +msgid "hooks for integrating with the CIA.vc notification service" +msgstr "" + +msgid "" "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" +"configure it, set the following options in your hgrc::" +msgstr "" + +msgid "" " [cia]\n" " # your registered CIA user name\n" " user = foo\n" @@ -1961,13 +2313,17 @@ " # 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" +" #test = False" +msgstr "" + +msgid "" " [hooks]\n" " # one of these:\n" " changegroup.cia = python:hgcia.hook\n" -" #incoming.cia = python:hgcia.hook\n" -"\n" +" #incoming.cia = python:hgcia.hook" +msgstr "" + +msgid "" " [web]\n" " # If you want hyperlinks (optional)\n" " baseurl = http://server/path/to/repo\n" @@ -1980,32 +2336,45 @@ msgid "email.from must be defined when sending by email" msgstr "" -msgid "" -"browse the repository in a graphical way\n" -"\n" +msgid "browse the repository in a graphical way" +msgstr "" + +msgid "" "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" -"distributed with Mercurial.)\n" -"\n" +"distributed with Mercurial.)" +msgstr "" + +msgid "" "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 the extension is shipped in the hgext\n" -"repository, and needs to be enabled.\n" -"\n" +"repository, and needs to be enabled." +msgstr "" + +msgid "" "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" -"\n" +"the path to hgk in your .hgrc file::" +msgstr "" + +msgid "" " [hgk]\n" -" path=/location/of/hgk\n" -"\n" +" path=/location/of/hgk" +msgstr "" + +msgid "" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add::\n" -"\n" +"Assuming you had already configured extdiff vdiff command, just add::" +msgstr "" + +msgid "" " [hgk]\n" -" vdiff=vdiff\n" -"\n" +" vdiff=vdiff" +msgstr "" + +msgid "" "Revisions context menu will now display additional entries to fire\n" "vdiff on hovered and selected revisions.\n" msgstr "" @@ -2091,18 +2460,23 @@ msgid "hg debug-rev-list [OPTION]... REV..." msgstr "" -msgid "" -"syntax highlighting for hgweb (requires Pygments)\n" -"\n" +msgid "syntax highlighting for hgweb (requires Pygments)" +msgstr "" + +msgid "" "It depends on the Pygments syntax highlighting library:\n" -"http://pygments.org/\n" -"\n" -"There is a single configuration option::\n" -"\n" +"http://pygments.org/" +msgstr "" + +msgid "There is a single configuration option::" +msgstr "" + +msgid "" " [web]\n" -" pygments_style = <style>\n" -"\n" -"The default is 'colorful'.\n" +" pygments_style = <style>" +msgstr "" + +msgid "The default is 'colorful'.\n" msgstr "" msgid "accelerate status report using Linux's inotify service" @@ -2111,9 +2485,10 @@ msgid "start an inotify server for this repository" msgstr "" -msgid "" -"debugging information for inotify extension\n" -"\n" +msgid "debugging information for inotify extension" +msgstr "" + +msgid "" " Prints the list of directories being watched by the inotify server.\n" " " msgstr "" @@ -2269,20 +2644,24 @@ msgid "finished setup\n" msgstr "" -msgid "" -"expand expressions into changelog and summaries\n" -"\n" +msgid "expand expressions into changelog and summaries" +msgstr "" + +msgid "" "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" +"expression, much like InterWiki does." +msgstr "" + +msgid "" "A few example patterns (link to bug tracking, etc.) that may be used\n" -"in your hgrc::\n" -"\n" +"in your hgrc::" +msgstr "" + +msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" -"i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" @@ -2294,52 +2673,76 @@ msgid "interhg: invalid regexp for %s: %s\n" msgstr "" -msgid "" -"expand keywords in tracked files\n" -"\n" +msgid "expand keywords in tracked files" +msgstr "" + +msgid "" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" -"tracked text files selected by your configuration.\n" -"\n" +"tracked text files selected by your configuration." +msgstr "" + +msgid "" "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" +"current user or for archive distribution." +msgstr "" + +msgid "" "Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files.\n" -"\n" -"Example::\n" -"\n" +"hgrc files." +msgstr "" + +msgid "Example::" +msgstr "" + +msgid "" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" -" x* = ignore\n" -"\n" +" x* = ignore" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories.\n" -"\n" +"lose speed in huge repositories." +msgstr "" + +msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" -"available templates and filters.\n" -"\n" +"available templates and filters." +msgstr "" + +msgid "" "An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\".\n" -"\n" +"returns a date like \"2006/09/18 15:13:13\"." +msgstr "" + +msgid "" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes.\n" -"\n" +"kwdemo\" to control the results of your config changes." +msgstr "" + +msgid "" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" -"history.\n" -"\n" +"history." +msgstr "" + +msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\".\n" -"\n" +"\"hg kwexpand\"." +msgstr "" + +msgid "" "Also, when committing with the record extension or using mq's qrecord,\n" "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" "the files in question to update keyword expansions after all changes\n" -"have been checked in.\n" -"\n" +"have been checked in." +msgstr "" + +msgid "" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" "{desc}\" expands to the first line of the changeset description.\n" @@ -2359,17 +2762,23 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "" -"print [keywordmaps] configuration and an expansion example\n" -"\n" +msgid "print [keywordmaps] configuration and an expansion example" +msgstr "" + +msgid "" " Show current, custom, or default keyword template maps and their\n" -" expansions.\n" -"\n" +" expansions." +msgstr "" + +msgid "" " 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" +" and using -f/--rcfile to source an external hgrc file." +msgstr "" + +msgid " Use -d/--default to disable current configuration." +msgstr "" + +msgid "" " See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" @@ -2416,31 +2825,42 @@ "\tkeywords expanded\n" msgstr "" -msgid "" -"expand keywords in the working directory\n" -"\n" -" Run after (re)enabling keyword expansion.\n" -"\n" +msgid "expand keywords in the working directory" +msgstr "" + +msgid " Run after (re)enabling keyword expansion." +msgstr "" + +msgid "" " kwexpand refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"show files configured for keyword expansion\n" -"\n" +msgid "show files configured for keyword expansion" +msgstr "" + +msgid "" " List which files in the working directory are matched by the\n" -" [keyword] configuration patterns.\n" -"\n" +" [keyword] configuration patterns." +msgstr "" + +msgid "" " 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" +" expansion." +msgstr "" + +msgid "" " See \"hg help keyword\" on how to construct patterns both for\n" -" inclusion and exclusion of files.\n" -"\n" +" inclusion and exclusion of files." +msgstr "" + +msgid "" " With -A/--all and -v/--verbose the codes used to show the status\n" -" of files are::\n" -"\n" +" of files are::" +msgstr "" + +msgid "" " K = keyword expansion candidate\n" " k = keyword expansion candidate (not tracked)\n" " I = ignored\n" @@ -2448,12 +2868,15 @@ " " msgstr "" -msgid "" -"revert expanded keywords in the working directory\n" -"\n" +msgid "revert expanded keywords in the working directory" +msgstr "" + +msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\".\n" -"\n" +" problems with \"hg import\" or \"hg merge\"." +msgstr "" + +msgid "" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" @@ -2491,25 +2914,35 @@ msgid "hg kwshrink [OPTION]... [FILE]..." msgstr "" -msgid "" -"manage a stack of patches\n" -"\n" +msgid "manage a stack of patches" +msgstr "" + +msgid "" "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" -"applied patches (subset of known patches).\n" -"\n" +"applied patches (subset of known patches)." +msgstr "" + +msgid "" "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" +"directory. Applied patches are both patch files and changesets." +msgstr "" + +msgid "Common tasks (use \"hg help command\" for more details)::" +msgstr "" + +msgid "" " prepare repository to work with patches qinit\n" " create new patch qnew\n" -" import existing patch qimport\n" -"\n" +" import existing patch qimport" +msgstr "" + +msgid "" " print patch series qseries\n" -" print applied patches qapplied\n" -"\n" +" print applied patches qapplied" +msgstr "" + +msgid "" " add known patch to applied stack qpush\n" " remove patch from applied stack qpop\n" " refresh contents of top applied patch qrefresh\n" @@ -2751,9 +3184,7 @@ msgid "cannot refresh a revision with children" msgstr "" -msgid "" -"refresh interrupted while patch was popped! (revert --all, qpush to " -"recover)\n" +msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2847,13 +3278,15 @@ msgid "adding %s to series file\n" msgstr "" -msgid "" -"remove patches from queue\n" -"\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" +msgid "remove patches from queue" +msgstr "" + +msgid "" +" The patches must not be applied, and at least one patch is required. With\n" +" -k/--keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." msgstr "" @@ -2870,38 +3303,50 @@ msgid "all patches applied\n" msgstr "" -msgid "" -"import a patch\n" -"\n" +msgid "import a patch" +msgstr "" + +msgid "" " 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" +" to the series." +msgstr "" + +msgid "" " The patch will have the same name as its source file unless you\n" -" give it a new one with -n/--name.\n" -"\n" +" give it a new one with -n/--name." +msgstr "" + +msgid "" " You can register an existing patch inside the patch directory with\n" -" the -e/--existing flag.\n" -"\n" +" the -e/--existing flag." +msgstr "" + +msgid "" " With -f/--force, an existing patch of the same name will be\n" -" overwritten.\n" -"\n" +" overwritten." +msgstr "" + +msgid "" " 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 -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\n" -" changes.\n" -"\n" +" changes." +msgstr "" + +msgid "" " 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 "" -msgid "" -"init a new queue repository\n" -"\n" +msgid "init a new queue repository" +msgstr "" + +msgid "" " 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" @@ -2909,18 +3354,23 @@ " qcommit to commit changes to this queue repository." msgstr "" -msgid "" -"clone main and patch repository at same time\n" -"\n" +msgid "clone main and patch repository at same time" +msgstr "" + +msgid "" " 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" -" before that it has no patches applied.\n" -"\n" +" before that it has no patches applied." +msgstr "" + +msgid "" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" +" default. Use -p <url> to change." +msgstr "" + +msgid "" " The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " @@ -2956,25 +3406,32 @@ msgid "print the name of the previous patch" msgstr "" -msgid "" -"create a new patch\n" -"\n" +msgid "create a new patch" +msgstr "" + +msgid "" " 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" +" as uncommitted modifications." +msgstr "" + +msgid "" " -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" +" to current user and date to current date." +msgstr "" + +msgid "" " -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" +" empty and the commit message is '[mq]: PATCH'." +msgstr "" + +msgid "" " 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" @@ -2982,16 +3439,21 @@ " " msgstr "" -msgid "" -"update the current patch\n" -"\n" +msgid "update the current patch" +msgstr "" + +msgid "" " 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" +" remaining modifications will remain in the working directory." +msgstr "" + +msgid "" " 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" +" will be refreshed just like matched files and remain in the patch." +msgstr "" + +msgid "" " 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" @@ -3002,14 +3464,17 @@ msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" msgstr "" -msgid "" -"diff of the current patch and subsequent modifications\n" -"\n" +msgid "diff of the current patch and subsequent modifications" +msgstr "" + +msgid "" " 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" +" after a qrefresh)." +msgstr "" + +msgid "" " Use 'hg diff' if you only want to see the changes made since the\n" " last qrefresh, or 'hg export qtip' if you want to see changes made\n" " by the current patch without including changes made since the\n" @@ -3017,16 +3482,19 @@ " " msgstr "" -msgid "" -"fold the named patches into the current patch\n" -"\n" +msgid "fold the named patches into the current patch" +msgstr "" + +msgid "" " 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 be\n" " deleted. With -k/--keep, the folded patch files will not be\n" -" removed afterwards.\n" -"\n" +" removed afterwards." +msgstr "" + +msgid "" " The header for each folded patch will be concatenated with the\n" " current patch header, separated by a line of '* * *'." msgstr "" @@ -3052,19 +3520,24 @@ msgid "push or pop patches until named patch is at top of stack" msgstr "" -msgid "" -"set or print guards for a patch\n" -"\n" +msgid "set or print guards for a patch" +msgstr "" + +msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" " pushed only if the qselect command has activated it. A patch with\n" " a negative guard (\"-foo\") is never pushed if the qselect command\n" -" has activated it.\n" -"\n" +" has activated it." +msgstr "" + +msgid "" " With no arguments, print the currently active guards.\n" " With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'.\n" -"\n" +" NOTE: Specifying negative guards now requires '--'." +msgstr "" + +msgid "" " To set guards on another patch:\n" " hg qguard -- other.patch +2.6.17 -stable\n" " " @@ -3083,9 +3556,10 @@ msgid "print the header of the topmost or specified patch" msgstr "" -msgid "" -"push the next patch onto the stack\n" -"\n" +msgid "push the next patch onto the stack" +msgstr "" + +msgid "" " When -f/--force is applied, all local changes in patched files\n" " will be lost.\n" " " @@ -3098,9 +3572,10 @@ msgid "merging with queue at: %s\n" msgstr "" -msgid "" -"pop the current patch off the stack\n" -"\n" +msgid "pop the current patch off the stack" +msgstr "" + +msgid "" " 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" @@ -3111,9 +3586,10 @@ msgid "using patch queue: %s\n" msgstr "" -msgid "" -"rename a patch\n" -"\n" +msgid "rename a patch" +msgstr "" + +msgid "" " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" @@ -3144,45 +3620,59 @@ msgid "copy %s to %s\n" msgstr "" -msgid "" -"strip a revision and all its descendants from the repository\n" -"\n" +msgid "strip a revision and all its descendants from the repository" +msgstr "" + +msgid "" " If one of the working directory's parent revisions is stripped, the\n" " working directory will be updated to the parent of the stripped\n" " revision.\n" " " msgstr "" -msgid "" -"set or print guarded patches to push\n" -"\n" +msgid "set or print guarded patches to push" +msgstr "" + +msgid "" " 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\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" +" match the current guard. For example:" +msgstr "" + +msgid "" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" -" qselect stable\n" -"\n" +" qselect stable" +msgstr "" + +msgid "" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" " it has a negative match) but push bar.patch (because it has a\n" -" positive match).\n" -"\n" +" positive match)." +msgstr "" + +msgid "" " With no arguments, prints the currently active guards.\n" -" With one argument, sets the active guard.\n" -"\n" +" With one argument, sets the active guard." +msgstr "" + +msgid "" " Use -n/--none to deactivate guards (no other arguments needed).\n" " When no guards are active, patches with positive guards are\n" -" skipped and patches with negative guards are pushed.\n" -"\n" +" skipped and patches with negative guards are pushed." +msgstr "" + +msgid "" " 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\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" +" guarded patches." +msgstr "" + +msgid "" " 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 "" @@ -3216,18 +3706,23 @@ msgid "reapplying unguarded patches\n" msgstr "" -msgid "" -"move applied patches into repository history\n" -"\n" +msgid "move applied patches into repository history" +msgstr "" + +msgid "" " Finishes the specified revisions (corresponding to applied\n" " patches) by moving them out of mq control into regular repository\n" -" history.\n" -"\n" +" history." +msgstr "" + +msgid "" " 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" +" stack of applied patches." +msgstr "" + +msgid "" " 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" @@ -3494,33 +3989,47 @@ msgid "hg qfinish [-a] [REV]..." msgstr "" -msgid "" -"hooks for sending email notifications at commit/push time\n" -"\n" +msgid "hooks for sending email notifications at commit/push time" +msgstr "" + +msgid "" "Subscriptions can be managed through a hgrc file. Default mode is to\n" -"print messages to stdout, for testing and configuring.\n" -"\n" +"print messages to stdout, for testing and configuring." +msgstr "" + +msgid "" "To use, configure the notify extension and enable it in hgrc like\n" -"this::\n" -"\n" +"this::" +msgstr "" + +msgid "" " [extensions]\n" -" notify =\n" -"\n" +" notify =" +msgstr "" + +msgid "" " [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" +" changegroup.notify = python:hgext.notify.hook" +msgstr "" + +msgid "" " [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" +" # config items go here" +msgstr "" + +msgid "Required configuration items::" +msgstr "" + +msgid " config = /path/to/file # file containing subscriptions" +msgstr "" + +msgid "Optional configuration items::" +msgstr "" + +msgid "" " 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" @@ -3531,31 +4040,40 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this " -"list\n" +" sources = serve # notify if source of incoming changes in this list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" " 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" +" baseurl = http://hgserver/... # root of hg web site for browsing commits" +msgstr "" + +msgid "" "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" +"handier for you." +msgstr "" + +msgid "::" +msgstr "" + +msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" -" user@host = pattern\n" -"\n" +" user@host = pattern" +msgstr "" + +msgid "" " [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" +" pattern = user@host" +msgstr "" + +msgid "Glob patterns are matched against path to repository root." +msgstr "" + +msgid "" "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 "" @@ -3571,134 +4089,183 @@ #, python-format msgid "" "\n" -"diffs (truncated from %d to %d lines):\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"diffs (%d lines):\n" -"\n" +"diffs (truncated from %d to %d lines):" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):" msgstr "" #, 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" +msgid "browse command output with an external pager" +msgstr "" + +msgid "To set the pager that should be used, set the application variable::" +msgstr "" + +msgid "" " [pager]\n" -" pager = LESS='FSRX' less\n" -"\n" +" pager = LESS='FSRX' less" +msgstr "" + +msgid "" "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" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." +msgstr "" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting::\n" -"\n" +"setting::" +msgstr "" + +msgid "" " [pager]\n" -" quiet = True\n" -"\n" +" quiet = True" +msgstr "" + +msgid "" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list::\n" -"\n" +"pager.ignore list::" +msgstr "" + +msgid "" " [pager]\n" -" ignore = version, help, update\n" -"\n" +" ignore = version, help, update" +msgstr "" + +msgid "" "You can also enable the pager only for certain commands using\n" -"pager.attend::\n" -"\n" +"pager.attend::" +msgstr "" + +msgid "" " [pager]\n" -" attend = log\n" -"\n" -"If pager.attend is present, pager.ignore will be ignored.\n" -"\n" +" attend = log" +msgstr "" + +msgid "If pager.attend is present, pager.ignore will be ignored." +msgstr "" + +msgid "" "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" +msgid "interpret suffixes to refer to ancestor revisions" +msgstr "" + +msgid "" "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" +"ancestors of a specific revision." +msgstr "" + +msgid "For example, if you can refer to a revision as \"foo\", then::" +msgstr "" + +msgid "" " 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^ = foo^1" +msgstr "" + +msgid "" " 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 "" -"command to send changesets as (a series of) patch emails\n" -"\n" +msgid "command to send changesets as (a series of) patch emails" +msgstr "" + +msgid "" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" -"describes the series as a whole.\n" -"\n" +"describes the series as a whole." +msgstr "" + +msgid "" "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" +"message contains two or three body parts:" +msgstr "" + +msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\".\n" -"\n" +"- The patch itself, as generated by \"hg export\"." +msgstr "" + +msgid "" "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" +"mail and news readers, and in mail archives." +msgstr "" + +msgid "" "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" +"you are sending the right changes." +msgstr "" + +msgid "" "To configure other defaults, add a section like this to your hgrc\n" -"file::\n" -"\n" +"file::" +msgstr "" + +msgid "" " [email]\n" " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ...\n" -"\n" +" bcc = bcc1, bcc2, ..." +msgstr "" + +msgid "" "Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb.\n" -"\n" +"as a patchbomb." +msgstr "" + +msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" "the \"email\" command with the \"-n\" option (test only). You will be\n" "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" +"message, so you can verify everything is alright." +msgstr "" + +msgid "" "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" +"files, e.g. with mutt::" +msgstr "" + +msgid " % mutt -R -f mbox" +msgstr "" + +msgid "" "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" +"package), to send each message out::" +msgstr "" + +msgid " % formail -s sendmail -bm -t < mbox" +msgstr "" + +msgid "That should be all. Now your patchbomb is on its way out." +msgstr "" + +msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -3719,53 +4286,66 @@ msgid "diffstat rejected" msgstr "" -msgid "" -"send changesets by email\n" -"\n" +msgid "send changesets by email" +msgstr "" + +msgid "" " By default, diffs are sent in the format generated by hg export,\n" " one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole.\n" -"\n" +" introduction, which describes the series as a whole." +msgstr "" + +msgid "" " 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 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" +" \"hg export\"." +msgstr "" + +msgid "" " 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" +" will be created." +msgstr "" + +msgid "" " 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" +" of the specified revisions if any are provided)" +msgstr "" + +msgid "" " 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" +" will be sent." +msgstr "" + +msgid "" " 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 3000 # send patch 3000 (deprecated)" +msgstr "" + +msgid "" " 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 -o -r 3000 DEST # send all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " -"default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " -"DEST\n" -"\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -3785,14 +4365,11 @@ msgid "" "\n" -"Write the introductory message for the patch series.\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"This patch series consists of %d patches.\n" -"\n" +"Write the introductory message for the patch series." +msgstr "" + +#, python-format +msgid "This patch series consists of %d patches." msgstr "" msgid "Final summary:\n" @@ -3879,27 +4456,38 @@ msgid "command to delete untracked files from the working directory" msgstr "" -msgid "" -"removes files not tracked by Mercurial\n" -"\n" +msgid "removes files not tracked by Mercurial" +msgstr "" + +msgid "" " 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" -"\n" +" and uncommitted changes in an otherwise-clean source tree." +msgstr "" + +msgid " This means that purge will delete:" +msgstr "" + +msgid "" " - 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" -"\n" +" they contain files under source control management" +msgstr "" + +msgid " But it will leave untouched:" +msgstr "" + +msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" -"\n" +" - New files added to the repository (with \"hg add\")" +msgstr "" + +msgid "" " If directories are given on the command line, only files in these\n" -" directories are considered.\n" -"\n" +" directories are considered." +msgstr "" + +msgid "" " 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" @@ -3938,23 +4526,29 @@ msgid "hg purge [OPTION]... [DIR]..." msgstr "" -msgid "" -"command to move sets of revisions to a different ancestor\n" -"\n" +msgid "command to move sets of revisions to a different ancestor" +msgstr "" + +msgid "" "This extension lets you rebase changesets in an existing Mercurial\n" -"repository.\n" -"\n" +"repository." +msgstr "" + +msgid "" "For more information:\n" "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" -msgid "" -"move changeset (and descendants) to a different branch\n" -"\n" +msgid "move changeset (and descendants) to a different branch" +msgstr "" + +msgid "" " 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" +" changes relative to a master development tree." +msgstr "" + +msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" " continued with --continue/-c or aborted with --abort/-a.\n" " " @@ -4050,9 +4644,7 @@ msgid "abort an interrupted rebase" msgstr "" -msgid "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " -"| [-c] | [-a]" +msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]" msgstr "" msgid "commands to interactively select changes for commit/qrefresh" @@ -4119,30 +4711,41 @@ msgid "record change %d/%d to %r?" msgstr "" -msgid "" -"interactively select changes to commit\n" -"\n" +msgid "interactively select changes to commit" +msgstr "" + +msgid "" " If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be candidates for recording.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" will be candidates for recording." +msgstr "" + +msgid " See 'hg help dates' for a list of formats valid for -d/--date." +msgstr "" + +msgid "" " 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" +" possible::" +msgstr "" + +msgid "" " y - record this change\n" -" n - skip this change\n" -"\n" +" n - skip this change" +msgstr "" + +msgid "" " s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" +" f - record remaining changes to this file" +msgstr "" + +msgid "" " 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" +" q - quit, recording no changes" +msgstr "" + +msgid " ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -4166,12 +4769,15 @@ msgid "share a common history between several working directories" msgstr "" -msgid "" -"create a new shared repository (experimental)\n" -"\n" +msgid "create a new shared repository (experimental)" +msgstr "" + +msgid "" " Initialize a new repository and working directory that shares its\n" -" history with another repository.\n" -"\n" +" history with another repository." +msgstr "" + +msgid "" " NOTE: actions that change history such as rollback or moving the\n" " source may confuse sharers.\n" " " @@ -4183,11 +4789,13 @@ msgid "[-U] SOURCE [DEST]" msgstr "" -msgid "" -"command to transplant changesets from another branch\n" -"\n" -"This extension allows you to transplant patches from another branch.\n" -"\n" +msgid "command to transplant changesets from another branch" +msgstr "" + +msgid "This extension allows you to transplant patches from another branch." +msgstr "" + +msgid "" "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 "" @@ -4242,38 +4850,52 @@ msgid "apply changeset? [ynmpcq?]:" msgstr "" -msgid "" -"transplant changesets from another branch\n" -"\n" +msgid "transplant changesets from another branch" +msgstr "" + +msgid "" " 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" -"\n" +" specified, log messages will have a comment appended of the form::" +msgstr "" + +msgid " (transplanted from CHANGESETHASH)" +msgstr "" + +msgid "" " You can rewrite the changelog message with the --filter option.\n" " Its argument will be invoked with the current changelog message as\n" -" $1 and the patch as $2.\n" -"\n" +" $1 and the patch as $2." +msgstr "" + +msgid "" " 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" +" changesets you want." +msgstr "" + +msgid "" " hg transplant --branch REVISION --all will rebase the selected\n" " branch (up to the named revision) onto your current working\n" -" directory.\n" -"\n" +" directory." +msgstr "" + +msgid "" " 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" +" normally instead of transplanting them." +msgstr "" + +msgid "" " If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser.\n" -"\n" +" an interactive changeset browser." +msgstr "" + +msgid "" " If a changeset application fails, you can fix the merge by hand\n" " and then resume where you left off by calling hg transplant\n" " --continue/-c.\n" @@ -4325,38 +4947,49 @@ msgid "filter changesets through FILTER" msgstr "" -msgid "" -"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." -msgstr "" - -msgid "" -"allow the use of MBCS paths with problematic encodings\n" -"\n" +msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "allow the use of MBCS paths with problematic encodings" +msgstr "" + +msgid "" "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" +"operation." +msgstr "" + +msgid "This extension is useful for:" +msgstr "" + +msgid "" "- 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" -"\n" +" case-insensitive file system." +msgstr "" + +msgid "This extension is not needed for:" +msgstr "" + +msgid "" "- 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" -"\n" +"- Any user who do not use any of problematic encodings." +msgstr "" + +msgid "Note that there are some limitations on using this extension:" +msgstr "" + +msgid "" "- You should use single encoding in one repository.\n" "- You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" -"\n" +" HGENCODING." +msgstr "" + +msgid "" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" @@ -4369,31 +5002,41 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "" -msgid "" -"perform automatic newline conversion\n" -"\n" -"To perform automatic newline conversion, use::\n" -"\n" +msgid "perform automatic newline conversion" +msgstr "" + +msgid "To perform automatic newline conversion, use::" +msgstr "" + +msgid "" " [extensions]\n" " win32text =\n" " [encode]\n" " ** = cleverencode:\n" -" # or ** = macencode:\n" -"\n" +" # or ** = macencode:" +msgstr "" + +msgid "" " [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" +" # or ** = macdecode:" +msgstr "" + +msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgstr "" + +msgid "" " [hooks]\n" " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" -"\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr" +msgstr "" + +msgid "" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled::\n" -"\n" +"pushed or pulled::" +msgstr "" + +msgid "" " [hooks]\n" " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" @@ -4419,13 +5062,21 @@ msgid "" "\n" "To prevent this mistake in your local repository,\n" -"add to Mercurial.ini or .hg/hgrc:\n" -"\n" +"add to Mercurial.ini or .hg/hgrc:" +msgstr "" + +#, python-format +msgid "" "[hooks]\n" -"pretxncommit.%s = python:hgext.win32text.forbid%s\n" -"\n" -"and also consider adding:\n" -"\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s" +msgstr "" + +#, python-format +msgid "and also consider adding:" +msgstr "" + +#, python-format +msgid "" "[extensions]\n" "win32text =\n" "[encode]\n" @@ -4434,21 +5085,29 @@ "** = %sdecode:\n" msgstr "" -msgid "" -"discover and advertise repositories on the local network\n" -"\n" +msgid "discover and advertise repositories on the local network" +msgstr "" + +msgid "" "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" +"without knowing their actual IP address." +msgstr "" + +msgid "" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository::\n" -"\n" +"in your repository::" +msgstr "" + +msgid "" " $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" -"\n" +" $ hg serve" +msgstr "" + +msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgstr "" + +msgid "" " $ hg paths\n" " zc-test = http://example.com:8000/test\n" msgstr "" @@ -4708,39 +5367,54 @@ msgstr "" #, fuzzy -msgid "" -"add the specified files on the next commit\n" -"\n" +msgid "add the specified files on the next commit" +msgstr "新增下次要 commit 的檔案" + +#, fuzzy +msgid "" " Schedule files to be version controlled and added to the\n" -" repository.\n" -"\n" +" repository." +msgstr " 新增要納入版本控制並加到 repository 的檔案。" + +#, fuzzy +msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget.\n" -"\n" +" undo an add before that, see hg forget." +msgstr "" +" 這些檔案將於下次 commit 時被加到 repository。\n" +" 若想要回到新增檔案前的狀態，請參閱 hg revert 命令。" + +#, fuzzy +msgid "" " If no names are given, add all files to the repository.\n" " " msgstr "" -"新增下次要 commit 的檔案\n" -"\n" -" 新增要納入版本控制並加到 repository 的檔案。\n" -"\n" -" 這些檔案將於下次 commit 時被加到 repository。\n" -" 若想要回到新增檔案前的狀態，請參閱 hg revert 命令。\n" -"\n" " 如果沒有指定檔案，則會將所有的檔案都標示為加到 repository。\n" " " #, fuzzy -msgid "" -"add all new files, delete all missing files\n" -"\n" +msgid "add all new files, delete all missing files" +msgstr "新增所有未受版本控制的檔案，並刪除所有消失的檔案。" + +#, fuzzy +msgid "" " Add all new files and remove all missing files from the\n" -" repository.\n" -"\n" +" repository." +msgstr "" +" 新增所有未加到 repository 的檔案，並移除已加到 repository\n" +" 卻消失的檔案。" + +#, fuzzy +msgid "" " 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" +" commit." +msgstr "" +" 如果新的檔案中檔名有符合任一存在於 .hgignore 的樣式，\n" +" 則該檔將被忽略。如同 add 命令，這些變更將於下次提交時發生效用。" + +#, fuzzy +msgid "" " 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" @@ -4749,14 +5423,6 @@ " can be expensive.\n" " " msgstr "" -"新增所有未受版本控制的檔案，並刪除所有消失的檔案。\n" -"\n" -" 新增所有未加到 repository 的檔案，並移除已加到 repository\n" -" 卻消失的檔案。\n" -"\n" -" 如果新的檔案中檔名有符合任一存在於 .hgignore 的樣式，\n" -" 則該檔將被忽略。如同 add 命令，這些變更將於下次提交時發生效用。\n" -"\n" " 可使用 -s/--similarity 選項去偵測更名的檔案。後面接著的是一個\n" " 大於 0 的參數，可用來比對每個被新增或移除的檔案，並試圖找出其\n" " 更名的可能性。此選項需要指定一個介於 0 (不使用) 至\n" @@ -4770,29 +5436,30 @@ msgid "similarity must be between 0 and 100" msgstr "similarity 參數必須介於 0 至 100" -msgid "" -"show changeset information by line for each file\n" -"\n" +msgid "show changeset information by line for each file" +msgstr "顯示每個檔案中每一行 changeset 的資訊" + +msgid "" +" List changes in files, showing the revision id responsible for\n" +" each line" +msgstr "" " List changes in files, showing the revision id responsible for\n" -" each line\n" -"\n" +" each line" + +msgid "" " This command is useful for discovering when a change was made and\n" -" by whom.\n" -"\n" +" by whom." +msgstr "" +" This command is useful for discovering when a change was made and\n" +" by whom." + +msgid "" " 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 "" -"顯示每個檔案中每一行 changeset 的資訊\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" @@ -4810,49 +5477,57 @@ msgstr "" #, fuzzy -msgid "" -"create an unversioned archive of a repository revision\n" -"\n" +msgid "create an unversioned archive of a repository revision" +msgstr "建立一個沒有版本控制的版本封存" + +#, fuzzy +msgid "" +" By default, the revision used is the parent of the working\n" +" directory; use -r/--rev to specify a different revision." +msgstr "" " By default, the revision used is the parent of the working\n" -" directory; use -r/--rev to specify a different revision.\n" -"\n" +" directory; use -r/--rev to specify a different revision." + +#, fuzzy +msgid "" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are::\n" -"\n" +" types are::" +msgstr "" +" To specify the type of archive to create, use -t/--type. Valid\n" +" types are:" + +#, fuzzy +msgid "" " \"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" -"\n" -" Each member added to an archive file has a directory prefix\n" -" prepended. Use -p/--prefix to specify a format string for the\n" -" prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " -msgstr "" -"建立一個沒有版本控制的版本封存\n" -"\n" -" By default, the revision used is the parent of the working\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" +" \"zip\": zip archive, compressed using deflate" +msgstr "" " \"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" +" \"zip\": zip archive, compressed using deflate" + +#, fuzzy +msgid "" +" The exact name of the destination archive or directory is given\n" +" using a format string; see 'hg help export' for details." +msgstr "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details.\n" -"\n" +" using a format string; see 'hg help export' for details." + +#, fuzzy +msgid "" +" Each member added to an archive file has a directory prefix\n" +" prepended. Use -p/--prefix to specify a format string for the\n" +" prefix. The default is the basename of the archive, with suffixes\n" +" removed.\n" +" " +msgstr "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" @@ -4868,40 +5543,35 @@ msgid "cannot archive plain files to stdout" msgstr "" -msgid "" -"reverse effect of earlier changeset\n" -"\n" +msgid "reverse effect of earlier changeset" +msgstr "回復先前 changeset 所作的變更" + +msgid "" " Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset.\n" -"\n" +" changeset is a child of the backed out changeset." +msgstr "" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset." + +msgid "" " 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.\n" -"\n" +" backout changeset with another head." +msgstr "" +" 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." + +msgid "" " 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 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" -" " -msgstr "" -"回復先前 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 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.\n" -"\n" +" The result of this merge is not committed, as with a normal merge." +msgstr "" " 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 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" -" " +" The result of this merge is not committed, as with a normal merge." msgid "please specify just one revision" msgstr "" @@ -4939,9 +5609,10 @@ msgid "(use \"backout --merge\" if you want to auto-merge)\n" msgstr "" -msgid "" -"subdivision search of changesets\n" -"\n" +msgid "subdivision search of changesets" +msgstr "對 changesets 作二分法搜尋" + +msgid "" " 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" @@ -4949,20 +5620,8 @@ " 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.\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 "" -"對 changesets 作二分法搜尋\n" -"\n" +" or announce that it has found the bad revision." +msgstr "" " 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" @@ -4970,11 +5629,23 @@ " 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" +" or announce that it has found the bad revision." + +msgid "" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first." +msgstr "" " 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" +" revision as good or bad without checking it out first." + +msgid "" +" 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 "" " 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" @@ -5023,41 +5694,47 @@ msgstr "" #, fuzzy -msgid "" -"set or show the current branch name\n" -"\n" +msgid "set or show the current branch name" +msgstr "設定或顯示目前的 branch 名稱" + +#, fuzzy +msgid "" +" With no argument, show the current branch name. With one argument,\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." +msgstr "" " With no argument, show the current branch name. With one argument,\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" +" branch." + +#, fuzzy +msgid "" " 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" +" branch name that already exists, even if it's inactive." +msgstr "" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive." + +#, fuzzy +msgid "" " 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" +" change." +msgstr "" +" 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." + +#, fuzzy +msgid "" " Use the command 'hg update' to switch to an existing branch. Use\n" " 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" -"設定或顯示目前的 branch 名稱\n" -"\n" -" With no argument, show the current branch name. With one argument,\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.\n" " " @@ -5073,32 +5750,62 @@ msgstr "" #, fuzzy -msgid "" -"list repository named branches\n" -"\n" +msgid "list repository named branches" +msgstr "顯示 repository 的 named branches" + +#, fuzzy +msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch).\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" -" " -msgstr "" -"顯示 repository 的 named branches\n" -"\n" +" been marked closed (see hg commit --close-branch)." +msgstr "" " 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" -"\n" +" inactive. If active is specified, only show active branches." + +#, fuzzy +msgid "" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads." +msgstr " A branch is considered active if it contains repository heads." + +#, fuzzy +msgid "" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" " Use the command 'hg update' to switch to an existing branch.\n" " " #, fuzzy -msgid "" -"create a changegroup file\n" +msgid "create a changegroup file" +msgstr "" +"建立一個 changegroup 檔案\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" known to be in another repository.\n" +"\n" +" 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" +"\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" +" " + +#, fuzzy +msgid "" +" Generate a compressed changegroup file collecting changesets not\n" +" known to be in another repository." +msgstr "" +"建立一個 changegroup 檔案\n" "\n" " Generate a compressed changegroup file collecting changesets not\n" " known to be in another repository.\n" @@ -5106,11 +5813,37 @@ " 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).\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" +" -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" +"\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" +" " + +#, fuzzy +msgid "" +" If no destination repository is specified the destination is\n" +" assumed to have all the nodes specified by one or more --base\n" +" parameters. To create a bundle containing all changesets, use\n" +" -a/--all (or --base null)." +msgstr "" +"建立一個 changegroup 檔案\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" known to be in another repository.\n" +"\n" +" 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" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -5120,6 +5853,67 @@ " Applying bundles preserves all changeset contents including\n" " permissions, copy/rename information, and revision history.\n" " " + +#, fuzzy +msgid "" +" 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)." +msgstr "" +"建立一個 changegroup 檔案\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" known to be in another repository.\n" +"\n" +" 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" +"\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" +" " + +#, fuzzy +msgid "" +" 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." +msgstr "" +"建立一個 changegroup 檔案\n" +"\n" +" Generate a compressed changegroup file collecting changesets not\n" +" known to be in another repository.\n" +"\n" +" 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" +"\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" +" " + +#, fuzzy +msgid "" +" Applying bundles preserves all changeset contents including\n" +" permissions, copy/rename information, and revision history.\n" +" " msgstr "" "建立一個 changegroup 檔案\n" "\n" @@ -5149,40 +5943,147 @@ msgstr "" #, fuzzy -msgid "" -"output the current or given revision of files\n" -"\n" +msgid "output the current or given revision of files" +msgstr "輸出目前或是特定 revision 的檔案內容" + +#, fuzzy +msgid "" +" 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." +msgstr "" " 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" +" or tip if no revision is checked out." + +#, fuzzy +msgid "" " 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" +" for the export command, with the following additions::" +msgstr "" +" 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:" + +#, fuzzy +msgid "" " %s basename of file being printed\n" " %d dirname of file being printed, or '.' if in repository root\n" " %p root-relative path name of file being printed\n" " " msgstr "" -"輸出目前或是特定 revision 的檔案內容\n" -"\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 repository root\n" " %p root-relative path name of file being printed\n" " " #, fuzzy -msgid "" -"make a copy of an existing repository\n" +msgid "make a copy of an existing repository" +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid " Create a copy of an existing repository in a new directory." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source." +msgstr "" +"對已存在的 repository 複製一份\n" "\n" " Create a copy of an existing repository in a new directory.\n" "\n" @@ -5216,7 +6117,217 @@ " 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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" 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." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" 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." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" 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)." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid " See 'hg help urls' for valid source format details." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" @@ -5226,6 +6337,228 @@ " 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" +" " + +#, fuzzy +msgid "" +" It is possible to specify an ssh:// URL as the destination, but no\n" +" .hg/hgrc and working directory will be created on the remote side.\n" +" Please see 'hg help urls' for important details about ssh:// URLs." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking." +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" In some cases, you can clone repositories and checked out files\n" +" using full hardlinks with ::" +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid " $ cp -al REPO REPOCLONE" +msgstr "" +"對已存在的 repository 複製一份\n" +"\n" +" Create a copy of an existing repository in a new directory.\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source.\n" +"\n" +" 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" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking.\n" +"\n" +" In some cases, you can clone repositories and checked out files\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" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" +"\n" +" " + +#, fuzzy +msgid "" +" 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" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq.\n" " " msgstr "" "對已存在的 repository 複製一份\n" @@ -5275,42 +6608,38 @@ "\n" " " -msgid "" -"commit the specified files or all outstanding changes\n" -"\n" +msgid "commit the specified files or all outstanding changes" +msgstr "將指定的檔案或是目前的變更 commit" + +msgid "" +" Commit changes to the given files into the repository. Unlike a\n" +" centralized RCS, this operation is a local operation. See hg push\n" +" for a way to actively distribute your changes." +msgstr "" " 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" +" for a way to actively distribute your changes." + +msgid "" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed." +msgstr "" " If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be committed.\n" -"\n" +" will be committed." + +msgid "" " If you are committing the result of a merge, do not provide any\n" -" filenames or -I/-X filters.\n" -"\n" +" filenames or -I/-X filters." +msgstr "" +" If you are committing the result of a merge, do not provide any\n" +" filenames or -I/-X filters." + +msgid "" " 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" -" " -msgstr "" -"將指定的檔案或是目前的變更 commit\n" -"\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" -" filenames or -I/-X filters.\n" -"\n" +" started to prompt you for a message." +msgstr "" " 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" -" " +" started to prompt you for a message." msgid "nothing changed\n" msgstr "" @@ -5322,31 +6651,32 @@ msgid "committed changeset %d:%s\n" msgstr "" -msgid "" -"mark files as copied for the next commit\n" -"\n" +msgid "mark files as copied for the next commit" +msgstr "將檔案標示為 copied 並於下次 commit" + +msgid "" +" Mark dest as having copies of source files. If dest is a\n" +" directory, copies are put in that directory. If dest is a file,\n" +" the source must be a single file." +msgstr "" " Mark dest as having copies of source files. If dest is a\n" " directory, copies are put in that directory. If dest is a file,\n" -" the source must be a single file.\n" -"\n" +" the source must be a single file." + +msgid "" " By default, this command copies the contents of files as they\n" " exist in the working directory. If invoked with -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" operation is recorded, but no copying is performed." +msgstr "" +" By default, this command copies the contents of files as they\n" +" exist in the working directory. If invoked with -A/--after, the\n" +" operation is recorded, but no copying is performed." + +msgid "" " This command takes effect with the next commit. To undo a copy\n" " before that, see hg revert.\n" " " msgstr "" -"將檔案標示為 copied 並於下次 commit\n" -"\n" -" Mark dest as having copies of source files. If dest is a\n" -" directory, copies are put in that directory. If dest is a file,\n" -" the source must be a single file.\n" -"\n" -" By default, this command copies the contents of files as they\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" " before that, see hg revert.\n" " " @@ -5388,31 +6718,31 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr "" -msgid "" -"show combined config settings from all hgrc files\n" -"\n" -" With no arguments, print names and values of all config items.\n" -"\n" +msgid "show combined config settings from all hgrc files" +msgstr "顯示合併自所有 hgrc 檔案內容的設定值" + +msgid " With no arguments, print names and values of all config items." +msgstr " With no arguments, print names and values of all config items." + +msgid "" +" With one argument of the form section.name, print just the value\n" +" of that config item." +msgstr "" " With one argument of the form section.name, print just the value\n" -" of that config item.\n" -"\n" +" of that config item." + +msgid "" " With multiple arguments, print names and values of all config\n" -" items with matching section names.\n" -"\n" +" items with matching section names." +msgstr "" +" With multiple arguments, print names and values of all config\n" +" items with matching section names." + +msgid "" " With --debug, the source (filename and line number) is printed\n" " for each config item.\n" " " msgstr "" -"顯示合併自所有 hgrc 檔案內容的設定值\n" -"\n" -" 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" " " @@ -5420,9 +6750,10 @@ msgid "only one config item permitted" msgstr "" -msgid "" -"manually set the parents of the current working directory\n" -"\n" +msgid "manually set the parents of the current working directory" +msgstr "" + +msgid "" " This is useful for writing repository conversion tools, but should\n" " be used with care.\n" " " @@ -5488,14 +6819,10 @@ msgid " patch test failed!\n" msgstr "" -msgid "" -" (Current patch tool may be incompatible with patch, or misconfigured. " -"Please check your .hgrc file)\n" -msgstr "" - -msgid "" -" Internal patcher failure, please report this error to http://mercurial." -"selenic.com/bts/\n" +msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" +msgstr "" + +msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5538,71 +6865,78 @@ msgid "show how files match on given patterns" msgstr "" -msgid "" -"diff repository (or selected files)\n" -"\n" -" Show differences between revisions for the specified files.\n" -"\n" -" Differences between files are shown using the unified diff format.\n" -"\n" +msgid "diff repository (or selected files)" +msgstr "diff repository (或是所選擇的檔案)" + +msgid " Show differences between revisions for the specified files." +msgstr " Show differences between revisions for the specified files." + +msgid " Differences between files are shown using the unified diff format." +msgstr " Differences between files are shown using the unified diff format." + +msgid "" " NOTE: diff may generate unexpected results for merges, as it will\n" " default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified.\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.\n" -"\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 "" -"diff repository (或是所選擇的檔案)\n" -"\n" -" Show differences between revisions for the specified files.\n" -"\n" -" Differences between files are shown using the unified diff format.\n" -"\n" +" changeset if no revisions are specified." +msgstr "" " NOTE: diff may generate unexpected results for merges, as it will\n" " default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified.\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.\n" -"\n" +" changeset if no revisions are specified." + +msgid "" " 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" +" anyway, probably with undesirable results." +msgstr "" +" 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." + +msgid "" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" +" " +msgstr "" " Use the -g/--git option to generate diffs in the git extended diff\n" " format. For more information, read 'hg help diffs'.\n" " " #, fuzzy -msgid "" -"dump the header and diffs for one or more changesets\n" -"\n" -" Print the changeset header and diffs for one or more revisions.\n" -"\n" +msgid "dump the header and diffs for one or more changesets" +msgstr "將一或多個 changesets 的 header 以及 diffs dump 出來" + +#, fuzzy +msgid " Print the changeset header and diffs for one or more revisions." +msgstr " Print the changeset header and diffs for one or more revisions." + +#, fuzzy +msgid "" " The information shown in the changeset header is: author,\n" -" changeset hash, parent(s) and commit comment.\n" -"\n" +" changeset hash, parent(s) and commit comment." +msgstr "" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment." + +#, fuzzy +msgid "" " 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" +" first parent only." +msgstr "" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only." + +#, fuzzy +msgid "" " 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" +" given using a format string. The formatting rules are as follows::" +msgstr "" +" 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:" + +#, fuzzy +msgid "" " %% literal \"%\" character\n" " %H changeset hash (40 bytes of hexadecimal)\n" " %N number of patches being generated\n" @@ -5610,33 +6944,8 @@ " %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 "" -"將一或多個 changesets 的 header 以及 diffs dump 出來\n" -"\n" -" Print the changeset header and diffs for one or more revisions.\n" -"\n" -" 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\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" +" %r zero-padded changeset revision number" +msgstr "" " %% literal \"%\" character\n" " %H changeset hash (40 bytes of hexadecimal)\n" " %N number of patches being generated\n" @@ -5644,15 +6953,32 @@ " %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" +" %r zero-padded changeset revision number" + +#, fuzzy +msgid "" +" 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." +msgstr "" " 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" +" diff anyway, probably with undesirable results." + +#, fuzzy +msgid "" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information." +msgstr "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information.\n" -"\n" +" format. See 'hg help diffs' for more information." + +#, fuzzy +msgid "" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" +" " +msgstr "" " With the --switch-parent option, the diff will be against the\n" " second parent. It can be useful to review a merge.\n" " " @@ -5666,16 +6992,21 @@ msgid "exporting patch:\n" msgstr "" -msgid "" -"forget the specified files on the next commit\n" -"\n" +msgid "forget the specified files on the next commit" +msgstr "" + +msgid "" " Mark the specified files so they will no longer be tracked\n" -" after the next commit.\n" -"\n" +" after the next commit." +msgstr "" + +msgid "" " 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" +" working directory." +msgstr "" + +msgid "" " To undo a forget before the next commit, see hg add.\n" " " msgstr "" @@ -5687,16 +7018,24 @@ 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" -"\n" +msgid "search for a pattern in specified files and revisions" +msgstr "從指定的檔案或 revisions 搜尋樣式" + +msgid " Search revisions of files for a regular expression." +msgstr " Search revisions of files for a regular expression." + +msgid "" " 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 a\n" -" match appears.\n" -"\n" +" match appears." +msgstr "" +" 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 a\n" +" match appears." + +msgid "" " 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" " that contains a change in match status (\"-\" for a match that\n" @@ -5704,15 +7043,6 @@ " use the --all flag.\n" " " msgstr "" -"從指定的檔案或 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 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" " that contains a change in match status (\"-\" for a match that\n" @@ -5725,28 +7055,170 @@ msgstr "" #, fuzzy -msgid "" -"show current repository heads or show branch heads\n" +msgid "show current repository heads or show branch heads" +msgstr "" +"顯示目前的 repository heads 或是 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" +"\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" +" " + +#, fuzzy +msgid " With no arguments, show all repository head changesets." +msgstr "" +"顯示目前的 repository heads 或是 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" +"\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" +" " + +#, fuzzy +msgid "" " 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" +" for update and merge operations." +msgstr "" +"顯示目前的 repository heads 或是 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" "\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" +" 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" +" " + +#, fuzzy +msgid "" +" If one or more REV is given, the \"branch heads\" will be shown for\n" +" the named branch associated with the specified changeset(s)." +msgstr "" +"顯示目前的 repository heads 或是 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" +"\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" +" " + +#, fuzzy +msgid "" " 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" +" are true heads, the branch is considered inactive." +msgstr "" +"顯示目前的 repository heads 或是 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" +"\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" +" " + +#, fuzzy +msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch).\n" -"\n" +" (see hg commit --close-branch)." +msgstr "" +"顯示目前的 repository heads 或是 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" +"\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" +" " + +#, fuzzy +msgid "" " If STARTREV is specified, only those heads that are descendants of\n" " STARTREV will be displayed.\n" " " @@ -5788,18 +7260,16 @@ msgid "no changes on branch %s are reachable from %s\n" msgstr "" -msgid "" -"show help for a given topic or a help overview\n" -"\n" -" With no arguments, print a list of commands with short help messages.\n" -"\n" +msgid "show help for a given topic or a help overview" +msgstr "顯示特定主題的 help 說明或是 help overview" + +msgid " With no arguments, print a list of commands with short help messages." +msgstr " With no arguments, print a list of commands with short help messages." + +msgid "" " Given a topic, extension, or command name, print help for that\n" " topic." msgstr "" -"顯示特定主題的 help 說明或是 help overview\n" -"\n" -" 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." @@ -5820,12 +7290,8 @@ msgid "use \"hg -v help %s\" to show global options" msgstr "使用 \"hg -v help %s\" 以顯示全域選項" -msgid "" -"list of commands:\n" -"\n" -msgstr "" -"命令列表:\n" -"\n" +msgid "list of commands:" +msgstr "命令列表:" #, python-format msgid "" @@ -5855,53 +7321,46 @@ msgstr "沒有可用的說明文字" #, fuzzy, python-format -msgid "" -"%s extension - %s\n" -"\n" +msgid "%s extension - %s" msgstr "%s 擴充套件 - %s\n" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial 分散式版本控制系統\n" -msgid "" -"basic commands:\n" -"\n" -msgstr "" -"基本命令:\n" -"\n" - -msgid "" -"\n" -"additional help topics:\n" -"\n" -msgstr "" -"\n" -"額外的說明主題:\n" -"\n" - -msgid "" -"identify the working copy or specified revision\n" -"\n" +msgid "basic commands:" +msgstr "基本命令:" + +msgid "" +"\n" +"additional help topics:" +msgstr "" +"\n" +"額外的說明主題:" + +msgid "identify the working copy or specified revision" +msgstr "識別 working copy 或指定的 revision 完整性" + +msgid "" " With no revision, print a summary of the current state of the\n" -" repository.\n" -"\n" +" repository." +msgstr "" +" With no revision, print a summary of the current state of the\n" +" repository." + +msgid "" " Specifying a path to a repository root or Mercurial bundle will\n" -" cause lookup to operate on that repository/bundle.\n" -"\n" +" cause lookup to operate on that repository/bundle." +msgstr "" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle." + +msgid "" " 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 "" -"識別 working copy 或指定的 revision 完整性\n" -"\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" @@ -5909,68 +7368,78 @@ " " #, fuzzy -msgid "" -"import an ordered set of patches\n" -"\n" -" Import a list of patches and commit them individually.\n" -"\n" +msgid "import an ordered set of patches" +msgstr "import 一組有順序的 patches" + +#, fuzzy +msgid " Import a list of patches and commit them individually." +msgstr " Import a list of patches and commit them individually." + +#, fuzzy +msgid "" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f/--force flag.\n" -"\n" +" will abort unless given the -f/--force flag." +msgstr "" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f/--force flag." + +#, fuzzy +msgid "" " You can import a patch straight from a mail message. Even patches\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\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 "" -"import 一組有順序的 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/--force flag.\n" -"\n" +" message." +msgstr "" " You can import a patch straight from a mail message. Even patches\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" +" message." + +#, fuzzy +msgid "" " 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" +" override these." +msgstr "" +" 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." + +#, fuzzy +msgid "" " 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" +" deficiencies in the text patch format." +msgstr "" +" 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." + +#, fuzzy +msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" -" copies in the patch in the same way as 'addremove'.\n" -"\n" +" copies in the patch in the same way as 'addremove'." +msgstr "" +" With -s/--similarity, hg will attempt to discover renames and\n" +" copies in the patch in the same way as 'addremove'." + +#, fuzzy +msgid "" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" " To read a patch from standard input, use \"-\" as the patch name.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5987,196 +7456,198 @@ msgid "patch is damaged or loses information" msgstr "" -msgid "" -"show new changesets found in source\n" -"\n" +msgid "show new changesets found in source" +msgstr "顯示來源端新的 changesets" + +msgid "" " Show new changesets found in the specified path/URL or the default\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" -" " -msgstr "" -"顯示來源端新的 changesets\n" -"\n" +" if a pull at the time you issued this command." +msgstr "" " Show new changesets found in the specified path/URL or the default\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" +" if a pull at the time you issued this command." + +msgid "" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull." +msgstr "" " For remote repository, using --bundle avoids downloading the\n" -" changesets twice if the incoming is followed by a pull.\n" -"\n" +" changesets twice if the incoming is followed by a pull." + +msgid "" +" See pull for valid source format details.\n" +" " +msgstr "" " See pull for valid source format details.\n" " " -msgid "" -"create a new repository in the given directory\n" -"\n" +msgid "create a new repository in the given directory" +msgstr "於指定的目錄建立新的 repository" + +msgid "" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it will be created.\n" -"\n" -" If no directory is given, the current directory is used.\n" -"\n" +" directory does not exist, it will be created." +msgstr "" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it will be created." + +msgid " If no directory is given, the current directory is used." +msgstr " If no directory is given, the current directory is used." + +msgid "" " It is possible to specify an ssh:// URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" -"於指定的目錄建立新的 repository\n" -"\n" -" Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it will be created.\n" -"\n" -" If no directory is given, the current directory is used.\n" -"\n" " It is possible to specify an ssh:// URL as the destination.\n" " See 'hg help urls' for more information.\n" " " -msgid "" -"locate files matching specific patterns\n" -"\n" +msgid "locate files matching specific patterns" +msgstr "找出符合指定樣式的檔案" + +msgid "" " Print files under Mercurial control in the working directory whose\n" -" names match the given patterns.\n" -"\n" +" names match the given patterns." +msgstr "" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns." + +msgid "" " 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" +" subdirectories, use \"--include .\"." +msgstr "" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\"." + +msgid "" " 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" +" of all files under Mercurial control in the working directory." +msgstr "" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory." + +msgid "" " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" " contain whitespace as multiple filenames.\n" " " msgstr "" -"找出符合指定樣式的檔案\n" -"\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\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" " contain whitespace as multiple filenames.\n" " " -msgid "" -"show revision history of entire repository or files\n" -"\n" +msgid "show revision history of entire repository or files" +msgstr "顯示整個 repository 或特定檔案的 revision history" + +msgid "" " Print the revision history of the specified files or the entire\n" -" project.\n" -"\n" +" project." +msgstr "" +" Print the revision history of the specified files or the entire\n" +" project." + +msgid "" " File history is shown without following rename or copy history of\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" +" only follows the first parent of merge revisions." +msgstr "" +" File history is shown without following rename or copy history of\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." + +msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" used as the starting revision." +msgstr "" +" If no revision range is specified, the default is tip:0 unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision." + +msgid "" " 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" +" changed files and full commit message are shown." +msgstr "" +" 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." + +msgid "" " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" " will appear in files:.\n" " " msgstr "" -"顯示整個 repository 或特定檔案的 revision history\n" -"\n" -" Print the revision history of the specified files or the entire\n" -" project.\n" -"\n" -" File history is shown without following rename or copy history of\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" -" If no revision range is specified, the default is tip:0 unless\n" -" --follow is set, in which case the working directory parent is\n" -" used as the starting revision.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\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, only files different from BOTH parents\n" " will appear in files:.\n" " " -msgid "" -"output the current or given revision of the project manifest\n" -"\n" +msgid "output the current or given revision of the project manifest" +msgstr "輸出 project manifest 目前或指定的 revision" + +msgid "" " Print a list of version controlled files for the given revision.\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" +" is used, or the null revision if no revision is checked out." +msgstr "" +" Print a list of version controlled files for the given revision.\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." + +msgid "" " With -v, print file permissions, symlink and executable bits.\n" " With --debug, print file revision hashes.\n" " " msgstr "" -"輸出 project manifest 目前或指定的 revision\n" -"\n" -" Print a list of version controlled files for the given revision.\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" " " -msgid "" -"merge working directory with another revision\n" -"\n" +msgid "merge working directory with another revision" +msgstr "將 working directory 與其他的 revision 合併" + +msgid "" " The current working directory is updated with all changes made in\n" -" the requested revision since the last common predecessor revision.\n" -"\n" +" the requested revision since the last common predecessor revision." +msgstr "" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision." + +msgid "" " 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" +" two parents." +msgstr "" +" 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." + +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" " explicit revision with which to merge with must be provided.\n" " " msgstr "" -"將 working directory 與其他的 revision 合併\n" -"\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\n" " head, the other head is merged with by default. Otherwise, an\n" @@ -6198,33 +7669,32 @@ msgid "%s - use \"hg update\" instead" msgstr "" -msgid "" -"working dir not at a head rev - use \"hg update\" or merge with an explicit " -"rev" -msgstr "" - -msgid "" -"show changesets not found in destination\n" -"\n" +msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" +msgstr "" + +msgid "show changesets not found in destination" +msgstr "顯示目的端沒有的 changesets" + +msgid "" +" 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." +msgstr "" " 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" +" be pushed if a push was requested." + +msgid "" +" See pull for valid destination format details.\n" +" " +msgstr "" " See pull for valid destination format details.\n" " " -msgstr "" -"顯示目的端沒有的 changesets\n" -"\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" -" " - -msgid "" -"show the parents of the working directory or revision\n" -"\n" + +msgid "show the parents of the working directory or revision" +msgstr "顯示 working directory 或特定 revision 的 parents" + +msgid "" " 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" @@ -6232,8 +7702,6 @@ " argument to --rev if given) is printed.\n" " " msgstr "" -"顯示 working directory 或特定 revision 的 parents\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" @@ -6248,26 +7716,27 @@ msgid "'%s' not found in manifest!" msgstr "" -msgid "" -"show aliases for remote repositories\n" -"\n" +msgid "show aliases for remote repositories" +msgstr "顯示 remote repositories 的別名" + +msgid "" +" Show definition of symbolic path name NAME. If no name is given,\n" +" show definition of all available names." +msgstr "" " Show definition of symbolic path name NAME. If no name is given,\n" -" show definition of all available names.\n" -"\n" +" show definition of all available names." + +msgid "" " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" -" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" -"\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." +msgstr "" +" 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." + +msgid "" " See 'hg help urls' for more information.\n" " " msgstr "" -"顯示 remote repositories 的別名\n" -"\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" -"\n" " See 'hg help urls' for more information.\n" " " @@ -6283,81 +7752,87 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "(執行 'hg update' 來取得 working copy)\n" -msgid "" -"pull changes from the specified source\n" -"\n" -" Pull changes from a remote repository to a local one.\n" -"\n" +msgid "pull changes from the specified source" +msgstr "pull 指定來源端的 changes" + +msgid " Pull changes from a remote repository to a local one." +msgstr " Pull changes from a remote repository to a local one." + +msgid "" " This finds all changes from the repository at the specified path\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" +" project in the working directory." +msgstr "" +" This finds all changes from the repository at the specified path\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." + +msgid "" " Use hg incoming if you want to see what would have been added by a\n" " pull at the time you issued this command. If you then decide to\n" " added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming.\n" -"\n" -" If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " -msgstr "" -"pull 指定來源端的 changes\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 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" +" where X is the last changeset listed by hg incoming." +msgstr "" " 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" +" where X is the last changeset listed by hg incoming." + +msgid "" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" " " #, fuzzy -msgid "" -"push changes to the specified destination\n" -"\n" -" Push changes from the local repository to the given destination.\n" -"\n" +msgid "push changes to the specified destination" +msgstr "將 changes push 至指定的目的端" + +#, fuzzy +msgid " Push changes from the local repository to the given destination." +msgstr " Push changes from the local repository to the given destination." + +#, fuzzy +msgid "" " This is the symmetrical operation for pull. It moves changes from\n" " the current repository to a different one. If the destination is\n" " local this is identical to a pull in that directory from the\n" -" current one.\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" -" 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 "" -"將 changes push 至指定的目的端\n" -"\n" -" Push changes from the local repository to the given destination.\n" -"\n" +" current one." +msgstr "" " 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" +" current one." + +#, fuzzy +msgid "" +" By default, push will refuse to run if it detects the result would\n" +" increase the number of remote heads. This generally indicates the\n" +" user forgot to pull and merge before pushing." +msgstr "" " By default, push will refuse to run if it detects the result would\n" " increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing.\n" -"\n" +" user forgot to pull and merge before pushing." + +#, fuzzy +msgid "" +" If -r/--rev is used, the named revision and all its ancestors will\n" +" be pushed to the remote repository." +msgstr "" " If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository.\n" -"\n" +" be pushed to the remote repository." + +#, fuzzy +msgid "" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" +" " +msgstr "" " 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" @@ -6367,75 +7842,79 @@ msgid "pushing to %s\n" msgstr "" -msgid "" -"roll back an interrupted transaction\n" -"\n" -" Recover from an interrupted commit or pull.\n" -"\n" +msgid "roll back an interrupted transaction" +msgstr "roll back 一個被中斷的 transaction" + +msgid " Recover from an interrupted commit or pull." +msgstr " Recover from an interrupted commit or pull." + +msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" " suggests it.\n" " " msgstr "" -"roll back 一個被中斷的 transaction\n" -"\n" -" Recover from an interrupted commit or pull.\n" -"\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" " " #, fuzzy -msgid "" -"remove the specified files on the next commit\n" -"\n" -" Schedule the indicated files for removal from the repository.\n" -"\n" +msgid "remove the specified files on the next commit" +msgstr "移除下次要 commit 的檔案" + +#, fuzzy +msgid " Schedule the indicated files for removal from the repository." +msgstr " Schedule the indicated files for removal from the repository." + +#, fuzzy +msgid "" " 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" +" revision without deleting them from the working directory." +msgstr "" +" 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." + +#, fuzzy +msgid "" " 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" +" and Delete (from disk)::" +msgstr "" +" 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)." + +#, fuzzy +msgid "" " 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 "" -"移除下次要 commit 的檔案\n" -"\n" -" Schedule the indicated files for removal from the repository.\n" -"\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 [!]\n" -" (as reported by hg status). The actions are Warn, Remove (from\n" -" branch) and Delete (from disk).\n" -"\n" +" -Af R R R R" +msgstr "" " 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" +" -Af R R R R" + +#, fuzzy +msgid "" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see hg revert.\n" " " @@ -6457,38 +7936,56 @@ msgid "has been marked for add" msgstr "" -msgid "" -"rename files; equivalent of copy + remove\n" -"\n" +msgid "rename files; equivalent of copy + remove" +msgstr "重新命名檔案；等同於 copy + remove" + +msgid "" " 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 -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" file, there can only be one source." +msgstr "" +" 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." + +msgid "" +" This command takes effect at the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" " This command takes effect at the next commit. To undo a rename\n" " before that, see hg revert.\n" " " -msgstr "" -"重新命名檔案；等同於 copy + remove\n" -"\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 -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" -" before that, see hg revert.\n" -" " - -#, fuzzy -msgid "" -"retry file merges from a merge or update\n" + +#, fuzzy +msgid "retry file merges from a merge or update" +msgstr "" +"重試經由 merge 或 update 命令所造成、卻未完成的合併\n" +"\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/--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" +" U = unresolved\n" +" R = resolved\n" +" " + +#, fuzzy +msgid "" +" 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/--all switch." +msgstr "" +"重試經由 merge 或 update 命令所造成、卻未完成的合併\n" "\n" " This command will cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" @@ -6502,8 +7999,85 @@ " 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" +" The codes used to show the status of files are:\n" +" U = unresolved\n" +" R = resolved\n" +" " + +#, fuzzy +msgid "" +" 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." +msgstr "" +"重試經由 merge 或 update 命令所造成、卻未完成的合併\n" +"\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/--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" +" U = unresolved\n" +" R = resolved\n" +" " + +#, fuzzy +msgid "" +" 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." +msgstr "" +"重試經由 merge 或 update 命令所造成、卻未完成的合併\n" +"\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/--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" +" U = unresolved\n" +" R = resolved\n" +" " + +#, fuzzy +msgid " The codes used to show the status of files are::" +msgstr "" +"重試經由 merge 或 update 命令所造成、卻未完成的合併\n" +"\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/--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" +" U = unresolved\n" +" R = resolved\n" +" " + +#, fuzzy +msgid "" " U = unresolved\n" " R = resolved\n" " " @@ -6536,69 +8110,74 @@ msgid "no files or directories specified; use --all to remerge all files" msgstr "" -msgid "" -"restore individual files or directories to an earlier state\n" -"\n" +msgid "restore individual files or directories to an earlier state" +msgstr "將特定的檔案或目錄回復成較早的狀態" + +msgid "" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)" +msgstr "" " (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)\n" -"\n" +" change the working directory parents.)" + +msgid "" +" With no revision specified, revert the named files or directories\n" +" to the contents they had in the parent of the working directory.\n" +" This restores the contents of the affected files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames. If the\n" +" working directory has two parents, you must explicitly specify the\n" +" revision to revert to." +msgstr "" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" " This restores the contents of the affected files to an unmodified\n" " state and unschedules adds, removes, copies, and renames. If the\n" " working directory has two parents, you must explicitly specify the\n" -" revision to revert to.\n" -"\n" +" revision to revert to." + +msgid "" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" " to \"roll back\" some or all of an earlier change. See 'hg help\n" -" dates' for a list of formats valid for -d/--date.\n" -"\n" +" dates' for a list of formats valid for -d/--date." +msgstr "" +" 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." + +msgid "" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" " revert to a revision other than the parent of the working\n" " directory, the reverted files will thus appear modified\n" -" afterwards.\n" -"\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" -"\n" -" Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " -msgstr "" -"將特定的檔案或目錄回復成較早的狀態\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" -" This restores the contents of the affected files to an unmodified\n" -" state and unschedules adds, removes, copies, and renames. If the\n" -" working directory has two parents, you must explicitly specify the\n" -" revision to revert to.\n" -"\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" +" afterwards." +msgstr "" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" " revert to a revision other than the parent of the working\n" " directory, the reverted files will thus appear modified\n" -" afterwards.\n" -"\n" +" afterwards." + +msgid "" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset." +msgstr "" " If a file has been deleted, it is restored. If the executable mode\n" -" of a file was changed, it is reset.\n" -"\n" +" of a file was changed, it is reset." + +msgid "" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted." +msgstr "" " If names are given, all files matching the names are reverted.\n" -" If no arguments are given, no files are reverted.\n" -"\n" +" If no arguments are given, no files are reverted." + +msgid "" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" " Modified files are saved with a .orig suffix before reverting.\n" " To disable these backups, use --no-backup.\n" " " @@ -6634,26 +8213,50 @@ msgstr "" #, fuzzy -msgid "" -"roll back the last transaction\n" -"\n" +msgid "roll back the last transaction" +msgstr "roll back 最後一次的 transaction" + +#, fuzzy +msgid "" " 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. This command does not alter\n" -" the working directory.\n" -"\n" +" the working directory." +msgstr "" +" 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." + +#, fuzzy +msgid "" " 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" -"\n" +" and their effects can be rolled back::" +msgstr "" +" 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:" + +#, fuzzy +msgid "" " commit\n" " import\n" " pull\n" " push (with this repository as destination)\n" -" unbundle\n" -"\n" +" unbundle" +msgstr "" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle" + +#, fuzzy +msgid "" " This command is not intended for use on public repositories. Once\n" " changes are visible for pull by other users, rolling a transaction\n" " back locally is ineffective (someone else may already have pulled\n" @@ -6662,24 +8265,6 @@ " may fail if a rollback is performed.\n" " " msgstr "" -"roll back 最後一次的 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" -"\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" -"\n" -" commit\n" -" import\n" -" pull\n" -" push (with this repository as destination)\n" -" unbundle\n" -"\n" " This command is not intended for use on public repositories. Once\n" " changes are visible for pull by other users, rolling a transaction\n" " back locally is ineffective (someone else may already have pulled\n" @@ -6688,31 +8273,28 @@ " may fail if a rollback is performed.\n" " " -msgid "" -"print the root (top) of the current working directory\n" -"\n" +msgid "print the root (top) of the current working directory" +msgstr "顯示目前 working directory 的 root 目錄" + +msgid "" +" Print the root directory of the current repository.\n" +" " +msgstr "" " Print the root directory of the current repository.\n" " " -msgstr "" -"顯示目前 working directory 的 root 目錄\n" -"\n" -" Print the root directory of the current repository.\n" -" " - -msgid "" -"export the repository via HTTP\n" -"\n" -" Start a local HTTP repository browser and pull server.\n" -"\n" + +msgid "export the repository via HTTP" +msgstr "將 repository 經由 HTTP 發佈" + +msgid " Start a local HTTP repository browser and pull server." +msgstr " Start a local HTTP repository browser and pull server." + +msgid "" " By default, the server logs accesses to stdout and errors to\n" " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" " files.\n" " " msgstr "" -"將 repository 經由 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/--accesslog and -E/--errorlog options to log to\n" " files.\n" @@ -6723,8 +8305,9 @@ msgstr "" #, fuzzy -msgid "" -"show changed files in the working directory\n" +msgid "show changed files in the working directory" +msgstr "" +"顯示 working directory 中已變更的檔案\n" "\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" @@ -6745,8 +8328,174 @@ " 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" +" 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" +" " + +#, fuzzy +msgid "" +" 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" +" 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." +msgstr "" +"顯示 working directory 中已變更的檔案\n" +"\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" +" 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" +"\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" +" report permission changes and diff only reports changes relative\n" +" 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 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" +" " + +#, fuzzy +msgid "" +" Option -q/--quiet hides untracked (unknown and ignored) files\n" +" unless explicitly requested with -u/--unknown or -i/--ignored." +msgstr "" +"顯示 working directory 中已變更的檔案\n" +"\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" +" 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" +"\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" +" report permission changes and diff only reports changes relative\n" +" 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 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" +" " + +#, fuzzy +msgid "" +" 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" +" report permission changes and diff only reports changes relative\n" +" to one merge parent." +msgstr "" +"顯示 working directory 中已變更的檔案\n" +"\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" +" 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" +"\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" +" report permission changes and diff only reports changes relative\n" +" 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 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" +" " + +#, fuzzy +msgid "" +" If one revision is given, it is used as the base revision.\n" +" If two revisions are given, the differences between them are\n" +" shown." +msgstr "" +"顯示 working directory 中已變更的檔案\n" +"\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" +" 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" +"\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" +" report permission changes and diff only reports changes relative\n" +" 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 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" +" " + +#, fuzzy +msgid "" " M = modified\n" " A = added\n" " R = removed\n" @@ -6789,12 +8538,15 @@ " = origin of the previous file listed as A (added)\n" " " -msgid "" -"summarize working directory state\n" -"\n" +msgid "summarize working directory state" +msgstr "" + +msgid "" " This generates a brief summary of the working directory state,\n" -" including parents, branch, commit status, and available updates.\n" -"\n" +" including parents, branch, commit status, and available updates." +msgstr "" + +msgid "" " With the --remote option, this will check the default paths for\n" " incoming and outgoing changes. This can be time-consuming.\n" " " @@ -6885,46 +8637,40 @@ 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" -"\n" +msgid "add one or more tags for the current or given revision" +msgstr "對目前或是指定的 revision 新增一或多個 tags" + +msgid " Name a particular revision using <name>." +msgstr " Name a particular revision using <name>." + +msgid "" " Tags are used to name particular revisions of the repository and are\n" " very useful to compare different revisions, to go back to significant\n" -" earlier versions or to mark branch points as releases, etc.\n" -"\n" +" earlier versions or to mark branch points as releases, etc." +msgstr "" +" Tags are used to name particular revisions of the repository and are\n" +" very useful to compare different revisions, to go back to significant\n" +" earlier versions or to mark branch points as releases, etc." + +msgid "" " If no revision is given, the parent of the working directory is\n" -" used, or tip if no revision is checked out.\n" -"\n" +" used, or tip if no revision is checked out." +msgstr "" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out." + +msgid "" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" " similarly to other project files and can be hand-edited if\n" " necessary. The file '.hg/localtags' is used for local tags (not\n" -" shared among repositories).\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"對目前或是指定的 revision 新增一或多個 tags\n" -"\n" -" Name a particular revision using <name>.\n" -"\n" -" Tags are used to name particular revisions of the repository and are\n" -" 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\n" -" used, or tip if no revision is checked out.\n" -"\n" +" shared among repositories)." +msgstr "" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" " similarly to other project files and can be hand-edited if\n" " necessary. The file '.hg/localtags' is used for local tags (not\n" -" shared among repositories).\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" shared among repositories)." msgid "tag names must be unique" msgstr "" @@ -6952,119 +8698,119 @@ msgid "tag '%s' already exists (use -f to force)" msgstr "" -msgid "" -"list repository tags\n" -"\n" +msgid "list repository tags" +msgstr "列出 repository tags" + +msgid "" +" This lists both regular and local tags. When the -v/--verbose\n" +" switch is used, a third column \"local\" is printed for local tags.\n" +" " +msgstr "" " 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 "" -"列出 repository tags\n" -"\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" -" " - -msgid "" -"show the tip revision\n" -"\n" + +msgid "show the tip revision" +msgstr "顯示 tip revision" + +msgid "" " 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" +" recently changed head)." +msgstr "" +" 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)." + +msgid "" " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" " and cannot be renamed or assigned to a different changeset.\n" " " msgstr "" -"顯示 tip revision\n" -"\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" " that repository becomes the current tip. The \"tip\" tag is special\n" " and cannot be renamed or assigned to a different changeset.\n" " " -msgid "" -"apply one or more changegroup files\n" -"\n" +msgid "apply one or more changegroup files" +msgstr "套用一或多個 changegroup 檔案" + +msgid "" " Apply one or more compressed changegroup files generated by the\n" " bundle command.\n" " " msgstr "" -"套用一或多個 changegroup 檔案\n" -"\n" " Apply one or more compressed changegroup files generated by the\n" " bundle command.\n" " " #, fuzzy -msgid "" -"update working directory\n" -"\n" +msgid "update working directory" +msgstr "更新 working directory" + +#, fuzzy +msgid "" " 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" +" clone -U')." +msgstr "" +" 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')." + +#, fuzzy +msgid "" " 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" +" branch." +msgstr "" +" 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." + +#, fuzzy +msgid "" " 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" +" to abort." +msgstr "" +" 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." + +#, fuzzy +msgid "" " 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 "" -"更新 working directory\n" -"\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.\n" -"\n" +" a suggestion to use 'merge' or 'update -C' instead." +msgstr "" " 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" +" a suggestion to use 'merge' or 'update -C' instead." + +#, fuzzy +msgid "" " 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" -" " +" revert." +msgstr "" +" If you want to update just one file to an older revision, use\n" +" revert." msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -7073,21 +8819,19 @@ msgid "uncommitted local changes" msgstr "未同步的變更" -msgid "" -"verify the integrity of the repository\n" -"\n" -" Verify the integrity of the current repository.\n" -"\n" +msgid "verify the integrity of the repository" +msgstr "驗證 repository 的完整性" + +msgid " Verify the integrity of the current repository." +msgstr " Verify the integrity of the current repository." + +msgid "" " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" " integrity of their crosslinks and indices.\n" " " msgstr "" -"驗證 repository 的完整性\n" -"\n" -" Verify the integrity of the current repository.\n" -"\n" " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" @@ -7477,9 +9221,7 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "" -msgid "" -"directory strip option for patch. This has the same meaning as the " -"corresponding patch option" +msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" msgstr "" msgid "base path" @@ -7926,9 +9668,7 @@ msgid "Option --cwd may not be abbreviated!" msgstr "" -msgid "" -"Option -R has to be separated from other options (e.g. not -qR) and --" -"repository may only be abbreviated as --repo!" +msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" msgstr "" #, python-format @@ -7946,9 +9686,7 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" -msgid "" -"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" -"misc/lsprof/" +msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" msgstr "" #, python-format @@ -8076,9 +9814,7 @@ msgid "destination '%s' is not empty" msgstr "目的端 '%s' 不是空的" -msgid "" -"src repository does not support revision lookup and so doesn't support clone " -"by revision" +msgid "src repository does not support revision lookup and so doesn't support clone by revision" msgstr "" msgid "clone from remote to remote not supported" @@ -8089,16 +9825,13 @@ msgstr "正在新增 branch\n" #, python-format -msgid "" -"%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" msgstr "" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " -"abandon\n" +msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" @@ -8366,9 +10099,7 @@ msgid "requesting all changes\n" msgstr "" -msgid "" -"Partial pull cannot be done because other repository doesn't support " -"changegroupsubset." +msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." msgstr "" #, python-format @@ -8487,9 +10218,7 @@ msgstr "" #, python-format -msgid "" -"untracked file in working directory differs from file in requested revision: " -"'%s'" +msgid "untracked file in working directory differs from file in requested revision: '%s'" msgstr "" #, python-format