Show More
This diff has been collapsed as it changes many lines, (3111 lines changed) Show them Hide them | |||
@@ -7,8 +7,8 b' msgid ""' | |||
|
7 | 7 | msgstr "" |
|
8 | 8 | "Project-Id-Version: Mercurial\n" |
|
9 | 9 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
10 |
"POT-Creation-Date: 2009- |
|
|
11 |
"PO-Revision-Date: 2009- |
|
|
10 | "POT-Creation-Date: 2009-10-25 12:38+0100\n" | |
|
11 | "PO-Revision-Date: 2009-10-25 12:50+0100\n" | |
|
12 | 12 | "Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>\n" |
|
13 | 13 | "Language-Team: Traditional Chinese\n" |
|
14 | 14 | "MIME-Version: 1.0\n" |
@@ -25,7 +25,10 b' msgstr "\xe9\x81\xb8\xe9\xa0\x85"' | |||
|
25 | 25 | msgid "COMMANDS" |
|
26 | 26 | msgstr "命令" |
|
27 | 27 | |
|
28 | msgid " options:\n" | |
|
28 | #, fuzzy | |
|
29 | msgid "" | |
|
30 | " options:\n" | |
|
31 | "\n" | |
|
29 | 32 | msgstr " 選項: \n" |
|
30 | 33 | |
|
31 | 34 | #, python-format |
@@ -36,12 +39,512 b' msgstr ""' | |||
|
36 | 39 | " 別名: %s\n" |
|
37 | 40 | "\n" |
|
38 | 41 | |
|
39 | #, python-format | |
|
40 | msgid "acl: %s not enabled\n" | |
|
41 | msgstr "acl: %s 尚未啟用\n" | |
|
42 | ||
|
43 | #, python-format | |
|
44 | msgid "acl: %s enabled, %d entries for user %s\n" | |
|
42 | msgid "" | |
|
43 | "Some commands allow the user to specify a date, e.g.:\n" | |
|
44 | "\n" | |
|
45 | "- backout, commit, import, tag: Specify the commit date.\n" | |
|
46 | "- log, revert, update: Select revision(s) by date.\n" | |
|
47 | "\n" | |
|
48 | "Many date formats are valid. Here are some examples::\n" | |
|
49 | "\n" | |
|
50 | " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |
|
51 | " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |
|
52 | " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |
|
53 | " \"Dec 6\" (midnight)\n" | |
|
54 | " \"13:18\" (today assumed)\n" | |
|
55 | " \"3:39\" (3:39AM assumed)\n" | |
|
56 | " \"3:39pm\" (15:39)\n" | |
|
57 | " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |
|
58 | " \"2006-12-6 13:18\"\n" | |
|
59 | " \"2006-12-6\"\n" | |
|
60 | " \"12-6\"\n" | |
|
61 | " \"12/6\"\n" | |
|
62 | " \"12/6/6\" (Dec 6 2006)\n" | |
|
63 | "\n" | |
|
64 | "Lastly, there is Mercurial's internal format::\n" | |
|
65 | "\n" | |
|
66 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" | |
|
67 | "\n" | |
|
68 | "This is the internal representation format for dates. unixtime is the\n" | |
|
69 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" | |
|
70 | "the offset of the local timezone, in seconds west of UTC (negative if\n" | |
|
71 | "the timezone is east of UTC).\n" | |
|
72 | "\n" | |
|
73 | "The log command also accepts date ranges::\n" | |
|
74 | "\n" | |
|
75 | " \"<{datetime}\" - at or before a given date/time\n" | |
|
76 | " \">{datetime}\" - on or after a given date/time\n" | |
|
77 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
|
78 | " \"-{days}\" - within a given number of days of today\n" | |
|
79 | msgstr "" | |
|
80 | ||
|
81 | msgid "" | |
|
82 | "Mercurial's default format for showing changes between two versions of\n" | |
|
83 | "a file is compatible with the unified format of GNU diff, which can be\n" | |
|
84 | "used by GNU patch and many other standard tools.\n" | |
|
85 | "\n" | |
|
86 | "While this standard format is often enough, it does not encode the\n" | |
|
87 | "following information:\n" | |
|
88 | "\n" | |
|
89 | "- executable status and other permission bits\n" | |
|
90 | "- copy or rename information\n" | |
|
91 | "- changes in binary files\n" | |
|
92 | "- creation or deletion of empty files\n" | |
|
93 | "\n" | |
|
94 | "Mercurial also supports the extended diff format from the git VCS\n" | |
|
95 | "which addresses these limitations. The git diff format is not produced\n" | |
|
96 | "by default because a few widespread tools still do not understand this\n" | |
|
97 | "format.\n" | |
|
98 | "\n" | |
|
99 | "This means that when generating diffs from a Mercurial repository\n" | |
|
100 | "(e.g. with \"hg export\"), you should be careful about things like file\n" | |
|
101 | "copies and renames or other things mentioned above, because when\n" | |
|
102 | "applying a standard diff to a different repository, this extra\n" | |
|
103 | "information is lost. Mercurial's internal operations (like push and\n" | |
|
104 | "pull) are not affected by this, because they use an internal binary\n" | |
|
105 | "format for communicating changes.\n" | |
|
106 | "\n" | |
|
107 | "To make Mercurial produce the git extended diff format, use the --git\n" | |
|
108 | "option available for many commands, or set 'git = True' in the [diff]\n" | |
|
109 | "section of your hgrc. You do not need to set this option when\n" | |
|
110 | "importing diffs in this format or using them in the mq extension.\n" | |
|
111 | msgstr "" | |
|
112 | ||
|
113 | msgid "" | |
|
114 | "HG\n" | |
|
115 | " Path to the 'hg' executable, automatically passed when running\n" | |
|
116 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
|
117 | " the hg executable's name if it's frozen, or an executable named\n" | |
|
118 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
119 | " Windows) is searched.\n" | |
|
120 | "\n" | |
|
121 | "HGEDITOR\n" | |
|
122 | " This is the name of the editor to run when committing. See EDITOR.\n" | |
|
123 | "\n" | |
|
124 | " (deprecated, use .hgrc)\n" | |
|
125 | "\n" | |
|
126 | "HGENCODING\n" | |
|
127 | " This overrides the default locale setting detected by Mercurial.\n" | |
|
128 | " This setting is used to convert data including usernames,\n" | |
|
129 | " changeset descriptions, tag names, and branches. This setting can\n" | |
|
130 | " be overridden with the --encoding command-line option.\n" | |
|
131 | "\n" | |
|
132 | "HGENCODINGMODE\n" | |
|
133 | " This sets Mercurial's behavior for handling unknown characters\n" | |
|
134 | " while transcoding user input. The default is \"strict\", which\n" | |
|
135 | " causes Mercurial to abort if it can't map a character. Other\n" | |
|
136 | " settings include \"replace\", which replaces unknown characters, and\n" | |
|
137 | " \"ignore\", which drops them. This setting can be overridden with\n" | |
|
138 | " the --encodingmode command-line option.\n" | |
|
139 | "\n" | |
|
140 | "HGMERGE\n" | |
|
141 | " An executable to use for resolving merge conflicts. The program\n" | |
|
142 | " will be executed with three arguments: local file, remote file,\n" | |
|
143 | " ancestor file.\n" | |
|
144 | "\n" | |
|
145 | " (deprecated, use .hgrc)\n" | |
|
146 | "\n" | |
|
147 | "HGRCPATH\n" | |
|
148 | " A list of files or directories to search for hgrc files. Item\n" | |
|
149 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
|
150 | " platform default search path is used. If empty, only the .hg/hgrc\n" | |
|
151 | " from the current repository is read.\n" | |
|
152 | "\n" | |
|
153 | " For each element in HGRCPATH:\n" | |
|
154 | "\n" | |
|
155 | " - if it's a directory, all files ending with .rc are added\n" | |
|
156 | " - otherwise, the file itself will be added\n" | |
|
157 | "\n" | |
|
158 | "HGUSER\n" | |
|
159 | " This is the string used as the author of a commit. If not set,\n" | |
|
160 | " available values will be considered in this order:\n" | |
|
161 | "\n" | |
|
162 | " - HGUSER (deprecated)\n" | |
|
163 | " - hgrc files from the HGRCPATH\n" | |
|
164 | " - EMAIL\n" | |
|
165 | " - interactive prompt\n" | |
|
166 | " - LOGNAME (with '@hostname' appended)\n" | |
|
167 | "\n" | |
|
168 | " (deprecated, use .hgrc)\n" | |
|
169 | "\n" | |
|
170 | "EMAIL\n" | |
|
171 | " May be used as the author of a commit; see HGUSER.\n" | |
|
172 | "\n" | |
|
173 | "LOGNAME\n" | |
|
174 | " May be used as the author of a commit; see HGUSER.\n" | |
|
175 | "\n" | |
|
176 | "VISUAL\n" | |
|
177 | " This is the name of the editor to use when committing. See EDITOR.\n" | |
|
178 | "\n" | |
|
179 | "EDITOR\n" | |
|
180 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
|
181 | " user to modify, for example when writing commit messages. The\n" | |
|
182 | " editor it uses is determined by looking at the environment\n" | |
|
183 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
|
184 | " non-empty one is chosen. If all of them are empty, the editor\n" | |
|
185 | " defaults to 'vi'.\n" | |
|
186 | "\n" | |
|
187 | "PYTHONPATH\n" | |
|
188 | " This is used by Python to find imported modules and may need to be\n" | |
|
189 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
|
190 | msgstr "" | |
|
191 | ||
|
192 | msgid "" | |
|
193 | "Mercurial has the ability to add new features through the use of\n" | |
|
194 | "extensions. Extensions may add new commands, add options to\n" | |
|
195 | "existing commands, change the default behavior of commands, or\n" | |
|
196 | "implement hooks.\n" | |
|
197 | "\n" | |
|
198 | "Extensions are not loaded by default for a variety of reasons:\n" | |
|
199 | "they can increase startup overhead; they may be meant for advanced\n" | |
|
200 | "usage only; they may provide potentially dangerous abilities (such\n" | |
|
201 | "as letting you destroy or modify history); they might not be ready\n" | |
|
202 | "for prime time; or they may alter some usual behaviors of stock\n" | |
|
203 | "Mercurial. It is thus up to the user to activate extensions as\n" | |
|
204 | "needed.\n" | |
|
205 | "\n" | |
|
206 | "To enable the \"foo\" extension, either shipped with Mercurial or in\n" | |
|
207 | "the Python search path, create an entry for it in your hgrc, like\n" | |
|
208 | "this::\n" | |
|
209 | "\n" | |
|
210 | " [extensions]\n" | |
|
211 | " foo =\n" | |
|
212 | "\n" | |
|
213 | "You may also specify the full path to an extension::\n" | |
|
214 | "\n" | |
|
215 | " [extensions]\n" | |
|
216 | " myfeature = ~/.hgext/myfeature.py\n" | |
|
217 | "\n" | |
|
218 | "To explicitly disable an extension enabled in an hgrc of broader\n" | |
|
219 | "scope, prepend its path with !::\n" | |
|
220 | "\n" | |
|
221 | " [extensions]\n" | |
|
222 | " # disabling extension bar residing in /path/to/extension/bar.py\n" | |
|
223 | " hgext.bar = !/path/to/extension/bar.py\n" | |
|
224 | " # ditto, but no path was supplied for extension baz\n" | |
|
225 | " hgext.baz = !\n" | |
|
226 | msgstr "" | |
|
227 | ||
|
228 | msgid "" | |
|
229 | "When Mercurial accepts more than one revision, they may be specified\n" | |
|
230 | "individually, or provided as a topologically continuous range,\n" | |
|
231 | "separated by the \":\" character.\n" | |
|
232 | "\n" | |
|
233 | "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" | |
|
234 | "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" | |
|
235 | "specified, it defaults to revision number 0. If END is not specified,\n" | |
|
236 | "it defaults to the tip. The range \":\" thus means \"all revisions\".\n" | |
|
237 | "\n" | |
|
238 | "If BEGIN is greater than END, revisions are treated in reverse order.\n" | |
|
239 | "\n" | |
|
240 | "A range acts as a closed interval. This means that a range of 3:5\n" | |
|
241 | "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
|
242 | msgstr "" | |
|
243 | ||
|
244 | msgid "" | |
|
245 | "Mercurial accepts several notations for identifying one or more files\n" | |
|
246 | "at a time.\n" | |
|
247 | "\n" | |
|
248 | "By default, Mercurial treats filenames as shell-style extended glob\n" | |
|
249 | "patterns.\n" | |
|
250 | "\n" | |
|
251 | "Alternate pattern notations must be specified explicitly.\n" | |
|
252 | "\n" | |
|
253 | "To use a plain path name without any pattern matching, start it with\n" | |
|
254 | "``path:``. These path names must completely match starting at the\n" | |
|
255 | "current repository root.\n" | |
|
256 | "\n" | |
|
257 | "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" | |
|
258 | "at the current directory; a glob such as ``*.c`` will only match files\n" | |
|
259 | "in the current directory ending with ``.c``.\n" | |
|
260 | "\n" | |
|
261 | "The supported glob syntax extensions are ``**`` to match any string\n" | |
|
262 | "across path separators and ``{a,b}`` to mean \"a or b\".\n" | |
|
263 | "\n" | |
|
264 | "To use a Perl/Python regular expression, start a name with ``re:``.\n" | |
|
265 | "Regexp pattern matching is anchored at the root of the repository.\n" | |
|
266 | "\n" | |
|
267 | "Plain examples::\n" | |
|
268 | "\n" | |
|
269 | " path:foo/bar a name bar in a directory named foo in the root\n" | |
|
270 | " of the repository\n" | |
|
271 | " path:path:name a file or directory named \"path:name\"\n" | |
|
272 | "\n" | |
|
273 | "Glob examples::\n" | |
|
274 | "\n" | |
|
275 | " glob:*.c any name ending in \".c\" in the current directory\n" | |
|
276 | " *.c any name ending in \".c\" in the current directory\n" | |
|
277 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |
|
278 | " current directory including itself.\n" | |
|
279 | " foo/*.c any name ending in \".c\" in the directory foo\n" | |
|
280 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
|
281 | " including itself.\n" | |
|
282 | "\n" | |
|
283 | "Regexp examples::\n" | |
|
284 | "\n" | |
|
285 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
286 | msgstr "" | |
|
287 | ||
|
288 | msgid "" | |
|
289 | "Mercurial supports several ways to specify individual revisions.\n" | |
|
290 | "\n" | |
|
291 | "A plain integer is treated as a revision number. Negative integers are\n" | |
|
292 | "treated as sequential offsets from the tip, with -1 denoting the tip,\n" | |
|
293 | "-2 denoting the revision prior to the tip, and so forth.\n" | |
|
294 | "\n" | |
|
295 | "A 40-digit hexadecimal string is treated as a unique revision\n" | |
|
296 | "identifier.\n" | |
|
297 | "\n" | |
|
298 | "A hexadecimal string less than 40 characters long is treated as a\n" | |
|
299 | "unique revision identifier and is referred to as a short-form\n" | |
|
300 | "identifier. A short-form identifier is only valid if it is the prefix\n" | |
|
301 | "of exactly one full-length identifier.\n" | |
|
302 | "\n" | |
|
303 | "Any other string is treated as a tag or branch name. A tag name is a\n" | |
|
304 | "symbolic name associated with a revision identifier. A branch name\n" | |
|
305 | "denotes the tipmost revision of that branch. Tag and branch names must\n" | |
|
306 | "not contain the \":\" character.\n" | |
|
307 | "\n" | |
|
308 | "The reserved name \"tip\" is a special tag that always identifies the\n" | |
|
309 | "most recent revision.\n" | |
|
310 | "\n" | |
|
311 | "The reserved name \"null\" indicates the null revision. This is the\n" | |
|
312 | "revision of an empty repository, and the parent of revision 0.\n" | |
|
313 | "\n" | |
|
314 | "The reserved name \".\" indicates the working directory parent. If no\n" | |
|
315 | "working directory is checked out, it is equivalent to null. If an\n" | |
|
316 | "uncommitted merge is in progress, \".\" is the revision of the first\n" | |
|
317 | "parent.\n" | |
|
318 | msgstr "" | |
|
319 | ||
|
320 | msgid "" | |
|
321 | "Mercurial allows you to customize output of commands through\n" | |
|
322 | "templates. You can either pass in a template from the command\n" | |
|
323 | "line, via the --template option, or select an existing\n" | |
|
324 | "template-style (--style).\n" | |
|
325 | "\n" | |
|
326 | "You can customize output for any \"log-like\" command: log,\n" | |
|
327 | "outgoing, incoming, tip, parents, heads and glog.\n" | |
|
328 | "\n" | |
|
329 | "Three styles are packaged with Mercurial: default (the style used\n" | |
|
330 | "when no explicit preference is passed), compact and changelog.\n" | |
|
331 | "Usage::\n" | |
|
332 | "\n" | |
|
333 | " $ hg log -r1 --style changelog\n" | |
|
334 | "\n" | |
|
335 | "A template is a piece of text, with markup to invoke variable\n" | |
|
336 | "expansion::\n" | |
|
337 | "\n" | |
|
338 | " $ hg log -r1 --template \"{node}\\n\"\n" | |
|
339 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |
|
340 | "\n" | |
|
341 | "Strings in curly braces are called keywords. The availability of\n" | |
|
342 | "keywords depends on the exact context of the templater. These\n" | |
|
343 | "keywords are usually available for templating a log-like command:\n" | |
|
344 | "\n" | |
|
345 | ":author: String. The unmodified author of the changeset.\n" | |
|
346 | ":branches: String. The name of the branch on which the changeset\n" | |
|
347 | " was committed. Will be empty if the branch name was\n" | |
|
348 | " default.\n" | |
|
349 | ":date: Date information. The date when the changeset was\n" | |
|
350 | " committed.\n" | |
|
351 | ":desc: String. The text of the changeset description.\n" | |
|
352 | ":diffstat: String. Statistics of changes with the following\n" | |
|
353 | " format: \"modified files: +added/-removed lines\"\n" | |
|
354 | ":files: List of strings. All files modified, added, or removed\n" | |
|
355 | " by this changeset.\n" | |
|
356 | ":file_adds: List of strings. Files added by this changeset.\n" | |
|
357 | ":file_mods: List of strings. Files modified by this changeset.\n" | |
|
358 | ":file_dels: List of strings. Files removed by this changeset.\n" | |
|
359 | ":node: String. The changeset identification hash, as a\n" | |
|
360 | " 40-character hexadecimal string.\n" | |
|
361 | ":parents: List of strings. The parents of the changeset.\n" | |
|
362 | ":rev: Integer. The repository-local changeset revision\n" | |
|
363 | " number.\n" | |
|
364 | ":tags: List of strings. Any tags associated with the\n" | |
|
365 | " changeset.\n" | |
|
366 | ":latesttag: String. Most recent global tag in the ancestors of this\n" | |
|
367 | " changeset.\n" | |
|
368 | ":latesttagdistance: Integer. Longest path to the latest tag.\n" | |
|
369 | "\n" | |
|
370 | "The \"date\" keyword does not produce human-readable output. If you\n" | |
|
371 | "want to use a date in your output, you can use a filter to process\n" | |
|
372 | "it. Filters are functions which return a string based on the input\n" | |
|
373 | "variable. You can also use a chain of filters to get the desired\n" | |
|
374 | "output::\n" | |
|
375 | "\n" | |
|
376 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |
|
377 | " 2008-08-21 18:22 +0000\n" | |
|
378 | "\n" | |
|
379 | "List of filters:\n" | |
|
380 | "\n" | |
|
381 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
|
382 | " every line except the last.\n" | |
|
383 | ":age: Date. Returns a human-readable date/time difference\n" | |
|
384 | " between the given date/time and the current\n" | |
|
385 | " date/time.\n" | |
|
386 | ":basename: Any text. Treats the text as a path, and returns the\n" | |
|
387 | " last component of the path after splitting by the\n" | |
|
388 | " path separator (ignoring trailing separators). For\n" | |
|
389 | " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" | |
|
390 | " becomes \"bar\".\n" | |
|
391 | ":stripdir: Treat the text as path and strip a directory level,\n" | |
|
392 | " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" | |
|
393 | " \"foo\".\n" | |
|
394 | ":date: Date. Returns a date in a Unix date format, including\n" | |
|
395 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
|
396 | ":domain: Any text. Finds the first string that looks like an\n" | |
|
397 | " email address, and extracts just the domain\n" | |
|
398 | " component. Example: 'User <user@example.com>' becomes\n" | |
|
399 | " 'example.com'.\n" | |
|
400 | ":email: Any text. Extracts the first string that looks like\n" | |
|
401 | " an email address. Example: 'User <user@example.com>'\n" | |
|
402 | " becomes 'user@example.com'.\n" | |
|
403 | ":escape: Any text. Replaces the special XML/XHTML characters\n" | |
|
404 | " \"&\", \"<\" and \">\" with XML entities.\n" | |
|
405 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
|
406 | ":fill76: Any text. Wraps the text to fit in 76 columns.\n" | |
|
407 | ":firstline: Any text. Returns the first line of text.\n" | |
|
408 | ":nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
|
409 | ":hgdate: Date. Returns the date as a pair of numbers:\n" | |
|
410 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
|
411 | ":isodate: Date. Returns the date in ISO 8601 format:\n" | |
|
412 | " \"2009-08-18 13:00 +0200\".\n" | |
|
413 | ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |
|
414 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" | |
|
415 | " rfc3339date filter.\n" | |
|
416 | ":localdate: Date. Converts a date to local date.\n" | |
|
417 | ":obfuscate: Any text. Returns the input text rendered as a\n" | |
|
418 | " sequence of XML entities.\n" | |
|
419 | ":person: Any text. Returns the text before an email address.\n" | |
|
420 | ":rfc822date: Date. Returns a date using the same format used in\n" | |
|
421 | " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |
|
422 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
|
423 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" | |
|
424 | ":short: Changeset hash. Returns the short form of a changeset\n" | |
|
425 | " hash, i.e. a 12-byte hexadecimal string.\n" | |
|
426 | ":shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
|
427 | ":strip: Any text. Strips all leading and trailing whitespace.\n" | |
|
428 | ":tabindent: Any text. Returns the text, with every line except\n" | |
|
429 | " the first starting with a tab character.\n" | |
|
430 | ":urlescape: Any text. Escapes all \"special\" characters. For\n" | |
|
431 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
|
432 | ":user: Any text. Returns the user portion of an email\n" | |
|
433 | " address.\n" | |
|
434 | msgstr "" | |
|
435 | ||
|
436 | msgid "" | |
|
437 | "Valid URLs are of the form::\n" | |
|
438 | "\n" | |
|
439 | " local/filesystem/path[#revision]\n" | |
|
440 | " file://local/filesystem/path[#revision]\n" | |
|
441 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
442 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
443 | " ssh://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
444 | "\n" | |
|
445 | "Paths in the local filesystem can either point to Mercurial\n" | |
|
446 | "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" | |
|
447 | "incoming --bundle').\n" | |
|
448 | "\n" | |
|
449 | "An optional identifier after # indicates a particular branch, tag, or\n" | |
|
450 | "changeset to use from the remote repository. See also 'hg help\n" | |
|
451 | "revisions'.\n" | |
|
452 | "\n" | |
|
453 | "Some features, such as pushing to http:// and https:// URLs are only\n" | |
|
454 | "possible if the feature is explicitly enabled on the remote Mercurial\n" | |
|
455 | "server.\n" | |
|
456 | "\n" | |
|
457 | "Some notes about using SSH with Mercurial:\n" | |
|
458 | "\n" | |
|
459 | "- SSH requires an accessible shell account on the destination machine\n" | |
|
460 | " and a copy of hg in the remote path or specified with as remotecmd.\n" | |
|
461 | "- path is relative to the remote user's home directory by default. Use\n" | |
|
462 | " an extra slash at the start of a path to specify an absolute path::\n" | |
|
463 | "\n" | |
|
464 | " ssh://example.com//tmp/repository\n" | |
|
465 | "\n" | |
|
466 | "- Mercurial doesn't use its own compression via SSH; the right thing\n" | |
|
467 | " to do is to configure it in your ~/.ssh/config, e.g.::\n" | |
|
468 | "\n" | |
|
469 | " Host *.mylocalnetwork.example.com\n" | |
|
470 | " Compression no\n" | |
|
471 | " Host *\n" | |
|
472 | " Compression yes\n" | |
|
473 | "\n" | |
|
474 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" | |
|
475 | " with the --ssh command line option.\n" | |
|
476 | "\n" | |
|
477 | "These URLs can all be stored in your hgrc with path aliases under the\n" | |
|
478 | "[paths] section like so::\n" | |
|
479 | "\n" | |
|
480 | " [paths]\n" | |
|
481 | " alias1 = URL1\n" | |
|
482 | " alias2 = URL2\n" | |
|
483 | " ...\n" | |
|
484 | "\n" | |
|
485 | "You can then use the alias for any command that uses a URL (for\n" | |
|
486 | "example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
|
487 | "\n" | |
|
488 | "Two path aliases are special because they are used as defaults when\n" | |
|
489 | "you do not provide the URL to a command:\n" | |
|
490 | "\n" | |
|
491 | "default:\n" | |
|
492 | " When you create a repository with hg clone, the clone command saves\n" | |
|
493 | " the location of the source repository as the new repository's\n" | |
|
494 | " 'default' path. This is then used when you omit path from push- and\n" | |
|
495 | " pull-like commands (including incoming and outgoing).\n" | |
|
496 | "\n" | |
|
497 | "default-push:\n" | |
|
498 | " The push command will look for a path named 'default-push', and\n" | |
|
499 | " prefer it over 'default' if both are defined.\n" | |
|
500 | msgstr "" | |
|
501 | ||
|
502 | msgid "" | |
|
503 | "hooks for controlling repository access\n" | |
|
504 | "\n" | |
|
505 | "This hook makes it possible to allow or deny write access to portions\n" | |
|
506 | "of a repository when receiving incoming changesets.\n" | |
|
507 | "\n" | |
|
508 | "The authorization is matched based on the local user name on the\n" | |
|
509 | "system where the hook runs, and not the committer of the original\n" | |
|
510 | "changeset (since the latter is merely informative).\n" | |
|
511 | "\n" | |
|
512 | "The acl hook is best used along with a restricted shell like hgsh,\n" | |
|
513 | "preventing authenticating users from doing anything other than\n" | |
|
514 | "pushing or pulling. The hook is not safe to use if users have\n" | |
|
515 | "interactive shell access, as they can then disable the hook.\n" | |
|
516 | "Nor is it safe if remote users share an account, because then there\n" | |
|
517 | "is no way to distinguish them.\n" | |
|
518 | "\n" | |
|
519 | "To use this hook, configure the acl extension in your hgrc like this::\n" | |
|
520 | "\n" | |
|
521 | " [extensions]\n" | |
|
522 | " hgext.acl =\n" | |
|
523 | "\n" | |
|
524 | " [hooks]\n" | |
|
525 | " pretxnchangegroup.acl = python:hgext.acl.hook\n" | |
|
526 | "\n" | |
|
527 | " [acl]\n" | |
|
528 | " # Check whether the source of incoming changes is in this list\n" | |
|
529 | " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" | |
|
530 | " sources = serve\n" | |
|
531 | "\n" | |
|
532 | "The allow and deny sections take a subtree pattern as key (with a glob\n" | |
|
533 | "syntax by default), and a comma separated list of users as the\n" | |
|
534 | "corresponding value. The deny list is checked before the allow list\n" | |
|
535 | "is. ::\n" | |
|
536 | "\n" | |
|
537 | " [acl.allow]\n" | |
|
538 | " # If acl.allow is not present, all users are allowed by default.\n" | |
|
539 | " # An empty acl.allow section means no users allowed.\n" | |
|
540 | " docs/** = doc_writer\n" | |
|
541 | " .hgtags = release_engineer\n" | |
|
542 | "\n" | |
|
543 | " [acl.deny]\n" | |
|
544 | " # If acl.deny is not present, no users are refused by default.\n" | |
|
545 | " # An empty acl.deny section means all users allowed.\n" | |
|
546 | " glob pattern = user4, user5\n" | |
|
547 | " ** = user6\n" | |
|
45 | 548 | msgstr "" |
|
46 | 549 | |
|
47 | 550 | #, python-format |
@@ -49,52 +552,38 b' msgid "config error - hook type \\"%s\\" c' | |||
|
49 | 552 | msgstr "" |
|
50 | 553 | |
|
51 | 554 | #, python-format |
|
52 | msgid "acl: changes have source \"%s\" - skipping\n" | |
|
53 | msgstr "" | |
|
54 | ||
|
55 | #, python-format | |
|
56 | msgid "acl: user %s denied on %s\n" | |
|
57 | msgstr "" | |
|
58 | ||
|
59 | #, python-format | |
|
60 | 555 | msgid "acl: access denied for changeset %s" |
|
61 | 556 | msgstr "" |
|
62 | 557 | |
|
63 | #, python-format | |
|
64 | msgid "acl: user %s not allowed on %s\n" | |
|
65 | msgstr "" | |
|
66 | ||
|
67 | #, python-format | |
|
68 | msgid "acl: allowing changeset %s\n" | |
|
69 | msgstr "" | |
|
70 | ||
|
71 | msgid "" | |
|
72 | "Mercurial bookmarks\n" | |
|
73 | "\n" | |
|
74 | "Mercurial bookmarks are local moveable pointers to changesets. Every\n" | |
|
75 | "bookmark points to a changeset identified by its hash. If you commit a\n" | |
|
558 | msgid "" | |
|
559 | "track a line of development with movable markers\n" | |
|
560 | "\n" | |
|
561 | "Bookmarks are local movable markers to changesets. Every bookmark\n" | |
|
562 | "points to a changeset identified by its hash. If you commit a\n" | |
|
76 | 563 | "changeset that is based on a changeset that has a bookmark on it, the\n" |
|
77 |
"bookmark |
|
|
564 | "bookmark shifts to the new changeset.\n" | |
|
78 | 565 | "\n" |
|
79 | 566 | "It is possible to use bookmark names in every revision lookup (e.g. hg\n" |
|
80 | 567 | "merge, hg update).\n" |
|
81 | 568 | "\n" |
|
82 | "The bookmark extension offers the possiblity to have a more git-like\n" | |
|
83 | "experience by adding the following configuration option to your .hgrc:\n" | |
|
84 | "\n" | |
|
85 | "[bookmarks]\n" | |
|
86 | "track.current = True\n" | |
|
87 | "\n" | |
|
88 | "This will cause bookmarks to track the bookmark that you are currently\n" | |
|
89 | "on, and just updates it. This is similar to git's approach to\n" | |
|
569 | "By default, when several bookmarks point to the same changeset, they\n" | |
|
570 | "will all move forward together. It is possible to obtain a more\n" | |
|
571 | "git-like experience by adding the following configuration option to\n" | |
|
572 | "your .hgrc::\n" | |
|
573 | "\n" | |
|
574 | " [bookmarks]\n" | |
|
575 | " track.current = True\n" | |
|
576 | "\n" | |
|
577 | "This will cause Mercurial to track the bookmark that you are currently\n" | |
|
578 | "using, and only update it. This is similar to git's approach to\n" | |
|
90 | 579 | "branching.\n" |
|
91 | 580 | msgstr "" |
|
92 | 581 | |
|
93 | 582 | msgid "" |
|
94 | "Mercurial bookmarks\n" | |
|
583 | "track a line of development with movable markers\n" | |
|
95 | 584 | "\n" |
|
96 | 585 | " Bookmarks are pointers to certain commits that move when\n" |
|
97 | " commiting. Bookmarks are local. They can be renamed, copied and\n" | |
|
586 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |
|
98 | 587 | " deleted. It is possible to use bookmark names in 'hg merge' and\n" |
|
99 | 588 | " 'hg update' to merge and update respectively to a given bookmark.\n" |
|
100 | 589 | "\n" |
@@ -139,7 +628,7 b' msgid "hg bookmarks [-f] [-d] [-m NAME] ' | |||
|
139 | 628 | msgstr "" |
|
140 | 629 | |
|
141 | 630 | msgid "" |
|
142 | "Bugzilla integration\n" | |
|
631 | "hooks for integrating with the Bugzilla bug tracker\n" | |
|
143 | 632 | "\n" |
|
144 | 633 | "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
|
145 | 634 | "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" |
@@ -155,65 +644,86 b' msgid ""' | |||
|
155 | 644 | "be run by Mercurial as the user pushing the change; you will need to\n" |
|
156 | 645 | "ensure the Bugzilla install file permissions are set appropriately.\n" |
|
157 | 646 | "\n" |
|
158 | "Configuring the extension:\n" | |
|
159 | "\n" | |
|
160 | " [bugzilla]\n" | |
|
161 | "\n" | |
|
162 |
" |
|
|
163 | " database.\n" | |
|
164 | " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" | |
|
165 | " user Username to use to access MySQL server. Default 'bugs'.\n" | |
|
166 | " password Password to use to access MySQL server.\n" | |
|
167 | " timeout Database connection timeout (seconds). Default 5.\n" | |
|
168 | " version Bugzilla version. Specify '3.0' for Bugzilla versions\n" | |
|
169 | " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" | |
|
170 | " and '2.16' for versions prior to 2.18.\n" | |
|
171 | " bzuser Fallback Bugzilla user name to record comments with, if\n" | |
|
172 | " changeset committer cannot be found as a Bugzilla user.\n" | |
|
173 | " bzdir Bugzilla install directory. Used by default notify.\n" | |
|
174 | " Default '/var/www/html/bugzilla'.\n" | |
|
175 | " notify The command to run to get Bugzilla to send bug change\n" | |
|
176 | " notification emails. Substitutes from a map with 3\n" | |
|
177 | " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" | |
|
178 | " bugzilla email). Default depends on version; from 2.18\n" | |
|
179 | " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" | |
|
180 | " %(id)s %(user)s\".\n" | |
|
181 | " regexp Regular expression to match bug IDs in changeset commit\n" | |
|
182 | " message. Must contain one \"()\" group. The default\n" | |
|
183 | " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" | |
|
184 | " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" | |
|
185 | " variations thereof. Matching is case insensitive.\n" | |
|
186 | " style The style file to use when formatting comments.\n" | |
|
187 | " template Template to use when formatting comments. Overrides\n" | |
|
188 | " style if specified. In addition to the usual Mercurial\n" | |
|
189 | " keywords, the extension specifies:\n" | |
|
190 | " {bug} The Bugzilla bug ID.\n" | |
|
191 | " {root} The full pathname of the Mercurial\n" | |
|
192 | " repository.\n" | |
|
193 | " {webroot} Stripped pathname of the Mercurial\n" | |
|
194 | " repository.\n" | |
|
195 | " {hgweb} Base URL for browsing Mercurial\n" | |
|
196 | " repositories.\n" | |
|
197 | " Default 'changeset {node|short} in repo {root} refers '\n" | |
|
198 | " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" | |
|
199 | " strip The number of slashes to strip from the front of {root}\n" | |
|
200 | " to produce {webroot}. Default 0.\n" | |
|
201 | " usermap Path of file containing Mercurial committer ID to\n" | |
|
202 | " Bugzilla user ID mappings. If specified, the file\n" | |
|
203 | " should contain one mapping per line,\n" | |
|
204 | " \"committer\"=\"Bugzilla user\". See also the [usermap]\n" | |
|
205 | " section.\n" | |
|
206 | "\n" | |
|
207 | " [usermap]\n" | |
|
208 | " Any entries in this section specify mappings of Mercurial\n" | |
|
209 | " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
|
210 | " \"committer\"=\"Bugzilla user\"\n" | |
|
211 | "\n" | |
|
212 | " [web]\n" | |
|
213 |
" |
|
|
214 | " from templates as {hgweb}.\n" | |
|
215 | "\n" | |
|
216 | "Activating the extension:\n" | |
|
647 | "The extension is configured through three different configuration\n" | |
|
648 | "sections. These keys are recognized in the [bugzilla] section:\n" | |
|
649 | "\n" | |
|
650 | "host\n" | |
|
651 | " Hostname of the MySQL server holding the Bugzilla database.\n" | |
|
652 | "\n" | |
|
653 | "db\n" | |
|
654 | " Name of the Bugzilla database in MySQL. Default 'bugs'.\n" | |
|
655 | "\n" | |
|
656 | "user\n" | |
|
657 | " Username to use to access MySQL server. Default 'bugs'.\n" | |
|
658 | "\n" | |
|
659 | "password\n" | |
|
660 | " Password to use to access MySQL server.\n" | |
|
661 | "\n" | |
|
662 | "timeout\n" | |
|
663 | " Database connection timeout (seconds). Default 5.\n" | |
|
664 | "\n" | |
|
665 | "version\n" | |
|
666 | " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" | |
|
667 | " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" | |
|
668 | " to 2.18.\n" | |
|
669 | "\n" | |
|
670 | "bzuser\n" | |
|
671 | " Fallback Bugzilla user name to record comments with, if changeset\n" | |
|
672 | " committer cannot be found as a Bugzilla user.\n" | |
|
673 | "\n" | |
|
674 | "bzdir\n" | |
|
675 | " Bugzilla install directory. Used by default notify. Default\n" | |
|
676 | " '/var/www/html/bugzilla'.\n" | |
|
677 | "\n" | |
|
678 | "notify\n" | |
|
679 | " The command to run to get Bugzilla to send bug change notification\n" | |
|
680 | " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" | |
|
681 | " and 'user' (committer bugzilla email). Default depends on version;\n" | |
|
682 | " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" | |
|
683 | " %(id)s %(user)s\".\n" | |
|
684 | "\n" | |
|
685 | "regexp\n" | |
|
686 | " Regular expression to match bug IDs in changeset commit message.\n" | |
|
687 | " Must contain one \"()\" group. The default expression matches 'Bug\n" | |
|
688 | " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" | |
|
689 | " 1234 and 5678' and variations thereof. Matching is case insensitive.\n" | |
|
690 | "\n" | |
|
691 | "style\n" | |
|
692 | " The style file to use when formatting comments.\n" | |
|
693 | "\n" | |
|
694 | "template\n" | |
|
695 | " Template to use when formatting comments. Overrides style if\n" | |
|
696 | " specified. In addition to the usual Mercurial keywords, the\n" | |
|
697 | " extension specifies::\n" | |
|
698 | "\n" | |
|
699 | " {bug} The Bugzilla bug ID.\n" | |
|
700 | " {root} The full pathname of the Mercurial repository.\n" | |
|
701 | " {webroot} Stripped pathname of the Mercurial repository.\n" | |
|
702 | " {hgweb} Base URL for browsing Mercurial repositories.\n" | |
|
703 | "\n" | |
|
704 | " Default 'changeset {node|short} in repo {root} refers '\n" | |
|
705 | " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" | |
|
706 | "\n" | |
|
707 | "strip\n" | |
|
708 | " The number of slashes to strip from the front of {root} to produce\n" | |
|
709 | " {webroot}. Default 0.\n" | |
|
710 | "\n" | |
|
711 | "usermap\n" | |
|
712 | " Path of file containing Mercurial committer ID to Bugzilla user ID\n" | |
|
713 | " mappings. If specified, the file should contain one mapping per\n" | |
|
714 | " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n" | |
|
715 | "\n" | |
|
716 | "The [usermap] section is used to specify mappings of Mercurial\n" | |
|
717 | "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
|
718 | "\"committer\"=\"Bugzilla user\"\n" | |
|
719 | "\n" | |
|
720 | "Finally, the [web] section supports one entry:\n" | |
|
721 | "\n" | |
|
722 | "baseurl\n" | |
|
723 | " Base URL for browsing Mercurial repositories. Reference from\n" | |
|
724 | " templates as {hgweb}.\n" | |
|
725 | "\n" | |
|
726 | "Activating the extension::\n" | |
|
217 | 727 | "\n" |
|
218 | 728 | " [extensions]\n" |
|
219 | 729 | " hgext.bugzilla =\n" |
@@ -226,7 +736,7 b' msgid ""' | |||
|
226 | 736 | "\n" |
|
227 | 737 | "This example configuration is for a collection of Mercurial\n" |
|
228 | 738 | "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" |
|
229 | "installation in /opt/bugzilla-3.2.\n" | |
|
739 | "installation in /opt/bugzilla-3.2. ::\n" | |
|
230 | 740 | "\n" |
|
231 | 741 | " [bugzilla]\n" |
|
232 | 742 | " host=localhost\n" |
@@ -234,8 +744,9 b' msgid ""' | |||
|
234 | 744 | " version=3.0\n" |
|
235 | 745 | " bzuser=unknown@domain.com\n" |
|
236 | 746 | " bzdir=/opt/bugzilla-3.2\n" |
|
237 |
" template=Changeset {node|short} in {root|basename}.\ |
|
|
238 | "rev/{node|short}\\n\\n{desc}\\n\n" | |
|
747 | " template=Changeset {node|short} in {root|basename}.\n" | |
|
748 | " {hgweb}/{webroot}/rev/{node|short}\\n\n" | |
|
749 | " {desc}\\n\n" | |
|
239 | 750 | " strip=5\n" |
|
240 | 751 | "\n" |
|
241 | 752 | " [web]\n" |
@@ -244,7 +755,7 b' msgid ""' | |||
|
244 | 755 | " [usermap]\n" |
|
245 | 756 | " user@emaildomain.com=user.name@bugzilladomain.com\n" |
|
246 | 757 | "\n" |
|
247 | "Commits add a comment to the Bugzilla bug record of the form:\n" | |
|
758 | "Commits add a comment to the Bugzilla bug record of the form::\n" | |
|
248 | 759 | "\n" |
|
249 | 760 | " Changeset 3b16791d6642 in repository-name.\n" |
|
250 | 761 | " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" |
@@ -323,6 +834,9 b' msgstr ""' | |||
|
323 | 834 | msgid "database error: %s" |
|
324 | 835 | msgstr "" |
|
325 | 836 | |
|
837 | msgid "command to display child changesets" | |
|
838 | msgstr "" | |
|
839 | ||
|
326 | 840 | msgid "" |
|
327 | 841 | "show the children of the given or working directory revision\n" |
|
328 | 842 | "\n" |
@@ -340,7 +854,7 b' msgstr ""' | |||
|
340 | 854 | msgid "hg children [-r REV] [FILE]" |
|
341 | 855 | msgstr "" |
|
342 | 856 | |
|
343 |
msgid "command to |
|
|
857 | msgid "command to display statistics about repository history" | |
|
344 | 858 | msgstr "" |
|
345 | 859 | |
|
346 | 860 | #, python-format |
@@ -352,15 +866,19 b' msgid "generating stats: %d%%"' | |||
|
352 | 866 | msgstr "" |
|
353 | 867 | |
|
354 | 868 | msgid "" |
|
355 | "graph count of revisions grouped by template\n" | |
|
356 | "\n" | |
|
357 | " Will graph count of changed lines or revisions grouped by template\n" | |
|
358 | " or alternatively by date, if dateformat is used. In this case it\n" | |
|
359 | " will override template.\n" | |
|
360 | "\n" | |
|
361 | " By default statistics are counted for number of changed lines.\n" | |
|
362 | "\n" | |
|
363 | " Examples:\n" | |
|
869 | "histogram of changes to the repository\n" | |
|
870 | "\n" | |
|
871 | " This command will display a histogram representing the number\n" | |
|
872 | " of changed lines or revisions, grouped according to the given\n" | |
|
873 | " template. The default template will group changes by author.\n" | |
|
874 | " The --dateformat option may be used to group the results by\n" | |
|
875 | " date instead.\n" | |
|
876 | "\n" | |
|
877 | " Statistics are based on the number of changed lines, or\n" | |
|
878 | " alternatively the number of matching revisions if the\n" | |
|
879 | " --changesets option is specified.\n" | |
|
880 | "\n" | |
|
881 | " Examples::\n" | |
|
364 | 882 | "\n" |
|
365 | 883 | " # display count of changed lines for every committer\n" |
|
366 | 884 | " hg churn -t '{author|email}'\n" |
@@ -374,17 +892,14 b' msgid ""' | |||
|
374 | 892 | " # display count of lines changed in every year\n" |
|
375 | 893 | " hg churn -f '%Y' -s\n" |
|
376 | 894 | "\n" |
|
377 | " The map file format used to specify aliases is fairly simple:\n" | |
|
378 | "\n" | |
|
379 | " <alias email> <actual email>\n" | |
|
380 | "\n" | |
|
381 | " By default .hgchurn in the working directory root will be used, if\n" | |
|
382 | " it exists. Use the --aliases option to override this.\n" | |
|
383 | " " | |
|
384 | msgstr "" | |
|
385 | ||
|
386 | #, python-format | |
|
387 | msgid "assuming %i character terminal\n" | |
|
895 | " It is possible to map alternate email addresses to a main address\n" | |
|
896 | " by providing a file using the following format::\n" | |
|
897 | "\n" | |
|
898 | " <alias email> <actual email>\n" | |
|
899 | "\n" | |
|
900 | " Such a file may be specified with the --aliases option, otherwise\n" | |
|
901 | " a .hgchurn file will be looked for in the working directory root.\n" | |
|
902 | " " | |
|
388 | 903 | msgstr "" |
|
389 | 904 | |
|
390 | 905 | msgid "count rate for the specified revision or range" |
@@ -415,7 +930,7 b' msgid "hg churn [-d DATE] [-r REV] [--al' | |||
|
415 | 930 | msgstr "" |
|
416 | 931 | |
|
417 | 932 | msgid "" |
|
418 | "add color output to status, qseries, and diff-related commands\n" | |
|
933 | "colorize output from some commands\n" | |
|
419 | 934 | "\n" |
|
420 | 935 | "This extension modifies the status command to add color to its output\n" |
|
421 | 936 | "to reflect file status, the qseries command to add color to reflect\n" |
@@ -428,52 +943,53 b' msgid ""' | |||
|
428 | 943 | "function (aka ANSI escape codes). This module also provides the\n" |
|
429 | 944 | "render_text function, which can be used to add effects to any text.\n" |
|
430 | 945 | "\n" |
|
431 | "To enable this extension, add this to your .hgrc file:\n" | |
|
432 | "[extensions]\n" | |
|
433 |
" |
|
|
434 | "\n" | |
|
435 | "Default effects may be overridden from the .hgrc file:\n" | |
|
436 | "\n" | |
|
437 | "[color]\n" | |
|
438 |
"status. |
|
|
439 |
"status. |
|
|
440 | "status.removed = red bold blue_background\n" | |
|
441 | "status.deleted = cyan bold underline\n" | |
|
442 | "status.unknown = magenta bold underline\n" | |
|
443 |
"status. |
|
|
444 | "\n" | |
|
445 | "# 'none' turns off all effects\n" | |
|
446 | "status.clean = none\n" | |
|
447 | "status.copied = none\n" | |
|
448 | "\n" | |
|
449 | "qseries.applied = blue bold underline\n" | |
|
450 | "qseries.unapplied = black bold\n" | |
|
451 | "qseries.missing = red bold\n" | |
|
452 | "\n" | |
|
453 | "diff.diffline = bold\n" | |
|
454 |
" |
|
|
455 |
" |
|
|
456 | "diff.file_b = green bold\n" | |
|
457 | "diff.hunk = magenta\n" | |
|
458 | "diff.deleted = red\n" | |
|
459 | "diff.inserted = green\n" | |
|
460 | "diff.changed = white\n" | |
|
461 | "diff.trailingwhitespace = bold red_background\n" | |
|
946 | "Default effects may be overridden from the .hgrc file::\n" | |
|
947 | "\n" | |
|
948 | " [color]\n" | |
|
949 | " status.modified = blue bold underline red_background\n" | |
|
950 | " status.added = green bold\n" | |
|
951 | " status.removed = red bold blue_background\n" | |
|
952 | " status.deleted = cyan bold underline\n" | |
|
953 | " status.unknown = magenta bold underline\n" | |
|
954 | " status.ignored = black bold\n" | |
|
955 | "\n" | |
|
956 | " # 'none' turns off all effects\n" | |
|
957 | " status.clean = none\n" | |
|
958 | " status.copied = none\n" | |
|
959 | "\n" | |
|
960 | " qseries.applied = blue bold underline\n" | |
|
961 | " qseries.unapplied = black bold\n" | |
|
962 | " qseries.missing = red bold\n" | |
|
963 | "\n" | |
|
964 | " diff.diffline = bold\n" | |
|
965 | " diff.extended = cyan bold\n" | |
|
966 | " diff.file_a = red bold\n" | |
|
967 | " diff.file_b = green bold\n" | |
|
968 | " diff.hunk = magenta\n" | |
|
969 | " diff.deleted = red\n" | |
|
970 | " diff.inserted = green\n" | |
|
971 | " diff.changed = white\n" | |
|
972 | " diff.trailingwhitespace = bold red_background\n" | |
|
462 | 973 | msgstr "" |
|
463 | 974 | |
|
464 | 975 | msgid "when to colorize (always, auto, or never)" |
|
465 | 976 | msgstr "" |
|
466 | 977 | |
|
467 | msgid "don't colorize output" | |
|
468 | msgstr "" | |
|
469 | ||
|
470 | msgid "converting foreign VCS repositories to Mercurial" | |
|
978 | msgid "don't colorize output (DEPRECATED)" | |
|
979 | msgstr "" | |
|
980 | ||
|
981 | #, python-format | |
|
982 | msgid "ignoring unknown color/effect %r (configured in color.%s)\n" | |
|
983 | msgstr "" | |
|
984 | ||
|
985 | msgid "import revisions from foreign VCS repositories into Mercurial" | |
|
471 | 986 | msgstr "" |
|
472 | 987 | |
|
473 | 988 | msgid "" |
|
474 | 989 | "convert a foreign SCM repository to a Mercurial one.\n" |
|
475 | 990 | "\n" |
|
476 | 991 | " Accepted source formats [identifiers]:\n" |
|
992 | "\n" | |
|
477 | 993 | " - Mercurial [hg]\n" |
|
478 | 994 | " - CVS [cvs]\n" |
|
479 | 995 | " - Darcs [darcs]\n" |
@@ -485,6 +1001,7 b' msgid ""' | |||
|
485 | 1001 | " - Perforce [p4]\n" |
|
486 | 1002 | "\n" |
|
487 | 1003 | " Accepted destination formats [identifiers]:\n" |
|
1004 | "\n" | |
|
488 | 1005 | " - Mercurial [hg]\n" |
|
489 | 1006 | " - Subversion [svn] (history on branches is not preserved)\n" |
|
490 | 1007 | "\n" |
@@ -496,23 +1013,28 b' msgid ""' | |||
|
496 | 1013 | " basename of the source with '-hg' appended. If the destination\n" |
|
497 | 1014 | " repository doesn't exist, it will be created.\n" |
|
498 | 1015 | "\n" |
|
499 | " By default, all sources except Mercurial will use\n" | |
|
500 |
" |
|
|
501 |
" |
|
|
502 | " --branchsort: convert from parent to child revision when\n" | |
|
503 | " possible, which means branches are usually converted one after\n" | |
|
504 | " the other. It generates more compact repositories.\n" | |
|
505 | " --datesort: sort revisions by date. Converted repositories have\n" | |
|
506 | " good-looking changelogs but are often an order of magnitude\n" | |
|
507 | " larger than the same ones generated by --branchsort.\n" | |
|
508 | " --sourcesort: try to preserve source revisions order, only\n" | |
|
509 | " supported by Mercurial sources.\n" | |
|
1016 | " By default, all sources except Mercurial will use --branchsort.\n" | |
|
1017 | " Mercurial uses --sourcesort to preserve original revision numbers\n" | |
|
1018 | " order. Sort modes have the following effects:\n" | |
|
1019 | "\n" | |
|
1020 | " --branchsort convert from parent to child revision when possible,\n" | |
|
1021 | " which means branches are usually converted one after\n" | |
|
1022 | " the other. It generates more compact repositories.\n" | |
|
1023 | "\n" | |
|
1024 | " --datesort sort revisions by date. Converted repositories have\n" | |
|
1025 | " good-looking changelogs but are often an order of\n" | |
|
1026 | " magnitude larger than the same ones generated by\n" | |
|
1027 | " --branchsort.\n" | |
|
1028 | "\n" | |
|
1029 | " --sourcesort try to preserve source revisions order, only\n" | |
|
1030 | " supported by Mercurial sources.\n" | |
|
510 | 1031 | "\n" |
|
511 | 1032 | " If <REVMAP> isn't given, it will be put in a default location\n" |
|
512 | 1033 | " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" |
|
513 | 1034 | " that maps each source commit ID to the destination ID for that\n" |
|
514 | " revision, like so:\n" | |
|
515 | " <source ID> <destination ID>\n" | |
|
1035 | " revision, like so::\n" | |
|
1036 | "\n" | |
|
1037 | " <source ID> <destination ID>\n" | |
|
516 | 1038 | "\n" |
|
517 | 1039 | " If the file doesn't exist, it's automatically created. It's\n" |
|
518 | 1040 | " updated on each commit copied, so convert-repo can be interrupted\n" |
@@ -526,7 +1048,7 b' msgid ""' | |||
|
526 | 1048 | "\n" |
|
527 | 1049 | " The filemap is a file that allows filtering and remapping of files\n" |
|
528 | 1050 | " and directories. Comment lines start with '#'. Each line can\n" |
|
529 | " contain one of the following directives:\n" | |
|
1051 | " contain one of the following directives::\n" | |
|
530 | 1052 | "\n" |
|
531 | 1053 | " include path/to/file\n" |
|
532 | 1054 | "\n" |
@@ -536,11 +1058,11 b' msgid ""' | |||
|
536 | 1058 | "\n" |
|
537 | 1059 | " The 'include' directive causes a file, or all files under a\n" |
|
538 | 1060 | " directory, to be included in the destination repository, and the\n" |
|
539 |
" exclusion of all other files and directories not explicitly |
|
|
540 |
" The 'exclude' directive causes files or directories to |
|
|
541 |
" The 'rename' directive renames a file or directory. To |
|
|
542 |
" a subdirectory into the root of the repository, us |
|
|
543 | " path to rename to.\n" | |
|
1061 | " exclusion of all other files and directories not explicitly\n" | |
|
1062 | " included. The 'exclude' directive causes files or directories to\n" | |
|
1063 | " be omitted. The 'rename' directive renames a file or directory. To\n" | |
|
1064 | " rename from a subdirectory into the root of the repository, use\n" | |
|
1065 | " '.' as the path to rename to.\n" | |
|
544 | 1066 | "\n" |
|
545 | 1067 | " The splicemap is a file that allows insertion of synthetic\n" |
|
546 | 1068 | " history, letting you specify the parents of a revision. This is\n" |
@@ -565,7 +1087,7 b' msgid ""' | |||
|
565 | 1087 | " in one repository from \"default\" to a named branch.\n" |
|
566 | 1088 | "\n" |
|
567 | 1089 | " Mercurial Source\n" |
|
568 |
" ---------------- |
|
|
1090 | " ----------------\n" | |
|
569 | 1091 | "\n" |
|
570 | 1092 | " --config convert.hg.ignoreerrors=False (boolean)\n" |
|
571 | 1093 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
@@ -590,43 +1112,31 b' msgid ""' | |||
|
590 | 1112 | " converted, and that any directory reorganization in the CVS\n" |
|
591 | 1113 | " sandbox is ignored.\n" |
|
592 | 1114 | "\n" |
|
593 | " Because CVS does not have changesets, it is necessary to collect\n" | |
|
594 | " individual commits to CVS and merge them into changesets. CVS\n" | |
|
595 | " source uses its internal changeset merging code by default but can\n" | |
|
596 | " be configured to call the external 'cvsps' program by setting:\n" | |
|
597 | " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" | |
|
598 | " This option is deprecated and will be removed in Mercurial 1.4.\n" | |
|
599 | "\n" | |
|
600 | 1115 | " The options shown are the defaults.\n" |
|
601 | 1116 | "\n" |
|
602 | " Internal cvsps is selected by setting\n" | |
|
603 | " --config convert.cvsps=builtin\n" | |
|
604 | " and has a few more configurable options:\n" | |
|
605 |
" |
|
|
606 | " Set to False to disable remote log caching, for testing and\n" | |
|
607 | " debugging purposes.\n" | |
|
608 | " --config convert.cvsps.fuzz=60 (integer)\n" | |
|
609 | " Specify the maximum time (in seconds) that is allowed\n" | |
|
610 | " between commits with identical user and log message in a\n" | |
|
611 | " single changeset. When very large files were checked in as\n" | |
|
612 | " part of a changeset then the default may not be long\n" | |
|
613 | " enough.\n" | |
|
614 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |
|
615 | " Specify a regular expression to which commit log messages\n" | |
|
616 | " are matched. If a match occurs, then the conversion\n" | |
|
617 | " process will insert a dummy revision merging the branch on\n" | |
|
618 |
" |
|
|
619 | " the regex.\n" | |
|
620 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |
|
621 | " Specify a regular expression to which commit log messages\n" | |
|
622 | " are matched. If a match occurs, then the conversion\n" | |
|
623 | " process will add the most recent revision on the branch\n" | |
|
624 | " indicated in the regex as the second parent of the\n" | |
|
625 | " changeset.\n" | |
|
626 | "\n" | |
|
627 | " The hgext/convert/cvsps wrapper script allows the builtin\n" | |
|
1117 | " --config convert.cvsps.cache=True (boolean)\n" | |
|
1118 | " Set to False to disable remote log caching, for testing and\n" | |
|
1119 | " debugging purposes.\n" | |
|
1120 | " --config convert.cvsps.fuzz=60 (integer)\n" | |
|
1121 | " Specify the maximum time (in seconds) that is allowed between\n" | |
|
1122 | " commits with identical user and log message in a single\n" | |
|
1123 | " changeset. When very large files were checked in as part of a\n" | |
|
1124 | " changeset then the default may not be long enough.\n" | |
|
1125 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" | |
|
1126 | " Specify a regular expression to which commit log messages are\n" | |
|
1127 | " matched. If a match occurs, then the conversion process will\n" | |
|
1128 | " insert a dummy revision merging the branch on which this log\n" | |
|
1129 | " message occurs to the branch indicated in the regex.\n" | |
|
1130 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" | |
|
1131 | " Specify a regular expression to which commit log messages are\n" | |
|
1132 | " matched. If a match occurs, then the conversion process will\n" | |
|
1133 | " add the most recent revision on the branch indicated in the\n" | |
|
1134 | " regex as the second parent of the changeset.\n" | |
|
1135 | "\n" | |
|
1136 | " An additional \"debugcvsps\" Mercurial command allows the builtin\n" | |
|
628 | 1137 | " changeset merging code to be run without doing a conversion. Its\n" |
|
629 | " parameters and output are similar to that of cvsps 2.1.\n" | |
|
1138 | " parameters and output are similar to that of cvsps 2.1. Please see\n" | |
|
1139 | " the command help for more details.\n" | |
|
630 | 1140 | "\n" |
|
631 | 1141 | " Subversion Source\n" |
|
632 | 1142 | " -----------------\n" |
@@ -672,7 +1182,6 b' msgid ""' | |||
|
672 | 1182 | " --config convert.p4.startrev=0 (perforce changelist number)\n" |
|
673 | 1183 | " specify initial Perforce revision.\n" |
|
674 | 1184 | "\n" |
|
675 | "\n" | |
|
676 | 1185 | " Mercurial Destination\n" |
|
677 | 1186 | " ---------------------\n" |
|
678 | 1187 | "\n" |
@@ -790,18 +1299,10 b' msgid "cannot find required \\"%s\\" tool"' | |||
|
790 | 1299 | msgstr "" |
|
791 | 1300 | |
|
792 | 1301 | #, python-format |
|
793 | msgid "running: %s\n" | |
|
794 | msgstr "" | |
|
795 | ||
|
796 | #, python-format | |
|
797 | 1302 | msgid "%s error:\n" |
|
798 | 1303 | msgstr "" |
|
799 | 1304 | |
|
800 | 1305 | #, python-format |
|
801 | msgid "%s %s" | |
|
802 | msgstr "" | |
|
803 | ||
|
804 | #, python-format | |
|
805 | 1306 | msgid "syntax error in %s(%d): key/value pair expected" |
|
806 | 1307 | msgstr "" |
|
807 | 1308 | |
@@ -875,16 +1376,8 b' msgstr ""' | |||
|
875 | 1376 | msgid "--sourcesort is not supported by this data source" |
|
876 | 1377 | msgstr "" |
|
877 | 1378 | |
|
878 | msgid "" | |
|
879 | "warning: support for external cvsps is deprecated and will be removed in " | |
|
880 | "Mercurial 1.4\n" | |
|
881 | msgstr "" | |
|
882 | ||
|
883 | #, python-format | |
|
884 | msgid "revision %s is not a patchset number or date" | |
|
885 | msgstr "" | |
|
886 | ||
|
887 | msgid "using builtin cvsps\n" | |
|
1379 | #, python-format | |
|
1380 | msgid "revision %s is not a patchset number" | |
|
888 | 1381 | msgstr "" |
|
889 | 1382 | |
|
890 | 1383 | #, python-format |
@@ -894,7 +1387,9 b' msgstr ""' | |||
|
894 | 1387 | msgid "CVS pserver authentication failed" |
|
895 | 1388 | msgstr "" |
|
896 | 1389 | |
|
897 | msgid "server sucks" | |
|
1390 | #, python-format | |
|
1391 | msgid "" | |
|
1392 | "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" | |
|
898 | 1393 | msgstr "" |
|
899 | 1394 | |
|
900 | 1395 | #, python-format |
@@ -928,10 +1423,6 b' msgstr ""' | |||
|
928 | 1423 | msgid "running %s\n" |
|
929 | 1424 | msgstr "" |
|
930 | 1425 | |
|
931 | #, python-format | |
|
932 | msgid "prefix=%r directory=%r root=%r\n" | |
|
933 | msgstr "" | |
|
934 | ||
|
935 | 1426 | msgid "RCS file must be followed by working file" |
|
936 | 1427 | msgstr "" |
|
937 | 1428 | |
@@ -945,10 +1436,6 b' msgid "revision must be followed by date' | |||
|
945 | 1436 | msgstr "" |
|
946 | 1437 | |
|
947 | 1438 | #, python-format |
|
948 | msgid "found synthetic revision in %s: %r\n" | |
|
949 | msgstr "" | |
|
950 | ||
|
951 | #, python-format | |
|
952 | 1439 | msgid "writing cvs log cache %s\n" |
|
953 | 1440 | msgstr "" |
|
954 | 1441 | |
@@ -972,13 +1459,13 b' msgstr ""' | |||
|
972 | 1459 | msgid "%d changeset entries\n" |
|
973 | 1460 | msgstr "" |
|
974 | 1461 | |
|
1462 | #, python-format | |
|
1463 | msgid "darcs version 2.1 or newer needed (found %r)" | |
|
1464 | msgstr "" | |
|
1465 | ||
|
975 | 1466 | msgid "Python ElementTree module is not available" |
|
976 | 1467 | msgstr "" |
|
977 | 1468 | |
|
978 | #, python-format | |
|
979 | msgid "cleaning up %s\n" | |
|
980 | msgstr "" | |
|
981 | ||
|
982 | 1469 | msgid "internal calling inconsistency" |
|
983 | 1470 | msgstr "" |
|
984 | 1471 | |
@@ -1013,22 +1500,6 b' msgid ""' | |||
|
1013 | 1500 | msgstr "" |
|
1014 | 1501 | |
|
1015 | 1502 | #, python-format |
|
1016 | msgid "applying revision %s...\n" | |
|
1017 | msgstr "" | |
|
1018 | ||
|
1019 | #, python-format | |
|
1020 | msgid "computing changeset between %s and %s...\n" | |
|
1021 | msgstr "" | |
|
1022 | ||
|
1023 | #, python-format | |
|
1024 | msgid "obtaining revision %s...\n" | |
|
1025 | msgstr "" | |
|
1026 | ||
|
1027 | #, python-format | |
|
1028 | msgid "analyzing revision %s...\n" | |
|
1029 | msgstr "" | |
|
1030 | ||
|
1031 | #, python-format | |
|
1032 | 1503 | msgid "could not parse cat-log of %s" |
|
1033 | 1504 | msgstr "" |
|
1034 | 1505 | |
@@ -1040,12 +1511,6 b' msgstr ""' | |||
|
1040 | 1511 | msgid "initializing destination %s repository\n" |
|
1041 | 1512 | msgstr "" |
|
1042 | 1513 | |
|
1043 | msgid "run hg sink pre-conversion action\n" | |
|
1044 | msgstr "" | |
|
1045 | ||
|
1046 | msgid "run hg sink post-conversion action\n" | |
|
1047 | msgstr "" | |
|
1048 | ||
|
1049 | 1514 | #, python-format |
|
1050 | 1515 | msgid "pulling from %s into %s\n" |
|
1051 | 1516 | msgstr "" |
@@ -1064,12 +1529,6 b' msgstr ""' | |||
|
1064 | 1529 | msgid "ignoring: %s\n" |
|
1065 | 1530 | msgstr "" |
|
1066 | 1531 | |
|
1067 | msgid "run hg source pre-conversion action\n" | |
|
1068 | msgstr "" | |
|
1069 | ||
|
1070 | msgid "run hg source post-conversion action\n" | |
|
1071 | msgstr "" | |
|
1072 | ||
|
1073 | 1532 | #, python-format |
|
1074 | 1533 | msgid "%s does not look like a monotone repo" |
|
1075 | 1534 | msgstr "" |
@@ -1084,6 +1543,9 b' msgstr ""' | |||
|
1084 | 1543 | msgid "collecting p4 changelists\n" |
|
1085 | 1544 | msgstr "" |
|
1086 | 1545 | |
|
1546 | msgid "Mercurial failed to run itself, check hg executable is in PATH" | |
|
1547 | msgstr "" | |
|
1548 | ||
|
1087 | 1549 | msgid "Subversion python bindings could not be loaded" |
|
1088 | 1550 | msgstr "" |
|
1089 | 1551 | |
@@ -1134,84 +1596,22 b' msgid "no tags found at revision %d\\n"' | |||
|
1134 | 1596 | msgstr "" |
|
1135 | 1597 | |
|
1136 | 1598 | #, python-format |
|
1137 | msgid "ignoring foreign branch %r\n" | |
|
1138 | msgstr "" | |
|
1139 | ||
|
1140 | #, python-format | |
|
1141 | 1599 | msgid "%s not found up to revision %d" |
|
1142 | 1600 | msgstr "" |
|
1143 | 1601 | |
|
1144 | 1602 | #, python-format |
|
1145 | msgid "branch renamed from %s to %s at %d\n" | |
|
1146 | msgstr "" | |
|
1147 | ||
|
1148 | #, python-format | |
|
1149 | msgid "reparent to %s\n" | |
|
1150 | msgstr "" | |
|
1151 | ||
|
1152 | #, python-format | |
|
1153 | msgid "copied to %s from %s@%s\n" | |
|
1154 | msgstr "" | |
|
1155 | ||
|
1156 | #, python-format | |
|
1157 | msgid "gone from %s\n" | |
|
1158 | msgstr "" | |
|
1159 | ||
|
1160 | #, python-format | |
|
1161 | msgid "found parent directory %s\n" | |
|
1162 | msgstr "" | |
|
1163 | ||
|
1164 | #, python-format | |
|
1165 | msgid "base, entry %s %s\n" | |
|
1166 | msgstr "" | |
|
1167 | ||
|
1168 | msgid "munge-o-matic\n" | |
|
1169 | msgstr "" | |
|
1170 | ||
|
1171 | #, python-format | |
|
1172 | msgid "info: %s %s %s %s\n" | |
|
1173 | msgstr "" | |
|
1174 | ||
|
1175 | #, python-format | |
|
1176 | msgid "unknown path in revision %d: %s\n" | |
|
1177 | msgstr "" | |
|
1178 | ||
|
1179 | #, python-format | |
|
1180 | msgid "mark %s came from %s:%d\n" | |
|
1181 | msgstr "" | |
|
1182 | ||
|
1183 | #, python-format | |
|
1184 | msgid "parsing revision %d (%d changes)\n" | |
|
1185 | msgstr "" | |
|
1186 | ||
|
1187 | #, python-format | |
|
1188 | 1603 | msgid "found parent of branch %s at %d: %s\n" |
|
1189 | 1604 | msgstr "" |
|
1190 | 1605 | |
|
1191 | msgid "no copyfrom path, don't know what to do.\n" | |
|
1192 | msgstr "" | |
|
1193 | ||
|
1194 | 1606 | #, python-format |
|
1195 | 1607 | msgid "fetching revision log for \"%s\" from %d to %d\n" |
|
1196 | 1608 | msgstr "" |
|
1197 | 1609 | |
|
1198 | 1610 | #, python-format |
|
1199 | msgid "skipping blacklisted revision %d\n" | |
|
1200 | msgstr "" | |
|
1201 | ||
|
1202 | #, python-format | |
|
1203 | msgid "revision %d has no entries\n" | |
|
1204 | msgstr "" | |
|
1205 | ||
|
1206 | #, python-format | |
|
1207 | 1611 | msgid "svn: branch has no revision %s" |
|
1208 | 1612 | msgstr "" |
|
1209 | 1613 | |
|
1210 | 1614 | #, python-format |
|
1211 | msgid "%r is not under %r, ignoring\n" | |
|
1212 | msgstr "" | |
|
1213 | ||
|
1214 | #, python-format | |
|
1215 | 1615 | msgid "initializing svn repo %r\n" |
|
1216 | 1616 | msgstr "" |
|
1217 | 1617 | |
@@ -1229,20 +1629,16 b' msgid "XXX TAGS NOT IMPLEMENTED YET\\n"' | |||
|
1229 | 1629 | msgstr "" |
|
1230 | 1630 | |
|
1231 | 1631 | msgid "" |
|
1232 | "\n" | |
|
1233 | "The `extdiff' Mercurial extension allows you to use external programs\n" | |
|
1234 | "to compare revisions, or revision with working directory. The external diff\n" | |
|
1235 | "programs are called with a configurable set of options and two\n" | |
|
1632 | "command to allow external programs to compare revisions\n" | |
|
1633 | "\n" | |
|
1634 | "The extdiff Mercurial extension allows you to use external programs\n" | |
|
1635 | "to compare revisions, or revision with working directory. The external\n" | |
|
1636 | "diff programs are called with a configurable set of options and two\n" | |
|
1236 | 1637 | "non-option arguments: paths to directories containing snapshots of\n" |
|
1237 | 1638 | "files to compare.\n" |
|
1238 | 1639 | "\n" |
|
1239 | "To enable this extension:\n" | |
|
1240 | "\n" | |
|
1241 | " [extensions]\n" | |
|
1242 | " hgext.extdiff =\n" | |
|
1243 | "\n" | |
|
1244 | "The `extdiff' extension also allows to configure new diff commands, so\n" | |
|
1245 | "you do not need to type \"hg extdiff -p kdiff3\" always.\n" | |
|
1640 | "The extdiff extension also allows to configure new diff commands, so\n" | |
|
1641 | "you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" | |
|
1246 | 1642 | "\n" |
|
1247 | 1643 | " [extdiff]\n" |
|
1248 | 1644 | " # add new command that runs GNU diff(1) in 'context diff' mode\n" |
@@ -1258,14 +1654,13 b' msgid ""' | |||
|
1258 | 1654 | " meld =\n" |
|
1259 | 1655 | "\n" |
|
1260 | 1656 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
|
1261 | " # (see http://www.vim.org/scripts/script.php?script_id=102)\n" | |
|
1262 |
" # |
|
|
1263 | "in\n" | |
|
1657 | " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" | |
|
1658 | " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" | |
|
1264 | 1659 | " # your .vimrc\n" |
|
1265 | 1660 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" |
|
1266 | 1661 | "\n" |
|
1267 | 1662 | "You can use -I/-X and list of file or directory names like normal \"hg\n" |
|
1268 |
"diff\" command. The |
|
|
1663 | "diff\" command. The extdiff extension makes snapshots of only needed\n" | |
|
1269 | 1664 | "files, so running the external diff program will actually be pretty\n" |
|
1270 | 1665 | "fast (at least faster than having to compare the entire tree).\n" |
|
1271 | 1666 | msgstr "" |
@@ -1281,14 +1676,6 b' msgstr ""' | |||
|
1281 | 1676 | msgid "cannot specify --rev and --change at the same time" |
|
1282 | 1677 | msgstr "" |
|
1283 | 1678 | |
|
1284 | #, python-format | |
|
1285 | msgid "running %r in %s\n" | |
|
1286 | msgstr "" | |
|
1287 | ||
|
1288 | #, python-format | |
|
1289 | msgid "file changed while diffing. Overwriting: %s (src: %s)\n" | |
|
1290 | msgstr "" | |
|
1291 | ||
|
1292 | 1679 | msgid "cleaning up temp directory\n" |
|
1293 | 1680 | msgstr "" |
|
1294 | 1681 | |
@@ -1324,10 +1711,25 b' msgid "hg extdiff [OPT]... [FILE]..."' | |||
|
1324 | 1711 | msgstr "" |
|
1325 | 1712 | |
|
1326 | 1713 | #, python-format |
|
1714 | msgid "" | |
|
1715 | "use %(path)s to diff repository (or selected files)\n" | |
|
1716 | "\n" | |
|
1717 | " Show differences between revisions for the specified files, using the\n" | |
|
1718 | " %(path)s program.\n" | |
|
1719 | "\n" | |
|
1720 | " When two revision arguments are given, then changes are shown between\n" | |
|
1721 | " those revisions. If only one revision is specified then that revision " | |
|
1722 | "is\n" | |
|
1723 | " compared to the working directory, and, when no revisions are " | |
|
1724 | "specified,\n" | |
|
1725 | " the working directory files are compared to its parent." | |
|
1726 | msgstr "" | |
|
1727 | ||
|
1728 | #, python-format | |
|
1327 | 1729 | msgid "hg %s [OPTION]... [FILE]..." |
|
1328 | 1730 | msgstr "" |
|
1329 | 1731 | |
|
1330 |
msgid "pull |
|
|
1732 | msgid "pull, update and merge in one command" | |
|
1331 | 1733 | msgstr "" |
|
1332 | 1734 | |
|
1333 | 1735 | msgid "" |
@@ -1391,10 +1793,6 b' msgid "merging with %d:%s\\n"' | |||
|
1391 | 1793 | msgstr "" |
|
1392 | 1794 | |
|
1393 | 1795 | #, python-format |
|
1394 | msgid "Automated merge with %s" | |
|
1395 | msgstr "" | |
|
1396 | ||
|
1397 | #, python-format | |
|
1398 | 1796 | msgid "new changeset %d:%s merges remote changes with local\n" |
|
1399 | 1797 | msgstr "" |
|
1400 | 1798 | |
@@ -1413,6 +1811,9 b' msgstr ""' | |||
|
1413 | 1811 | msgid "hg fetch [SOURCE]" |
|
1414 | 1812 | msgstr "" |
|
1415 | 1813 | |
|
1814 | msgid "commands to sign and verify changesets" | |
|
1815 | msgstr "" | |
|
1816 | ||
|
1416 | 1817 | msgid "error while verifying signature" |
|
1417 | 1818 | msgstr "" |
|
1418 | 1819 | |
@@ -1463,10 +1864,6 b' msgid ""' | |||
|
1463 | 1864 | "force)" |
|
1464 | 1865 | msgstr "" |
|
1465 | 1866 | |
|
1466 | #, python-format | |
|
1467 | msgid "Added signature for changeset %s" | |
|
1468 | msgstr "" | |
|
1469 | ||
|
1470 | 1867 | msgid "unknown signature version" |
|
1471 | 1868 | msgstr "" |
|
1472 | 1869 | |
@@ -1495,7 +1892,7 b' msgid "hg sigs"' | |||
|
1495 | 1892 | msgstr "" |
|
1496 | 1893 | |
|
1497 | 1894 | msgid "" |
|
1498 | "show revision graphs in terminal windows\n" | |
|
1895 | "command to view revision graphs from a shell\n" | |
|
1499 | 1896 | "\n" |
|
1500 | 1897 | "This extension adds a --graph option to the incoming, outgoing and log\n" |
|
1501 | 1898 | "commands. When this options is given, an ASCII representation of the\n" |
@@ -1540,40 +1937,40 b' msgid "hg glog [OPTION]... [FILE]"' | |||
|
1540 | 1937 | msgstr "" |
|
1541 | 1938 | |
|
1542 | 1939 | msgid "" |
|
1543 | "CIA notification\n" | |
|
1544 | "\n" | |
|
1545 | "This is meant to be run as a changegroup or incoming hook.\n" | |
|
1546 |
" |
|
|
1547 | "\n" | |
|
1548 | "[cia]\n" | |
|
1549 | "# your registered CIA user name\n" | |
|
1550 | "user = foo\n" | |
|
1551 | "# the name of the project in CIA\n" | |
|
1552 | "project = foo\n" | |
|
1553 | "# the module (subproject) (optional)\n" | |
|
1554 | "#module = foo\n" | |
|
1555 | "# Append a diffstat to the log message (optional)\n" | |
|
1556 | "#diffstat = False\n" | |
|
1557 | "# Template to use for log messages (optional)\n" | |
|
1558 | "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" | |
|
1559 | "# Style to use (optional)\n" | |
|
1560 | "#style = foo\n" | |
|
1561 | "# The URL of the CIA notification service (optional)\n" | |
|
1562 | "# You can use mailto: URLs to send by email, eg\n" | |
|
1563 | "# mailto:cia@cia.vc\n" | |
|
1564 | "# Make sure to set email.from if you do this.\n" | |
|
1565 | "#url = http://cia.vc/\n" | |
|
1566 | "# print message instead of sending it (optional)\n" | |
|
1567 | "#test = False\n" | |
|
1568 | "\n" | |
|
1569 | "[hooks]\n" | |
|
1570 | "# one of these:\n" | |
|
1571 | "changegroup.cia = python:hgcia.hook\n" | |
|
1572 | "#incoming.cia = python:hgcia.hook\n" | |
|
1573 | "\n" | |
|
1574 | "[web]\n" | |
|
1575 | "# If you want hyperlinks (optional)\n" | |
|
1576 | "baseurl = http://server/path/to/repo\n" | |
|
1940 | "hooks for integrating with the CIA.vc notification service\n" | |
|
1941 | "\n" | |
|
1942 | "This is meant to be run as a changegroup or incoming hook. To\n" | |
|
1943 | "configure it, set the following options in your hgrc::\n" | |
|
1944 | "\n" | |
|
1945 | " [cia]\n" | |
|
1946 | " # your registered CIA user name\n" | |
|
1947 | " user = foo\n" | |
|
1948 | " # the name of the project in CIA\n" | |
|
1949 | " project = foo\n" | |
|
1950 | " # the module (subproject) (optional)\n" | |
|
1951 | " #module = foo\n" | |
|
1952 | " # Append a diffstat to the log message (optional)\n" | |
|
1953 | " #diffstat = False\n" | |
|
1954 | " # Template to use for log messages (optional)\n" | |
|
1955 | " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" | |
|
1956 | " # Style to use (optional)\n" | |
|
1957 | " #style = foo\n" | |
|
1958 | " # The URL of the CIA notification service (optional)\n" | |
|
1959 | " # You can use mailto: URLs to send by email, eg\n" | |
|
1960 | " # mailto:cia@cia.vc\n" | |
|
1961 | " # Make sure to set email.from if you do this.\n" | |
|
1962 | " #url = http://cia.vc/\n" | |
|
1963 | " # print message instead of sending it (optional)\n" | |
|
1964 | " #test = False\n" | |
|
1965 | "\n" | |
|
1966 | " [hooks]\n" | |
|
1967 | " # one of these:\n" | |
|
1968 | " changegroup.cia = python:hgcia.hook\n" | |
|
1969 | " #incoming.cia = python:hgcia.hook\n" | |
|
1970 | "\n" | |
|
1971 | " [web]\n" | |
|
1972 | " # If you want hyperlinks (optional)\n" | |
|
1973 | " baseurl = http://server/path/to/repo\n" | |
|
1577 | 1974 | msgstr "" |
|
1578 | 1975 | |
|
1579 | 1976 | #, python-format |
@@ -1583,14 +1980,8 b' msgstr ""' | |||
|
1583 | 1980 | msgid "email.from must be defined when sending by email" |
|
1584 | 1981 | msgstr "" |
|
1585 | 1982 | |
|
1586 | msgid "cia: no user specified" | |
|
1587 | msgstr "" | |
|
1588 | ||
|
1589 | msgid "cia: no project specified" | |
|
1590 | msgstr "" | |
|
1591 | ||
|
1592 | msgid "" | |
|
1593 | "browsing the repository in a graphical way\n" | |
|
1983 | msgid "" | |
|
1984 | "browse the repository in a graphical way\n" | |
|
1594 | 1985 | "\n" |
|
1595 | 1986 | "The hgk extension allows browsing the history of a repository in a\n" |
|
1596 | 1987 | "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" |
@@ -1599,36 +1990,24 b' msgid ""' | |||
|
1599 | 1990 | "hgk consists of two parts: a Tcl script that does the displaying and\n" |
|
1600 | 1991 | "querying of information, and an extension to Mercurial named hgk.py,\n" |
|
1601 | 1992 | "which provides hooks for hgk to get information. hgk can be found in\n" |
|
1602 |
"the contrib directory, and |
|
|
1603 | "\n" | |
|
1604 | "To load the hgext.py extension, add it to your .hgrc file (you have to\n" | |
|
1605 | "use your global $HOME/.hgrc file, not one in a repository). You can\n" | |
|
1606 | "specify an absolute path:\n" | |
|
1607 | "\n" | |
|
1608 | " [extensions]\n" | |
|
1609 | " hgk=/usr/local/lib/hgk.py\n" | |
|
1610 | "\n" | |
|
1611 | "Mercurial can also scan the default python library path for a file\n" | |
|
1612 | "named 'hgk.py' if you set hgk empty:\n" | |
|
1613 | "\n" | |
|
1614 | " [extensions]\n" | |
|
1615 | " hgk=\n" | |
|
1993 | "the contrib directory, and the extension is shipped in the hgext\n" | |
|
1994 | "repository, and needs to be enabled.\n" | |
|
1616 | 1995 | "\n" |
|
1617 | 1996 | "The hg view command will launch the hgk Tcl script. For this command\n" |
|
1618 | 1997 | "to work, hgk must be in your search path. Alternately, you can specify\n" |
|
1619 | "the path to hgk in your .hgrc file:\n" | |
|
1998 | "the path to hgk in your .hgrc file::\n" | |
|
1620 | 1999 | "\n" |
|
1621 | 2000 | " [hgk]\n" |
|
1622 | 2001 | " path=/location/of/hgk\n" |
|
1623 | 2002 | "\n" |
|
1624 | 2003 | "hgk can make use of the extdiff extension to visualize revisions.\n" |
|
1625 | "Assuming you had already configured extdiff vdiff command, just add:\n" | |
|
2004 | "Assuming you had already configured extdiff vdiff command, just add::\n" | |
|
1626 | 2005 | "\n" |
|
1627 | 2006 | " [hgk]\n" |
|
1628 | 2007 | " vdiff=vdiff\n" |
|
1629 | 2008 | "\n" |
|
1630 | 2009 | "Revisions context menu will now display additional entries to fire\n" |
|
1631 | "vdiff on hovered and selected revisions." | |
|
2010 | "vdiff on hovered and selected revisions.\n" | |
|
1632 | 2011 | msgstr "" |
|
1633 | 2012 | |
|
1634 | 2013 | msgid "diff trees from two commits" |
@@ -1688,7 +2067,7 b' msgstr ""' | |||
|
1688 | 2067 | msgid "hg debug-config" |
|
1689 | 2068 | msgstr "" |
|
1690 | 2069 | |
|
1691 |
msgid "hg debug-merge-base |
|
|
2070 | msgid "hg debug-merge-base REV REV" | |
|
1692 | 2071 | msgstr "" |
|
1693 | 2072 | |
|
1694 | 2073 | msgid "ignored" |
@@ -1709,31 +2088,24 b' msgstr ""' | |||
|
1709 | 2088 | msgid "max-count" |
|
1710 | 2089 | msgstr "" |
|
1711 | 2090 | |
|
1712 |
msgid "hg debug-rev-list [ |
|
|
1713 | msgstr "" | |
|
1714 | ||
|
1715 | msgid "" | |
|
1716 |
"syntax highlighting |
|
|
2091 | msgid "hg debug-rev-list [OPTION]... REV..." | |
|
2092 | msgstr "" | |
|
2093 | ||
|
2094 | msgid "" | |
|
2095 | "syntax highlighting for hgweb (requires Pygments)\n" | |
|
1717 | 2096 | "\n" |
|
1718 | 2097 | "It depends on the Pygments syntax highlighting library:\n" |
|
1719 | 2098 | "http://pygments.org/\n" |
|
1720 | 2099 | "\n" |
|
1721 | "To enable the extension add this to hgrc:\n" | |
|
1722 | "\n" | |
|
1723 | "[extensions]\n" | |
|
1724 | "hgext.highlight =\n" | |
|
1725 | "\n" | |
|
1726 | "There is a single configuration option:\n" | |
|
1727 | "\n" | |
|
1728 | "[web]\n" | |
|
1729 | "pygments_style = <style>\n" | |
|
2100 | "There is a single configuration option::\n" | |
|
2101 | "\n" | |
|
2102 | " [web]\n" | |
|
2103 | " pygments_style = <style>\n" | |
|
1730 | 2104 | "\n" |
|
1731 | 2105 | "The default is 'colorful'.\n" |
|
1732 | "\n" | |
|
1733 | "-- Adam Hupp <adam@hupp.org>\n" | |
|
1734 | msgstr "" | |
|
1735 | ||
|
1736 | msgid "inotify-based status acceleration for Linux systems\n" | |
|
2106 | msgstr "" | |
|
2107 | ||
|
2108 | msgid "accelerate status report using Linux's inotify service" | |
|
1737 | 2109 | msgstr "" |
|
1738 | 2110 | |
|
1739 | 2111 | msgid "start an inotify server for this repository" |
@@ -1761,15 +2133,12 b' msgstr ""' | |||
|
1761 | 2133 | msgid "name of file to write process ID to" |
|
1762 | 2134 | msgstr "" |
|
1763 | 2135 | |
|
1764 | msgid "hg inserve [OPT]..." | |
|
2136 | msgid "hg inserve [OPTION]..." | |
|
1765 | 2137 | msgstr "" |
|
1766 | 2138 | |
|
1767 | 2139 | msgid "(found dead inotify server socket; removing it)\n" |
|
1768 | 2140 | msgstr "" |
|
1769 | 2141 | |
|
1770 | msgid "(starting inotify server)\n" | |
|
1771 | msgstr "" | |
|
1772 | ||
|
1773 | 2142 | #, python-format |
|
1774 | 2143 | msgid "could not start inotify server: %s\n" |
|
1775 | 2144 | msgstr "" |
@@ -1778,9 +2147,6 b' msgstr ""' | |||
|
1778 | 2147 | msgid "could not talk to new inotify server: %s\n" |
|
1779 | 2148 | msgstr "" |
|
1780 | 2149 | |
|
1781 | msgid "(inotify server not running)\n" | |
|
1782 | msgstr "" | |
|
1783 | ||
|
1784 | 2150 | #, python-format |
|
1785 | 2151 | msgid "failed to contact inotify server: %s\n" |
|
1786 | 2152 | msgstr "" |
@@ -1838,10 +2204,6 b' msgid "watching directories under %r\\n"' | |||
|
1838 | 2204 | msgstr "" |
|
1839 | 2205 | |
|
1840 | 2206 | #, python-format |
|
1841 | msgid "status: %r dir(%d) -> %s\n" | |
|
1842 | msgstr "" | |
|
1843 | ||
|
1844 | #, python-format | |
|
1845 | 2207 | msgid "status: %r %s -> %s\n" |
|
1846 | 2208 | msgstr "" |
|
1847 | 2209 | |
@@ -1907,6 +2269,23 b' msgstr ""' | |||
|
1907 | 2269 | msgid "finished setup\n" |
|
1908 | 2270 | msgstr "" |
|
1909 | 2271 | |
|
2272 | msgid "" | |
|
2273 | "expand expressions into changelog and summaries\n" | |
|
2274 | "\n" | |
|
2275 | "This extension allows the use of a special syntax in summaries, which\n" | |
|
2276 | "will be automatically expanded into links or any other arbitrary\n" | |
|
2277 | "expression, much like InterWiki does.\n" | |
|
2278 | "\n" | |
|
2279 | "A few example patterns (link to bug tracking, etc.) that may be used\n" | |
|
2280 | "in your hgrc::\n" | |
|
2281 | "\n" | |
|
2282 | " [interhg]\n" | |
|
2283 | " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" | |
|
2284 | " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" | |
|
2285 | "i\n" | |
|
2286 | " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" | |
|
2287 | msgstr "" | |
|
2288 | ||
|
1910 | 2289 | #, python-format |
|
1911 | 2290 | msgid "interhg: invalid pattern for %s: %s\n" |
|
1912 | 2291 | msgstr "" |
@@ -1916,7 +2295,7 b' msgid "interhg: invalid regexp for %s: %' | |||
|
1916 | 2295 | msgstr "" |
|
1917 | 2296 | |
|
1918 | 2297 | msgid "" |
|
1919 | "keyword expansion in local repositories\n" | |
|
2298 | "expand keywords in tracked files\n" | |
|
1920 | 2299 | "\n" |
|
1921 | 2300 | "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" |
|
1922 | 2301 | "tracked text files selected by your configuration.\n" |
@@ -1928,20 +2307,22 b' msgid ""' | |||
|
1928 | 2307 | "Configuration is done in the [keyword] and [keywordmaps] sections of\n" |
|
1929 | 2308 | "hgrc files.\n" |
|
1930 | 2309 | "\n" |
|
1931 | "Example:\n" | |
|
2310 | "Example::\n" | |
|
1932 | 2311 | "\n" |
|
1933 | 2312 | " [keyword]\n" |
|
1934 | 2313 | " # expand keywords in every python file except those matching \"x*\"\n" |
|
1935 | 2314 | " **.py =\n" |
|
1936 | 2315 | " x* = ignore\n" |
|
1937 | 2316 | "\n" |
|
1938 |
"N |
|
|
1939 |
" |
|
|
2317 | "NOTE: the more specific you are in your filename patterns the less you\n" | |
|
2318 | "lose speed in huge repositories.\n" | |
|
1940 | 2319 | "\n" |
|
1941 | 2320 | "For [keywordmaps] template mapping and expansion demonstration and\n" |
|
1942 | "control run \"hg kwdemo\".\n" | |
|
1943 | "\n" | |
|
1944 | "An additional date template filter {date|utcdate} is provided.\n" | |
|
2321 | "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" | |
|
2322 | "available templates and filters.\n" | |
|
2323 | "\n" | |
|
2324 | "An additional date template filter {date|utcdate} is provided. It\n" | |
|
2325 | "returns a date like \"2006/09/18 15:13:13\".\n" | |
|
1945 | 2326 | "\n" |
|
1946 | 2327 | "The default template mappings (view with \"hg kwdemo -d\") can be\n" |
|
1947 | 2328 | "replaced with customized keywords and templates. Again, run \"hg\n" |
@@ -1960,8 +2341,8 b' msgid ""' | |||
|
1960 | 2341 | "have been checked in.\n" |
|
1961 | 2342 | "\n" |
|
1962 | 2343 | "Expansions spanning more than one line and incremental expansions,\n" |
|
1963 | "like CVS' $Log$, are not supported. A keyword template map\n" | |
|
1964 |
" |
|
|
2344 | "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" | |
|
2345 | "{desc}\" expands to the first line of the changeset description.\n" | |
|
1965 | 2346 | msgstr "" |
|
1966 | 2347 | |
|
1967 | 2348 | #, python-format |
@@ -1984,36 +2365,55 b' msgid ""' | |||
|
1984 | 2365 | " Show current, custom, or default keyword template maps and their\n" |
|
1985 | 2366 | " expansions.\n" |
|
1986 | 2367 | "\n" |
|
1987 |
" Extend current configuration by specifying maps as arguments |
|
|
1988 |
" |
|
|
1989 | "\n" | |
|
1990 | " Override current keyword template maps with \"default\" option.\n" | |
|
1991 | " " | |
|
1992 | msgstr "" | |
|
1993 | ||
|
1994 | #, python-format | |
|
1995 | msgid "" | |
|
1996 | "\n" | |
|
1997 | "\t%s\n" | |
|
2368 | " Extend the current configuration by specifying maps as arguments\n" | |
|
2369 | " and using -f/--rcfile to source an external hgrc file.\n" | |
|
2370 | "\n" | |
|
2371 | " Use -d/--default to disable current configuration.\n" | |
|
2372 | "\n" | |
|
2373 | " See \"hg help templates\" for information on templates and filters.\n" | |
|
2374 | " " | |
|
1998 | 2375 | msgstr "" |
|
1999 | 2376 | |
|
2000 | 2377 | #, python-format |
|
2001 | 2378 | msgid "creating temporary repository at %s\n" |
|
2002 | 2379 | msgstr "" |
|
2003 | 2380 | |
|
2004 | #, python-format | |
|
2005 | msgid "" | |
|
2006 | "\n" | |
|
2007 | "%s keywords written to %s:\n" | |
|
2381 | msgid "" | |
|
2382 | "\n" | |
|
2383 | "\tconfiguration using custom keyword template maps\n" | |
|
2384 | msgstr "" | |
|
2385 | ||
|
2386 | msgid "\textending current template maps\n" | |
|
2387 | msgstr "" | |
|
2388 | ||
|
2389 | msgid "\toverriding default template maps\n" | |
|
2390 | msgstr "" | |
|
2391 | ||
|
2392 | msgid "" | |
|
2393 | "\n" | |
|
2394 | "\tconfiguration using default keyword template maps\n" | |
|
2395 | msgstr "" | |
|
2396 | ||
|
2397 | msgid "\tdisabling current template maps\n" | |
|
2398 | msgstr "" | |
|
2399 | ||
|
2400 | msgid "" | |
|
2401 | "\n" | |
|
2402 | "\tconfiguration using current keyword template maps\n" | |
|
2403 | msgstr "" | |
|
2404 | ||
|
2405 | #, python-format | |
|
2406 | msgid "" | |
|
2407 | "\n" | |
|
2408 | "keywords written to %s:\n" | |
|
2008 | 2409 | msgstr "" |
|
2009 | 2410 | |
|
2010 | 2411 | msgid "unhooked all commit hooks\n" |
|
2011 | 2412 | msgstr "" |
|
2012 | 2413 | |
|
2013 | #, python-format | |
|
2014 | msgid "" | |
|
2015 | "\n" | |
|
2016 | "removing temporary repository %s\n" | |
|
2414 | msgid "" | |
|
2415 | "\n" | |
|
2416 | "\tkeywords expanded\n" | |
|
2017 | 2417 | msgstr "" |
|
2018 | 2418 | |
|
2019 | 2419 | msgid "" |
@@ -2026,11 +2426,25 b' msgid ""' | |||
|
2026 | 2426 | msgstr "" |
|
2027 | 2427 | |
|
2028 | 2428 | msgid "" |
|
2029 |
" |
|
|
2030 | "\n" | |
|
2031 |
" |
|
|
2032 | " for keyword expansion. That is, files matched by [keyword] config\n" | |
|
2033 | " patterns but not symlinks.\n" | |
|
2429 | "show files configured for keyword expansion\n" | |
|
2430 | "\n" | |
|
2431 | " List which files in the working directory are matched by the\n" | |
|
2432 | " [keyword] configuration patterns.\n" | |
|
2433 | "\n" | |
|
2434 | " Useful to prevent inadvertent keyword expansion and to speed up\n" | |
|
2435 | " execution by including only files that are actual candidates for\n" | |
|
2436 | " expansion.\n" | |
|
2437 | "\n" | |
|
2438 | " See \"hg help keyword\" on how to construct patterns both for\n" | |
|
2439 | " inclusion and exclusion of files.\n" | |
|
2440 | "\n" | |
|
2441 | " With -A/--all and -v/--verbose the codes used to show the status\n" | |
|
2442 | " of files are::\n" | |
|
2443 | "\n" | |
|
2444 | " K = keyword expansion candidate\n" | |
|
2445 | " k = keyword expansion candidate (not tracked)\n" | |
|
2446 | " I = ignored\n" | |
|
2447 | " i = ignored (not tracked)\n" | |
|
2034 | 2448 | " " |
|
2035 | 2449 | msgstr "" |
|
2036 | 2450 | |
@@ -2062,7 +2476,13 b' msgstr ""' | |||
|
2062 | 2476 | msgid "show files excluded from expansion" |
|
2063 | 2477 | msgstr "" |
|
2064 | 2478 | |
|
2065 |
msgid " |
|
|
2479 | msgid "only show unknown (not tracked) files" | |
|
2480 | msgstr "" | |
|
2481 | ||
|
2482 | msgid "show keyword status flags of all files (DEPRECATED)" | |
|
2483 | msgstr "" | |
|
2484 | ||
|
2485 | msgid "only show untracked files (DEPRECATED)" | |
|
2066 | 2486 | msgstr "" |
|
2067 | 2487 | |
|
2068 | 2488 | msgid "hg kwfiles [OPTION]... [FILE]..." |
@@ -2072,7 +2492,7 b' msgid "hg kwshrink [OPTION]... [FILE]...' | |||
|
2072 | 2492 | msgstr "" |
|
2073 | 2493 | |
|
2074 | 2494 | msgid "" |
|
2075 | "patch management and development\n" | |
|
2495 | "manage a stack of patches\n" | |
|
2076 | 2496 | "\n" |
|
2077 | 2497 | "This extension lets you work with a stack of patches in a Mercurial\n" |
|
2078 | 2498 | "repository. It manages two stacks of patches - all known patches, and\n" |
@@ -2081,19 +2501,18 b' msgid ""' | |||
|
2081 | 2501 | "Known patches are represented as patch files in the .hg/patches\n" |
|
2082 | 2502 | "directory. Applied patches are both patch files and changesets.\n" |
|
2083 | 2503 | "\n" |
|
2084 | "Common tasks (use \"hg help command\" for more details):\n" | |
|
2085 | "\n" | |
|
2086 | "prepare repository to work with patches qinit\n" | |
|
2087 | "create new patch qnew\n" | |
|
2088 | "import existing patch qimport\n" | |
|
2089 | "\n" | |
|
2090 | "print patch series qseries\n" | |
|
2091 | "print applied patches qapplied\n" | |
|
2092 | "print name of top applied patch qtop\n" | |
|
2093 | "\n" | |
|
2094 |
" |
|
|
2095 | "remove patch from applied stack qpop\n" | |
|
2096 | "refresh contents of top applied patch qrefresh\n" | |
|
2504 | "Common tasks (use \"hg help command\" for more details)::\n" | |
|
2505 | "\n" | |
|
2506 | " prepare repository to work with patches qinit\n" | |
|
2507 | " create new patch qnew\n" | |
|
2508 | " import existing patch qimport\n" | |
|
2509 | "\n" | |
|
2510 | " print patch series qseries\n" | |
|
2511 | " print applied patches qapplied\n" | |
|
2512 | "\n" | |
|
2513 | " add known patch to applied stack qpush\n" | |
|
2514 | " remove patch from applied stack qpop\n" | |
|
2515 | " refresh contents of top applied patch qrefresh\n" | |
|
2097 | 2516 | msgstr "" |
|
2098 | 2517 | |
|
2099 | 2518 | #, python-format |
@@ -2112,10 +2531,6 b' msgid "invalid character in guard %r: %r' | |||
|
2112 | 2531 | msgstr "" |
|
2113 | 2532 | |
|
2114 | 2533 | #, python-format |
|
2115 | msgid "active guards: %s\n" | |
|
2116 | msgstr "" | |
|
2117 | ||
|
2118 | #, python-format | |
|
2119 | 2534 | msgid "guard %r too short" |
|
2120 | 2535 | msgstr "" |
|
2121 | 2536 | |
@@ -2182,7 +2597,7 b' msgid "applying %s\\n"' | |||
|
2182 | 2597 | msgstr "" |
|
2183 | 2598 | |
|
2184 | 2599 | #, python-format |
|
2185 |
msgid " |
|
|
2600 | msgid "unable to read %s\n" | |
|
2186 | 2601 | msgstr "" |
|
2187 | 2602 | |
|
2188 | 2603 | #, python-format |
@@ -2213,6 +2628,10 b' msgstr ""' | |||
|
2213 | 2628 | msgid "cannot delete revision %d above applied patches" |
|
2214 | 2629 | msgstr "" |
|
2215 | 2630 | |
|
2631 | #, python-format | |
|
2632 | msgid "patch %s finalized without changeset message\n" | |
|
2633 | msgstr "" | |
|
2634 | ||
|
2216 | 2635 | msgid "qdelete requires at least one revision or patch name" |
|
2217 | 2636 | msgstr "" |
|
2218 | 2637 | |
@@ -2322,6 +2741,10 b' msgstr ""' | |||
|
2322 | 2741 | msgid "deletions found between repo revs" |
|
2323 | 2742 | msgstr "" |
|
2324 | 2743 | |
|
2744 | #, fuzzy, python-format | |
|
2745 | msgid "popping %s\n" | |
|
2746 | msgstr "合併 %s 中\n" | |
|
2747 | ||
|
2325 | 2748 | msgid "patch queue now empty\n" |
|
2326 | 2749 | msgstr "" |
|
2327 | 2750 | |
@@ -2427,24 +2850,26 b' msgstr ""' | |||
|
2427 | 2850 | msgid "" |
|
2428 | 2851 | "remove patches from queue\n" |
|
2429 | 2852 | "\n" |
|
2430 |
" The patches must not be applied, |
|
|
2431 | " -r/--rev parameter. At least one patch or revision is required.\n" | |
|
2432 | "\n" | |
|
2433 | " With --rev, mq will stop managing the named revisions (converting\n" | |
|
2434 | " them to regular Mercurial changesets). The qfinish command should\n" | |
|
2435 | " be used as an alternative for qdelete -r, as the latter option is\n" | |
|
2436 | " deprecated.\n" | |
|
2437 | "\n" | |
|
2438 | " With -k/--keep, the patch files are preserved in the patch\n" | |
|
2439 | " directory." | |
|
2853 | " The patches must not be applied, and at least one patch is required. " | |
|
2854 | "With\n" | |
|
2855 | " -k/--keep, the patch files are preserved in the patch directory.\n" | |
|
2856 | "\n" | |
|
2857 | " To stop managing a patch and move it into permanent history,\n" | |
|
2858 | " use the qfinish command." | |
|
2440 | 2859 | msgstr "" |
|
2441 | 2860 | |
|
2442 | 2861 | msgid "print the patches already applied" |
|
2443 | 2862 | msgstr "" |
|
2444 | 2863 | |
|
2864 | msgid "only one patch applied\n" | |
|
2865 | msgstr "" | |
|
2866 | ||
|
2445 | 2867 | msgid "print the patches not yet applied" |
|
2446 | 2868 | msgstr "" |
|
2447 | 2869 | |
|
2870 | msgid "all patches applied\n" | |
|
2871 | msgstr "" | |
|
2872 | ||
|
2448 | 2873 | msgid "" |
|
2449 | 2874 | "import a patch\n" |
|
2450 | 2875 | "\n" |
@@ -2528,15 +2953,9 b' msgstr ""' | |||
|
2528 | 2953 | msgid "print the name of the next patch" |
|
2529 | 2954 | msgstr "" |
|
2530 | 2955 | |
|
2531 | msgid "all patches applied\n" | |
|
2532 | msgstr "" | |
|
2533 | ||
|
2534 | 2956 | msgid "print the name of the previous patch" |
|
2535 | 2957 | msgstr "" |
|
2536 | 2958 | |
|
2537 | msgid "only one patch applied\n" | |
|
2538 | msgstr "" | |
|
2539 | ||
|
2540 | 2959 | msgid "" |
|
2541 | 2960 | "create a new patch\n" |
|
2542 | 2961 | "\n" |
@@ -2838,7 +3257,10 b' msgstr ""' | |||
|
2838 | 3257 | msgid "print first line of patch header" |
|
2839 | 3258 | msgstr "" |
|
2840 | 3259 | |
|
2841 | msgid "hg qapplied [-s] [PATCH]" | |
|
3260 | msgid "show only the last patch" | |
|
3261 | msgstr "" | |
|
3262 | ||
|
3263 | msgid "hg qapplied [-1] [-s] [PATCH]" | |
|
2842 | 3264 | msgstr "" |
|
2843 | 3265 | |
|
2844 | 3266 | msgid "use pull protocol to copy metadata" |
@@ -2865,7 +3287,7 b' msgstr ""' | |||
|
2865 | 3287 | msgid "keep patch file" |
|
2866 | 3288 | msgstr "" |
|
2867 | 3289 | |
|
2868 | msgid "stop managing a revision" | |
|
3290 | msgid "stop managing a revision (DEPRECATED)" | |
|
2869 | 3291 | msgstr "" |
|
2870 | 3292 | |
|
2871 | 3293 | msgid "hg qdelete [-k] [-r REV]... [PATCH]..." |
@@ -2955,7 +3377,7 b' msgstr ""' | |||
|
2955 | 3377 | msgid "queue name to pop" |
|
2956 | 3378 | msgstr "" |
|
2957 | 3379 | |
|
2958 | msgid "forget any local changes" | |
|
3380 | msgid "forget any local changes to patched files" | |
|
2959 | 3381 | msgstr "" |
|
2960 | 3382 | |
|
2961 | 3383 | msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" |
@@ -2982,16 +3404,16 b' msgstr ""' | |||
|
2982 | 3404 | msgid "refresh only files already in the patch and specified files" |
|
2983 | 3405 | msgstr "" |
|
2984 | 3406 | |
|
2985 |
msgid "add/update |
|
|
2986 | msgstr "" | |
|
2987 | ||
|
2988 | msgid "add/update \"From: <given user>\" in patch" | |
|
2989 | msgstr "" | |
|
2990 | ||
|
2991 | msgid "update \"Date: <current date>\" in patch (if present)" | |
|
2992 | msgstr "" | |
|
2993 | ||
|
2994 | msgid "update \"Date: <given date>\" in patch (if present)" | |
|
3407 | msgid "add/update author field in patch with current user" | |
|
3408 | msgstr "" | |
|
3409 | ||
|
3410 | msgid "add/update author field in patch with given user" | |
|
3411 | msgstr "" | |
|
3412 | ||
|
3413 | msgid "add/update date field in patch with current date" | |
|
3414 | msgstr "" | |
|
3415 | ||
|
3416 | msgid "add/update date field in patch with given date" | |
|
2995 | 3417 | msgstr "" |
|
2996 | 3418 | |
|
2997 | 3419 | msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." |
@@ -3060,77 +3482,82 b' msgstr ""' | |||
|
3060 | 3482 | msgid "hg qtop [-s]" |
|
3061 | 3483 | msgstr "" |
|
3062 | 3484 | |
|
3063 | msgid "hg qunapplied [-s] [PATCH]" | |
|
3485 | msgid "show only the first patch" | |
|
3486 | msgstr "" | |
|
3487 | ||
|
3488 | msgid "hg qunapplied [-1] [-s] [PATCH]" | |
|
3064 | 3489 | msgstr "" |
|
3065 | 3490 | |
|
3066 | 3491 | msgid "finish all applied changesets" |
|
3067 | 3492 | msgstr "" |
|
3068 | 3493 | |
|
3069 |
msgid "hg qfinish [-a] [REV... |
|
|
3070 | msgstr "" | |
|
3071 | ||
|
3072 | msgid "" | |
|
3073 |
"hook |
|
|
3074 | "\n" | |
|
3075 |
"Subscriptions can be managed through hgrc. Default mode is to |
|
|
3076 | "messages to stdout, for testing and configuring.\n" | |
|
3077 | "\n" | |
|
3078 |
"To use, configure notify extension and enable in hgrc like |
|
|
3079 | "\n" | |
|
3080 | " [extensions]\n" | |
|
3081 | " hgext.notify =\n" | |
|
3082 | "\n" | |
|
3083 | " [hooks]\n" | |
|
3084 | " # one email for each incoming changeset\n" | |
|
3085 | " incoming.notify = python:hgext.notify.hook\n" | |
|
3086 | " # batch emails when many changesets incoming at one time\n" | |
|
3087 | " changegroup.notify = python:hgext.notify.hook\n" | |
|
3088 | "\n" | |
|
3089 | " [notify]\n" | |
|
3090 | " # config items go in here\n" | |
|
3091 | "\n" | |
|
3092 | " config items:\n" | |
|
3093 | "\n" | |
|
3094 | " REQUIRED:\n" | |
|
3095 |
" |
|
|
3096 | "\n" | |
|
3097 | " OPTIONAL:\n" | |
|
3098 | " test = True # print messages to stdout for testing\n" | |
|
3099 |
" |
|
|
3100 | " domain = example.com # domain to use if committer missing domain\n" | |
|
3101 | " style = ... # style file to use when formatting email\n" | |
|
3102 |
" |
|
|
3103 |
" |
|
|
3104 |
" |
|
|
3105 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" | |
|
3106 | " maxsubject = 67 # truncate subject line longer than this\n" | |
|
3107 | " diffstat = True # add a diffstat before the diff content\n" | |
|
3108 | " sources = serve # notify if source of incoming changes in this " | |
|
3494 | msgid "hg qfinish [-a] [REV]..." | |
|
3495 | msgstr "" | |
|
3496 | ||
|
3497 | msgid "" | |
|
3498 | "hooks for sending email notifications at commit/push time\n" | |
|
3499 | "\n" | |
|
3500 | "Subscriptions can be managed through a hgrc file. Default mode is to\n" | |
|
3501 | "print messages to stdout, for testing and configuring.\n" | |
|
3502 | "\n" | |
|
3503 | "To use, configure the notify extension and enable it in hgrc like\n" | |
|
3504 | "this::\n" | |
|
3505 | "\n" | |
|
3506 | " [extensions]\n" | |
|
3507 | " hgext.notify =\n" | |
|
3508 | "\n" | |
|
3509 | " [hooks]\n" | |
|
3510 | " # one email for each incoming changeset\n" | |
|
3511 | " incoming.notify = python:hgext.notify.hook\n" | |
|
3512 | " # batch emails when many changesets incoming at one time\n" | |
|
3513 | " changegroup.notify = python:hgext.notify.hook\n" | |
|
3514 | "\n" | |
|
3515 | " [notify]\n" | |
|
3516 | " # config items go here\n" | |
|
3517 | "\n" | |
|
3518 | "Required configuration items::\n" | |
|
3519 | "\n" | |
|
3520 | " config = /path/to/file # file containing subscriptions\n" | |
|
3521 | "\n" | |
|
3522 | "Optional configuration items::\n" | |
|
3523 | "\n" | |
|
3524 | " test = True # print messages to stdout for testing\n" | |
|
3525 | " strip = 3 # number of slashes to strip for url paths\n" | |
|
3526 | " domain = example.com # domain to use if committer missing domain\n" | |
|
3527 | " style = ... # style file to use when formatting email\n" | |
|
3528 | " template = ... # template to use when formatting email\n" | |
|
3529 | " incoming = ... # template to use when run as incoming hook\n" | |
|
3530 | " changegroup = ... # template when run as changegroup hook\n" | |
|
3531 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" | |
|
3532 | " maxsubject = 67 # truncate subject line longer than this\n" | |
|
3533 | " diffstat = True # add a diffstat before the diff content\n" | |
|
3534 | " sources = serve # notify if source of incoming changes in this " | |
|
3109 | 3535 | "list\n" |
|
3110 |
" |
|
|
3111 | " [email]\n" | |
|
3112 | " from = user@host.com # email address to send as if none given\n" | |
|
3113 | " [web]\n" | |
|
3114 | " baseurl = http://hgserver/... # root of hg web site for browsing commits\n" | |
|
3115 | "\n" | |
|
3116 | " notify config file has same format as regular hgrc. it has two\n" | |
|
3117 | " sections so you can express subscriptions in whatever way is handier\n" | |
|
3118 | " for you.\n" | |
|
3119 | "\n" | |
|
3120 | " [usersubs]\n" | |
|
3121 | " # key is subscriber email, value is \",\"-separated list of glob " | |
|
3122 | "patterns\n" | |
|
3123 | " user@host = pattern\n" | |
|
3124 | "\n" | |
|
3125 | " [reposubs]\n" | |
|
3126 | " # key is glob pattern, value is \",\"-separated list of subscriber " | |
|
3127 | "emails\n" | |
|
3128 | " pattern = user@host\n" | |
|
3129 | "\n" | |
|
3130 | " glob patterns are matched against path to repository root.\n" | |
|
3131 | "\n" | |
|
3132 | " if you like, you can put notify config file in repository that users\n" | |
|
3133 | " can push changes to, they can manage their own subscriptions." | |
|
3536 | " # (serve == ssh or http, push, pull, bundle)\n" | |
|
3537 | " merge = False # send notification for merges (default True)\n" | |
|
3538 | " [email]\n" | |
|
3539 | " from = user@host.com # email address to send as if none given\n" | |
|
3540 | " [web]\n" | |
|
3541 | " baseurl = http://hgserver/... # root of hg web site for browsing commits\n" | |
|
3542 | "\n" | |
|
3543 | "The notify config file has same format as a regular hgrc file. It has\n" | |
|
3544 | "two sections so you can express subscriptions in whatever way is\n" | |
|
3545 | "handier for you.\n" | |
|
3546 | "\n" | |
|
3547 | "::\n" | |
|
3548 | "\n" | |
|
3549 | " [usersubs]\n" | |
|
3550 | " # key is subscriber email, value is \",\"-separated list of glob patterns\n" | |
|
3551 | " user@host = pattern\n" | |
|
3552 | "\n" | |
|
3553 | " [reposubs]\n" | |
|
3554 | " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" | |
|
3555 | " pattern = user@host\n" | |
|
3556 | "\n" | |
|
3557 | "Glob patterns are matched against path to repository root.\n" | |
|
3558 | "\n" | |
|
3559 | "If you like, you can put notify config file in repository that users\n" | |
|
3560 | "can push changes to, they can manage their own subscriptions.\n" | |
|
3134 | 3561 | msgstr "" |
|
3135 | 3562 | |
|
3136 | 3563 | #, python-format |
@@ -3156,17 +3583,13 b' msgid ""' | |||
|
3156 | 3583 | msgstr "" |
|
3157 | 3584 | |
|
3158 | 3585 | #, python-format |
|
3159 | msgid "notify: no subscribers to repository %s\n" | |
|
3160 | msgstr "" | |
|
3161 | ||
|
3162 | #, python-format | |
|
3163 | msgid "notify: changes have source \"%s\" - skipping\n" | |
|
3164 | msgstr "" | |
|
3165 | ||
|
3166 | msgid "" | |
|
3167 | "browse command output with external pager\n" | |
|
3168 | "\n" | |
|
3169 | "To set the pager that should be used, set the application variable:\n" | |
|
3586 | msgid "notify: suppressing notification for merge %d:%s\n" | |
|
3587 | msgstr "" | |
|
3588 | ||
|
3589 | msgid "" | |
|
3590 | "browse command output with an external pager\n" | |
|
3591 | "\n" | |
|
3592 | "To set the pager that should be used, set the application variable::\n" | |
|
3170 | 3593 | "\n" |
|
3171 | 3594 | " [pager]\n" |
|
3172 | 3595 | " pager = LESS='FSRX' less\n" |
@@ -3175,19 +3598,19 b' msgid ""' | |||
|
3175 | 3598 | "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" |
|
3176 | 3599 | "\n" |
|
3177 | 3600 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" |
|
3178 | "setting:\n" | |
|
3601 | "setting::\n" | |
|
3179 | 3602 | "\n" |
|
3180 | 3603 | " [pager]\n" |
|
3181 | 3604 | " quiet = True\n" |
|
3182 | 3605 | "\n" |
|
3183 | 3606 | "You can disable the pager for certain commands by adding them to the\n" |
|
3184 | "pager.ignore list:\n" | |
|
3607 | "pager.ignore list::\n" | |
|
3185 | 3608 | "\n" |
|
3186 | 3609 | " [pager]\n" |
|
3187 | 3610 | " ignore = version, help, update\n" |
|
3188 | 3611 | "\n" |
|
3189 | 3612 | "You can also enable the pager only for certain commands using\n" |
|
3190 | "pager.attend:\n" | |
|
3613 | "pager.attend::\n" | |
|
3191 | 3614 | "\n" |
|
3192 | 3615 | " [pager]\n" |
|
3193 | 3616 | " attend = log\n" |
@@ -3199,27 +3622,27 b' msgid ""' | |||
|
3199 | 3622 | msgstr "" |
|
3200 | 3623 | |
|
3201 | 3624 | msgid "" |
|
3202 |
" |
|
|
3625 | "interpret suffixes to refer to ancestor revisions\n" | |
|
3203 | 3626 | "\n" |
|
3204 | 3627 | "This extension allows you to use git-style suffixes to refer to the\n" |
|
3205 | 3628 | "ancestors of a specific revision.\n" |
|
3206 | 3629 | "\n" |
|
3207 | "For example, if you can refer to a revision as \"foo\", then:\n" | |
|
3208 | "\n" | |
|
3209 |
" |
|
|
3630 | "For example, if you can refer to a revision as \"foo\", then::\n" | |
|
3631 | "\n" | |
|
3632 | " foo^N = Nth parent of foo\n" | |
|
3210 | 3633 | " foo^0 = foo\n" |
|
3211 | 3634 | " foo^1 = first parent of foo\n" |
|
3212 | 3635 | " foo^2 = second parent of foo\n" |
|
3213 | 3636 | " foo^ = foo^1\n" |
|
3214 | 3637 | "\n" |
|
3215 |
" |
|
|
3638 | " foo~N = Nth first grandparent of foo\n" | |
|
3216 | 3639 | " foo~0 = foo\n" |
|
3217 | 3640 | " foo~1 = foo^1 = foo^ = first parent of foo\n" |
|
3218 | 3641 | " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" |
|
3219 | 3642 | msgstr "" |
|
3220 | 3643 | |
|
3221 | 3644 | msgid "" |
|
3222 |
" |
|
|
3645 | "command to send changesets as (a series of) patch emails\n" | |
|
3223 | 3646 | "\n" |
|
3224 | 3647 | "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" |
|
3225 | 3648 | "describes the series as a whole.\n" |
@@ -3228,11 +3651,9 b' msgid ""' | |||
|
3228 | 3651 | "first line of the changeset description as the subject text. The\n" |
|
3229 | 3652 | "message contains two or three body parts:\n" |
|
3230 | 3653 | "\n" |
|
3231 |
" |
|
|
3232 | "\n" | |
|
3233 | " [Optional] The result of running diffstat on the patch.\n" | |
|
3234 | "\n" | |
|
3235 | " The patch itself, as generated by \"hg export\".\n" | |
|
3654 | "- The changeset description.\n" | |
|
3655 | "- [Optional] The result of running diffstat on the patch.\n" | |
|
3656 | "- The patch itself, as generated by \"hg export\".\n" | |
|
3236 | 3657 | "\n" |
|
3237 | 3658 | "Each message refers to the first in the series using the In-Reply-To\n" |
|
3238 | 3659 | "and References headers, so they will show up as a sequence in threaded\n" |
@@ -3242,13 +3663,8 b' msgid ""' | |||
|
3242 | 3663 | "with a diffstat summary and the changeset summary, so you can be sure\n" |
|
3243 | 3664 | "you are sending the right changes.\n" |
|
3244 | 3665 | "\n" |
|
3245 | "To enable this extension:\n" | |
|
3246 | "\n" | |
|
3247 | " [extensions]\n" | |
|
3248 | " hgext.patchbomb =\n" | |
|
3249 | "\n" | |
|
3250 | 3666 | "To configure other defaults, add a section like this to your hgrc\n" |
|
3251 | "file:\n" | |
|
3667 | "file::\n" | |
|
3252 | 3668 | "\n" |
|
3253 | 3669 | " [email]\n" |
|
3254 | 3670 | " from = My Name <my@email>\n" |
@@ -3271,13 +3687,13 b' msgid ""' | |||
|
3271 | 3687 | "patchbomb message in a pager or sending the messages directly, it will\n" |
|
3272 | 3688 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" |
|
3273 | 3689 | "can be previewed with any mail user agent which supports UNIX mbox\n" |
|
3274 | "files, e.g. with mutt:\n" | |
|
3690 | "files, e.g. with mutt::\n" | |
|
3275 | 3691 | "\n" |
|
3276 | 3692 | " % mutt -R -f mbox\n" |
|
3277 | 3693 | "\n" |
|
3278 |
"When you are previewing the patchbomb messages, you can use `formail |
|
|
3694 | "When you are previewing the patchbomb messages, you can use ``formail``\n" | |
|
3279 | 3695 | "(a utility that is commonly installed as part of the procmail\n" |
|
3280 | "package), to send each message out:\n" | |
|
3696 | "package), to send each message out::\n" | |
|
3281 | 3697 | "\n" |
|
3282 | 3698 | " % formail -s sendmail -bm -t < mbox\n" |
|
3283 | 3699 | "\n" |
@@ -3287,7 +3703,11 b' msgid ""' | |||
|
3287 | 3703 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" |
|
3288 | 3704 | "that the patchbomb extension can automatically send patchbombs\n" |
|
3289 | 3705 | "directly from the commandline. See the [email] and [smtp] sections in\n" |
|
3290 | "hgrc(5) for details." | |
|
3706 | "hgrc(5) for details.\n" | |
|
3707 | msgstr "" | |
|
3708 | ||
|
3709 | #, python-format | |
|
3710 | msgid "%sPlease enter a valid value" | |
|
3291 | 3711 | msgstr "" |
|
3292 | 3712 | |
|
3293 | 3713 | msgid "Please enter a valid value.\n" |
@@ -3327,23 +3747,24 b' msgid ""' | |||
|
3327 | 3747 | " single email containing a binary Mercurial bundle as an attachment\n" |
|
3328 | 3748 | " will be sent.\n" |
|
3329 | 3749 | "\n" |
|
3330 | " Examples:\n" | |
|
3331 | "\n" | |
|
3332 | " hg email -r 3000 # send patch 3000 only\n" | |
|
3333 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | |
|
3334 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" | |
|
3335 | " hg email 3000 # send patch 3000 (deprecated)\n" | |
|
3336 | "\n" | |
|
3337 | " hg email -o # send all patches not in default\n" | |
|
3338 | " hg email -o DEST # send all patches not in DEST\n" | |
|
3339 | " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" | |
|
3340 | " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" | |
|
3341 | "\n" | |
|
3342 | " hg email -b # send bundle of all patches not in default\n" | |
|
3343 | " hg email -b DEST # send bundle of all patches not in DEST\n" | |
|
3344 | " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " | |
|
3750 | " Examples::\n" | |
|
3751 | "\n" | |
|
3752 | " hg email -r 3000 # send patch 3000 only\n" | |
|
3753 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" | |
|
3754 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" | |
|
3755 | " hg email 3000 # send patch 3000 (deprecated)\n" | |
|
3756 | "\n" | |
|
3757 | " hg email -o # send all patches not in default\n" | |
|
3758 | " hg email -o DEST # send all patches not in DEST\n" | |
|
3759 | " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" | |
|
3760 | " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" | |
|
3761 | "\n" | |
|
3762 | " hg email -b # send bundle of all patches not in default\n" | |
|
3763 | " hg email -b DEST # send bundle of all patches not in DEST\n" | |
|
3764 | " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " | |
|
3345 | 3765 | "default\n" |
|
3346 |
" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in |
|
|
3766 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " | |
|
3767 | "DEST\n" | |
|
3347 | 3768 | "\n" |
|
3348 | 3769 | " Before using this command, you will need to enable email in your\n" |
|
3349 | 3770 | " hgrc. See the [email] section in hgrc(5) for details.\n" |
@@ -3422,6 +3843,9 b' msgstr ""' | |||
|
3422 | 3843 | msgid "message identifier to reply to" |
|
3423 | 3844 | msgstr "" |
|
3424 | 3845 | |
|
3846 | msgid "flags to add in subject prefixes" | |
|
3847 | msgstr "" | |
|
3848 | ||
|
3425 | 3849 | msgid "email addresses of recipients" |
|
3426 | 3850 | msgstr "" |
|
3427 | 3851 | |
@@ -3452,6 +3876,9 b' msgstr ""' | |||
|
3452 | 3876 | msgid "hg email [OPTION]... [DEST]..." |
|
3453 | 3877 | msgstr "" |
|
3454 | 3878 | |
|
3879 | msgid "command to delete untracked files from the working directory" | |
|
3880 | msgstr "" | |
|
3881 | ||
|
3455 | 3882 | msgid "" |
|
3456 | 3883 | "removes files not tracked by Mercurial\n" |
|
3457 | 3884 | "\n" |
@@ -3459,13 +3886,16 b' msgid ""' | |||
|
3459 | 3886 | " and uncommitted changes in an otherwise-clean source tree.\n" |
|
3460 | 3887 | "\n" |
|
3461 | 3888 | " This means that purge will delete:\n" |
|
3462 | " - Unknown files: files marked with \"?\" by \"hg status\"\n" | |
|
3463 | " - Empty directories: in fact Mercurial ignores directories unless\n" | |
|
3464 | " they contain files under source control management\n" | |
|
3889 | "\n" | |
|
3890 | " - Unknown files: files marked with \"?\" by \"hg status\"\n" | |
|
3891 | " - Empty directories: in fact Mercurial ignores directories unless\n" | |
|
3892 | " they contain files under source control management\n" | |
|
3893 | "\n" | |
|
3465 | 3894 | " But it will leave untouched:\n" |
|
3466 | " - Modified and unmodified tracked files\n" | |
|
3467 | " - Ignored files (unless --all is specified)\n" | |
|
3468 | " - New files added to the repository (with \"hg add\")\n" | |
|
3895 | "\n" | |
|
3896 | " - Modified and unmodified tracked files\n" | |
|
3897 | " - Ignored files (unless --all is specified)\n" | |
|
3898 | " - New files added to the repository (with \"hg add\")\n" | |
|
3469 | 3899 | "\n" |
|
3470 | 3900 | " If directories are given on the command line, only files in these\n" |
|
3471 | 3901 | " directories are considered.\n" |
@@ -3509,16 +3939,13 b' msgid "hg purge [OPTION]... [DIR]..."' | |||
|
3509 | 3939 | msgstr "" |
|
3510 | 3940 | |
|
3511 | 3941 | msgid "" |
|
3512 | "move sets of revisions to a different ancestor\n" | |
|
3942 | "command to move sets of revisions to a different ancestor\n" | |
|
3513 | 3943 | "\n" |
|
3514 | 3944 | "This extension lets you rebase changesets in an existing Mercurial\n" |
|
3515 | 3945 | "repository.\n" |
|
3516 | 3946 | "\n" |
|
3517 | 3947 | "For more information:\n" |
|
3518 |
"http:// |
|
|
3519 | msgstr "" | |
|
3520 | ||
|
3521 | msgid "first revision, do not change ancestor\n" | |
|
3948 | "http://mercurial.selenic.com/wiki/RebaseExtension\n" | |
|
3522 | 3949 | msgstr "" |
|
3523 | 3950 | |
|
3524 | 3951 | msgid "" |
@@ -3564,60 +3991,17 b' msgstr ""' | |||
|
3564 | 3991 | msgid "%d revisions have been skipped\n" |
|
3565 | 3992 | msgstr "" |
|
3566 | 3993 | |
|
3567 | msgid " set parents\n" | |
|
3568 | msgstr "" | |
|
3569 | ||
|
3570 | #, python-format | |
|
3571 | msgid "rebasing %d:%s\n" | |
|
3572 | msgstr "" | |
|
3573 | ||
|
3574 | #, python-format | |
|
3575 | msgid " future parents are %d and %d\n" | |
|
3576 | msgstr "" | |
|
3577 | ||
|
3578 | #, python-format | |
|
3579 | msgid " update to %d:%s\n" | |
|
3580 | msgstr "" | |
|
3581 | ||
|
3582 | msgid " already in target\n" | |
|
3583 | msgstr "" | |
|
3584 | ||
|
3585 | #, python-format | |
|
3586 | msgid " merge against %d:%s\n" | |
|
3587 | msgstr "" | |
|
3588 | ||
|
3589 | 3994 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" |
|
3590 | 3995 | msgstr "" |
|
3591 | 3996 | |
|
3592 | msgid "resuming interrupted rebase\n" | |
|
3593 | msgstr "" | |
|
3594 | ||
|
3595 | 3997 | #, python-format |
|
3596 | 3998 | msgid "no changes, revision %d skipped\n" |
|
3597 | 3999 | msgstr "" |
|
3598 | 4000 | |
|
3599 | 4001 | #, python-format |
|
3600 | msgid "next revision set to %s\n" | |
|
3601 | msgstr "" | |
|
3602 | ||
|
3603 | #, python-format | |
|
3604 | 4002 | msgid "cannot use revision %d as base, result would have 3 parents" |
|
3605 | 4003 | msgstr "" |
|
3606 | 4004 | |
|
3607 | #, python-format | |
|
3608 | msgid "revision %d is an mq patch (%s), finalize it.\n" | |
|
3609 | msgstr "" | |
|
3610 | ||
|
3611 | #, python-format | |
|
3612 | msgid "import mq patch %d (%s)\n" | |
|
3613 | msgstr "" | |
|
3614 | ||
|
3615 | msgid "rebase status stored\n" | |
|
3616 | msgstr "" | |
|
3617 | ||
|
3618 | msgid "rebase status resumed\n" | |
|
3619 | msgstr "" | |
|
3620 | ||
|
3621 | 4005 | msgid "no rebase in progress" |
|
3622 | 4006 | msgstr "" |
|
3623 | 4007 | |
@@ -3630,28 +4014,15 b' msgstr ""' | |||
|
3630 | 4014 | msgid "cannot rebase onto an applied mq patch" |
|
3631 | 4015 | msgstr "" |
|
3632 | 4016 | |
|
3633 | msgid "cannot rebase an ancestor" | |
|
3634 | msgstr "" | |
|
3635 | ||
|
3636 | msgid "cannot rebase a descendant" | |
|
3637 | msgstr "" | |
|
3638 | ||
|
3639 | msgid "already working on current\n" | |
|
3640 | msgstr "" | |
|
3641 | ||
|
3642 | msgid "already working on the current branch\n" | |
|
3643 | msgstr "" | |
|
3644 | ||
|
3645 | #, python-format | |
|
3646 | msgid "rebase onto %d starting from %d\n" | |
|
4017 | msgid "source is ancestor of destination" | |
|
4018 | msgstr "" | |
|
4019 | ||
|
4020 | msgid "source is descendant of destination" | |
|
3647 | 4021 | msgstr "" |
|
3648 | 4022 | |
|
3649 | 4023 | msgid "unable to collapse, there is more than one external parent" |
|
3650 | 4024 | msgstr "" |
|
3651 | 4025 | |
|
3652 | msgid "--update and --rebase are not compatible, ignoring the update flag\n" | |
|
3653 | msgstr "" | |
|
3654 | ||
|
3655 | 4026 | msgid "rebase working directory to branch head" |
|
3656 | 4027 | msgstr "" |
|
3657 | 4028 | |
@@ -3664,13 +4035,13 b' msgstr ""' | |||
|
3664 | 4035 | msgid "rebase onto a given revision" |
|
3665 | 4036 | msgstr "" |
|
3666 | 4037 | |
|
3667 |
msgid "collapse the rebased |
|
|
3668 | msgstr "" | |
|
3669 | ||
|
3670 |
msgid "keep original |
|
|
3671 | msgstr "" | |
|
3672 | ||
|
3673 | msgid "keep original branches" | |
|
4038 | msgid "collapse the rebased changesets" | |
|
4039 | msgstr "" | |
|
4040 | ||
|
4041 | msgid "keep original changesets" | |
|
4042 | msgstr "" | |
|
4043 | ||
|
4044 | msgid "keep original branch names" | |
|
3674 | 4045 | msgstr "" |
|
3675 | 4046 | |
|
3676 | 4047 | msgid "continue an interrupted rebase" |
@@ -3684,7 +4055,7 b' msgid ""' | |||
|
3684 | 4055 | "| [-c] | [-a]" |
|
3685 | 4056 | msgstr "" |
|
3686 | 4057 | |
|
3687 |
msgid "interactive |
|
|
4058 | msgid "commands to interactively select changes for commit/qrefresh" | |
|
3688 | 4059 | msgstr "" |
|
3689 | 4060 | |
|
3690 | 4061 | msgid "this modifies a binary file (all or nothing)\n" |
@@ -3724,30 +4095,9 b' msgstr ""' | |||
|
3724 | 4095 | msgid "&?" |
|
3725 | 4096 | msgstr "" |
|
3726 | 4097 | |
|
3727 | msgid "y" | |
|
3728 | msgstr "" | |
|
3729 | ||
|
3730 | msgid "?" | |
|
3731 | msgstr "" | |
|
3732 | ||
|
3733 | 4098 | msgid "y - record this change" |
|
3734 | 4099 | msgstr "" |
|
3735 | 4100 | |
|
3736 | msgid "s" | |
|
3737 | msgstr "" | |
|
3738 | ||
|
3739 | msgid "f" | |
|
3740 | msgstr "" | |
|
3741 | ||
|
3742 | msgid "d" | |
|
3743 | msgstr "" | |
|
3744 | ||
|
3745 | msgid "a" | |
|
3746 | msgstr "" | |
|
3747 | ||
|
3748 | msgid "q" | |
|
3749 | msgstr "" | |
|
3750 | ||
|
3751 | 4101 | msgid "user quit" |
|
3752 | 4102 | msgstr "" |
|
3753 | 4103 | |
@@ -3758,6 +4108,9 b' msgstr ""' | |||
|
3758 | 4108 | msgid " and " |
|
3759 | 4109 | msgstr "" |
|
3760 | 4110 | |
|
4111 | msgid "y" | |
|
4112 | msgstr "" | |
|
4113 | ||
|
3761 | 4114 | #, python-format |
|
3762 | 4115 | msgid "record this change to %r?" |
|
3763 | 4116 | msgstr "" |
@@ -3777,19 +4130,19 b' msgid ""' | |||
|
3777 | 4130 | " You will be prompted for whether to record changes to each\n" |
|
3778 | 4131 | " modified file, and for files with multiple changes, for each\n" |
|
3779 | 4132 | " change to use. For each query, the following responses are\n" |
|
3780 | " possible:\n" | |
|
3781 | "\n" | |
|
3782 | " y - record this change\n" | |
|
3783 | " n - skip this change\n" | |
|
3784 | "\n" | |
|
3785 | " s - skip remaining changes to this file\n" | |
|
3786 | " f - record remaining changes to this file\n" | |
|
3787 | "\n" | |
|
3788 | " d - done, skip remaining changes and files\n" | |
|
3789 | " a - record all changes to all remaining files\n" | |
|
3790 | " q - quit, recording no changes\n" | |
|
3791 | "\n" | |
|
3792 | " ? - display help" | |
|
4133 | " possible::\n" | |
|
4134 | "\n" | |
|
4135 | " y - record this change\n" | |
|
4136 | " n - skip this change\n" | |
|
4137 | "\n" | |
|
4138 | " s - skip remaining changes to this file\n" | |
|
4139 | " f - record remaining changes to this file\n" | |
|
4140 | "\n" | |
|
4141 | " d - done, skip remaining changes and files\n" | |
|
4142 | " a - record all changes to all remaining files\n" | |
|
4143 | " q - quit, recording no changes\n" | |
|
4144 | "\n" | |
|
4145 | " ? - display help" | |
|
3793 | 4146 | msgstr "" |
|
3794 | 4147 | |
|
3795 | 4148 | msgid "'mq' extension not loaded" |
@@ -3801,26 +4154,18 b' msgstr ""' | |||
|
3801 | 4154 | msgid "no changes to record\n" |
|
3802 | 4155 | msgstr "" |
|
3803 | 4156 | |
|
3804 | #, python-format | |
|
3805 | msgid "backup %r as %r\n" | |
|
3806 | msgstr "" | |
|
3807 | ||
|
3808 | msgid "applying patch\n" | |
|
3809 | msgstr "" | |
|
3810 | ||
|
3811 | 4157 | msgid "patch failed to apply" |
|
3812 | 4158 | msgstr "" |
|
3813 | 4159 | |
|
3814 | #, python-format | |
|
3815 | msgid "restoring %r to %r\n" | |
|
3816 | msgstr "" | |
|
3817 | ||
|
3818 | 4160 | msgid "hg record [OPTION]... [FILE]..." |
|
3819 | 4161 | msgstr "" |
|
3820 | 4162 | |
|
3821 | 4163 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
3822 | 4164 | msgstr "" |
|
3823 | 4165 | |
|
4166 | msgid "share a common history between several working directories" | |
|
4167 | msgstr "" | |
|
4168 | ||
|
3824 | 4169 | msgid "" |
|
3825 | 4170 | "create a new shared repository (experimental)\n" |
|
3826 | 4171 | "\n" |
@@ -3839,7 +4184,7 b' msgid "[-U] SOURCE [DEST]"' | |||
|
3839 | 4184 | msgstr "" |
|
3840 | 4185 | |
|
3841 | 4186 | msgid "" |
|
3842 | "patch transplanting tool\n" | |
|
4187 | "command to transplant changesets from another branch\n" | |
|
3843 | 4188 | "\n" |
|
3844 | 4189 | "This extension allows you to transplant patches from another branch.\n" |
|
3845 | 4190 | "\n" |
@@ -3902,9 +4247,9 b' msgid ""' | |||
|
3902 | 4247 | "\n" |
|
3903 | 4248 | " Selected changesets will be applied on top of the current working\n" |
|
3904 | 4249 | " directory with the log of the original changeset. If --log is\n" |
|
3905 | " specified, log messages will have a comment appended of the form:\n" | |
|
3906 | "\n" | |
|
3907 | " (transplanted from CHANGESETHASH)\n" | |
|
4250 | " specified, log messages will have a comment appended of the form::\n" | |
|
4251 | "\n" | |
|
4252 | " (transplanted from CHANGESETHASH)\n" | |
|
3908 | 4253 | "\n" |
|
3909 | 4254 | " You can rewrite the changelog message with the --filter option.\n" |
|
3910 | 4255 | " Its argument will be invoked with the current changelog message as\n" |
@@ -3985,7 +4330,7 b' msgid ""' | |||
|
3985 | 4330 | msgstr "" |
|
3986 | 4331 | |
|
3987 | 4332 | msgid "" |
|
3988 |
"allow t |
|
|
4333 | "allow the use of MBCS paths with problematic encodings\n" | |
|
3989 | 4334 | "\n" |
|
3990 | 4335 | "Some MBCS encodings are not good for some path operations (i.e.\n" |
|
3991 | 4336 | "splitting path, case conversion, etc.) with its encoded bytes. We call\n" |
@@ -3995,40 +4340,63 b' msgid ""' | |||
|
3995 | 4340 | "operation.\n" |
|
3996 | 4341 | "\n" |
|
3997 | 4342 | "This extension is useful for:\n" |
|
3998 | " * Japanese Windows users using shift_jis encoding.\n" | |
|
3999 |
" |
|
|
4000 | " * All users who use a repository with one of problematic encodings on\n" | |
|
4001 | " case-insensitive file system.\n" | |
|
4343 | "\n" | |
|
4344 | "- Japanese Windows users using shift_jis encoding.\n" | |
|
4345 | "- Chinese Windows users using big5 encoding.\n" | |
|
4346 | "- All users who use a repository with one of problematic encodings on\n" | |
|
4347 | " case-insensitive file system.\n" | |
|
4002 | 4348 | "\n" |
|
4003 | 4349 | "This extension is not needed for:\n" |
|
4004 | " * Any user who use only ASCII chars in path.\n" | |
|
4005 | " * Any user who do not use any of problematic encodings.\n" | |
|
4350 | "\n" | |
|
4351 | "- Any user who use only ASCII chars in path.\n" | |
|
4352 | "- Any user who do not use any of problematic encodings.\n" | |
|
4006 | 4353 | "\n" |
|
4007 | 4354 | "Note that there are some limitations on using this extension:\n" |
|
4008 | " * You should use single encoding in one repository.\n" | |
|
4009 |
" |
|
|
4010 | " HGENCODING.\n" | |
|
4011 | "\n" | |
|
4012 | "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" | |
|
4013 | "\n" | |
|
4014 | " [extensions]\n" | |
|
4015 | " hgext.win32mbcs =\n" | |
|
4355 | "\n" | |
|
4356 | "- You should use single encoding in one repository.\n" | |
|
4357 | "- You should set same encoding for the repository by locale or\n" | |
|
4358 | " HGENCODING.\n" | |
|
4016 | 4359 | "\n" |
|
4017 | 4360 | "Path encoding conversion are done between Unicode and\n" |
|
4018 | 4361 | "encoding.encoding which is decided by Mercurial from current locale\n" |
|
4019 | 4362 | "setting or HGENCODING.\n" |
|
4020 | "\n" | |
|
4021 | msgstr "" | |
|
4022 | ||
|
4023 | #, python-format | |
|
4024 | msgid "[win32mbcs] filename conversion fail with %s encoding\n" | |
|
4363 | msgstr "" | |
|
4364 | ||
|
4365 | #, python-format | |
|
4366 | msgid "[win32mbcs] filename conversion failed with %s encoding\n" | |
|
4025 | 4367 | msgstr "" |
|
4026 | 4368 | |
|
4027 | 4369 | msgid "[win32mbcs] cannot activate on this platform.\n" |
|
4028 | 4370 | msgstr "" |
|
4029 | 4371 | |
|
4030 | #, python-format | |
|
4031 | msgid "[win32mbcs] activated with encoding: %s\n" | |
|
4372 | msgid "" | |
|
4373 | "perform automatic newline conversion\n" | |
|
4374 | "\n" | |
|
4375 | "To perform automatic newline conversion, use::\n" | |
|
4376 | "\n" | |
|
4377 | " [extensions]\n" | |
|
4378 | " hgext.win32text =\n" | |
|
4379 | " [encode]\n" | |
|
4380 | " ** = cleverencode:\n" | |
|
4381 | " # or ** = macencode:\n" | |
|
4382 | "\n" | |
|
4383 | " [decode]\n" | |
|
4384 | " ** = cleverdecode:\n" | |
|
4385 | " # or ** = macdecode:\n" | |
|
4386 | "\n" | |
|
4387 | "If not doing conversion, to make sure you do not commit CRLF/CR by " | |
|
4388 | "accident::\n" | |
|
4389 | "\n" | |
|
4390 | " [hooks]\n" | |
|
4391 | " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" | |
|
4392 | " # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" | |
|
4393 | "\n" | |
|
4394 | "To do the same check on a server to prevent CRLF/CR from being\n" | |
|
4395 | "pushed or pulled::\n" | |
|
4396 | "\n" | |
|
4397 | " [hooks]\n" | |
|
4398 | " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" | |
|
4399 | " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" | |
|
4032 | 4400 | msgstr "" |
|
4033 | 4401 | |
|
4034 | 4402 | #, python-format |
@@ -4067,28 +4435,22 b' msgid ""' | |||
|
4067 | 4435 | msgstr "" |
|
4068 | 4436 | |
|
4069 | 4437 | msgid "" |
|
4070 | "zeroconf support for Mercurial repositories\n" | |
|
4438 | "discover and advertise repositories on the local network\n" | |
|
4071 | 4439 | "\n" |
|
4072 | 4440 | "Zeroconf enabled repositories will be announced in a network without\n" |
|
4073 | 4441 | "the need to configure a server or a service. They can be discovered\n" |
|
4074 | 4442 | "without knowing their actual IP address.\n" |
|
4075 | 4443 | "\n" |
|
4076 | "To use the zeroconf extension add the following entry to your hgrc\n" | |
|
4077 | "file:\n" | |
|
4078 | "\n" | |
|
4079 | "[extensions]\n" | |
|
4080 | "hgext.zeroconf =\n" | |
|
4081 | "\n" | |
|
4082 | 4444 | "To allow other people to discover your repository using run \"hg serve\"\n" |
|
4083 |
"in your repository |
|
|
4084 | "\n" | |
|
4085 | " $ cd test\n" | |
|
4086 | " $ hg serve\n" | |
|
4087 | "\n" | |
|
4088 |
"You can discover zeroconf enabled repositories by running \"hg paths\" |
|
|
4089 | "\n" | |
|
4090 | " $ hg paths\n" | |
|
4091 | " zc-test = http://example.com:8000/test\n" | |
|
4445 | "in your repository::\n" | |
|
4446 | "\n" | |
|
4447 | " $ cd test\n" | |
|
4448 | " $ hg serve\n" | |
|
4449 | "\n" | |
|
4450 | "You can discover zeroconf enabled repositories by running \"hg paths\"::\n" | |
|
4451 | "\n" | |
|
4452 | " $ hg paths\n" | |
|
4453 | " zc-test = http://example.com:8000/test\n" | |
|
4092 | 4454 | msgstr "" |
|
4093 | 4455 | |
|
4094 | 4456 | msgid "archive prefix contains illegal components" |
@@ -4324,6 +4686,10 b' msgid "HG: branch \'%s\'"' | |||
|
4324 | 4686 | msgstr "" |
|
4325 | 4687 | |
|
4326 | 4688 | #, python-format |
|
4689 | msgid "HG: subrepo %s" | |
|
4690 | msgstr "" | |
|
4691 | ||
|
4692 | #, python-format | |
|
4327 | 4693 | msgid "HG: added %s" |
|
4328 | 4694 | msgstr "" |
|
4329 | 4695 | |
@@ -4341,6 +4707,7 b' msgstr ""' | |||
|
4341 | 4707 | msgid "empty commit message" |
|
4342 | 4708 | msgstr "" |
|
4343 | 4709 | |
|
4710 | #, fuzzy | |
|
4344 | 4711 | msgid "" |
|
4345 | 4712 | "add the specified files on the next commit\n" |
|
4346 | 4713 | "\n" |
@@ -4348,7 +4715,7 b' msgid ""' | |||
|
4348 | 4715 | " repository.\n" |
|
4349 | 4716 | "\n" |
|
4350 | 4717 | " The files will be added to the repository at the next commit. To\n" |
|
4351 |
" undo an add before that, see hg |
|
|
4718 | " undo an add before that, see hg forget.\n" | |
|
4352 | 4719 | "\n" |
|
4353 | 4720 | " If no names are given, add all files to the repository.\n" |
|
4354 | 4721 | " " |
@@ -4363,6 +4730,7 b' msgstr ""' | |||
|
4363 | 4730 | " 如果沒有指定檔案,則會將所有的檔案都標示為加到 repository。\n" |
|
4364 | 4731 | " " |
|
4365 | 4732 | |
|
4733 | #, fuzzy | |
|
4366 | 4734 | msgid "" |
|
4367 | 4735 | "add all new files, delete all missing files\n" |
|
4368 | 4736 | "\n" |
@@ -4374,11 +4742,11 b' msgid ""' | |||
|
4374 | 4742 | " commit.\n" |
|
4375 | 4743 | "\n" |
|
4376 | 4744 | " Use the -s/--similarity option to detect renamed files. With a\n" |
|
4377 |
" parameter |
|
|
4378 |
" file and records those similar enough as renames. This |
|
|
4379 |
" takes a percentage between 0 (disabled) and 100 (files must |
|
|
4380 |
" identical) as its parameter. Detecting renamed files this way |
|
|
4381 | " be expensive.\n" | |
|
4745 | " parameter greater than 0, this compares every removed file with\n" | |
|
4746 | " every added file and records those similar enough as renames. This\n" | |
|
4747 | " option takes a percentage between 0 (disabled) and 100 (files must\n" | |
|
4748 | " be identical) as its parameter. Detecting renamed files this way\n" | |
|
4749 | " can be expensive.\n" | |
|
4382 | 4750 | " " |
|
4383 | 4751 | msgstr "" |
|
4384 | 4752 | "新增所有未受版本控制的檔案,並刪除所有消失的檔案。\n" |
@@ -4441,6 +4809,7 b' msgstr ""' | |||
|
4441 | 4809 | msgid "%s: binary file\n" |
|
4442 | 4810 | msgstr "" |
|
4443 | 4811 | |
|
4812 | #, fuzzy | |
|
4444 | 4813 | msgid "" |
|
4445 | 4814 | "create an unversioned archive of a repository revision\n" |
|
4446 | 4815 | "\n" |
@@ -4448,14 +4817,14 b' msgid ""' | |||
|
4448 | 4817 | " directory; use -r/--rev to specify a different revision.\n" |
|
4449 | 4818 | "\n" |
|
4450 | 4819 | " To specify the type of archive to create, use -t/--type. Valid\n" |
|
4451 | " types are:\n" | |
|
4452 | "\n" | |
|
4453 | " \"files\" (default): a directory full of files\n" | |
|
4454 | " \"tar\": tar archive, uncompressed\n" | |
|
4455 | " \"tbz2\": tar archive, compressed using bzip2\n" | |
|
4456 | " \"tgz\": tar archive, compressed using gzip\n" | |
|
4457 | " \"uzip\": zip archive, uncompressed\n" | |
|
4458 | " \"zip\": zip archive, compressed using deflate\n" | |
|
4820 | " types are::\n" | |
|
4821 | "\n" | |
|
4822 | " \"files\" (default): a directory full of files\n" | |
|
4823 | " \"tar\": tar archive, uncompressed\n" | |
|
4824 | " \"tbz2\": tar archive, compressed using bzip2\n" | |
|
4825 | " \"tgz\": tar archive, compressed using gzip\n" | |
|
4826 | " \"uzip\": zip archive, uncompressed\n" | |
|
4827 | " \"zip\": zip archive, compressed using deflate\n" | |
|
4459 | 4828 | "\n" |
|
4460 | 4829 | " The exact name of the destination archive or directory is given\n" |
|
4461 | 4830 | " using a format string; see 'hg help export' for details.\n" |
@@ -4557,10 +4926,6 b' msgid "cannot use --parent on non-merge ' | |||
|
4557 | 4926 | msgstr "" |
|
4558 | 4927 | |
|
4559 | 4928 | #, python-format |
|
4560 | msgid "Backed out changeset %s" | |
|
4561 | msgstr "" | |
|
4562 | ||
|
4563 | #, python-format | |
|
4564 | 4929 | msgid "changeset %s backs out changeset %s\n" |
|
4565 | 4930 | msgstr "" |
|
4566 | 4931 | |
@@ -4642,10 +5007,6 b' msgid "incompatible arguments"' | |||
|
4642 | 5007 | msgstr "" |
|
4643 | 5008 | |
|
4644 | 5009 | #, python-format |
|
4645 | msgid "cannot find executable: %s" | |
|
4646 | msgstr "" | |
|
4647 | ||
|
4648 | #, python-format | |
|
4649 | 5010 | msgid "failed to execute %s" |
|
4650 | 5011 | msgstr "" |
|
4651 | 5012 | |
@@ -4658,9 +5019,10 b' msgid "Changeset %d:%s: %s\\n"' | |||
|
4658 | 5019 | msgstr "" |
|
4659 | 5020 | |
|
4660 | 5021 | #, python-format |
|
4661 |
msgid "Testing changeset % |
|
|
4662 | msgstr "" | |
|
4663 | ||
|
5022 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" | |
|
5023 | msgstr "" | |
|
5024 | ||
|
5025 | #, fuzzy | |
|
4664 | 5026 | msgid "" |
|
4665 | 5027 | "set or show the current branch name\n" |
|
4666 | 5028 | "\n" |
@@ -4677,7 +5039,8 b' msgid ""' | |||
|
4677 | 5039 | " the parent of the working directory, negating a previous branch\n" |
|
4678 | 5040 | " change.\n" |
|
4679 | 5041 | "\n" |
|
4680 | " Use the command 'hg update' to switch to an existing branch.\n" | |
|
5042 | " Use the command 'hg update' to switch to an existing branch. Use\n" | |
|
5043 | " 'hg commit --close-branch' to mark this branch as closed.\n" | |
|
4681 | 5044 | " " |
|
4682 | 5045 | msgstr "" |
|
4683 | 5046 | "設定或顯示目前的 branch 名稱\n" |
@@ -4709,13 +5072,16 b' msgstr ""' | |||
|
4709 | 5072 | msgid "marked working directory as branch %s\n" |
|
4710 | 5073 | msgstr "" |
|
4711 | 5074 | |
|
5075 | #, fuzzy | |
|
4712 | 5076 | msgid "" |
|
4713 | 5077 | "list repository named branches\n" |
|
4714 | 5078 | "\n" |
|
4715 | 5079 | " List the repository's named branches, indicating which ones are\n" |
|
4716 |
" inactive. If |
|
|
4717 | "\n" | |
|
4718 | " A branch is considered active if it contains repository heads.\n" | |
|
5080 | " inactive. If -c/--closed is specified, also list branches which have\n" | |
|
5081 | " been marked closed (see hg commit --close-branch).\n" | |
|
5082 | "\n" | |
|
5083 | " If -a/--active is specified, only show active branches. A branch\n" | |
|
5084 | " is considered active if it contains repository heads.\n" | |
|
4719 | 5085 | "\n" |
|
4720 | 5086 | " Use the command 'hg update' to switch to an existing branch.\n" |
|
4721 | 5087 | " " |
@@ -4730,6 +5096,7 b' msgstr ""' | |||
|
4730 | 5096 | " Use the command 'hg update' to switch to an existing branch.\n" |
|
4731 | 5097 | " " |
|
4732 | 5098 | |
|
5099 | #, fuzzy | |
|
4733 | 5100 | msgid "" |
|
4734 | 5101 | "create a changegroup file\n" |
|
4735 | 5102 | "\n" |
@@ -4739,9 +5106,11 b' msgid ""' | |||
|
4739 | 5106 | " If no destination repository is specified the destination is\n" |
|
4740 | 5107 | " assumed to have all the nodes specified by one or more --base\n" |
|
4741 | 5108 | " parameters. To create a bundle containing all changesets, use\n" |
|
4742 |
" -a/--all (or --base null). |
|
|
4743 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
4744 | " compressed using bz2).\n" | |
|
5109 | " -a/--all (or --base null).\n" | |
|
5110 | "\n" | |
|
5111 | " You can change compression method with the -t/--type option.\n" | |
|
5112 | " The available compression methods are: none, bzip2, and\n" | |
|
5113 | " gzip (by default, bundles are compressed using bzip2).\n" | |
|
4745 | 5114 | "\n" |
|
4746 | 5115 | " The bundle file can then be transferred using conventional means\n" |
|
4747 | 5116 | " and applied to another repository with the unbundle or pull\n" |
@@ -4779,6 +5148,7 b' msgstr ""' | |||
|
4779 | 5148 | msgid "unknown bundle type specified with --type" |
|
4780 | 5149 | msgstr "" |
|
4781 | 5150 | |
|
5151 | #, fuzzy | |
|
4782 | 5152 | msgid "" |
|
4783 | 5153 | "output the current or given revision of files\n" |
|
4784 | 5154 | "\n" |
@@ -4788,11 +5158,11 b' msgid ""' | |||
|
4788 | 5158 | "\n" |
|
4789 | 5159 | " Output may be to a file, in which case the name of the file is\n" |
|
4790 | 5160 | " given using a format string. The formatting rules are the same as\n" |
|
4791 | " for the export command, with the following additions:\n" | |
|
4792 | "\n" | |
|
4793 | " %s basename of file being printed\n" | |
|
4794 | " %d dirname of file being printed, or '.' if in repository root\n" | |
|
4795 | " %p root-relative path name of file being printed\n" | |
|
5161 | " for the export command, with the following additions::\n" | |
|
5162 | "\n" | |
|
5163 | " %s basename of file being printed\n" | |
|
5164 | " %d dirname of file being printed, or '.' if in repository root\n" | |
|
5165 | " %p root-relative path name of file being printed\n" | |
|
4796 | 5166 | " " |
|
4797 | 5167 | msgstr "" |
|
4798 | 5168 | "輸出目前或是特定 revision 的檔案內容\n" |
@@ -4810,6 +5180,7 b' msgstr ""' | |||
|
4810 | 5180 | " %p root-relative path name of file being printed\n" |
|
4811 | 5181 | " " |
|
4812 | 5182 | |
|
5183 | #, fuzzy | |
|
4813 | 5184 | msgid "" |
|
4814 | 5185 | "make a copy of an existing repository\n" |
|
4815 | 5186 | "\n" |
@@ -4845,7 +5216,7 b' msgid ""' | |||
|
4845 | 5216 | " avoid hardlinking.\n" |
|
4846 | 5217 | "\n" |
|
4847 | 5218 | " In some cases, you can clone repositories and checked out files\n" |
|
4848 | " using full hardlinks with\n" | |
|
5219 | " using full hardlinks with ::\n" | |
|
4849 | 5220 | "\n" |
|
4850 | 5221 | " $ cp -al REPO REPOCLONE\n" |
|
4851 | 5222 | "\n" |
@@ -4855,7 +5226,6 b' msgid ""' | |||
|
4855 | 5226 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
|
4856 | 5227 | " this is not compatible with certain extensions that place their\n" |
|
4857 | 5228 | " metadata under the .hg directory, such as mq.\n" |
|
4858 | "\n" | |
|
4859 | 5229 | " " |
|
4860 | 5230 | msgstr "" |
|
4861 | 5231 | "對已存在的 repository 複製一份\n" |
@@ -4942,6 +5312,9 b' msgstr ""' | |||
|
4942 | 5312 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
4943 | 5313 | " " |
|
4944 | 5314 | |
|
5315 | msgid "nothing changed\n" | |
|
5316 | msgstr "" | |
|
5317 | ||
|
4945 | 5318 | msgid "created new head\n" |
|
4946 | 5319 | msgstr "" |
|
4947 | 5320 | |
@@ -5121,8 +5494,8 b' msgid ""' | |||
|
5121 | 5494 | msgstr "" |
|
5122 | 5495 | |
|
5123 | 5496 | msgid "" |
|
5124 |
" Internal patcher failure, please report this error to http:// |
|
|
5125 | "com/mercurial/bts\n" | |
|
5497 | " Internal patcher failure, please report this error to http://mercurial." | |
|
5498 | "selenic.com/bts/\n" | |
|
5126 | 5499 | msgstr "" |
|
5127 | 5500 | |
|
5128 | 5501 | msgid "Checking commit editor...\n" |
@@ -5214,6 +5587,7 b' msgstr ""' | |||
|
5214 | 5587 | " format. For more information, read 'hg help diffs'.\n" |
|
5215 | 5588 | " " |
|
5216 | 5589 | |
|
5590 | #, fuzzy | |
|
5217 | 5591 | msgid "" |
|
5218 | 5592 | "dump the header and diffs for one or more changesets\n" |
|
5219 | 5593 | "\n" |
@@ -5227,16 +5601,16 b' msgid ""' | |||
|
5227 | 5601 | " first parent only.\n" |
|
5228 | 5602 | "\n" |
|
5229 | 5603 | " Output may be to a file, in which case the name of the file is\n" |
|
5230 | " given using a format string. The formatting rules are as follows:\n" | |
|
5231 | "\n" | |
|
5232 | " %% literal \"%\" character\n" | |
|
5233 | " %H changeset hash (40 bytes of hexadecimal)\n" | |
|
5234 | " %N number of patches being generated\n" | |
|
5235 | " %R changeset revision number\n" | |
|
5236 | " %b basename of the exporting repository\n" | |
|
5237 | " %h short-form changeset hash (12 bytes of hexadecimal)\n" | |
|
5238 | " %n zero-padded sequence number, starting at 1\n" | |
|
5239 | " %r zero-padded changeset revision number\n" | |
|
5604 | " given using a format string. The formatting rules are as follows::\n" | |
|
5605 | "\n" | |
|
5606 | " %% literal \"%\" character\n" | |
|
5607 | " %H changeset hash (40 bytes of hexadecimal)\n" | |
|
5608 | " %N number of patches being generated\n" | |
|
5609 | " %R changeset revision number\n" | |
|
5610 | " %b basename of the exporting repository\n" | |
|
5611 | " %h short-form changeset hash (12 bytes of hexadecimal)\n" | |
|
5612 | " %n zero-padded sequence number, starting at 1\n" | |
|
5613 | " %r zero-padded changeset revision number\n" | |
|
5240 | 5614 | "\n" |
|
5241 | 5615 | " Without the -a/--text option, export will avoid generating diffs\n" |
|
5242 | 5616 | " of files it detects as binary. With -a, export will generate a\n" |
@@ -5293,6 +5667,27 b' msgid "exporting patch:\\n"' | |||
|
5293 | 5667 | msgstr "" |
|
5294 | 5668 | |
|
5295 | 5669 | msgid "" |
|
5670 | "forget the specified files on the next commit\n" | |
|
5671 | "\n" | |
|
5672 | " Mark the specified files so they will no longer be tracked\n" | |
|
5673 | " after the next commit.\n" | |
|
5674 | "\n" | |
|
5675 | " This only removes files from the current branch, not from the\n" | |
|
5676 | " entire project history, and it does not delete them from the\n" | |
|
5677 | " working directory.\n" | |
|
5678 | "\n" | |
|
5679 | " To undo a forget before the next commit, see hg add.\n" | |
|
5680 | " " | |
|
5681 | msgstr "" | |
|
5682 | ||
|
5683 | msgid "no files specified" | |
|
5684 | msgstr "" | |
|
5685 | ||
|
5686 | #, python-format | |
|
5687 | msgid "not removing %s: file is already untracked\n" | |
|
5688 | msgstr "" | |
|
5689 | ||
|
5690 | msgid "" | |
|
5296 | 5691 | "search for a pattern in specified files and revisions\n" |
|
5297 | 5692 | "\n" |
|
5298 | 5693 | " Search revisions of files for a regular expression.\n" |
@@ -5329,27 +5724,31 b' msgstr ""' | |||
|
5329 | 5724 | msgid "grep: invalid match pattern: %s\n" |
|
5330 | 5725 | msgstr "" |
|
5331 | 5726 | |
|
5727 | #, fuzzy | |
|
5332 | 5728 | msgid "" |
|
5333 | 5729 | "show current repository heads or show branch heads\n" |
|
5334 | 5730 | "\n" |
|
5335 | 5731 | " With no arguments, show all repository head changesets.\n" |
|
5336 | 5732 | "\n" |
|
5337 |
" Repository \"heads\" are changesets |
|
|
5338 |
" |
|
|
5339 |
" |
|
|
5733 | " Repository \"heads\" are changesets with no child changesets. They are\n" | |
|
5734 | " where development generally takes place and are the usual targets\n" | |
|
5735 | " for update and merge operations.\n" | |
|
5340 | 5736 | "\n" |
|
5341 | 5737 | " If one or more REV is given, the \"branch heads\" will be shown for\n" |
|
5342 |
" the named branch associated with th |
|
|
5343 | " branch is called the revision's branch tag.\n" | |
|
5344 | "\n" | |
|
5345 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
5346 | " any children on the same branch. A branch head could be a true head\n" | |
|
5347 |
" or it could be the last changeset on |
|
|
5348 |
" was created. If none of the branch heads |
|
|
5349 | " is considered inactive.\n" | |
|
5350 | "\n" | |
|
5351 |
" If |
|
|
5352 | " are descendants of STARTREV will be displayed.\n" | |
|
5738 | " the named branch associated with the specified changeset(s).\n" | |
|
5739 | "\n" | |
|
5740 | " Branch heads are changesets on a named branch with no descendants on\n" | |
|
5741 | " the same branch. A branch head could be a \"true\" (repository) head,\n" | |
|
5742 | " or it could be the last changeset on that branch before it was\n" | |
|
5743 | " merged into another branch, or it could be the last changeset on the\n" | |
|
5744 | " branch before a new branch was created. If none of the branch heads\n" | |
|
5745 | " are true heads, the branch is considered inactive.\n" | |
|
5746 | "\n" | |
|
5747 | " If -c/--closed is specified, also show branch heads marked closed\n" | |
|
5748 | " (see hg commit --close-branch).\n" | |
|
5749 | "\n" | |
|
5750 | " If STARTREV is specified, only those heads that are descendants of\n" | |
|
5751 | " STARTREV will be displayed.\n" | |
|
5353 | 5752 | " " |
|
5354 | 5753 | msgstr "" |
|
5355 | 5754 | "顯示目前的 repository heads 或是 branch heads\n" |
@@ -5374,6 +5773,9 b' msgstr ""' | |||
|
5374 | 5773 | " are descendants of STARTREV will be displayed.\n" |
|
5375 | 5774 | " " |
|
5376 | 5775 | |
|
5776 | msgid "you must specify a branch to use --closed" | |
|
5777 | msgstr "" | |
|
5778 | ||
|
5377 | 5779 | #, python-format |
|
5378 | 5780 | msgid "no open branch heads on branch %s\n" |
|
5379 | 5781 | msgstr "" |
@@ -5442,24 +5844,20 b' msgstr "\xe9\x81\xb8\xe9\xa0\x85:\\n"' | |||
|
5442 | 5844 | msgid "no commands defined\n" |
|
5443 | 5845 | msgstr "沒有定義的命令\n" |
|
5444 | 5846 | |
|
5445 | msgid "" | |
|
5446 | "\n" | |
|
5447 | "enabled extensions:\n" | |
|
5448 | "\n" | |
|
5847 | #, fuzzy | |
|
5848 | msgid "enabled extensions:" | |
|
5449 | 5849 | msgstr "" |
|
5450 | 5850 | "\n" |
|
5451 | 5851 | "已啟用的擴充套件:\n" |
|
5452 | 5852 | "\n" |
|
5453 | 5853 | |
|
5454 | #, python-format | |
|
5455 | msgid " %s %s\n" | |
|
5456 | msgstr "" | |
|
5457 | ||
|
5458 | 5854 | msgid "no help text available" |
|
5459 | 5855 | msgstr "沒有可用的說明文字" |
|
5460 | 5856 | |
|
5461 | #, python-format | |
|
5462 | msgid "%s extension - %s\n" | |
|
5857 | #, fuzzy, python-format | |
|
5858 | msgid "" | |
|
5859 | "%s extension - %s\n" | |
|
5860 | "\n" | |
|
5463 | 5861 | msgstr "%s 擴充套件 - %s\n" |
|
5464 | 5862 | |
|
5465 | 5863 | msgid "Mercurial Distributed SCM\n" |
@@ -5510,6 +5908,7 b' msgstr ""' | |||
|
5510 | 5908 | " this revision and a branch name for non-default branches.\n" |
|
5511 | 5909 | " " |
|
5512 | 5910 | |
|
5911 | #, fuzzy | |
|
5513 | 5912 | msgid "" |
|
5514 | 5913 | "import an ordered set of patches\n" |
|
5515 | 5914 | "\n" |
@@ -5539,7 +5938,8 b' msgid ""' | |||
|
5539 | 5938 | " With -s/--similarity, hg will attempt to discover renames and\n" |
|
5540 | 5939 | " copies in the patch in the same way as 'addremove'.\n" |
|
5541 | 5940 | "\n" |
|
5542 | " To read a patch from standard input, use \"-\" as the patch name.\n" | |
|
5941 | " To read a patch from standard input, use \"-\" as the patch name. If\n" | |
|
5942 | " a URL is specified, the patch will be downloaded from it.\n" | |
|
5543 | 5943 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5544 | 5944 | " " |
|
5545 | 5945 | msgstr "" |
@@ -5581,12 +5981,6 b' msgstr ""' | |||
|
5581 | 5981 | msgid "no diffs found" |
|
5582 | 5982 | msgstr "" |
|
5583 | 5983 | |
|
5584 | #, python-format | |
|
5585 | msgid "" | |
|
5586 | "message:\n" | |
|
5587 | "%s\n" | |
|
5588 | msgstr "" | |
|
5589 | ||
|
5590 | 5984 | msgid "not a Mercurial patch" |
|
5591 | 5985 | msgstr "" |
|
5592 | 5986 | |
@@ -5926,6 +6320,7 b' msgstr ""' | |||
|
5926 | 6320 | " See 'hg help urls' for more information.\n" |
|
5927 | 6321 | " " |
|
5928 | 6322 | |
|
6323 | #, fuzzy | |
|
5929 | 6324 | msgid "" |
|
5930 | 6325 | "push changes to the specified destination\n" |
|
5931 | 6326 | "\n" |
@@ -5945,7 +6340,6 b' msgid ""' | |||
|
5945 | 6340 | "\n" |
|
5946 | 6341 | " Please see 'hg help urls' for important details about ssh://\n" |
|
5947 | 6342 | " URLs. If DESTINATION is omitted, a default path will be used.\n" |
|
5948 | " See 'hg help urls' for more information.\n" | |
|
5949 | 6343 | " " |
|
5950 | 6344 | msgstr "" |
|
5951 | 6345 | "將 changes push 至指定的目的端\n" |
@@ -5992,6 +6386,7 b' msgstr ""' | |||
|
5992 | 6386 | " suggests it.\n" |
|
5993 | 6387 | " " |
|
5994 | 6388 | |
|
6389 | #, fuzzy | |
|
5995 | 6390 | msgid "" |
|
5996 | 6391 | "remove the specified files on the next commit\n" |
|
5997 | 6392 | "\n" |
@@ -6005,15 +6400,15 b' msgid ""' | |||
|
6005 | 6400 | "\n" |
|
6006 | 6401 | " The following table details the behavior of remove for different\n" |
|
6007 | 6402 | " file states (columns) and option combinations (rows). The file\n" |
|
6008 | " states are Added [A], Clean [C], Modified [M] and Missing [!]\n" | |
|
6009 |
" |
|
|
6010 |
" |
|
|
6011 | "\n" | |
|
6012 | " A C M !\n" | |
|
6013 | " none W RD W R\n" | |
|
6014 | " -f R RD RD R\n" | |
|
6015 | " -A W W W R\n" | |
|
6016 | " -Af R R R R\n" | |
|
6403 | " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" | |
|
6404 | " reported by hg status). The actions are Warn, Remove (from branch)\n" | |
|
6405 | " and Delete (from disk)::\n" | |
|
6406 | "\n" | |
|
6407 | " A C M !\n" | |
|
6408 | " none W RD W R\n" | |
|
6409 | " -f R RD RD R\n" | |
|
6410 | " -A W W W R\n" | |
|
6411 | " -Af R R R R\n" | |
|
6017 | 6412 | "\n" |
|
6018 | 6413 | " This command schedules the files to be removed at the next commit.\n" |
|
6019 | 6414 | " To undo a remove before that, see hg revert.\n" |
@@ -6045,9 +6440,6 b' msgstr ""' | |||
|
6045 | 6440 | " To undo a remove before that, see hg revert.\n" |
|
6046 | 6441 | " " |
|
6047 | 6442 | |
|
6048 | msgid "no files specified" | |
|
6049 | msgstr "" | |
|
6050 | ||
|
6051 | 6443 | #, python-format |
|
6052 | 6444 | msgid "not removing %s: file is untracked\n" |
|
6053 | 6445 | msgstr "" |
@@ -6094,6 +6486,7 b' msgstr ""' | |||
|
6094 | 6486 | " before that, see hg revert.\n" |
|
6095 | 6487 | " " |
|
6096 | 6488 | |
|
6489 | #, fuzzy | |
|
6097 | 6490 | msgid "" |
|
6098 | 6491 | "retry file merges from a merge or update\n" |
|
6099 | 6492 | "\n" |
@@ -6109,9 +6502,10 b' msgid ""' | |||
|
6109 | 6502 | " indicating whether or not files are resolved. All files must be\n" |
|
6110 | 6503 | " marked as resolved before a commit is permitted.\n" |
|
6111 | 6504 | "\n" |
|
6112 | " The codes used to show the status of files are:\n" | |
|
6113 | " U = unresolved\n" | |
|
6114 |
" |
|
|
6505 | " The codes used to show the status of files are::\n" | |
|
6506 | "\n" | |
|
6507 | " U = unresolved\n" | |
|
6508 | " R = resolved\n" | |
|
6115 | 6509 | " " |
|
6116 | 6510 | msgstr "" |
|
6117 | 6511 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" |
@@ -6239,18 +6633,20 b' msgstr ""' | |||
|
6239 | 6633 | msgid "no changes needed to %s\n" |
|
6240 | 6634 | msgstr "" |
|
6241 | 6635 | |
|
6636 | #, fuzzy | |
|
6242 | 6637 | msgid "" |
|
6243 | 6638 | "roll back the last transaction\n" |
|
6244 | 6639 | "\n" |
|
6245 | 6640 | " This command should be used with care. There is only one level of\n" |
|
6246 | 6641 | " rollback, and there is no way to undo a rollback. It will also\n" |
|
6247 | 6642 | " restore the dirstate at the time of the last transaction, losing\n" |
|
6248 | " any dirstate changes since that time.\n" | |
|
6643 | " any dirstate changes since that time. This command does not alter\n" | |
|
6644 | " the working directory.\n" | |
|
6249 | 6645 | "\n" |
|
6250 | 6646 | " Transactions are used to encapsulate the effects of all commands\n" |
|
6251 | 6647 | " that create new changesets or propagate existing changesets into a\n" |
|
6252 | 6648 | " repository. For example, the following commands are transactional,\n" |
|
6253 | " and their effects can be rolled back:\n" | |
|
6649 | " and their effects can be rolled back::\n" | |
|
6254 | 6650 | "\n" |
|
6255 | 6651 | " commit\n" |
|
6256 | 6652 | " import\n" |
@@ -6326,6 +6722,7 b' msgstr ""' | |||
|
6326 | 6722 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
|
6327 | 6723 | msgstr "" |
|
6328 | 6724 | |
|
6725 | #, fuzzy | |
|
6329 | 6726 | msgid "" |
|
6330 | 6727 | "show changed files in the working directory\n" |
|
6331 | 6728 | "\n" |
@@ -6348,15 +6745,16 b' msgid ""' | |||
|
6348 | 6745 | " If two revisions are given, the differences between them are\n" |
|
6349 | 6746 | " shown.\n" |
|
6350 | 6747 | "\n" |
|
6351 | " The codes used to show the status of files are:\n" | |
|
6352 | " M = modified\n" | |
|
6353 |
" |
|
|
6354 |
" |
|
|
6355 |
" |
|
|
6356 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
6357 | " ? = not tracked\n" | |
|
6358 |
" |
|
|
6359 | " = origin of the previous file listed as A (added)\n" | |
|
6748 | " The codes used to show the status of files are::\n" | |
|
6749 | "\n" | |
|
6750 | " M = modified\n" | |
|
6751 | " A = added\n" | |
|
6752 | " R = removed\n" | |
|
6753 | " C = clean\n" | |
|
6754 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
6755 | " ? = not tracked\n" | |
|
6756 | " I = ignored\n" | |
|
6757 | " = origin of the previous file listed as A (added)\n" | |
|
6360 | 6758 | " " |
|
6361 | 6759 | msgstr "" |
|
6362 | 6760 | "顯示 working directory 中已變更的檔案\n" |
@@ -6392,6 +6790,102 b' msgstr ""' | |||
|
6392 | 6790 | " " |
|
6393 | 6791 | |
|
6394 | 6792 | msgid "" |
|
6793 | "summarize working directory state\n" | |
|
6794 | "\n" | |
|
6795 | " This generates a brief summary of the working directory state,\n" | |
|
6796 | " including parents, branch, commit status, and available updates.\n" | |
|
6797 | "\n" | |
|
6798 | " With the --remote option, this will check the default paths for\n" | |
|
6799 | " incoming and outgoing changes. This can be time-consuming.\n" | |
|
6800 | " " | |
|
6801 | msgstr "" | |
|
6802 | ||
|
6803 | msgid " (empty repository)" | |
|
6804 | msgstr "" | |
|
6805 | ||
|
6806 | msgid " (no revision checked out)" | |
|
6807 | msgstr "" | |
|
6808 | ||
|
6809 | #, python-format | |
|
6810 | msgid "parent: %d:%s %s\n" | |
|
6811 | msgstr "" | |
|
6812 | ||
|
6813 | #, fuzzy, python-format | |
|
6814 | msgid "branch: %s\n" | |
|
6815 | msgstr "找不到 branch %s" | |
|
6816 | ||
|
6817 | #, python-format | |
|
6818 | msgid "%d added" | |
|
6819 | msgstr "" | |
|
6820 | ||
|
6821 | #, python-format | |
|
6822 | msgid "%d modified" | |
|
6823 | msgstr "" | |
|
6824 | ||
|
6825 | #, fuzzy, python-format | |
|
6826 | msgid "%d removed" | |
|
6827 | msgstr "已移除" | |
|
6828 | ||
|
6829 | #, python-format | |
|
6830 | msgid "%d deleted" | |
|
6831 | msgstr "" | |
|
6832 | ||
|
6833 | #, python-format | |
|
6834 | msgid "%d ignored" | |
|
6835 | msgstr "" | |
|
6836 | ||
|
6837 | #, fuzzy, python-format | |
|
6838 | msgid "%d unknown" | |
|
6839 | msgstr "未知的 base" | |
|
6840 | ||
|
6841 | #, fuzzy, python-format | |
|
6842 | msgid "%d unresolved" | |
|
6843 | msgstr "已移除" | |
|
6844 | ||
|
6845 | #, fuzzy | |
|
6846 | msgid " (merge)" | |
|
6847 | msgstr "已合併" | |
|
6848 | ||
|
6849 | msgid " (new branch)" | |
|
6850 | msgstr "" | |
|
6851 | ||
|
6852 | msgid " (clean)" | |
|
6853 | msgstr "" | |
|
6854 | ||
|
6855 | msgid " (new branch head)" | |
|
6856 | msgstr "" | |
|
6857 | ||
|
6858 | #, python-format | |
|
6859 | msgid "commit: %s\n" | |
|
6860 | msgstr "" | |
|
6861 | ||
|
6862 | msgid "update: (current)\n" | |
|
6863 | msgstr "" | |
|
6864 | ||
|
6865 | #, python-format | |
|
6866 | msgid "update: %d new changesets (update)\n" | |
|
6867 | msgstr "" | |
|
6868 | ||
|
6869 | #, python-format | |
|
6870 | msgid "update: %d new changesets, %d branch heads (merge)\n" | |
|
6871 | msgstr "" | |
|
6872 | ||
|
6873 | msgid "1 or more incoming" | |
|
6874 | msgstr "" | |
|
6875 | ||
|
6876 | #, python-format | |
|
6877 | msgid "%d outgoing" | |
|
6878 | msgstr "" | |
|
6879 | ||
|
6880 | #, fuzzy, python-format | |
|
6881 | msgid "remote: %s\n" | |
|
6882 | msgstr "遠端: " | |
|
6883 | ||
|
6884 | #, fuzzy | |
|
6885 | msgid "remote: (synced)\n" | |
|
6886 | msgstr "遠端: " | |
|
6887 | ||
|
6888 | msgid "" | |
|
6395 | 6889 | "add one or more tags for the current or given revision\n" |
|
6396 | 6890 | "\n" |
|
6397 | 6891 | " Name a particular revision using <name>.\n" |
@@ -6455,17 +6949,9 b' msgid "tag \'%s\' is not a local tag"' | |||
|
6455 | 6949 | msgstr "" |
|
6456 | 6950 | |
|
6457 | 6951 | #, python-format |
|
6458 | msgid "Removed tag %s" | |
|
6459 | msgstr "" | |
|
6460 | ||
|
6461 | #, python-format | |
|
6462 | 6952 | msgid "tag '%s' already exists (use -f to force)" |
|
6463 | 6953 | msgstr "" |
|
6464 | 6954 | |
|
6465 | #, python-format | |
|
6466 | msgid "Added tag %s for changeset %s" | |
|
6467 | msgstr "" | |
|
6468 | ||
|
6469 | 6955 | msgid "" |
|
6470 | 6956 | "list repository tags\n" |
|
6471 | 6957 | "\n" |
@@ -6517,6 +7003,7 b' msgstr ""' | |||
|
6517 | 7003 | " bundle command.\n" |
|
6518 | 7004 | " " |
|
6519 | 7005 | |
|
7006 | #, fuzzy | |
|
6520 | 7007 | msgid "" |
|
6521 | 7008 | "update working directory\n" |
|
6522 | 7009 | "\n" |
@@ -6533,7 +7020,8 b' msgid ""' | |||
|
6533 | 7020 | "\n" |
|
6534 | 7021 | " When there are uncommitted changes, use option -C/--clean to\n" |
|
6535 | 7022 | " discard them, forcibly replacing the state of the working\n" |
|
6536 | " directory with the requested revision.\n" | |
|
7023 | " directory with the requested revision. Alternately, use -c/--check\n" | |
|
7024 | " to abort.\n" | |
|
6537 | 7025 | "\n" |
|
6538 | 7026 | " When there are uncommitted changes and option -C/--clean is not\n" |
|
6539 | 7027 | " used, and the parent revision and requested revision are on the\n" |
@@ -6578,6 +7066,13 b' msgstr ""' | |||
|
6578 | 7066 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
6579 | 7067 | " " |
|
6580 | 7068 | |
|
7069 | msgid "cannot specify both -c/--check and -C/--clean" | |
|
7070 | msgstr "" | |
|
7071 | ||
|
7072 | #, fuzzy | |
|
7073 | msgid "uncommitted local changes" | |
|
7074 | msgstr "未同步的變更" | |
|
7075 | ||
|
6581 | 7076 | msgid "" |
|
6582 | 7077 | "verify the integrity of the repository\n" |
|
6583 | 7078 | "\n" |
@@ -6613,7 +7108,7 b' msgid ""' | |||
|
6613 | 7108 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
6614 | 7109 | msgstr "" |
|
6615 | 7110 | |
|
6616 |
msgid "repository root directory or |
|
|
7111 | msgid "repository root directory or name of overlay bundle file" | |
|
6617 | 7112 | msgstr "" |
|
6618 | 7113 | |
|
6619 | 7114 | msgid "change working directory" |
@@ -6805,6 +7300,9 b' msgstr ""' | |||
|
6805 | 7300 | msgid "show only branches that have unmerged heads" |
|
6806 | 7301 | msgstr "" |
|
6807 | 7302 | |
|
7303 | msgid "show normal and closed branches" | |
|
7304 | msgstr "" | |
|
7305 | ||
|
6808 | 7306 | msgid "[-a]" |
|
6809 | 7307 | msgstr "" |
|
6810 | 7308 | |
@@ -6949,10 +7447,10 b' msgstr ""' | |||
|
6949 | 7447 | msgid "show only heads which are descendants of REV" |
|
6950 | 7448 | msgstr "" |
|
6951 | 7449 | |
|
6952 | msgid "show only the active heads from open branches" | |
|
6953 | msgstr "" | |
|
6954 | ||
|
6955 | msgid "show normal and closed heads" | |
|
7450 | msgid "show only the active branch heads from open branches" | |
|
7451 | msgstr "" | |
|
7452 | ||
|
7453 | msgid "show normal and closed branch heads" | |
|
6956 | 7454 | msgstr "" |
|
6957 | 7455 | |
|
6958 | 7456 | msgid "[-r STARTREV] [REV]..." |
@@ -7185,6 +7683,9 b' msgstr ""' | |||
|
7185 | 7683 | msgid "[-u] [NAME]..." |
|
7186 | 7684 | msgstr "" |
|
7187 | 7685 | |
|
7686 | msgid "check for push and pull" | |
|
7687 | msgstr "" | |
|
7688 | ||
|
7188 | 7689 | msgid "show status of all files" |
|
7189 | 7690 | msgstr "" |
|
7190 | 7691 | |
@@ -7245,6 +7746,9 b' msgstr ""' | |||
|
7245 | 7746 | msgid "overwrite locally modified files (no backup)" |
|
7246 | 7747 | msgstr "" |
|
7247 | 7748 | |
|
7749 | msgid "check for uncommitted changes" | |
|
7750 | msgstr "" | |
|
7751 | ||
|
7248 | 7752 | msgid "[-C] [-d DATE] [[-r] REV]" |
|
7249 | 7753 | msgstr "" |
|
7250 | 7754 | |
@@ -7258,36 +7762,6 b' msgstr ""' | |||
|
7258 | 7762 | msgid "branch name not in UTF-8!" |
|
7259 | 7763 | msgstr "" |
|
7260 | 7764 | |
|
7261 | #, python-format | |
|
7262 | msgid " searching for copies back to rev %d\n" | |
|
7263 | msgstr "" | |
|
7264 | ||
|
7265 | #, python-format | |
|
7266 | msgid "" | |
|
7267 | " unmatched files in local:\n" | |
|
7268 | " %s\n" | |
|
7269 | msgstr "" | |
|
7270 | ||
|
7271 | #, python-format | |
|
7272 | msgid "" | |
|
7273 | " unmatched files in other:\n" | |
|
7274 | " %s\n" | |
|
7275 | msgstr "" | |
|
7276 | ||
|
7277 | msgid " all copies found (* = to merge, ! = divergent):\n" | |
|
7278 | msgstr "" | |
|
7279 | ||
|
7280 | msgid " checking for directory renames\n" | |
|
7281 | msgstr "" | |
|
7282 | ||
|
7283 | #, python-format | |
|
7284 | msgid " dir %s -> %s\n" | |
|
7285 | msgstr "" | |
|
7286 | ||
|
7287 | #, python-format | |
|
7288 | msgid " file %s -> %s\n" | |
|
7289 | msgstr "" | |
|
7290 | ||
|
7291 | 7765 | msgid "working directory state appears damaged!" |
|
7292 | 7766 | msgstr "" |
|
7293 | 7767 | |
@@ -7334,16 +7808,16 b' msgid "abort: %s\\n"' | |||
|
7334 | 7808 | msgstr "" |
|
7335 | 7809 | |
|
7336 | 7810 | #, python-format |
|
7811 | msgid "hg: %s\n" | |
|
7812 | msgstr "" | |
|
7813 | ||
|
7814 | #, python-format | |
|
7337 | 7815 | msgid "" |
|
7338 | 7816 | "hg: command '%s' is ambiguous:\n" |
|
7339 | 7817 | " %s\n" |
|
7340 | 7818 | msgstr "" |
|
7341 | 7819 | |
|
7342 | 7820 | #, python-format |
|
7343 | msgid "hg: %s\n" | |
|
7344 | msgstr "" | |
|
7345 | ||
|
7346 | #, python-format | |
|
7347 | 7821 | msgid "timed out waiting for lock held by %s" |
|
7348 | 7822 | msgstr "" |
|
7349 | 7823 | |
@@ -7412,7 +7886,7 b' msgstr ""' | |||
|
7412 | 7886 | msgid "** unknown exception encountered, details follow\n" |
|
7413 | 7887 | msgstr "" |
|
7414 | 7888 | |
|
7415 |
msgid "** report bug details to http:// |
|
|
7889 | msgid "** report bug details to http://mercurial.selenic.com/bts/\n" | |
|
7416 | 7890 | msgstr "" |
|
7417 | 7891 | |
|
7418 | 7892 | msgid "** or mercurial@selenic.com\n" |
@@ -7439,10 +7913,6 b' msgid "alias \'%s\' resolves to ambiguous ' | |||
|
7439 | 7913 | msgstr "" |
|
7440 | 7914 | |
|
7441 | 7915 | #, python-format |
|
7442 | msgid "alias '%s' shadows command\n" | |
|
7443 | msgstr "" | |
|
7444 | ||
|
7445 | #, python-format | |
|
7446 | 7916 | msgid "malformed --config option: %s" |
|
7447 | 7917 | msgstr "" |
|
7448 | 7918 | |
@@ -7457,7 +7927,7 b' msgid "Option --cwd may not be abbreviat' | |||
|
7457 | 7927 | msgstr "" |
|
7458 | 7928 | |
|
7459 | 7929 | msgid "" |
|
7460 |
"Option -R has to be separated from other options ( |
|
|
7930 | "Option -R has to be separated from other options (e.g. not -qR) and --" | |
|
7461 | 7931 | "repository may only be abbreviated as --repo!" |
|
7462 | 7932 | msgstr "" |
|
7463 | 7933 | |
@@ -7506,10 +7976,6 b' msgid "tool %s requires a GUI\\n"' | |||
|
7506 | 7976 | msgstr "%s 工具需要 GUI 環境\n" |
|
7507 | 7977 | |
|
7508 | 7978 | #, python-format |
|
7509 | msgid "picked tool '%s' for %s (binary %s symlink %s)\n" | |
|
7510 | msgstr "選用 '%s' 工具來處理 %s (binary %s symlink %s)\n" | |
|
7511 | ||
|
7512 | #, python-format | |
|
7513 | 7979 | msgid "" |
|
7514 | 7980 | " no tool found to merge %s\n" |
|
7515 | 7981 | "keep (l)ocal or take (o)ther?" |
@@ -7523,9 +7989,6 b' msgstr ""' | |||
|
7523 | 7989 | msgid "&Other" |
|
7524 | 7990 | msgstr "" |
|
7525 | 7991 | |
|
7526 | msgid "l" | |
|
7527 | msgstr "" | |
|
7528 | ||
|
7529 | 7992 | #, python-format |
|
7530 | 7993 | msgid "merging %s and %s to %s\n" |
|
7531 | 7994 | msgstr "合併 %s 和 %s 至 %s\n" |
@@ -7535,13 +7998,6 b' msgid "merging %s\\n"' | |||
|
7535 | 7998 | msgstr "合併 %s 中\n" |
|
7536 | 7999 | |
|
7537 | 8000 | #, python-format |
|
7538 | msgid "my %s other %s ancestor %s\n" | |
|
7539 | msgstr "" | |
|
7540 | ||
|
7541 | msgid " premerge successful\n" | |
|
7542 | msgstr "" | |
|
7543 | ||
|
7544 | #, python-format | |
|
7545 | 8001 | msgid "" |
|
7546 | 8002 | " output file %s appears unchanged\n" |
|
7547 | 8003 | "was merge successful (yn)?" |
@@ -7553,9 +8009,6 b' msgstr ""' | |||
|
7553 | 8009 | msgid "&Yes" |
|
7554 | 8010 | msgstr "" |
|
7555 | 8011 | |
|
7556 | msgid "n" | |
|
7557 | msgstr "" | |
|
7558 | ||
|
7559 | 8012 | #, python-format |
|
7560 | 8013 | msgid "merging %s failed!\n" |
|
7561 | 8014 | msgstr "合併 %s 失敗!\n" |
@@ -7568,450 +8021,38 b' msgstr ""' | |||
|
7568 | 8021 | msgid "unknown bisect kind %s" |
|
7569 | 8022 | msgstr "" |
|
7570 | 8023 | |
|
8024 | #, fuzzy | |
|
8025 | msgid "disabled extensions:" | |
|
8026 | msgstr "" | |
|
8027 | "\n" | |
|
8028 | "已啟用的擴充套件:\n" | |
|
8029 | "\n" | |
|
8030 | ||
|
7571 | 8031 | msgid "Date Formats" |
|
7572 | 8032 | msgstr "日期格式" |
|
7573 | 8033 | |
|
7574 | msgid "" | |
|
7575 | "\n" | |
|
7576 | " Some commands allow the user to specify a date, e.g.:\n" | |
|
7577 | " * backout, commit, import, tag: Specify the commit date.\n" | |
|
7578 | " * log, revert, update: Select revision(s) by date.\n" | |
|
7579 | "\n" | |
|
7580 | " Many date formats are valid. Here are some examples:\n" | |
|
7581 | "\n" | |
|
7582 | " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |
|
7583 | " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |
|
7584 | " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |
|
7585 | " \"Dec 6\" (midnight)\n" | |
|
7586 | " \"13:18\" (today assumed)\n" | |
|
7587 | " \"3:39\" (3:39AM assumed)\n" | |
|
7588 | " \"3:39pm\" (15:39)\n" | |
|
7589 | " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |
|
7590 | " \"2006-12-6 13:18\"\n" | |
|
7591 | " \"2006-12-6\"\n" | |
|
7592 | " \"12-6\"\n" | |
|
7593 | " \"12/6\"\n" | |
|
7594 | " \"12/6/6\" (Dec 6 2006)\n" | |
|
7595 | "\n" | |
|
7596 | " Lastly, there is Mercurial's internal format:\n" | |
|
7597 | "\n" | |
|
7598 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" | |
|
7599 | "\n" | |
|
7600 | " This is the internal representation format for dates. unixtime is\n" | |
|
7601 | " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" | |
|
7602 | " offset is the offset of the local timezone, in seconds west of UTC\n" | |
|
7603 | " (negative if the timezone is east of UTC).\n" | |
|
7604 | "\n" | |
|
7605 | " The log command also accepts date ranges:\n" | |
|
7606 | "\n" | |
|
7607 | " \"<{datetime}\" - at or before a given date/time\n" | |
|
7608 | " \">{datetime}\" - on or after a given date/time\n" | |
|
7609 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
|
7610 | " \"-{days}\" - within a given number of days of today\n" | |
|
7611 | " " | |
|
7612 | msgstr "" | |
|
7613 | ||
|
7614 | 8034 | msgid "File Name Patterns" |
|
7615 | 8035 | msgstr "檔案名稱樣式" |
|
7616 | 8036 | |
|
7617 | msgid "" | |
|
7618 | "\n" | |
|
7619 | " Mercurial accepts several notations for identifying one or more\n" | |
|
7620 | " files at a time.\n" | |
|
7621 | "\n" | |
|
7622 | " By default, Mercurial treats filenames as shell-style extended\n" | |
|
7623 | " glob patterns.\n" | |
|
7624 | "\n" | |
|
7625 | " Alternate pattern notations must be specified explicitly.\n" | |
|
7626 | "\n" | |
|
7627 | " To use a plain path name without any pattern matching, start it\n" | |
|
7628 | " with \"path:\". These path names must completely match starting at\n" | |
|
7629 | " the current repository root.\n" | |
|
7630 | "\n" | |
|
7631 | " To use an extended glob, start a name with \"glob:\". Globs are\n" | |
|
7632 | " rooted at the current directory; a glob such as \"*.c\" will only\n" | |
|
7633 | " match files in the current directory ending with \".c\".\n" | |
|
7634 | "\n" | |
|
7635 | " The supported glob syntax extensions are \"**\" to match any string\n" | |
|
7636 | " across path separators and \"{a,b}\" to mean \"a or b\".\n" | |
|
7637 | "\n" | |
|
7638 | " To use a Perl/Python regular expression, start a name with \"re:\".\n" | |
|
7639 | " Regexp pattern matching is anchored at the root of the repository.\n" | |
|
7640 | "\n" | |
|
7641 | " Plain examples:\n" | |
|
7642 | "\n" | |
|
7643 | " path:foo/bar a name bar in a directory named foo in the root of\n" | |
|
7644 | " the repository\n" | |
|
7645 | " path:path:name a file or directory named \"path:name\"\n" | |
|
7646 | "\n" | |
|
7647 | " Glob examples:\n" | |
|
7648 | "\n" | |
|
7649 | " glob:*.c any name ending in \".c\" in the current directory\n" | |
|
7650 | " *.c any name ending in \".c\" in the current directory\n" | |
|
7651 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |
|
7652 | " current directory including itself.\n" | |
|
7653 | " foo/*.c any name ending in \".c\" in the directory foo\n" | |
|
7654 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
|
7655 | " including itself.\n" | |
|
7656 | "\n" | |
|
7657 | " Regexp examples:\n" | |
|
7658 | "\n" | |
|
7659 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
7660 | "\n" | |
|
7661 | " " | |
|
7662 | msgstr "" | |
|
7663 | ||
|
7664 | 8037 | msgid "Environment Variables" |
|
7665 | 8038 | msgstr "環境變數" |
|
7666 | 8039 | |
|
7667 | msgid "" | |
|
7668 | "\n" | |
|
7669 | "HG::\n" | |
|
7670 | " Path to the 'hg' executable, automatically passed when running\n" | |
|
7671 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
|
7672 | " the hg executable's name if it's frozen, or an executable named\n" | |
|
7673 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
7674 | " Windows) is searched.\n" | |
|
7675 | "\n" | |
|
7676 | "HGEDITOR::\n" | |
|
7677 | " This is the name of the editor to run when committing. See EDITOR.\n" | |
|
7678 | "\n" | |
|
7679 | " (deprecated, use .hgrc)\n" | |
|
7680 | "\n" | |
|
7681 | "HGENCODING::\n" | |
|
7682 | " This overrides the default locale setting detected by Mercurial.\n" | |
|
7683 | " This setting is used to convert data including usernames,\n" | |
|
7684 | " changeset descriptions, tag names, and branches. This setting can\n" | |
|
7685 | " be overridden with the --encoding command-line option.\n" | |
|
7686 | "\n" | |
|
7687 | "HGENCODINGMODE::\n" | |
|
7688 | " This sets Mercurial's behavior for handling unknown characters\n" | |
|
7689 | " while transcoding user input. The default is \"strict\", which\n" | |
|
7690 | " causes Mercurial to abort if it can't map a character. Other\n" | |
|
7691 | " settings include \"replace\", which replaces unknown characters, and\n" | |
|
7692 | " \"ignore\", which drops them. This setting can be overridden with\n" | |
|
7693 | " the --encodingmode command-line option.\n" | |
|
7694 | "\n" | |
|
7695 | "HGMERGE::\n" | |
|
7696 | " An executable to use for resolving merge conflicts. The program\n" | |
|
7697 | " will be executed with three arguments: local file, remote file,\n" | |
|
7698 | " ancestor file.\n" | |
|
7699 | "\n" | |
|
7700 | " (deprecated, use .hgrc)\n" | |
|
7701 | "\n" | |
|
7702 | "HGRCPATH::\n" | |
|
7703 | " A list of files or directories to search for hgrc files. Item\n" | |
|
7704 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
|
7705 | " platform default search path is used. If empty, only the .hg/hgrc\n" | |
|
7706 | " from the current repository is read.\n" | |
|
7707 | "\n" | |
|
7708 | " For each element in HGRCPATH:\n" | |
|
7709 | " * if it's a directory, all files ending with .rc are added\n" | |
|
7710 | " * otherwise, the file itself will be added\n" | |
|
7711 | "\n" | |
|
7712 | "HGUSER::\n" | |
|
7713 | " This is the string used as the author of a commit. If not set,\n" | |
|
7714 | " available values will be considered in this order:\n" | |
|
7715 | "\n" | |
|
7716 | " * HGUSER (deprecated)\n" | |
|
7717 | " * hgrc files from the HGRCPATH\n" | |
|
7718 | " * EMAIL\n" | |
|
7719 | " * interactive prompt\n" | |
|
7720 | " * LOGNAME (with '@hostname' appended)\n" | |
|
7721 | "\n" | |
|
7722 | " (deprecated, use .hgrc)\n" | |
|
7723 | "\n" | |
|
7724 | "EMAIL::\n" | |
|
7725 | " May be used as the author of a commit; see HGUSER.\n" | |
|
7726 | "\n" | |
|
7727 | "LOGNAME::\n" | |
|
7728 | " May be used as the author of a commit; see HGUSER.\n" | |
|
7729 | "\n" | |
|
7730 | "VISUAL::\n" | |
|
7731 | " This is the name of the editor to use when committing. See EDITOR.\n" | |
|
7732 | "\n" | |
|
7733 | "EDITOR::\n" | |
|
7734 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
|
7735 | " user to modify, for example when writing commit messages. The\n" | |
|
7736 | " editor it uses is determined by looking at the environment\n" | |
|
7737 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
|
7738 | " non-empty one is chosen. If all of them are empty, the editor\n" | |
|
7739 | " defaults to 'vi'.\n" | |
|
7740 | "\n" | |
|
7741 | "PYTHONPATH::\n" | |
|
7742 | " This is used by Python to find imported modules and may need to be\n" | |
|
7743 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
|
7744 | " " | |
|
7745 | msgstr "" | |
|
7746 | ||
|
7747 | 8040 | msgid "Specifying Single Revisions" |
|
7748 | 8041 | msgstr "" |
|
7749 | 8042 | |
|
7750 | msgid "" | |
|
7751 | "\n" | |
|
7752 | " Mercurial supports several ways to specify individual revisions.\n" | |
|
7753 | "\n" | |
|
7754 | " A plain integer is treated as a revision number. Negative integers\n" | |
|
7755 | " are treated as topological offsets from the tip, with -1 denoting\n" | |
|
7756 | " the tip. As such, negative numbers are only useful if you've\n" | |
|
7757 | " memorized your local tree numbers and want to save typing a single\n" | |
|
7758 | " digit. This editor suggests copy and paste.\n" | |
|
7759 | "\n" | |
|
7760 | " A 40-digit hexadecimal string is treated as a unique revision\n" | |
|
7761 | " identifier.\n" | |
|
7762 | "\n" | |
|
7763 | " A hexadecimal string less than 40 characters long is treated as a\n" | |
|
7764 | " unique revision identifier, and referred to as a short-form\n" | |
|
7765 | " identifier. A short-form identifier is only valid if it is the\n" | |
|
7766 | " prefix of exactly one full-length identifier.\n" | |
|
7767 | "\n" | |
|
7768 | " Any other string is treated as a tag name, which is a symbolic\n" | |
|
7769 | " name associated with a revision identifier. Tag names may not\n" | |
|
7770 | " contain the \":\" character.\n" | |
|
7771 | "\n" | |
|
7772 | " The reserved name \"tip\" is a special tag that always identifies\n" | |
|
7773 | " the most recent revision.\n" | |
|
7774 | "\n" | |
|
7775 | " The reserved name \"null\" indicates the null revision. This is the\n" | |
|
7776 | " revision of an empty repository, and the parent of revision 0.\n" | |
|
7777 | "\n" | |
|
7778 | " The reserved name \".\" indicates the working directory parent. If\n" | |
|
7779 | " no working directory is checked out, it is equivalent to null. If\n" | |
|
7780 | " an uncommitted merge is in progress, \".\" is the revision of the\n" | |
|
7781 | " first parent.\n" | |
|
7782 | " " | |
|
7783 | msgstr "" | |
|
7784 | ||
|
7785 | 8043 | msgid "Specifying Multiple Revisions" |
|
7786 | 8044 | msgstr "" |
|
7787 | 8045 | |
|
7788 | msgid "" | |
|
7789 | "\n" | |
|
7790 | " When Mercurial accepts more than one revision, they may be\n" | |
|
7791 | " specified individually, or provided as a topologically continuous\n" | |
|
7792 | " range, separated by the \":\" character.\n" | |
|
7793 | "\n" | |
|
7794 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" | |
|
7795 | " are revision identifiers. Both BEGIN and END are optional. If\n" | |
|
7796 | " BEGIN is not specified, it defaults to revision number 0. If END\n" | |
|
7797 | " is not specified, it defaults to the tip. The range \":\" thus means\n" | |
|
7798 | " \"all revisions\".\n" | |
|
7799 | "\n" | |
|
7800 | " If BEGIN is greater than END, revisions are treated in reverse\n" | |
|
7801 | " order.\n" | |
|
7802 | "\n" | |
|
7803 | " A range acts as a closed interval. This means that a range of 3:5\n" | |
|
7804 | " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
|
7805 | " " | |
|
7806 | msgstr "" | |
|
7807 | ||
|
7808 | 8046 | msgid "Diff Formats" |
|
7809 | 8047 | msgstr "" |
|
7810 | 8048 | |
|
7811 | msgid "" | |
|
7812 | "\n" | |
|
7813 | " Mercurial's default format for showing changes between two\n" | |
|
7814 | " versions of a file is compatible with the unified format of GNU\n" | |
|
7815 | " diff, which can be used by GNU patch and many other standard\n" | |
|
7816 | " tools.\n" | |
|
7817 | "\n" | |
|
7818 | " While this standard format is often enough, it does not encode the\n" | |
|
7819 | " following information:\n" | |
|
7820 | "\n" | |
|
7821 | " - executable status and other permission bits\n" | |
|
7822 | " - copy or rename information\n" | |
|
7823 | " - changes in binary files\n" | |
|
7824 | " - creation or deletion of empty files\n" | |
|
7825 | "\n" | |
|
7826 | " Mercurial also supports the extended diff format from the git VCS\n" | |
|
7827 | " which addresses these limitations. The git diff format is not\n" | |
|
7828 | " produced by default because a few widespread tools still do not\n" | |
|
7829 | " understand this format.\n" | |
|
7830 | "\n" | |
|
7831 | " This means that when generating diffs from a Mercurial repository\n" | |
|
7832 | " (e.g. with \"hg export\"), you should be careful about things like\n" | |
|
7833 | " file copies and renames or other things mentioned above, because\n" | |
|
7834 | " when applying a standard diff to a different repository, this\n" | |
|
7835 | " extra information is lost. Mercurial's internal operations (like\n" | |
|
7836 | " push and pull) are not affected by this, because they use an\n" | |
|
7837 | " internal binary format for communicating changes.\n" | |
|
7838 | "\n" | |
|
7839 | " To make Mercurial produce the git extended diff format, use the\n" | |
|
7840 | " --git option available for many commands, or set 'git = True' in\n" | |
|
7841 | " the [diff] section of your hgrc. You do not need to set this\n" | |
|
7842 | " option when importing diffs in this format or using them in the mq\n" | |
|
7843 | " extension.\n" | |
|
7844 | " " | |
|
7845 | msgstr "" | |
|
7846 | ||
|
7847 | 8049 | msgid "Template Usage" |
|
7848 | 8050 | msgstr "" |
|
7849 | 8051 | |
|
7850 | msgid "" | |
|
7851 | "\n" | |
|
7852 | " Mercurial allows you to customize output of commands through\n" | |
|
7853 | " templates. You can either pass in a template from the command\n" | |
|
7854 | " line, via the --template option, or select an existing\n" | |
|
7855 | " template-style (--style).\n" | |
|
7856 | "\n" | |
|
7857 | " You can customize output for any \"log-like\" command: log,\n" | |
|
7858 | " outgoing, incoming, tip, parents, heads and glog.\n" | |
|
7859 | "\n" | |
|
7860 | " Three styles are packaged with Mercurial: default (the style used\n" | |
|
7861 | " when no explicit preference is passed), compact and changelog.\n" | |
|
7862 | " Usage:\n" | |
|
7863 | "\n" | |
|
7864 | " $ hg log -r1 --style changelog\n" | |
|
7865 | "\n" | |
|
7866 | " A template is a piece of text, with markup to invoke variable\n" | |
|
7867 | " expansion:\n" | |
|
7868 | "\n" | |
|
7869 | " $ hg log -r1 --template \"{node}\\n\"\n" | |
|
7870 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |
|
7871 | "\n" | |
|
7872 | " Strings in curly braces are called keywords. The availability of\n" | |
|
7873 | " keywords depends on the exact context of the templater. These\n" | |
|
7874 | " keywords are usually available for templating a log-like command:\n" | |
|
7875 | "\n" | |
|
7876 | " - author: String. The unmodified author of the changeset.\n" | |
|
7877 | " - branches: String. The name of the branch on which the changeset\n" | |
|
7878 | " was committed. Will be empty if the branch name was default.\n" | |
|
7879 | " - date: Date information. The date when the changeset was committed.\n" | |
|
7880 | " - desc: String. The text of the changeset description.\n" | |
|
7881 | " - diffstat: String. Statistics of changes with the following\n" | |
|
7882 | " format: \"modified files: +added/-removed lines\"\n" | |
|
7883 | " - files: List of strings. All files modified, added, or removed by\n" | |
|
7884 | " this changeset.\n" | |
|
7885 | " - file_adds: List of strings. Files added by this changeset.\n" | |
|
7886 | " - file_mods: List of strings. Files modified by this changeset.\n" | |
|
7887 | " - file_dels: List of strings. Files removed by this changeset.\n" | |
|
7888 | " - node: String. The changeset identification hash, as a\n" | |
|
7889 | " 40-character hexadecimal string.\n" | |
|
7890 | " - parents: List of strings. The parents of the changeset.\n" | |
|
7891 | " - rev: Integer. The repository-local changeset revision number.\n" | |
|
7892 | " - tags: List of strings. Any tags associated with the changeset.\n" | |
|
7893 | "\n" | |
|
7894 | " The \"date\" keyword does not produce human-readable output. If you\n" | |
|
7895 | " want to use a date in your output, you can use a filter to process\n" | |
|
7896 | " it. Filters are functions which return a string based on the input\n" | |
|
7897 | " variable. You can also use a chain of filters to get the desired\n" | |
|
7898 | " output:\n" | |
|
7899 | "\n" | |
|
7900 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |
|
7901 | " 2008-08-21 18:22 +0000\n" | |
|
7902 | "\n" | |
|
7903 | " List of filters:\n" | |
|
7904 | "\n" | |
|
7905 | " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
|
7906 | " every line except the last.\n" | |
|
7907 | " - age: Date. Returns a human-readable date/time difference between\n" | |
|
7908 | " the given date/time and the current date/time.\n" | |
|
7909 | " - basename: Any text. Treats the text as a path, and returns the\n" | |
|
7910 | " last component of the path after splitting by the path\n" | |
|
7911 | " separator (ignoring trailing separators). For example,\n" | |
|
7912 | " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" | |
|
7913 | "\".\n" | |
|
7914 | " - stripdir: Treat the text as path and strip a directory level, if\n" | |
|
7915 | " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n" | |
|
7916 | " - date: Date. Returns a date in a Unix date format, including\n" | |
|
7917 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
|
7918 | " - domain: Any text. Finds the first string that looks like an\n" | |
|
7919 | " email address, and extracts just the domain component.\n" | |
|
7920 | " Example: 'User <user@example.com>' becomes 'example.com'.\n" | |
|
7921 | " - email: Any text. Extracts the first string that looks like an\n" | |
|
7922 | " email address. Example: 'User <user@example.com>' becomes\n" | |
|
7923 | " 'user@example.com'.\n" | |
|
7924 | " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" | |
|
7925 | " \"<\" and \">\" with XML entities.\n" | |
|
7926 | " - fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
|
7927 | " - fill76: Any text. Wraps the text to fit in 76 columns.\n" | |
|
7928 | " - firstline: Any text. Returns the first line of text.\n" | |
|
7929 | " - nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
|
7930 | " - hgdate: Date. Returns the date as a pair of numbers:\n" | |
|
7931 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
|
7932 | " - isodate: Date. Returns the date in ISO 8601 format.\n" | |
|
7933 | " - localdate: Date. Converts a date to local date.\n" | |
|
7934 | " - obfuscate: Any text. Returns the input text rendered as a\n" | |
|
7935 | " sequence of XML entities.\n" | |
|
7936 | " - person: Any text. Returns the text before an email address.\n" | |
|
7937 | " - rfc822date: Date. Returns a date using the same format used\n" | |
|
7938 | " in email headers.\n" | |
|
7939 | " - short: Changeset hash. Returns the short form of a changeset\n" | |
|
7940 | " hash, i.e. a 12-byte hexadecimal string.\n" | |
|
7941 | " - shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
|
7942 | " - strip: Any text. Strips all leading and trailing whitespace.\n" | |
|
7943 | " - tabindent: Any text. Returns the text, with every line except\n" | |
|
7944 | " the first starting with a tab character.\n" | |
|
7945 | " - urlescape: Any text. Escapes all \"special\" characters. For\n" | |
|
7946 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
|
7947 | " - user: Any text. Returns the user portion of an email address.\n" | |
|
7948 | " " | |
|
7949 | msgstr "" | |
|
7950 | ||
|
7951 | 8052 | msgid "URL Paths" |
|
7952 | 8053 | msgstr "" |
|
7953 | 8054 | |
|
7954 | msgid "" | |
|
7955 | "\n" | |
|
7956 | " Valid URLs are of the form:\n" | |
|
7957 | "\n" | |
|
7958 | " local/filesystem/path (or file://local/filesystem/path)\n" | |
|
7959 | " http://[user[:pass]@]host[:port]/[path]\n" | |
|
7960 | " https://[user[:pass]@]host[:port]/[path]\n" | |
|
7961 | " ssh://[user[:pass]@]host[:port]/[path]\n" | |
|
7962 | "\n" | |
|
7963 | " Paths in the local filesystem can either point to Mercurial\n" | |
|
7964 | " repositories or to bundle files (as created by 'hg bundle' or\n" | |
|
7965 | " 'hg incoming --bundle').\n" | |
|
7966 | "\n" | |
|
7967 | " An optional identifier after # indicates a particular branch, tag,\n" | |
|
7968 | " or changeset to use from the remote repository.\n" | |
|
7969 | "\n" | |
|
7970 | " Some features, such as pushing to http:// and https:// URLs are\n" | |
|
7971 | " only possible if the feature is explicitly enabled on the remote\n" | |
|
7972 | " Mercurial server.\n" | |
|
7973 | "\n" | |
|
7974 | " Some notes about using SSH with Mercurial:\n" | |
|
7975 | " - SSH requires an accessible shell account on the destination\n" | |
|
7976 | " machine and a copy of hg in the remote path or specified with as\n" | |
|
7977 | " remotecmd.\n" | |
|
7978 | " - path is relative to the remote user's home directory by default.\n" | |
|
7979 | " Use an extra slash at the start of a path to specify an absolute " | |
|
7980 | "path:\n" | |
|
7981 | " ssh://example.com//tmp/repository\n" | |
|
7982 | " - Mercurial doesn't use its own compression via SSH; the right\n" | |
|
7983 | " thing to do is to configure it in your ~/.ssh/config, e.g.:\n" | |
|
7984 | " Host *.mylocalnetwork.example.com\n" | |
|
7985 | " Compression no\n" | |
|
7986 | " Host *\n" | |
|
7987 | " Compression yes\n" | |
|
7988 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" | |
|
7989 | " or with the --ssh command line option.\n" | |
|
7990 | "\n" | |
|
7991 | " These URLs can all be stored in your hgrc with path aliases under\n" | |
|
7992 | " the [paths] section like so:\n" | |
|
7993 | " [paths]\n" | |
|
7994 | " alias1 = URL1\n" | |
|
7995 | " alias2 = URL2\n" | |
|
7996 | " ...\n" | |
|
7997 | "\n" | |
|
7998 | " You can then use the alias for any command that uses a URL (for\n" | |
|
7999 | " example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
|
8000 | "\n" | |
|
8001 | " Two path aliases are special because they are used as defaults\n" | |
|
8002 | " when you do not provide the URL to a command:\n" | |
|
8003 | "\n" | |
|
8004 | " default:\n" | |
|
8005 | " When you create a repository with hg clone, the clone command\n" | |
|
8006 | " saves the location of the source repository as the new\n" | |
|
8007 | " repository's 'default' path. This is then used when you omit\n" | |
|
8008 | " path from push- and pull-like commands (including incoming and\n" | |
|
8009 | " outgoing).\n" | |
|
8010 | "\n" | |
|
8011 | " default-push:\n" | |
|
8012 | " The push command will look for a path named 'default-push', and\n" | |
|
8013 | " prefer it over 'default' if both are defined.\n" | |
|
8014 | " " | |
|
8055 | msgid "Using additional features" | |
|
8015 | 8056 | msgstr "" |
|
8016 | 8057 | |
|
8017 | 8058 | msgid "can only share local repositories" |
@@ -8043,27 +8084,20 b' msgstr ""' | |||
|
8043 | 8084 | msgid "clone from remote to remote not supported" |
|
8044 | 8085 | msgstr "" |
|
8045 | 8086 | |
|
8046 | msgid "updated" | |
|
8047 | msgstr "已更新" | |
|
8048 | ||
|
8049 | msgid "merged" | |
|
8050 | msgstr "已合併" | |
|
8051 | ||
|
8052 | msgid "removed" | |
|
8053 | msgstr "已移除" | |
|
8054 | ||
|
8055 | msgid "unresolved" | |
|
8056 | msgstr "" | |
|
8057 | ||
|
8058 | #, python-format | |
|
8059 | msgid "%d files %s" | |
|
8087 | #, fuzzy, python-format | |
|
8088 | msgid "updating to branch %s\n" | |
|
8089 | msgstr "正在新增 branch\n" | |
|
8090 | ||
|
8091 | #, python-format | |
|
8092 | msgid "" | |
|
8093 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" | |
|
8060 | 8094 | msgstr "" |
|
8061 | 8095 | |
|
8062 | 8096 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
8063 | 8097 | msgstr "" |
|
8064 | 8098 | |
|
8065 | 8099 | msgid "" |
|
8066 |
"use 'hg resolve' to retry unresolved file merges or 'hg up |
|
|
8100 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " | |
|
8067 | 8101 | "abandon\n" |
|
8068 | 8102 | msgstr "" |
|
8069 | 8103 | |
@@ -8139,32 +8173,12 b' msgstr ""' | |||
|
8139 | 8173 | msgid "unsupported URL component: \"%s\"" |
|
8140 | 8174 | msgstr "" |
|
8141 | 8175 | |
|
8142 | #, python-format | |
|
8143 | msgid "using %s\n" | |
|
8144 | msgstr "" | |
|
8145 | ||
|
8146 | #, python-format | |
|
8147 | msgid "capabilities: %s\n" | |
|
8148 | msgstr "" | |
|
8149 | ||
|
8150 | 8176 | msgid "operation not supported over http" |
|
8151 | 8177 | msgstr "" |
|
8152 | 8178 | |
|
8153 | #, python-format | |
|
8154 | msgid "sending %s command\n" | |
|
8155 | msgstr "" | |
|
8156 | ||
|
8157 | #, python-format | |
|
8158 | msgid "sending %s bytes\n" | |
|
8159 | msgstr "" | |
|
8160 | ||
|
8161 | 8179 | msgid "authorization failed" |
|
8162 | 8180 | msgstr "" |
|
8163 | 8181 | |
|
8164 | #, python-format | |
|
8165 | msgid "http error while sending %s command\n" | |
|
8166 | msgstr "" | |
|
8167 | ||
|
8168 | 8182 | msgid "http error, possibly caused by proxy setting" |
|
8169 | 8183 | msgstr "" |
|
8170 | 8184 | |
@@ -8173,10 +8187,6 b' msgid "real URL is %s\\n"' | |||
|
8173 | 8187 | msgstr "" |
|
8174 | 8188 | |
|
8175 | 8189 | #, python-format |
|
8176 | msgid "requested URL: '%s'\n" | |
|
8177 | msgstr "" | |
|
8178 | ||
|
8179 | #, python-format | |
|
8180 | 8190 | msgid "'%s' does not appear to be an hg repository" |
|
8181 | 8191 | msgstr "" |
|
8182 | 8192 | |
@@ -8211,7 +8221,7 b' msgid "cannot create new http repository' | |||
|
8211 | 8221 | msgstr "" |
|
8212 | 8222 | |
|
8213 | 8223 | #, python-format |
|
8214 |
msgid " |
|
|
8224 | msgid "ignoring invalid syntax '%s'" | |
|
8215 | 8225 | msgstr "" |
|
8216 | 8226 | |
|
8217 | 8227 | #, python-format |
@@ -8242,21 +8252,6 b' msgid "working copy of .hgtags is change' | |||
|
8242 | 8252 | msgstr "" |
|
8243 | 8253 | |
|
8244 | 8254 | #, python-format |
|
8245 | msgid "%s, line %s: %s\n" | |
|
8246 | msgstr "" | |
|
8247 | ||
|
8248 | msgid "cannot parse entry" | |
|
8249 | msgstr "" | |
|
8250 | ||
|
8251 | #, python-format | |
|
8252 | msgid "node '%s' is not well formed" | |
|
8253 | msgstr "" | |
|
8254 | ||
|
8255 | #, python-format | |
|
8256 | msgid "tag '%s' refers to unknown node" | |
|
8257 | msgstr "" | |
|
8258 | ||
|
8259 | #, python-format | |
|
8260 | 8255 | msgid "working directory has unknown parent '%s'!" |
|
8261 | 8256 | msgstr "" |
|
8262 | 8257 | |
@@ -8264,10 +8259,6 b' msgstr ""' | |||
|
8264 | 8259 | msgid "unknown revision '%s'" |
|
8265 | 8260 | msgstr "" |
|
8266 | 8261 | |
|
8267 | #, python-format | |
|
8268 | msgid "filtering %s through %s\n" | |
|
8269 | msgstr "" | |
|
8270 | ||
|
8271 | 8262 | msgid "journal already exists - run hg recover" |
|
8272 | 8263 | msgstr "" |
|
8273 | 8264 | |
@@ -8299,14 +8290,6 b' msgstr ""' | |||
|
8299 | 8290 | msgid "working directory of %s" |
|
8300 | 8291 | msgstr "" |
|
8301 | 8292 | |
|
8302 | #, python-format | |
|
8303 | msgid " %s: searching for copy revision for %s\n" | |
|
8304 | msgstr "" | |
|
8305 | ||
|
8306 | #, python-format | |
|
8307 | msgid " %s: copy %s:%s\n" | |
|
8308 | msgstr "" | |
|
8309 | ||
|
8310 | 8293 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
8311 | 8294 | msgstr "" |
|
8312 | 8295 | |
@@ -8319,9 +8302,6 b' msgstr ""' | |||
|
8319 | 8302 | msgid "file not tracked!" |
|
8320 | 8303 | msgstr "" |
|
8321 | 8304 | |
|
8322 | msgid "nothing changed\n" | |
|
8323 | msgstr "" | |
|
8324 | ||
|
8325 | 8305 | msgid "unresolved merge conflicts (see hg resolve)" |
|
8326 | 8306 | msgstr "" |
|
8327 | 8307 | |
@@ -8374,41 +8354,6 b' msgstr ""' | |||
|
8374 | 8354 | msgid "searching for changes\n" |
|
8375 | 8355 | msgstr "" |
|
8376 | 8356 | |
|
8377 | #, python-format | |
|
8378 | msgid "examining %s:%s\n" | |
|
8379 | msgstr "" | |
|
8380 | ||
|
8381 | msgid "branch already found\n" | |
|
8382 | msgstr "" | |
|
8383 | ||
|
8384 | #, python-format | |
|
8385 | msgid "found incomplete branch %s:%s\n" | |
|
8386 | msgstr "" | |
|
8387 | ||
|
8388 | #, python-format | |
|
8389 | msgid "found new changeset %s\n" | |
|
8390 | msgstr "" | |
|
8391 | ||
|
8392 | #, python-format | |
|
8393 | msgid "request %d: %s\n" | |
|
8394 | msgstr "" | |
|
8395 | ||
|
8396 | #, python-format | |
|
8397 | msgid "received %s:%s\n" | |
|
8398 | msgstr "" | |
|
8399 | ||
|
8400 | #, python-format | |
|
8401 | msgid "narrowing %d:%d %s\n" | |
|
8402 | msgstr "" | |
|
8403 | ||
|
8404 | #, python-format | |
|
8405 | msgid "found new branch changeset %s\n" | |
|
8406 | msgstr "" | |
|
8407 | ||
|
8408 | #, python-format | |
|
8409 | msgid "narrowed branch search to %s:%s\n" | |
|
8410 | msgstr "" | |
|
8411 | ||
|
8412 | 8357 | msgid "already have changeset " |
|
8413 | 8358 | msgstr "" |
|
8414 | 8359 | |
@@ -8418,16 +8363,6 b' msgstr ""' | |||
|
8418 | 8363 | msgid "repository is unrelated" |
|
8419 | 8364 | msgstr "" |
|
8420 | 8365 | |
|
8421 | msgid "found new changesets starting at " | |
|
8422 | msgstr "" | |
|
8423 | ||
|
8424 | #, python-format | |
|
8425 | msgid "%d total queries\n" | |
|
8426 | msgstr "" | |
|
8427 | ||
|
8428 | msgid "common changesets up to " | |
|
8429 | msgstr "" | |
|
8430 | ||
|
8431 | 8366 | msgid "requesting all changes\n" |
|
8432 | 8367 | msgstr "" |
|
8433 | 8368 | |
@@ -8453,17 +8388,10 b' msgstr ""' | |||
|
8453 | 8388 | msgid "%d changesets found\n" |
|
8454 | 8389 | msgstr "" |
|
8455 | 8390 | |
|
8456 | msgid "list of changesets:\n" | |
|
8457 | msgstr "" | |
|
8458 | ||
|
8459 | 8391 | #, python-format |
|
8460 | 8392 | msgid "empty or missing revlog for %s" |
|
8461 | 8393 | msgstr "" |
|
8462 | 8394 | |
|
8463 | #, python-format | |
|
8464 | msgid "add changeset %s\n" | |
|
8465 | msgstr "" | |
|
8466 | ||
|
8467 | 8395 | msgid "adding changesets\n" |
|
8468 | 8396 | msgstr "" |
|
8469 | 8397 | |
@@ -8476,10 +8404,6 b' msgstr ""' | |||
|
8476 | 8404 | msgid "adding file changes\n" |
|
8477 | 8405 | msgstr "" |
|
8478 | 8406 | |
|
8479 | #, python-format | |
|
8480 | msgid "adding %s revisions\n" | |
|
8481 | msgstr "" | |
|
8482 | ||
|
8483 | 8407 | msgid "received file revlog group is empty" |
|
8484 | 8408 | msgstr "" |
|
8485 | 8409 | |
@@ -8491,9 +8415,6 b' msgstr ""' | |||
|
8491 | 8415 | msgid "added %d changesets with %d changes to %d files%s\n" |
|
8492 | 8416 | msgstr "" |
|
8493 | 8417 | |
|
8494 | msgid "updating the branch cache\n" | |
|
8495 | msgstr "" | |
|
8496 | ||
|
8497 | 8418 | msgid "Unexpected response from remote server:" |
|
8498 | 8419 | msgstr "" |
|
8499 | 8420 | |
@@ -8514,10 +8435,6 b' msgid "%d files to transfer, %s of data\\' | |||
|
8514 | 8435 | msgstr "" |
|
8515 | 8436 | |
|
8516 | 8437 | #, python-format |
|
8517 | msgid "adding %s (%s)\n" | |
|
8518 | msgstr "" | |
|
8519 | ||
|
8520 | #, python-format | |
|
8521 | 8438 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
8522 | 8439 | msgstr "" |
|
8523 | 8440 | |
@@ -8598,14 +8515,6 b' msgid "resolving manifests\\n"' | |||
|
8598 | 8515 | msgstr "" |
|
8599 | 8516 | |
|
8600 | 8517 | #, python-format |
|
8601 | msgid " overwrite %s partial %s\n" | |
|
8602 | msgstr "" | |
|
8603 | ||
|
8604 | #, python-format | |
|
8605 | msgid " ancestor %s local %s remote %s\n" | |
|
8606 | msgstr "" | |
|
8607 | ||
|
8608 | #, python-format | |
|
8609 | 8518 | msgid "" |
|
8610 | 8519 | " local changed %s which remote deleted\n" |
|
8611 | 8520 | "use (c)hanged version or (d)elete?" |
@@ -8617,9 +8526,6 b' msgstr ""' | |||
|
8617 | 8526 | msgid "&Delete" |
|
8618 | 8527 | msgstr "" |
|
8619 | 8528 | |
|
8620 | msgid "c" | |
|
8621 | msgstr "" | |
|
8622 | ||
|
8623 | 8529 | #, python-format |
|
8624 | 8530 | msgid "" |
|
8625 | 8531 | "remote changed %s which local deleted\n" |
@@ -8630,10 +8536,6 b' msgid "&Deleted"' | |||
|
8630 | 8536 | msgstr "" |
|
8631 | 8537 | |
|
8632 | 8538 | #, python-format |
|
8633 | msgid "preserving %s for resolve of %s\n" | |
|
8634 | msgstr "" | |
|
8635 | ||
|
8636 | #, python-format | |
|
8637 | 8539 | msgid "update failed to remove %s: %s!\n" |
|
8638 | 8540 | msgstr "" |
|
8639 | 8541 | |
@@ -8680,13 +8582,6 b' msgid "cannot create %s: unable to creat' | |||
|
8680 | 8582 | msgstr "無法建立 %s: 無法建立目的端目錄" |
|
8681 | 8583 | |
|
8682 | 8584 | #, python-format |
|
8683 | msgid "found patch at byte %d\n" | |
|
8684 | msgstr "於 byte %d 找到 patch\n" | |
|
8685 | ||
|
8686 | msgid "patch generated by hg export\n" | |
|
8687 | msgstr "經由 hg export 產生的 patch\n" | |
|
8688 | ||
|
8689 | #, python-format | |
|
8690 | 8585 | msgid "unable to find '%s' for patching\n" |
|
8691 | 8586 | msgstr "找不到可 patch 的 '%s'\n" |
|
8692 | 8587 | |
@@ -8757,7 +8652,7 b' msgid "Unsupported line endings type: %s' | |||
|
8757 | 8652 | msgstr "不支援的行尾結束類型: %s" |
|
8758 | 8653 | |
|
8759 | 8654 | #, python-format |
|
8760 | msgid "no valid hunks found; trying with %r instead\n" | |
|
8655 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
|
8761 | 8656 | msgstr "" |
|
8762 | 8657 | |
|
8763 | 8658 | #, python-format |
@@ -8769,13 +8664,6 b' msgid "killed by signal %d"' | |||
|
8769 | 8664 | msgstr "已被信號 %d 終止" |
|
8770 | 8665 | |
|
8771 | 8666 | #, python-format |
|
8772 | msgid "stopped by signal %d" | |
|
8773 | msgstr "已被信號 %d 停止" | |
|
8774 | ||
|
8775 | msgid "invalid exit code" | |
|
8776 | msgstr "不合法的 exit code" | |
|
8777 | ||
|
8778 | #, python-format | |
|
8779 | 8667 | msgid "saving bundle to %s\n" |
|
8780 | 8668 | msgstr "正在儲存 bundle 至 %s\n" |
|
8781 | 8669 | |
@@ -8846,12 +8734,12 b' msgstr "\xe7\x84\xa1\xe6\xb3\x95\xe8\xa7\xa3\xe6\x9e\x90\xe4\xbd\x8d\xe5\x9d\x80 %s"' | |||
|
8846 | 8734 | msgid "could not create remote repo" |
|
8847 | 8735 | msgstr "無法建立遠端 repo" |
|
8848 | 8736 | |
|
8737 | msgid "no suitable response from remote hg" | |
|
8738 | msgstr "" | |
|
8739 | ||
|
8849 | 8740 | msgid "remote: " |
|
8850 | 8741 | msgstr "遠端: " |
|
8851 | 8742 | |
|
8852 | msgid "no suitable response from remote hg" | |
|
8853 | msgstr "" | |
|
8854 | ||
|
8855 | 8743 | #, python-format |
|
8856 | 8744 | msgid "push refused: %s" |
|
8857 | 8745 | msgstr "push 被拒絕: %s" |
@@ -8869,17 +8757,6 b' msgstr "\xe7\x84\xa1\xe6\xb3\x95\xe5\xbb\xba\xe7\xab\x8b\xe6\x96\xb0\xe7\x9a\x84 static-http repository"' | |||
|
8869 | 8757 | msgid "invalid entry in fncache, line %s" |
|
8870 | 8758 | msgstr "" |
|
8871 | 8759 | |
|
8872 | msgid "scanning\n" | |
|
8873 | msgstr "掃描中\n" | |
|
8874 | ||
|
8875 | #, python-format | |
|
8876 | msgid "%d files, %d bytes to transfer\n" | |
|
8877 | msgstr "傳送 %d 檔案,%d bytes\n" | |
|
8878 | ||
|
8879 | #, python-format | |
|
8880 | msgid "sending %s (%d bytes)\n" | |
|
8881 | msgstr "傳送 %s (%d bytes)\n" | |
|
8882 | ||
|
8883 | 8760 | #, python-format |
|
8884 | 8761 | msgid "" |
|
8885 | 8762 | " subrepository sources for %s differ\n" |
@@ -8889,9 +8766,6 b' msgstr ""' | |||
|
8889 | 8766 | msgid "&Remote" |
|
8890 | 8767 | msgstr "" |
|
8891 | 8768 | |
|
8892 | msgid "r" | |
|
8893 | msgstr "" | |
|
8894 | ||
|
8895 | 8769 | #, python-format |
|
8896 | 8770 | msgid "" |
|
8897 | 8771 | " local changed subrepository %s which remote removed\n" |
@@ -8916,6 +8790,17 b' msgstr ""' | |||
|
8916 | 8790 | msgid "pushing subrepo %s\n" |
|
8917 | 8791 | msgstr "" |
|
8918 | 8792 | |
|
8793 | #, python-format | |
|
8794 | msgid "%s, line %s: %s\n" | |
|
8795 | msgstr "" | |
|
8796 | ||
|
8797 | msgid "cannot parse entry" | |
|
8798 | msgstr "" | |
|
8799 | ||
|
8800 | #, python-format | |
|
8801 | msgid "node '%s' is not well formed" | |
|
8802 | msgstr "" | |
|
8803 | ||
|
8919 | 8804 | msgid "unmatched quotes" |
|
8920 | 8805 | msgstr "" |
|
8921 | 8806 | |
@@ -8981,12 +8866,12 b' msgstr ""' | |||
|
8981 | 8866 | msgid "username %s contains a newline\n" |
|
8982 | 8867 | msgstr "" |
|
8983 | 8868 | |
|
8869 | msgid "response expected" | |
|
8870 | msgstr "" | |
|
8871 | ||
|
8984 | 8872 | msgid "unrecognized response\n" |
|
8985 | 8873 | msgstr "" |
|
8986 | 8874 | |
|
8987 | msgid "response expected" | |
|
8988 | msgstr "" | |
|
8989 | ||
|
8990 | 8875 | msgid "password: " |
|
8991 | 8876 | msgstr "" |
|
8992 | 8877 | |
@@ -9015,10 +8900,6 b' msgid "http auth: user %s, password %s\\n' | |||
|
9015 | 8900 | msgstr "" |
|
9016 | 8901 | |
|
9017 | 8902 | #, python-format |
|
9018 | msgid "proxying through http://%s:%s\n" | |
|
9019 | msgstr "" | |
|
9020 | ||
|
9021 | #, python-format | |
|
9022 | 8903 | msgid "command '%s' failed: %s" |
|
9023 | 8904 | msgstr "" |
|
9024 | 8905 | |
@@ -9216,11 +9097,15 b' msgid "unpacking %s"' | |||
|
9216 | 9097 | msgstr "" |
|
9217 | 9098 | |
|
9218 | 9099 | #, python-format |
|
9100 | msgid "warning: copy source of '%s' not in parents of %s" | |
|
9101 | msgstr "" | |
|
9102 | ||
|
9103 | #, python-format | |
|
9219 | 9104 | msgid "empty or missing copy source revlog %s:%s" |
|
9220 | 9105 | msgstr "" |
|
9221 | 9106 | |
|
9222 | 9107 | #, python-format |
|
9223 | msgid "warning: %s@%s: copy source revision is nullid %s:%s" | |
|
9108 | msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" | |
|
9224 | 9109 | msgstr "" |
|
9225 | 9110 | |
|
9226 | 9111 | #, python-format |
General Comments 0
You need to be logged in to leave comments.
Login now