Show More
| This diff has been collapsed as it changes many lines, (9905 lines changed) Show them Hide them | |||
| @@ -2,647 +2,53 b'' | |||
|
|
2 | 2 | # Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others |
|
|
3 | 3 | # This file is distributed under the same license as the Mercurial package. |
|
|
4 | 4 | # Chia-Huan Wu <willie.tw@gmail.com>, 2009. |
|
|
5 |
# |
|
|
|
5 | # | |
|
|
6 | 6 | 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: 20 |
|
|
|
10 | "POT-Creation-Date: 2010-10-31 22:27+0100\n" | |
|
|
11 | 11 | "PO-Revision-Date: 2009-10-25 12:50+0100\n" |
|
|
12 |
"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com> |
|
|
|
12 | "Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>," | |
|
|
13 | "leolarrel<leolarrel@gmail.com>\n" | |
|
|
13 | 14 | "Language-Team: Traditional Chinese\n" |
|
|
15 | "Language: \n" | |
|
|
14 | 16 | "MIME-Version: 1.0\n" |
|
|
15 | 17 | "Content-Type: text/plain; charset=UTF-8\n" |
|
|
16 | 18 | "Content-Transfer-Encoding: 8bit\n" |
|
|
17 | 19 | |
|
|
18 | 20 | #, python-format |
|
|
19 | 21 | msgid " (default: %s)" |
|
|
20 |
msgstr " |
|
|
|
21 | ||
|
|
22 |
msgid "O |
|
|
|
22 | msgstr "(內定: %s)" | |
|
|
23 | ||
|
|
24 | msgid "Options" | |
|
|
23 | 25 | msgstr "選項" |
|
|
24 | 26 | |
|
|
25 | msgid "COMMANDS" | |
|
|
26 | msgstr "命令" | |
|
|
27 | ||
|
|
28 | #, fuzzy | |
|
|
29 | msgid " options:" | |
|
|
30 | msgstr " 選項: \n" | |
|
|
27 | msgid "Commands" | |
|
|
28 | msgstr "基本命令" | |
|
|
29 | ||
|
|
30 | msgid "Extensions" | |
|
|
31 | msgstr "擴充套件" | |
|
|
32 | ||
|
|
33 | msgid "" | |
|
|
34 | "This section contains help for extensions that are distributed together with " | |
|
|
35 | "Mercurial. Help for other extensions is available in the help system." | |
|
|
36 | msgstr "" | |
|
|
37 | ||
|
|
38 | msgid "options:" | |
|
|
39 | msgstr "選項:" | |
|
|
31 | 40 | |
|
|
32 | 41 | #, python-format |
|
|
33 | 42 | msgid " aliases: %s" |
|
|
34 |
msgstr " |
|
|
|
35 | ||
|
|
36 | msgid "Some commands allow the user to specify a date, e.g.:" | |
|
|
37 | msgstr "" | |
|
|
38 | ||
|
|
39 | msgid "" | |
|
|
40 | "- backout, commit, import, tag: Specify the commit date.\n" | |
|
|
41 | "- log, revert, update: Select revision(s) by date." | |
|
|
42 | msgstr "" | |
|
|
43 | ||
|
|
44 | msgid "Many date formats are valid. Here are some examples::" | |
|
|
45 | msgstr "" | |
|
|
46 | ||
|
|
47 | msgid "" | |
|
|
48 | " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" | |
|
|
49 | " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" | |
|
|
50 | " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" | |
|
|
51 | " \"Dec 6\" (midnight)\n" | |
|
|
52 | " \"13:18\" (today assumed)\n" | |
|
|
53 | " \"3:39\" (3:39AM assumed)\n" | |
|
|
54 | " \"3:39pm\" (15:39)\n" | |
|
|
55 | " \"2006-12-06 13:18:29\" (ISO 8601 format)\n" | |
|
|
56 | " \"2006-12-6 13:18\"\n" | |
|
|
57 | " \"2006-12-6\"\n" | |
|
|
58 | " \"12-6\"\n" | |
|
|
59 | " \"12/6\"\n" | |
|
|
60 | " \"12/6/6\" (Dec 6 2006)" | |
|
|
61 | msgstr "" | |
|
|
62 | ||
|
|
63 | msgid "Lastly, there is Mercurial's internal format::" | |
|
|
64 | msgstr "" | |
|
|
65 | ||
|
|
66 | msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)" | |
|
|
67 | msgstr "" | |
|
|
68 | ||
|
|
69 | msgid "" | |
|
|
70 | "This is the internal representation format for dates. unixtime is the\n" | |
|
|
71 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" | |
|
|
72 | "the offset of the local timezone, in seconds west of UTC (negative if\n" | |
|
|
73 | "the timezone is east of UTC)." | |
|
|
74 | msgstr "" | |
|
|
75 | ||
|
|
76 | msgid "The log command also accepts date ranges::" | |
|
|
77 | msgstr "" | |
|
|
78 | ||
|
|
79 | msgid "" | |
|
|
80 | " \"<{datetime}\" - at or before a given date/time\n" | |
|
|
81 | " \">{datetime}\" - on or after a given date/time\n" | |
|
|
82 | " \"{datetime} to {datetime}\" - a date range, inclusive\n" | |
|
|
83 | " \"-{days}\" - within a given number of days of today\n" | |
|
|
84 | msgstr "" | |
|
|
85 | ||
|
|
86 | msgid "" | |
|
|
87 | "Mercurial's default format for showing changes between two versions of\n" | |
|
|
88 | "a file is compatible with the unified format of GNU diff, which can be\n" | |
|
|
89 | "used by GNU patch and many other standard tools." | |
|
|
90 | msgstr "" | |
|
|
91 | ||
|
|
92 | msgid "" | |
|
|
93 | "While this standard format is often enough, it does not encode the\n" | |
|
|
94 | "following information:" | |
|
|
95 | msgstr "" | |
|
|
96 | ||
|
|
97 | msgid "" | |
|
|
98 | "- executable status and other permission bits\n" | |
|
|
99 | "- copy or rename information\n" | |
|
|
100 | "- changes in binary files\n" | |
|
|
101 | "- creation or deletion of empty files" | |
|
|
102 | msgstr "" | |
|
|
103 | ||
|
|
104 | msgid "" | |
|
|
105 | "Mercurial also supports the extended diff format from the git VCS\n" | |
|
|
106 | "which addresses these limitations. The git diff format is not produced\n" | |
|
|
107 | "by default because a few widespread tools still do not understand this\n" | |
|
|
108 | "format." | |
|
|
109 | msgstr "" | |
|
|
110 | ||
|
|
111 | msgid "" | |
|
|
112 | "This means that when generating diffs from a Mercurial repository\n" | |
|
|
113 | "(e.g. with \"hg export\"), you should be careful about things like file\n" | |
|
|
114 | "copies and renames or other things mentioned above, because when\n" | |
|
|
115 | "applying a standard diff to a different repository, this extra\n" | |
|
|
116 | "information is lost. Mercurial's internal operations (like push and\n" | |
|
|
117 | "pull) are not affected by this, because they use an internal binary\n" | |
|
|
118 | "format for communicating changes." | |
|
|
119 | msgstr "" | |
|
|
120 | ||
|
|
121 | msgid "" | |
|
|
122 | "To make Mercurial produce the git extended diff format, use the --git\n" | |
|
|
123 | "option available for many commands, or set 'git = True' in the [diff]\n" | |
|
|
124 | "section of your hgrc. You do not need to set this option when\n" | |
|
|
125 | "importing diffs in this format or using them in the mq extension.\n" | |
|
|
126 | msgstr "" | |
|
|
127 | ||
|
|
128 | msgid "" | |
|
|
129 | "HG\n" | |
|
|
130 | " Path to the 'hg' executable, automatically passed when running\n" | |
|
|
131 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
|
|
132 | " the hg executable's name if it's frozen, or an executable named\n" | |
|
|
133 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
|
134 | " Windows) is searched." | |
|
|
135 | msgstr "" | |
|
|
136 | ||
|
|
137 | msgid "" | |
|
|
138 | "HGEDITOR\n" | |
|
|
139 | " This is the name of the editor to run when committing. See EDITOR." | |
|
|
140 | msgstr "" | |
|
|
141 | ||
|
|
142 | msgid " (deprecated, use .hgrc)" | |
|
|
143 | msgstr "" | |
|
|
144 | ||
|
|
145 | msgid "" | |
|
|
146 | "HGENCODING\n" | |
|
|
147 | " This overrides the default locale setting detected by Mercurial.\n" | |
|
|
148 | " This setting is used to convert data including usernames,\n" | |
|
|
149 | " changeset descriptions, tag names, and branches. This setting can\n" | |
|
|
150 | " be overridden with the --encoding command-line option." | |
|
|
151 | msgstr "" | |
|
|
152 | ||
|
|
153 | msgid "" | |
|
|
154 | "HGENCODINGMODE\n" | |
|
|
155 | " This sets Mercurial's behavior for handling unknown characters\n" | |
|
|
156 | " while transcoding user input. The default is \"strict\", which\n" | |
|
|
157 | " causes Mercurial to abort if it can't map a character. Other\n" | |
|
|
158 | " settings include \"replace\", which replaces unknown characters, and\n" | |
|
|
159 | " \"ignore\", which drops them. This setting can be overridden with\n" | |
|
|
160 | " the --encodingmode command-line option." | |
|
|
161 | msgstr "" | |
|
|
162 | ||
|
|
163 | msgid "" | |
|
|
164 | "HGMERGE\n" | |
|
|
165 | " An executable to use for resolving merge conflicts. The program\n" | |
|
|
166 | " will be executed with three arguments: local file, remote file,\n" | |
|
|
167 | " ancestor file." | |
|
|
168 | msgstr "" | |
|
|
169 | ||
|
|
170 | msgid "" | |
|
|
171 | "HGRCPATH\n" | |
|
|
172 | " A list of files or directories to search for hgrc files. Item\n" | |
|
|
173 | " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" | |
|
|
174 | " platform default search path is used. If empty, only the .hg/hgrc\n" | |
|
|
175 | " from the current repository is read." | |
|
|
176 | msgstr "" | |
|
|
177 | ||
|
|
178 | msgid " For each element in HGRCPATH:" | |
|
|
179 | msgstr "" | |
|
|
180 | ||
|
|
181 | msgid "" | |
|
|
182 | " - if it's a directory, all files ending with .rc are added\n" | |
|
|
183 | " - otherwise, the file itself will be added" | |
|
|
184 | msgstr "" | |
|
|
185 | ||
|
|
186 | msgid "" | |
|
|
187 | "HGUSER\n" | |
|
|
188 | " This is the string used as the author of a commit. If not set,\n" | |
|
|
189 | " available values will be considered in this order:" | |
|
|
190 | msgstr "" | |
|
|
191 | ||
|
|
192 | msgid "" | |
|
|
193 | " - HGUSER (deprecated)\n" | |
|
|
194 | " - hgrc files from the HGRCPATH\n" | |
|
|
195 | " - EMAIL\n" | |
|
|
196 | " - interactive prompt\n" | |
|
|
197 | " - LOGNAME (with '@hostname' appended)" | |
|
|
198 | msgstr "" | |
|
|
199 | ||
|
|
200 | msgid "" | |
|
|
201 | "EMAIL\n" | |
|
|
202 | " May be used as the author of a commit; see HGUSER." | |
|
|
203 | msgstr "" | |
|
|
204 | ||
|
|
205 | msgid "" | |
|
|
206 | "LOGNAME\n" | |
|
|
207 | " May be used as the author of a commit; see HGUSER." | |
|
|
208 | msgstr "" | |
|
|
209 | ||
|
|
210 | msgid "" | |
|
|
211 | "VISUAL\n" | |
|
|
212 | " This is the name of the editor to use when committing. See EDITOR." | |
|
|
213 | msgstr "" | |
|
|
214 | ||
|
|
215 | msgid "" | |
|
|
216 | "EDITOR\n" | |
|
|
217 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
|
|
218 | " user to modify, for example when writing commit messages. The\n" | |
|
|
219 | " editor it uses is determined by looking at the environment\n" | |
|
|
220 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
|
|
221 | " non-empty one is chosen. If all of them are empty, the editor\n" | |
|
|
222 | " defaults to 'vi'." | |
|
|
223 | msgstr "" | |
|
|
224 | ||
|
|
225 | msgid "" | |
|
|
226 | "PYTHONPATH\n" | |
|
|
227 | " This is used by Python to find imported modules and may need to be\n" | |
|
|
228 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
|
|
229 | msgstr "" | |
|
|
230 | ||
|
|
231 | msgid "" | |
|
|
232 | "Mercurial has the ability to add new features through the use of\n" | |
|
|
233 | "extensions. Extensions may add new commands, add options to\n" | |
|
|
234 | "existing commands, change the default behavior of commands, or\n" | |
|
|
235 | "implement hooks." | |
|
|
236 | msgstr "" | |
|
|
237 | ||
|
|
238 | msgid "" | |
|
|
239 | "Extensions are not loaded by default for a variety of reasons:\n" | |
|
|
240 | "they can increase startup overhead; they may be meant for advanced\n" | |
|
|
241 | "usage only; they may provide potentially dangerous abilities (such\n" | |
|
|
242 | "as letting you destroy or modify history); they might not be ready\n" | |
|
|
243 | "for prime time; or they may alter some usual behaviors of stock\n" | |
|
|
244 | "Mercurial. It is thus up to the user to activate extensions as\n" | |
|
|
245 | "needed." | |
|
|
246 | msgstr "" | |
|
|
247 | ||
|
|
248 | msgid "" | |
|
|
249 | "To enable the \"foo\" extension, either shipped with Mercurial or in\n" | |
|
|
250 | "the Python search path, create an entry for it in your hgrc, like\n" | |
|
|
251 | "this::" | |
|
|
252 | msgstr "" | |
|
|
253 | ||
|
|
254 | msgid "" | |
|
|
255 | " [extensions]\n" | |
|
|
256 | " foo =" | |
|
|
257 | msgstr "" | |
|
|
258 | ||
|
|
259 | msgid "You may also specify the full path to an extension::" | |
|
|
260 | msgstr "" | |
|
|
261 | ||
|
|
262 | msgid "" | |
|
|
263 | " [extensions]\n" | |
|
|
264 | " myfeature = ~/.hgext/myfeature.py" | |
|
|
265 | msgstr "" | |
|
|
266 | ||
|
|
267 | msgid "" | |
|
|
268 | "To explicitly disable an extension enabled in an hgrc of broader\n" | |
|
|
269 | "scope, prepend its path with !::" | |
|
|
270 | msgstr "" | |
|
|
271 | ||
|
|
272 | msgid "" | |
|
|
273 | " [extensions]\n" | |
|
|
274 | " # disabling extension bar residing in /path/to/extension/bar.py\n" | |
|
|
275 | " bar = !/path/to/extension/bar.py\n" | |
|
|
276 | " # ditto, but no path was supplied for extension baz\n" | |
|
|
277 | " baz = !\n" | |
|
|
278 | msgstr "" | |
|
|
279 | ||
|
|
280 | msgid "" | |
|
|
281 | "When Mercurial accepts more than one revision, they may be specified\n" | |
|
|
282 | "individually, or provided as a topologically continuous range,\n" | |
|
|
283 | "separated by the \":\" character." | |
|
|
284 | msgstr "" | |
|
|
285 | ||
|
|
286 | msgid "" | |
|
|
287 | "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" | |
|
|
288 | "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" | |
|
|
289 | "specified, it defaults to revision number 0. If END is not specified,\n" | |
|
|
290 | "it defaults to the tip. The range \":\" thus means \"all revisions\"." | |
|
|
291 | msgstr "" | |
|
|
292 | ||
|
|
293 | msgid "If BEGIN is greater than END, revisions are treated in reverse order." | |
|
|
294 | msgstr "" | |
|
|
295 | ||
|
|
296 | msgid "" | |
|
|
297 | "A range acts as a closed interval. This means that a range of 3:5\n" | |
|
|
298 | "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
|
|
299 | msgstr "" | |
|
|
300 | ||
|
|
301 | msgid "" | |
|
|
302 | "Mercurial accepts several notations for identifying one or more files\n" | |
|
|
303 | "at a time." | |
|
|
304 | msgstr "" | |
|
|
305 | ||
|
|
306 | msgid "" | |
|
|
307 | "By default, Mercurial treats filenames as shell-style extended glob\n" | |
|
|
308 | "patterns." | |
|
|
309 | msgstr "" | |
|
|
310 | ||
|
|
311 | msgid "Alternate pattern notations must be specified explicitly." | |
|
|
312 | msgstr "" | |
|
|
313 | ||
|
|
314 | msgid "" | |
|
|
315 | "To use a plain path name without any pattern matching, start it with\n" | |
|
|
316 | "``path:``. These path names must completely match starting at the\n" | |
|
|
317 | "current repository root." | |
|
|
318 | msgstr "" | |
|
|
319 | ||
|
|
320 | msgid "" | |
|
|
321 | "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" | |
|
|
322 | "at the current directory; a glob such as ``*.c`` will only match files\n" | |
|
|
323 | "in the current directory ending with ``.c``." | |
|
|
324 | msgstr "" | |
|
|
325 | ||
|
|
326 | msgid "" | |
|
|
327 | "The supported glob syntax extensions are ``**`` to match any string\n" | |
|
|
328 | "across path separators and ``{a,b}`` to mean \"a or b\"." | |
|
|
329 | msgstr "" | |
|
|
330 | ||
|
|
331 | msgid "" | |
|
|
332 | "To use a Perl/Python regular expression, start a name with ``re:``.\n" | |
|
|
333 | "Regexp pattern matching is anchored at the root of the repository." | |
|
|
334 | msgstr "" | |
|
|
335 | ||
|
|
336 | msgid "Plain examples::" | |
|
|
337 | msgstr "" | |
|
|
338 | ||
|
|
339 | msgid "" | |
|
|
340 | " path:foo/bar a name bar in a directory named foo in the root\n" | |
|
|
341 | " of the repository\n" | |
|
|
342 | " path:path:name a file or directory named \"path:name\"" | |
|
|
343 | msgstr "" | |
|
|
344 | ||
|
|
345 | msgid "Glob examples::" | |
|
|
346 | msgstr "" | |
|
|
347 | ||
|
|
348 | msgid "" | |
|
|
349 | " glob:*.c any name ending in \".c\" in the current directory\n" | |
|
|
350 | " *.c any name ending in \".c\" in the current directory\n" | |
|
|
351 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |
|
|
352 | " current directory including itself.\n" | |
|
|
353 | " foo/*.c any name ending in \".c\" in the directory foo\n" | |
|
|
354 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
|
|
355 | " including itself." | |
|
|
356 | msgstr "" | |
|
|
357 | ||
|
|
358 | msgid "Regexp examples::" | |
|
|
359 | msgstr "" | |
|
|
360 | ||
|
|
361 | msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
|
362 | msgstr "" | |
|
|
363 | ||
|
|
364 | msgid "Mercurial supports several ways to specify individual revisions." | |
|
|
365 | msgstr "" | |
|
|
366 | ||
|
|
367 | msgid "" | |
|
|
368 | "A plain integer is treated as a revision number. Negative integers are\n" | |
|
|
369 | "treated as sequential offsets from the tip, with -1 denoting the tip,\n" | |
|
|
370 | "-2 denoting the revision prior to the tip, and so forth." | |
|
|
371 | msgstr "" | |
|
|
372 | ||
|
|
373 | msgid "" | |
|
|
374 | "A 40-digit hexadecimal string is treated as a unique revision\n" | |
|
|
375 | "identifier." | |
|
|
376 | msgstr "" | |
|
|
377 | ||
|
|
378 | msgid "" | |
|
|
379 | "A hexadecimal string less than 40 characters long is treated as a\n" | |
|
|
380 | "unique revision identifier and is referred to as a short-form\n" | |
|
|
381 | "identifier. A short-form identifier is only valid if it is the prefix\n" | |
|
|
382 | "of exactly one full-length identifier." | |
|
|
383 | msgstr "" | |
|
|
384 | ||
|
|
385 | msgid "" | |
|
|
386 | "Any other string is treated as a tag or branch name. A tag name is a\n" | |
|
|
387 | "symbolic name associated with a revision identifier. A branch name\n" | |
|
|
388 | "denotes the tipmost revision of that branch. Tag and branch names must\n" | |
|
|
389 | "not contain the \":\" character." | |
|
|
390 | msgstr "" | |
|
|
391 | ||
|
|
392 | msgid "" | |
|
|
393 | "The reserved name \"tip\" is a special tag that always identifies the\n" | |
|
|
394 | "most recent revision." | |
|
|
395 | msgstr "" | |
|
|
396 | ||
|
|
397 | msgid "" | |
|
|
398 | "The reserved name \"null\" indicates the null revision. This is the\n" | |
|
|
399 | "revision of an empty repository, and the parent of revision 0." | |
|
|
400 | msgstr "" | |
|
|
401 | ||
|
|
402 | msgid "" | |
|
|
403 | "The reserved name \".\" indicates the working directory parent. If no\n" | |
|
|
404 | "working directory is checked out, it is equivalent to null. If an\n" | |
|
|
405 | "uncommitted merge is in progress, \".\" is the revision of the first\n" | |
|
|
406 | "parent.\n" | |
|
|
407 | msgstr "" | |
|
|
408 | ||
|
|
409 | msgid "" | |
|
|
410 | "Mercurial allows you to customize output of commands through\n" | |
|
|
411 | "templates. You can either pass in a template from the command\n" | |
|
|
412 | "line, via the --template option, or select an existing\n" | |
|
|
413 | "template-style (--style)." | |
|
|
414 | msgstr "" | |
|
|
415 | ||
|
|
416 | msgid "" | |
|
|
417 | "You can customize output for any \"log-like\" command: log,\n" | |
|
|
418 | "outgoing, incoming, tip, parents, heads and glog." | |
|
|
419 | msgstr "" | |
|
|
420 | ||
|
|
421 | msgid "" | |
|
|
422 | "Three styles are packaged with Mercurial: default (the style used\n" | |
|
|
423 | "when no explicit preference is passed), compact and changelog.\n" | |
|
|
424 | "Usage::" | |
|
|
425 | msgstr "" | |
|
|
426 | ||
|
|
427 | msgid " $ hg log -r1 --style changelog" | |
|
|
428 | msgstr "" | |
|
|
429 | ||
|
|
430 | msgid "" | |
|
|
431 | "A template is a piece of text, with markup to invoke variable\n" | |
|
|
432 | "expansion::" | |
|
|
433 | msgstr "" | |
|
|
434 | ||
|
|
435 | msgid "" | |
|
|
436 | " $ hg log -r1 --template \"{node}\\n\"\n" | |
|
|
437 | " b56ce7b07c52de7d5fd79fb89701ea538af65746" | |
|
|
438 | msgstr "" | |
|
|
439 | ||
|
|
440 | msgid "" | |
|
|
441 | "Strings in curly braces are called keywords. The availability of\n" | |
|
|
442 | "keywords depends on the exact context of the templater. These\n" | |
|
|
443 | "keywords are usually available for templating a log-like command:" | |
|
|
444 | msgstr "" | |
|
|
445 | ||
|
|
446 | msgid "" | |
|
|
447 | ":author: String. The unmodified author of the changeset.\n" | |
|
|
448 | ":branches: String. The name of the branch on which the changeset\n" | |
|
|
449 | " was committed. Will be empty if the branch name was\n" | |
|
|
450 | " default.\n" | |
|
|
451 | ":date: Date information. The date when the changeset was\n" | |
|
|
452 | " committed.\n" | |
|
|
453 | ":desc: String. The text of the changeset description.\n" | |
|
|
454 | ":diffstat: String. Statistics of changes with the following\n" | |
|
|
455 | " format: \"modified files: +added/-removed lines\"\n" | |
|
|
456 | ":files: List of strings. All files modified, added, or removed\n" | |
|
|
457 | " by this changeset.\n" | |
|
|
458 | ":file_adds: List of strings. Files added by this changeset.\n" | |
|
|
459 | ":file_mods: List of strings. Files modified by this changeset.\n" | |
|
|
460 | ":file_dels: List of strings. Files removed by this changeset.\n" | |
|
|
461 | ":node: String. The changeset identification hash, as a\n" | |
|
|
462 | " 40-character hexadecimal string.\n" | |
|
|
463 | ":parents: List of strings. The parents of the changeset.\n" | |
|
|
464 | ":rev: Integer. The repository-local changeset revision\n" | |
|
|
465 | " number.\n" | |
|
|
466 | ":tags: List of strings. Any tags associated with the\n" | |
|
|
467 | " changeset.\n" | |
|
|
468 | ":latesttag: String. Most recent global tag in the ancestors of this\n" | |
|
|
469 | " changeset.\n" | |
|
|
470 | ":latesttagdistance: Integer. Longest path to the latest tag." | |
|
|
471 | msgstr "" | |
|
|
472 | ||
|
|
473 | msgid "" | |
|
|
474 | "The \"date\" keyword does not produce human-readable output. If you\n" | |
|
|
475 | "want to use a date in your output, you can use a filter to process\n" | |
|
|
476 | "it. Filters are functions which return a string based on the input\n" | |
|
|
477 | "variable. You can also use a chain of filters to get the desired\n" | |
|
|
478 | "output::" | |
|
|
479 | msgstr "" | |
|
|
480 | ||
|
|
481 | msgid "" | |
|
|
482 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |
|
|
483 | " 2008-08-21 18:22 +0000" | |
|
|
484 | msgstr "" | |
|
|
485 | ||
|
|
486 | msgid "List of filters:" | |
|
|
487 | msgstr "" | |
|
|
488 | ||
|
|
489 | msgid "" | |
|
|
490 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
|
|
491 | " every line except the last.\n" | |
|
|
492 | ":age: Date. Returns a human-readable date/time difference\n" | |
|
|
493 | " between the given date/time and the current\n" | |
|
|
494 | " date/time.\n" | |
|
|
495 | ":basename: Any text. Treats the text as a path, and returns the\n" | |
|
|
496 | " last component of the path after splitting by the\n" | |
|
|
497 | " path separator (ignoring trailing separators). For\n" | |
|
|
498 | " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n" | |
|
|
499 | " becomes \"bar\".\n" | |
|
|
500 | ":stripdir: Treat the text as path and strip a directory level,\n" | |
|
|
501 | " if possible. For example, \"foo\" and \"foo/bar\" becomes\n" | |
|
|
502 | " \"foo\".\n" | |
|
|
503 | ":date: Date. Returns a date in a Unix date format, including\n" | |
|
|
504 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |
|
|
505 | ":domain: Any text. Finds the first string that looks like an\n" | |
|
|
506 | " email address, and extracts just the domain\n" | |
|
|
507 | " component. Example: 'User <user@example.com>' becomes\n" | |
|
|
508 | " 'example.com'.\n" | |
|
|
509 | ":email: Any text. Extracts the first string that looks like\n" | |
|
|
510 | " an email address. Example: 'User <user@example.com>'\n" | |
|
|
511 | " becomes 'user@example.com'.\n" | |
|
|
512 | ":escape: Any text. Replaces the special XML/XHTML characters\n" | |
|
|
513 | " \"&\", \"<\" and \">\" with XML entities.\n" | |
|
|
514 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" | |
|
|
515 | ":fill76: Any text. Wraps the text to fit in 76 columns.\n" | |
|
|
516 | ":firstline: Any text. Returns the first line of text.\n" | |
|
|
517 | ":nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
|
|
518 | ":hgdate: Date. Returns the date as a pair of numbers:\n" | |
|
|
519 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" | |
|
|
520 | ":isodate: Date. Returns the date in ISO 8601 format:\n" | |
|
|
521 | " \"2009-08-18 13:00 +0200\".\n" | |
|
|
522 | ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |
|
|
523 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n" | |
|
|
524 | " rfc3339date filter.\n" | |
|
|
525 | ":localdate: Date. Converts a date to local date.\n" | |
|
|
526 | ":obfuscate: Any text. Returns the input text rendered as a\n" | |
|
|
527 | " sequence of XML entities.\n" | |
|
|
528 | ":person: Any text. Returns the text before an email address.\n" | |
|
|
529 | ":rfc822date: Date. Returns a date using the same format used in\n" | |
|
|
530 | " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |
|
|
531 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
|
|
532 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" | |
|
|
533 | ":short: Changeset hash. Returns the short form of a changeset\n" | |
|
|
534 | " hash, i.e. a 12-byte hexadecimal string.\n" | |
|
|
535 | ":shortdate: Date. Returns a date like \"2006-09-18\".\n" | |
|
|
536 | ":strip: Any text. Strips all leading and trailing whitespace.\n" | |
|
|
537 | ":tabindent: Any text. Returns the text, with every line except\n" | |
|
|
538 | " the first starting with a tab character.\n" | |
|
|
539 | ":urlescape: Any text. Escapes all \"special\" characters. For\n" | |
|
|
540 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
|
|
541 | ":user: Any text. Returns the user portion of an email\n" | |
|
|
542 | " address.\n" | |
|
|
543 | msgstr "" | |
|
|
544 | ||
|
|
545 | msgid "Valid URLs are of the form::" | |
|
|
546 | msgstr "" | |
|
|
547 | ||
|
|
548 | msgid "" | |
|
|
549 | " local/filesystem/path[#revision]\n" | |
|
|
550 | " file://local/filesystem/path[#revision]\n" | |
|
|
551 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
|
552 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
|
553 | " ssh://[user[:pass]@]host[:port]/[path][#revision]" | |
|
|
554 | msgstr "" | |
|
|
555 | ||
|
|
556 | msgid "" | |
|
|
557 | "Paths in the local filesystem can either point to Mercurial\n" | |
|
|
558 | "repositories or to bundle files (as created by 'hg bundle' or 'hg\n" | |
|
|
559 | "incoming --bundle')." | |
|
|
560 | msgstr "" | |
|
|
561 | ||
|
|
562 | msgid "" | |
|
|
563 | "An optional identifier after # indicates a particular branch, tag, or\n" | |
|
|
564 | "changeset to use from the remote repository. See also 'hg help\n" | |
|
|
565 | "revisions'." | |
|
|
566 | msgstr "" | |
|
|
567 | ||
|
|
568 | msgid "" | |
|
|
569 | "Some features, such as pushing to http:// and https:// URLs are only\n" | |
|
|
570 | "possible if the feature is explicitly enabled on the remote Mercurial\n" | |
|
|
571 | "server." | |
|
|
572 | msgstr "" | |
|
|
573 | ||
|
|
574 | msgid "Some notes about using SSH with Mercurial:" | |
|
|
575 | msgstr "" | |
|
|
576 | ||
|
|
577 | msgid "" | |
|
|
578 | "- SSH requires an accessible shell account on the destination machine\n" | |
|
|
579 | " and a copy of hg in the remote path or specified with as remotecmd.\n" | |
|
|
580 | "- path is relative to the remote user's home directory by default. Use\n" | |
|
|
581 | " an extra slash at the start of a path to specify an absolute path::" | |
|
|
582 | msgstr "" | |
|
|
583 | ||
|
|
584 | msgid " ssh://example.com//tmp/repository" | |
|
|
585 | msgstr "" | |
|
|
586 | ||
|
|
587 | msgid "" | |
|
|
588 | "- Mercurial doesn't use its own compression via SSH; the right thing\n" | |
|
|
589 | " to do is to configure it in your ~/.ssh/config, e.g.::" | |
|
|
590 | msgstr "" | |
|
|
591 | ||
|
|
592 | msgid "" | |
|
|
593 | " Host *.mylocalnetwork.example.com\n" | |
|
|
594 | " Compression no\n" | |
|
|
595 | " Host *\n" | |
|
|
596 | " Compression yes" | |
|
|
597 | msgstr "" | |
|
|
598 | ||
|
|
599 | msgid "" | |
|
|
600 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" | |
|
|
601 | " with the --ssh command line option." | |
|
|
602 | msgstr "" | |
|
|
603 | ||
|
|
604 | msgid "" | |
|
|
605 | "These URLs can all be stored in your hgrc with path aliases under the\n" | |
|
|
606 | "[paths] section like so::" | |
|
|
607 | msgstr "" | |
|
|
608 | ||
|
|
609 | msgid "" | |
|
|
610 | " [paths]\n" | |
|
|
611 | " alias1 = URL1\n" | |
|
|
612 | " alias2 = URL2\n" | |
|
|
613 | " ..." | |
|
|
614 | msgstr "" | |
|
|
615 | ||
|
|
616 | msgid "" | |
|
|
617 | "You can then use the alias for any command that uses a URL (for\n" | |
|
|
618 | "example 'hg pull alias1' would pull from the 'alias1' path)." | |
|
|
619 | msgstr "" | |
|
|
620 | ||
|
|
621 | msgid "" | |
|
|
622 | "Two path aliases are special because they are used as defaults when\n" | |
|
|
623 | "you do not provide the URL to a command:" | |
|
|
624 | msgstr "" | |
|
|
625 | ||
|
|
626 | msgid "" | |
|
|
627 | "default:\n" | |
|
|
628 | " When you create a repository with hg clone, the clone command saves\n" | |
|
|
629 | " the location of the source repository as the new repository's\n" | |
|
|
630 | " 'default' path. This is then used when you omit path from push- and\n" | |
|
|
631 | " pull-like commands (including incoming and outgoing)." | |
|
|
632 | msgstr "" | |
|
|
633 | ||
|
|
634 | msgid "" | |
|
|
635 | "default-push:\n" | |
|
|
636 | " The push command will look for a path named 'default-push', and\n" | |
|
|
637 | " prefer it over 'default' if both are defined.\n" | |
|
|
638 | msgstr "" | |
|
|
43 | msgstr "\t別名:%s" | |
|
|
639 | 44 | |
|
|
640 | 45 | msgid "hooks for controlling repository access" |
|
|
641 | 46 | msgstr "" |
|
|
642 | 47 | |
|
|
643 | 48 | msgid "" |
|
|
644 |
"This hook makes it possible to allow or deny write access to |
|
|
|
645 |
"of a repository when receiving incoming changesets |
|
|
|
49 | "This hook makes it possible to allow or deny write access to given\n" | |
|
|
50 | "branches and paths of a repository when receiving incoming changesets\n" | |
|
|
51 | "via pretxnchangegroup and pretxncommit." | |
|
|
646 | 52 | msgstr "" |
|
|
647 | 53 | |
|
|
648 | 54 | msgid "" |
| @@ -653,63 +59,223 b' msgstr ""' | |||
|
|
653 | 59 | |
|
|
654 | 60 | msgid "" |
|
|
655 | 61 | "The acl hook is best used along with a restricted shell like hgsh,\n" |
|
|
656 | "preventing authenticating users from doing anything other than\n" | |
|
|
657 |
" |
|
|
|
658 |
" |
|
|
|
659 |
" |
|
|
|
660 |
" |
|
|
|
661 | msgstr "" | |
|
|
662 | ||
|
|
663 | msgid "To use this hook, configure the acl extension in your hgrc like this::" | |
|
|
664 | msgstr "" | |
|
|
665 | ||
|
|
666 | msgid "" | |
|
|
667 | " [extensions]\n" | |
|
|
668 | " acl =" | |
|
|
669 | msgstr "" | |
|
|
670 | ||
|
|
671 |
msg |
|
|
|
672 | " [hooks]\n" | |
|
|
62 | "preventing authenticating users from doing anything other than pushing\n" | |
|
|
63 | "or pulling. The hook is not safe to use if users have interactive\n" | |
|
|
64 | "shell access, as they can then disable the hook. Nor is it safe if\n" | |
|
|
65 | "remote users share an account, because then there is no way to\n" | |
|
|
66 | "distinguish them." | |
|
|
67 | msgstr "" | |
|
|
68 | ||
|
|
69 | msgid "The order in which access checks are performed is:" | |
|
|
70 | msgstr "" | |
|
|
71 | ||
|
|
72 | msgid "" | |
|
|
73 | "1) Deny list for branches (section ``acl.deny.branches``)\n" | |
|
|
74 | "2) Allow list for branches (section ``acl.allow.branches``)\n" | |
|
|
75 | "3) Deny list for paths (section ``acl.deny``)\n" | |
|
|
76 | "4) Allow list for paths (section ``acl.allow``)" | |
|
|
77 | msgstr "" | |
|
|
78 | ||
|
|
79 | msgid "The allow and deny sections take key-value pairs." | |
|
|
80 | msgstr "" | |
|
|
81 | ||
|
|
82 | msgid "" | |
|
|
83 | "Branch-based Access Control\n" | |
|
|
84 | "..........................." | |
|
|
85 | msgstr "" | |
|
|
86 | ||
|
|
87 | msgid "" | |
|
|
88 | "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" | |
|
|
89 | "have branch-based access control. Keys in these sections can be\n" | |
|
|
90 | "either:" | |
|
|
91 | msgstr "" | |
|
|
92 | ||
|
|
93 | msgid "" | |
|
|
94 | "- a branch name, or\n" | |
|
|
95 | "- an asterisk, to match any branch;" | |
|
|
96 | msgstr "" | |
|
|
97 | ||
|
|
98 | msgid "The corresponding values can be either:" | |
|
|
99 | msgstr "" | |
|
|
100 | ||
|
|
101 | msgid "" | |
|
|
102 | "- a comma-separated list containing users and groups, or\n" | |
|
|
103 | "- an asterisk, to match anyone;" | |
|
|
104 | msgstr "" | |
|
|
105 | ||
|
|
106 | msgid "" | |
|
|
107 | "Path-based Access Control\n" | |
|
|
108 | "........................." | |
|
|
109 | msgstr "" | |
|
|
110 | ||
|
|
111 | msgid "" | |
|
|
112 | "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" | |
|
|
113 | "access control. Keys in these sections accept a subtree pattern (with\n" | |
|
|
114 | "a glob syntax by default). The corresponding values follow the same\n" | |
|
|
115 | "syntax as the other sections above." | |
|
|
116 | msgstr "" | |
|
|
117 | ||
|
|
118 | msgid "" | |
|
|
119 | "Groups\n" | |
|
|
120 | "......" | |
|
|
121 | msgstr "" | |
|
|
122 | ||
|
|
123 | msgid "" | |
|
|
124 | "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" | |
|
|
125 | "name has the same effect as specifying all the users in that group." | |
|
|
126 | msgstr "" | |
|
|
127 | ||
|
|
128 | msgid "" | |
|
|
129 | "You can define group members in the ``acl.groups`` section.\n" | |
|
|
130 | "If a group name is not defined there, and Mercurial is running under\n" | |
|
|
131 | "a Unix-like system, the list of users will be taken from the OS.\n" | |
|
|
132 | "Otherwise, an exception will be raised." | |
|
|
133 | msgstr "" | |
|
|
134 | ||
|
|
135 | msgid "" | |
|
|
136 | "Example Configuration\n" | |
|
|
137 | "....................." | |
|
|
138 | msgstr "" | |
|
|
139 | ||
|
|
140 | msgid "::" | |
|
|
141 | msgstr "" | |
|
|
142 | ||
|
|
143 | msgid " [hooks]" | |
|
|
144 | msgstr "" | |
|
|
145 | ||
|
|
146 | msgid "" | |
|
|
147 | " # Use this if you want to check access restrictions at commit time\n" | |
|
|
148 | " pretxncommit.acl = python:hgext.acl.hook" | |
|
|
149 | msgstr "" | |
|
|
150 | ||
|
|
151 | msgid "" | |
|
|
152 | " # Use this if you want to check access restrictions for pull, push,\n" | |
|
|
153 | " # bundle and serve.\n" | |
|
|
673 | 154 | " pretxnchangegroup.acl = python:hgext.acl.hook" |
|
|
674 | 155 | msgstr "" |
|
|
675 | 156 | |
|
|
676 | 157 | msgid "" |
|
|
677 | 158 | " [acl]\n" |
|
|
678 |
" # |
|
|
|
679 | " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" | |
|
|
159 | " # Allow or deny access for incoming changes only if their source is\n" | |
|
|
160 | " # listed here, let them pass otherwise. Source is \"serve\" for all\n" | |
|
|
161 | " # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" | |
|
|
162 | " # related commands are run locally.\n" | |
|
|
163 | " # Default: serve\n" | |
|
|
680 | 164 | " sources = serve" |
|
|
681 | 165 | msgstr "" |
|
|
682 | 166 | |
|
|
683 | msgid "" | |
|
|
684 | "The allow and deny sections take a subtree pattern as key (with a glob\n" | |
|
|
685 | "syntax by default), and a comma separated list of users as the\n" | |
|
|
686 | "corresponding value. The deny list is checked before the allow list\n" | |
|
|
687 | "is. ::" | |
|
|
167 | msgid " [acl.deny.branches]" | |
|
|
168 | msgstr "" | |
|
|
169 | ||
|
|
170 | msgid "" | |
|
|
171 | " # Everyone is denied to the frozen branch:\n" | |
|
|
172 | " frozen-branch = *" | |
|
|
173 | msgstr "" | |
|
|
174 | ||
|
|
175 | msgid "" | |
|
|
176 | " # A bad user is denied on all branches:\n" | |
|
|
177 | " * = bad-user" | |
|
|
178 | msgstr "" | |
|
|
179 | ||
|
|
180 | msgid " [acl.allow.branches]" | |
|
|
181 | msgstr "" | |
|
|
182 | ||
|
|
183 | msgid "" | |
|
|
184 | " # A few users are allowed on branch-a:\n" | |
|
|
185 | " branch-a = user-1, user-2, user-3" | |
|
|
186 | msgstr "" | |
|
|
187 | ||
|
|
188 | msgid "" | |
|
|
189 | " # Only one user is allowed on branch-b:\n" | |
|
|
190 | " branch-b = user-1" | |
|
|
191 | msgstr "" | |
|
|
192 | ||
|
|
193 | msgid "" | |
|
|
194 | " # The super user is allowed on any branch:\n" | |
|
|
195 | " * = super-user" | |
|
|
196 | msgstr "" | |
|
|
197 | ||
|
|
198 | msgid "" | |
|
|
199 | " # Everyone is allowed on branch-for-tests:\n" | |
|
|
200 | " branch-for-tests = *" | |
|
|
201 | msgstr "" | |
|
|
202 | ||
|
|
203 | msgid "" | |
|
|
204 | " [acl.deny]\n" | |
|
|
205 | " # This list is checked first. If a match is found, acl.allow is not\n" | |
|
|
206 | " # checked. All users are granted access if acl.deny is not present.\n" | |
|
|
207 | " # Format for both lists: glob pattern = user, ..., @group, ..." | |
|
|
208 | msgstr "" | |
|
|
209 | ||
|
|
210 | msgid "" | |
|
|
211 | " # To match everyone, use an asterisk for the user:\n" | |
|
|
212 | " # my/glob/pattern = *" | |
|
|
213 | msgstr "" | |
|
|
214 | ||
|
|
215 | msgid "" | |
|
|
216 | " # user6 will not have write access to any file:\n" | |
|
|
217 | " ** = user6" | |
|
|
218 | msgstr "" | |
|
|
219 | ||
|
|
220 | msgid "" | |
|
|
221 | " # Group \"hg-denied\" will not have write access to any file:\n" | |
|
|
222 | " ** = @hg-denied" | |
|
|
223 | msgstr "" | |
|
|
224 | ||
|
|
225 | msgid "" | |
|
|
226 | " # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" | |
|
|
227 | " # everyone being able to change all other files. See below.\n" | |
|
|
228 | " src/main/resources/DONT-TOUCH-THIS.txt = *" | |
|
|
688 | 229 | msgstr "" |
|
|
689 | 230 | |
|
|
690 | 231 | msgid "" |
|
|
691 | 232 | " [acl.allow]\n" |
|
|
692 |
" # |
|
|
|
693 |
" # |
|
|
|
694 | " docs/** = doc_writer\n" | |
|
|
695 | " .hgtags = release_engineer" | |
|
|
696 |
msg |
|
|
|
697 | ||
|
|
698 | msgid "" | |
|
|
699 | " [acl.deny]\n" | |
|
|
700 | " # If acl.deny is not present, no users are refused by default.\n" | |
|
|
701 | " # An empty acl.deny section means all users allowed.\n" | |
|
|
702 | " glob pattern = user4, user5\n" | |
|
|
703 | " ** = user6\n" | |
|
|
704 | msgstr "" | |
|
|
705 | ||
|
|
706 | #, python-format | |
|
|
707 | msgid "config error - hook type \"%s\" cannot stop incoming changesets" | |
|
|
233 | " # if acl.allow is not present, all users are allowed by default\n" | |
|
|
234 | " # empty acl.allow = no users allowed" | |
|
|
235 | msgstr "" | |
|
|
236 | ||
|
|
237 | msgid "" | |
|
|
238 | " # User \"doc_writer\" has write access to any file under the \"docs\"\n" | |
|
|
239 | " # folder:\n" | |
|
|
240 | " docs/** = doc_writer" | |
|
|
241 | msgstr "" | |
|
|
242 | ||
|
|
243 | msgid "" | |
|
|
244 | " # User \"jack\" and group \"designers\" have write access to any file\n" | |
|
|
245 | " # under the \"images\" folder:\n" | |
|
|
246 | " images/** = jack, @designers" | |
|
|
247 | msgstr "" | |
|
|
248 | ||
|
|
249 | msgid "" | |
|
|
250 | " # Everyone (except for \"user6\" - see acl.deny above) will have write\n" | |
|
|
251 | " # access to any file under the \"resources\" folder (except for 1\n" | |
|
|
252 | " # file. See acl.deny):\n" | |
|
|
253 | " src/main/resources/** = *" | |
|
|
254 | msgstr "" | |
|
|
255 | ||
|
|
256 | msgid " .hgtags = release_engineer" | |
|
|
257 | msgstr "" | |
|
|
258 | ||
|
|
259 | #, python-format | |
|
|
260 | msgid "group '%s' is undefined" | |
|
|
261 | msgstr "沒有定義'%s'群組" | |
|
|
262 | ||
|
|
263 | #, python-format | |
|
|
264 | msgid "" | |
|
|
265 | "config error - hook type \"%s\" cannot stop incoming changesets nor commits" | |
|
|
266 | msgstr "" | |
|
|
267 | ||
|
|
268 | #, python-format | |
|
|
269 | msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" | |
|
|
270 | msgstr "" | |
|
|
271 | ||
|
|
272 | #, python-format | |
|
|
273 | msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" | |
|
|
708 | 274 | msgstr "" |
|
|
709 | 275 | |
|
|
710 | 276 | #, python-format |
|
|
711 | 277 | msgid "acl: access denied for changeset %s" |
|
|
712 | msgstr "" | |
|
|
278 | msgstr "acl: changeset %s 拒絕存取" | |
|
|
713 | 279 | |
|
|
714 | 280 | msgid "track a line of development with movable markers" |
|
|
715 | 281 | msgstr "" |
| @@ -722,15 +288,15 b' msgid ""' | |||
|
|
722 | 288 | msgstr "" |
|
|
723 | 289 | |
|
|
724 | 290 | msgid "" |
|
|
725 |
"It is possible to use bookmark names in every revision lookup (e.g. |
|
|
|
726 |
" |
|
|
|
291 | "It is possible to use bookmark names in every revision lookup (e.g.\n" | |
|
|
292 | ":hg:`merge`, :hg:`update`)." | |
|
|
727 | 293 | msgstr "" |
|
|
728 | 294 | |
|
|
729 | 295 | msgid "" |
|
|
730 | 296 | "By default, when several bookmarks point to the same changeset, they\n" |
|
|
731 | 297 | "will all move forward together. It is possible to obtain a more\n" |
|
|
732 | 298 | "git-like experience by adding the following configuration option to\n" |
|
|
733 | "your .hgrc::" | |
|
|
299 | "your configuration file::" | |
|
|
734 | 300 | msgstr "" |
|
|
735 | 301 | |
|
|
736 | 302 | msgid "" |
| @@ -747,47 +313,134 b' msgstr ""' | |||
|
|
747 | 313 | msgid "" |
|
|
748 | 314 | " Bookmarks are pointers to certain commits that move when\n" |
|
|
749 | 315 | " committing. Bookmarks are local. They can be renamed, copied and\n" |
|
|
750 |
" deleted. It is possible to use bookmark names in |
|
|
|
751 |
" |
|
|
|
752 | msgstr "" | |
|
|
753 | ||
|
|
754 | msgid "" | |
|
|
755 |
" You can use |
|
|
|
316 | " deleted. It is possible to use bookmark names in :hg:`merge` and\n" | |
|
|
317 | " :hg:`update` to merge and update respectively to a given bookmark." | |
|
|
318 | msgstr "" | |
|
|
319 | ||
|
|
320 | msgid "" | |
|
|
321 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |
|
|
756 | 322 | " directory's parent revision with the given name. If you specify\n" |
|
|
757 | 323 | " a revision using -r REV (where REV may be an existing bookmark),\n" |
|
|
758 |
" the bookmark is assigned to that revision. |
|
|
|
324 | " the bookmark is assigned to that revision." | |
|
|
325 | msgstr "" | |
|
|
326 | ||
|
|
327 | msgid "" | |
|
|
328 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
|
329 | " push` and :hg:`help pull`). This requires the bookmark extension to be\n" | |
|
|
330 | " enabled for both the local and remote repositories.\n" | |
|
|
759 | 331 | " " |
|
|
760 | 332 | msgstr "" |
|
|
761 | 333 | |
|
|
762 | 334 | msgid "a bookmark of this name does not exist" |
|
|
763 | msgstr "" | |
|
|
335 | msgstr "這個名字的書籤不存在" | |
|
|
764 | 336 | |
|
|
765 | 337 | msgid "a bookmark of the same name already exists" |
|
|
766 | msgstr "" | |
|
|
338 | msgstr "已經有相同名字的書籤了" | |
|
|
767 | 339 | |
|
|
768 | 340 | msgid "new bookmark name required" |
|
|
769 | msgstr "" | |
|
|
341 | msgstr "需要新的書籤名字" | |
|
|
770 | 342 | |
|
|
771 | 343 | msgid "bookmark name required" |
|
|
772 | msgstr "" | |
|
|
344 | msgstr "需要書籤的名字" | |
|
|
773 | 345 | |
|
|
774 | 346 | msgid "bookmark name cannot contain newlines" |
|
|
347 | msgstr "書籤名字不可以有換行字元" | |
|
|
348 | ||
|
|
349 | msgid "bookmark names cannot consist entirely of whitespace" | |
|
|
775 | 350 | msgstr "" |
|
|
776 | 351 | |
|
|
777 | 352 | msgid "a bookmark cannot have the name of an existing branch" |
|
|
778 | 353 | msgstr "" |
|
|
779 | 354 | |
|
|
355 | msgid "no bookmarks set\n" | |
|
|
356 | msgstr "沒有設定書籤\n" | |
|
|
357 | ||
|
|
358 | #, python-format | |
|
|
359 | msgid "updating bookmark %s\n" | |
|
|
360 | msgstr "更新書籤 %s\n" | |
|
|
361 | ||
|
|
362 | #, python-format | |
|
|
363 | msgid "not updating divergent bookmark %s\n" | |
|
|
364 | msgstr "沒有更新分歧的書籤 %s\n" | |
|
|
365 | ||
|
|
366 | #, python-format | |
|
|
367 | msgid "updating bookmark %s failed!\n" | |
|
|
368 | msgstr "更新書籤 %s 失敗！\n" | |
|
|
369 | ||
|
|
370 | #, python-format | |
|
|
371 | msgid "remote bookmark %s not found!" | |
|
|
372 | msgstr "找不到 %s書籤" | |
|
|
373 | ||
|
|
374 | #, python-format | |
|
|
375 | msgid "importing bookmark %s\n" | |
|
|
376 | msgstr "匯入書籤 %s\n" | |
|
|
377 | ||
|
|
378 | #, python-format | |
|
|
379 | msgid "exporting bookmark %s\n" | |
|
|
380 | msgstr "匯出書籤 %s\n" | |
|
|
381 | ||
|
|
382 | #, python-format | |
|
|
383 | msgid "deleting remote bookmark %s\n" | |
|
|
384 | msgstr "刪除遠端書籤 %s\n" | |
|
|
385 | ||
|
|
386 | #, python-format | |
|
|
387 | msgid "bookmark %s does not exist on the local or remote repository!\n" | |
|
|
388 | msgstr "%s 書籤沒有在本地或遠端儲存庫!\n" | |
|
|
389 | ||
|
|
390 | #, fuzzy | |
|
|
391 | msgid "searching for changed bookmarks\n" | |
|
|
392 | msgstr "正在搜尋變更\n" | |
|
|
393 | ||
|
|
394 | #, fuzzy | |
|
|
395 | msgid "no changed bookmarks found\n" | |
|
|
396 | msgstr "找不到變更\n" | |
|
|
397 | ||
|
|
398 | #, python-format | |
|
|
399 | msgid "comparing with %s\n" | |
|
|
400 | msgstr "正在跟 %s 比對\n" | |
|
|
401 | ||
|
|
402 | msgid "bookmark to import" | |
|
|
403 | msgstr "" | |
|
|
404 | ||
|
|
405 | msgid "BOOKMARK" | |
|
|
406 | msgstr "" | |
|
|
407 | ||
|
|
408 | msgid "bookmark to export" | |
|
|
409 | msgstr "" | |
|
|
410 | ||
|
|
411 | msgid "compare bookmark" | |
|
|
412 | msgstr "比對書籤" | |
|
|
413 | ||
|
|
414 | msgid "" | |
|
|
415 | "``bookmark([name])``\n" | |
|
|
416 | " The named bookmark or all bookmarks." | |
|
|
417 | msgstr "" | |
|
|
418 | ||
|
|
419 | #. i18n: "bookmark" is a keyword | |
|
|
420 | msgid "bookmark takes one or no arguments" | |
|
|
421 | msgstr "bookmark 需要一個參數或沒有參數" | |
|
|
422 | ||
|
|
423 | #. i18n: "bookmark" is a keyword | |
|
|
424 | msgid "the argument to bookmark must be a string" | |
|
|
425 | msgstr "" | |
|
|
426 | ||
|
|
780 | 427 | msgid "force" |
|
|
781 | 428 | msgstr "" |
|
|
782 | 429 | |
|
|
430 | msgid "REV" | |
|
|
431 | msgstr "" | |
|
|
432 | ||
|
|
783 | 433 | msgid "revision" |
|
|
784 | msgstr "" | |
|
|
434 | msgstr "修定版" | |
|
|
785 | 435 | |
|
|
786 | 436 | msgid "delete a given bookmark" |
|
|
437 | msgstr "刪除一個特定的書籤" | |
|
|
438 | ||
|
|
439 | msgid "NAME" | |
|
|
787 | 440 | msgstr "" |
|
|
788 | 441 | |
|
|
789 | 442 | msgid "rename a given bookmark" |
|
|
790 | msgstr "" | |
|
|
443 | msgstr "更名一個特定的書籤" | |
|
|
791 | 444 | |
|
|
792 | 445 | msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" |
|
|
793 | 446 | msgstr "" |
| @@ -992,25 +645,25 b' msgstr ""' | |||
|
|
992 | 645 | |
|
|
993 | 646 | #, python-format |
|
|
994 | 647 | msgid "connecting to %s:%s as %s, password %s\n" |
|
|
995 | msgstr "" | |
|
|
648 | msgstr "正在連線到 %s:%s as %s, 密碼是 %s\n" | |
|
|
996 | 649 | |
|
|
997 | 650 | #, python-format |
|
|
998 | 651 | msgid "query: %s %s\n" |
|
|
999 | msgstr "" | |
|
|
652 | msgstr "查詢: %s %s\n" | |
|
|
1000 | 653 | |
|
|
1001 | 654 | #, python-format |
|
|
1002 | 655 | msgid "failed query: %s %s\n" |
|
|
1003 | msgstr "" | |
|
|
656 | msgstr "查詢失敗了: %s %s\n" | |
|
|
1004 | 657 | |
|
|
1005 | 658 | msgid "unknown database schema" |
|
|
1006 | msgstr "" | |
|
|
659 | msgstr "未知的資料庫schema" | |
|
|
1007 | 660 | |
|
|
1008 | 661 | #, python-format |
|
|
1009 | 662 | msgid "bug %d already knows about changeset %s\n" |
|
|
1010 | 663 | msgstr "" |
|
|
1011 | 664 | |
|
|
1012 | 665 | msgid "telling bugzilla to send mail:\n" |
|
|
1013 | msgstr "" | |
|
|
666 | msgstr "告訴bugzilla去寄信:\n" | |
|
|
1014 | 667 | |
|
|
1015 | 668 | #, python-format |
|
|
1016 | 669 | msgid " bug %s\n" |
| @@ -1018,30 +671,30 b' msgstr ""' | |||
|
|
1018 | 671 | |
|
|
1019 | 672 | #, python-format |
|
|
1020 | 673 | msgid "running notify command %s\n" |
|
|
1021 | msgstr "" | |
|
|
674 | msgstr "執行通知命令 %s\n" | |
|
|
1022 | 675 | |
|
|
1023 | 676 | #, python-format |
|
|
1024 | 677 | msgid "bugzilla notify command %s" |
|
|
1025 | msgstr "" | |
|
|
678 | msgstr "bugzilla 通知命令 %s" | |
|
|
1026 | 679 | |
|
|
1027 | 680 | msgid "done\n" |
|
|
1028 | msgstr "" | |
|
|
681 | msgstr "完成\n" | |
|
|
1029 | 682 | |
|
|
1030 | 683 | #, python-format |
|
|
1031 | 684 | msgid "looking up user %s\n" |
|
|
1032 | msgstr "" | |
|
|
685 | msgstr "查閱使用者 %s\n" | |
|
|
1033 | 686 | |
|
|
1034 | 687 | #, python-format |
|
|
1035 | 688 | msgid "cannot find bugzilla user id for %s" |
|
|
1036 | msgstr "" | |
|
|
689 | msgstr "找不到 bugzilla 使用者%s 的 ID" | |
|
|
1037 | 690 | |
|
|
1038 | 691 | #, python-format |
|
|
1039 | 692 | msgid "cannot find bugzilla user id for %s or %s" |
|
|
1040 | msgstr "" | |
|
|
693 | msgstr "找不到 bugzilla 使用者%s 或 %s的 ID" | |
|
|
1041 | 694 | |
|
|
1042 | 695 | #, python-format |
|
|
1043 | 696 | msgid "bugzilla version %s not supported" |
|
|
1044 | msgstr "" | |
|
|
697 | msgstr "bugzilla版本 %s 不支援" | |
|
|
1045 | 698 | |
|
|
1046 | 699 | msgid "" |
|
|
1047 | 700 | "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
| @@ -1051,7 +704,7 b' msgstr ""' | |||
|
|
1051 | 704 | |
|
|
1052 | 705 | #, python-format |
|
|
1053 | 706 | msgid "python mysql support not available: %s" |
|
|
1054 | msgstr "" | |
|
|
707 | msgstr "python mmysql 支援不能用: %s" | |
|
|
1055 | 708 | |
|
|
1056 | 709 | #, python-format |
|
|
1057 | 710 | msgid "hook type %s does not pass a changeset id" |
| @@ -1059,7 +712,7 b' msgstr ""' | |||
|
|
1059 | 712 | |
|
|
1060 | 713 | #, python-format |
|
|
1061 | 714 | msgid "database error: %s" |
|
|
1062 | msgstr "" | |
|
|
715 | msgstr "資料庫錯誤: %s" | |
|
|
1063 | 716 | |
|
|
1064 | 717 | msgid "command to display child changesets" |
|
|
1065 | 718 | msgstr "" |
| @@ -1089,9 +742,8 b' msgstr ""' | |||
|
|
1089 | 742 | msgid "Revision %d is a merge, ignoring...\n" |
|
|
1090 | 743 | msgstr "" |
|
|
1091 | 744 | |
|
|
1092 | #, python-format | |
|
|
1093 | msgid "generating stats: %d%%" | |
|
|
1094 | msgstr "" | |
|
|
745 | msgid "analyzing" | |
|
|
746 | msgstr "分析中" | |
|
|
1095 | 747 | |
|
|
1096 | 748 | msgid "histogram of changes to the repository" |
|
|
1097 | 749 | msgstr "" |
| @@ -1138,7 +790,7 b' msgid ""' | |||
|
|
1138 | 790 | " by providing a file using the following format::" |
|
|
1139 | 791 | msgstr "" |
|
|
1140 | 792 | |
|
|
1141 | msgid " <alias email> <actual email>" | |
|
|
793 | msgid " <alias email> = <actual email>" | |
|
|
1142 | 794 | msgstr "" |
|
|
1143 | 795 | |
|
|
1144 | 796 | msgid "" |
| @@ -1147,15 +799,28 b' msgid ""' | |||
|
|
1147 | 799 | " " |
|
|
1148 | 800 | msgstr "" |
|
|
1149 | 801 | |
|
|
802 | #, python-format | |
|
|
803 | msgid "skipping malformed alias: %s\n" | |
|
|
804 | msgstr "" | |
|
|
805 | ||
|
|
1150 | 806 | msgid "count rate for the specified revision or range" |
|
|
1151 | 807 | msgstr "" |
|
|
1152 | 808 | |
|
|
809 | msgid "DATE" | |
|
|
810 | msgstr "" | |
|
|
811 | ||
|
|
1153 | 812 | msgid "count rate for revisions matching date spec" |
|
|
1154 | 813 | msgstr "" |
|
|
1155 | 814 | |
|
|
815 | msgid "TEMPLATE" | |
|
|
816 | msgstr "" | |
|
|
817 | ||
|
|
1156 | 818 | msgid "template to group changesets" |
|
|
1157 | 819 | msgstr "" |
|
|
1158 | 820 | |
|
|
821 | msgid "FORMAT" | |
|
|
822 | msgstr "" | |
|
|
823 | ||
|
|
1159 | 824 | msgid "strftime-compatible format for grouping by date" |
|
|
1160 | 825 | msgstr "" |
|
|
1161 | 826 | |
| @@ -1165,21 +830,25 b' msgstr ""' | |||
|
|
1165 | 830 | msgid "sort by key (default: sort by count)" |
|
|
1166 | 831 | msgstr "" |
|
|
1167 | 832 | |
|
|
833 | msgid "display added/removed lines separately" | |
|
|
834 | msgstr "" | |
|
|
835 | ||
|
|
836 | msgid "FILE" | |
|
|
837 | msgstr "" | |
|
|
838 | ||
|
|
1168 | 839 | msgid "file with email aliases" |
|
|
1169 | 840 | msgstr "" |
|
|
1170 | 841 | |
|
|
1171 | msgid "show progress" | |
|
|
1172 | msgstr "" | |
|
|
1173 | ||
|
|
1174 | msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" | |
|
|
842 | msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" | |
|
|
1175 | 843 | msgstr "" |
|
|
1176 | 844 | |
|
|
1177 | 845 | msgid "colorize output from some commands" |
|
|
1178 | 846 | msgstr "" |
|
|
1179 | 847 | |
|
|
1180 | 848 | msgid "" |
|
|
1181 |
"This extension modifies the status command to add color to |
|
|
|
1182 | "to reflect file status, the qseries command to add color to reflect\n" | |
|
|
849 | "This extension modifies the status and resolve commands to add color to " | |
|
|
850 | "their\n" | |
|
|
851 | "output to reflect file status, the qseries command to add color to reflect\n" | |
|
|
1183 | 852 | "patch status (applied, unapplied, missing), and to diff-related\n" |
|
|
1184 | 853 | "commands to highlight additions, removals, diff headers, and trailing\n" |
|
|
1185 | 854 | "whitespace." |
| @@ -1192,7 +861,7 b' msgid ""' | |||
|
|
1192 | 861 | "render_text function, which can be used to add effects to any text." |
|
|
1193 | 862 | msgstr "" |
|
|
1194 | 863 | |
|
|
1195 |
msgid "Default effects may be overridden from |
|
|
|
864 | msgid "Default effects may be overridden from your configuration file::" | |
|
|
1196 | 865 | msgstr "" |
|
|
1197 | 866 | |
|
|
1198 | 867 | msgid "" |
| @@ -1226,17 +895,50 b' msgid ""' | |||
|
|
1226 | 895 | " diff.deleted = red\n" |
|
|
1227 | 896 | " diff.inserted = green\n" |
|
|
1228 | 897 | " diff.changed = white\n" |
|
|
1229 |
" diff.trailingwhitespace = bold red_background |
|
|
|
1230 | msgstr "" | |
|
|
1231 | ||
|
|
1232 | msgid "when to colorize (always, auto, or never)" | |
|
|
1233 | msgstr "" | |
|
|
1234 | ||
|
|
1235 | msgid "don't colorize output (DEPRECATED)" | |
|
|
898 | " diff.trailingwhitespace = bold red_background" | |
|
|
899 | msgstr "" | |
|
|
900 | ||
|
|
901 | msgid "" | |
|
|
902 | " resolve.unresolved = red bold\n" | |
|
|
903 | " resolve.resolved = green bold" | |
|
|
904 | msgstr "" | |
|
|
905 | ||
|
|
906 | msgid " bookmarks.current = green" | |
|
|
907 | msgstr "" | |
|
|
908 | ||
|
|
909 | msgid "" | |
|
|
910 | " branches.active = none\n" | |
|
|
911 | " branches.closed = black bold\n" | |
|
|
912 | " branches.current = green\n" | |
|
|
913 | " branches.inactive = none" | |
|
|
914 | msgstr "" | |
|
|
915 | ||
|
|
916 | msgid "" | |
|
|
917 | "The color extension will try to detect whether to use ANSI codes or\n" | |
|
|
918 | "Win32 console APIs, unless it is made explicit::" | |
|
|
919 | msgstr "" | |
|
|
920 | ||
|
|
921 | msgid "" | |
|
|
922 | " [color]\n" | |
|
|
923 | " mode = ansi" | |
|
|
924 | msgstr "" | |
|
|
925 | ||
|
|
926 | msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color." | |
|
|
1236 | 927 | msgstr "" |
|
|
1237 | 928 | |
|
|
1238 | 929 | #, python-format |
|
|
1239 | 930 | msgid "ignoring unknown color/effect %r (configured in color.%s)\n" |
|
|
931 | msgstr "忽略未知的顏色/效果 %r (被設定在 color.%s)\n" | |
|
|
932 | ||
|
|
933 | msgid "win32console not found, please install pywin32\n" | |
|
|
934 | msgstr "找不到win32console,請安裝pywin32\n" | |
|
|
935 | ||
|
|
936 | #. i18n: 'always', 'auto', and 'never' are keywords and should | |
|
|
937 | #. not be translated | |
|
|
938 | msgid "when to colorize (boolean, always, auto, or never)" | |
|
|
939 | msgstr "" | |
|
|
940 | ||
|
|
941 | msgid "TYPE" | |
|
|
1240 | 942 | msgstr "" |
|
|
1241 | 943 | |
|
|
1242 | 944 | msgid "import revisions from foreign VCS repositories into Mercurial" |
| @@ -1276,7 +978,7 b' msgstr ""' | |||
|
|
1276 | 978 | |
|
|
1277 | 979 | msgid "" |
|
|
1278 | 980 | " If no destination directory name is specified, it defaults to the\n" |
|
|
1279 |
" basename of the source with |
|
|
|
981 | " basename of the source with ``-hg`` appended. If the destination\n" | |
|
|
1280 | 982 | " repository doesn't exist, it will be created." |
|
|
1281 | 983 | msgstr "" |
|
|
1282 | 984 | |
| @@ -1316,41 +1018,53 b' msgstr ""' | |||
|
|
1316 | 1018 | |
|
|
1317 | 1019 | msgid "" |
|
|
1318 | 1020 | " If the file doesn't exist, it's automatically created. It's\n" |
|
|
1319 |
" updated on each commit copied, so convert |
|
|
|
1021 | " updated on each commit copied, so :hg:`convert` can be interrupted\n" | |
|
|
1320 | 1022 | " and can be run repeatedly to copy new commits." |
|
|
1321 | 1023 | msgstr "" |
|
|
1322 | 1024 | |
|
|
1323 | 1025 | msgid "" |
|
|
1324 |
" The |
|
|
|
1325 |
" |
|
|
|
1326 |
" |
|
|
|
1327 |
" |
|
|
|
1328 | " srcauthor=whatever string you want" | |
|
|
1026 | " The authormap is a simple text file that maps each source commit\n" | |
|
|
1027 | " author to a destination commit author. It is handy for source SCMs\n" | |
|
|
1028 | " that use unix logins to identify authors (eg: CVS). One line per\n" | |
|
|
1029 | " author mapping and the line format is::" | |
|
|
1030 | msgstr "" | |
|
|
1031 | ||
|
|
1032 | msgid " source author = destination author" | |
|
|
1033 | msgstr "" | |
|
|
1034 | ||
|
|
1035 | msgid " Empty lines and lines starting with a ``#`` are ignored." | |
|
|
1329 | 1036 | msgstr "" |
|
|
1330 | 1037 | |
|
|
1331 | 1038 | msgid "" |
|
|
1332 | 1039 | " The filemap is a file that allows filtering and remapping of files\n" |
|
|
1333 | " and directories. Comment lines start with '#'. Each line can\n" | |
|
|
1334 | " contain one of the following directives::" | |
|
|
1335 | msgstr "" | |
|
|
1336 | ||
|
|
1337 | msgid " include path/to/file" | |
|
|
1338 | msgstr "" | |
|
|
1339 | ||
|
|
1340 | msgid " exclude path/to/file" | |
|
|
1341 | msgstr "" | |
|
|
1342 | ||
|
|
1343 | msgid " rename from/file to/file" | |
|
|
1344 | msgstr "" | |
|
|
1345 | ||
|
|
1346 | msgid "" | |
|
|
1347 | " The 'include' directive causes a file, or all files under a\n" | |
|
|
1040 | " and directories. Each line can contain one of the following\n" | |
|
|
1041 | " directives::" | |
|
|
1042 | msgstr "" | |
|
|
1043 | ||
|
|
1044 | msgid " include path/to/file-or-dir" | |
|
|
1045 | msgstr "" | |
|
|
1046 | ||
|
|
1047 | msgid " exclude path/to/file-or-dir" | |
|
|
1048 | msgstr "" | |
|
|
1049 | ||
|
|
1050 | msgid " rename path/to/source path/to/destination" | |
|
|
1051 | msgstr "" | |
|
|
1052 | ||
|
|
1053 | msgid "" | |
|
|
1054 | " Comment lines start with ``#``. A specified path matches if it\n" | |
|
|
1055 | " equals the full relative name of a file or one of its parent\n" | |
|
|
1056 | " directories. The ``include`` or ``exclude`` directive with the\n" | |
|
|
1057 | " longest matching path applies, so line order does not matter." | |
|
|
1058 | msgstr "" | |
|
|
1059 | ||
|
|
1060 | msgid "" | |
|
|
1061 | " The ``include`` directive causes a file, or all files under a\n" | |
|
|
1348 | 1062 | " directory, to be included in the destination repository, and the\n" |
|
|
1349 | 1063 | " exclusion of all other files and directories not explicitly\n" |
|
|
1350 |
" included. The |
|
|
|
1351 |
" be omitted. The |
|
|
|
1352 |
" rename from a subdirectory into the root of |
|
|
|
1353 |
" |
|
|
|
1064 | " included. The ``exclude`` directive causes files or directories to\n" | |
|
|
1065 | " be omitted. The ``rename`` directive renames a file or directory if\n" | |
|
|
1066 | " it is converted. To rename from a subdirectory into the root of\n" | |
|
|
1067 | " the repository, use ``.`` as the path to rename to." | |
|
|
1354 | 1068 | msgstr "" |
|
|
1355 | 1069 | |
|
|
1356 | 1070 | msgid "" |
| @@ -1359,11 +1073,21 b' msgid ""' | |||
|
|
1359 | 1073 | " useful if you want to e.g. give a Subversion merge two parents, or\n" |
|
|
1360 | 1074 | " graft two disconnected series of history together. Each entry\n" |
|
|
1361 | 1075 | " contains a key, followed by a space, followed by one or two\n" |
|
|
1362 | " comma-separated values. The key is the revision ID in the source\n" | |
|
|
1076 | " comma-separated values::" | |
|
|
1077 | msgstr "" | |
|
|
1078 | ||
|
|
1079 | msgid " key parent1, parent2" | |
|
|
1080 | msgstr "" | |
|
|
1081 | ||
|
|
1082 | msgid "" | |
|
|
1083 | " The key is the revision ID in the source\n" | |
|
|
1363 | 1084 | " revision control system whose parents should be modified (same\n" |
|
|
1364 | 1085 | " format as a key in .hg/shamap). The values are the revision IDs\n" |
|
|
1365 | 1086 | " (in either the source or destination revision control system) that\n" |
|
|
1366 | " should be used as the new parents for that node." | |
|
|
1087 | " should be used as the new parents for that node. For example, if\n" | |
|
|
1088 | " you have merged \"release-1.0\" into \"trunk\", then you should\n" | |
|
|
1089 | " specify the revision on \"trunk\" as the first parent and the one on\n" | |
|
|
1090 | " the \"release-1.0\" branch as the second." | |
|
|
1367 | 1091 | msgstr "" |
|
|
1368 | 1092 | |
|
|
1369 | 1093 | msgid "" |
| @@ -1372,16 +1096,23 b' msgid ""' | |||
|
|
1372 | 1096 | " conjunction with a splicemap, it allows for a powerful combination\n" |
|
|
1373 | 1097 | " to help fix even the most badly mismanaged repositories and turn them\n" |
|
|
1374 | 1098 | " into nicely structured Mercurial repositories. The branchmap contains\n" |
|
|
1375 | " lines of the form \"original_branch_name new_branch_name\".\n" | |
|
|
1376 | " \"original_branch_name\" is the name of the branch in the source\n" | |
|
|
1377 | " repository, and \"new_branch_name\" is the name of the branch is the\n" | |
|
|
1378 | " destination repository. This can be used to (for instance) move code\n" | |
|
|
1379 | " in one repository from \"default\" to a named branch." | |
|
|
1099 | " lines of the form::" | |
|
|
1100 | msgstr "" | |
|
|
1101 | ||
|
|
1102 | msgid " original_branch_name new_branch_name" | |
|
|
1103 | msgstr "" | |
|
|
1104 | ||
|
|
1105 | msgid "" | |
|
|
1106 | " where \"original_branch_name\" is the name of the branch in the\n" | |
|
|
1107 | " source repository, and \"new_branch_name\" is the name of the branch\n" | |
|
|
1108 | " is the destination repository. No whitespace is allowed in the\n" | |
|
|
1109 | " branch names. This can be used to (for instance) move code in one\n" | |
|
|
1110 | " repository from \"default\" to a named branch." | |
|
|
1380 | 1111 | msgstr "" |
|
|
1381 | 1112 | |
|
|
1382 | 1113 | msgid "" |
|
|
1383 | 1114 | " Mercurial Source\n" |
|
|
1384 | " ----------------" | |
|
|
1115 | " ''''''''''''''''" | |
|
|
1385 | 1116 | msgstr "" |
|
|
1386 | 1117 | |
|
|
1387 | 1118 | msgid "" |
| @@ -1398,7 +1129,7 b' msgstr ""' | |||
|
|
1398 | 1129 | |
|
|
1399 | 1130 | msgid "" |
|
|
1400 | 1131 | " CVS Source\n" |
|
|
1401 | " ----------" | |
|
|
1132 | " ''''''''''" | |
|
|
1402 | 1133 | msgstr "" |
|
|
1403 | 1134 | |
|
|
1404 | 1135 | msgid "" |
| @@ -1434,7 +1165,16 b' msgid ""' | |||
|
|
1434 | 1165 | " Specify a regular expression to which commit log messages are\n" |
|
|
1435 | 1166 | " matched. If a match occurs, then the conversion process will\n" |
|
|
1436 | 1167 | " add the most recent revision on the branch indicated in the\n" |
|
|
1437 | " regex as the second parent of the changeset." | |
|
|
1168 | " regex as the second parent of the changeset.\n" | |
|
|
1169 | " --config hook.cvslog\n" | |
|
|
1170 | " Specify a Python function to be called at the end of gathering\n" | |
|
|
1171 | " the CVS log. The function is passed a list with the log entries,\n" | |
|
|
1172 | " and can modify the entries in-place, or add or delete them.\n" | |
|
|
1173 | " --config hook.cvschangesets\n" | |
|
|
1174 | " Specify a Python function to be called after the changesets\n" | |
|
|
1175 | " are calculated from the the CVS log. The function is passed\n" | |
|
|
1176 | " a list with the changeset entries, and can modify the changesets\n" | |
|
|
1177 | " in-place, or add or delete them." | |
|
|
1438 | 1178 | msgstr "" |
|
|
1439 | 1179 | |
|
|
1440 | 1180 | msgid "" |
| @@ -1446,7 +1186,7 b' msgstr ""' | |||
|
|
1446 | 1186 | |
|
|
1447 | 1187 | msgid "" |
|
|
1448 | 1188 | " Subversion Source\n" |
|
|
1449 | " -----------------" | |
|
|
1189 | " '''''''''''''''''" | |
|
|
1450 | 1190 | msgstr "" |
|
|
1451 | 1191 | |
|
|
1452 | 1192 | msgid "" |
| @@ -1484,7 +1224,7 b' msgstr ""' | |||
|
|
1484 | 1224 | |
|
|
1485 | 1225 | msgid "" |
|
|
1486 | 1226 | " Perforce Source\n" |
|
|
1487 | " ---------------" | |
|
|
1227 | " '''''''''''''''" | |
|
|
1488 | 1228 | msgstr "" |
|
|
1489 | 1229 | |
|
|
1490 | 1230 | msgid "" |
| @@ -1508,7 +1248,7 b' msgstr ""' | |||
|
|
1508 | 1248 | |
|
|
1509 | 1249 | msgid "" |
|
|
1510 | 1250 | " Mercurial Destination\n" |
|
|
1511 | " ---------------------" | |
|
|
1251 | " '''''''''''''''''''''" | |
|
|
1512 | 1252 | msgstr "" |
|
|
1513 | 1253 | |
|
|
1514 | 1254 | msgid "" |
| @@ -1539,21 +1279,24 b' msgid ""' | |||
|
|
1539 | 1279 | " dates." |
|
|
1540 | 1280 | msgstr "" |
|
|
1541 | 1281 | |
|
|
1542 | msgid "username mapping filename" | |
|
|
1282 | msgid "username mapping filename (DEPRECATED, use --authormap instead)" | |
|
|
1283 | msgstr "" | |
|
|
1284 | ||
|
|
1285 | msgid "source repository type" | |
|
|
1543 | 1286 | msgstr "" |
|
|
1544 | 1287 | |
|
|
1545 | 1288 | msgid "destination repository type" |
|
|
1546 | 1289 | msgstr "" |
|
|
1547 | 1290 | |
|
|
1291 | msgid "import up to target revision REV" | |
|
|
1292 | msgstr "" | |
|
|
1293 | ||
|
|
1294 | msgid "remap usernames using this file" | |
|
|
1295 | msgstr "" | |
|
|
1296 | ||
|
|
1548 | 1297 | msgid "remap file names using contents of file" |
|
|
1549 | 1298 | msgstr "" |
|
|
1550 | 1299 | |
|
|
1551 | msgid "import up to target revision REV" | |
|
|
1552 | msgstr "" | |
|
|
1553 | ||
|
|
1554 | msgid "source repository type" | |
|
|
1555 | msgstr "" | |
|
|
1556 | ||
|
|
1557 | 1300 | msgid "splice synthesized history into place" |
|
|
1558 | 1301 | msgstr "" |
|
|
1559 | 1302 | |
| @@ -1605,15 +1348,24 b' msgstr ""' | |||
|
|
1605 | 1348 | msgid "hg debugcvsps [OPTION]... [PATH]..." |
|
|
1606 | 1349 | msgstr "" |
|
|
1607 | 1350 | |
|
|
1608 | msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" | |
|
|
1351 | #, python-format | |
|
|
1352 | msgid "%s does not look like a Bazaar repository" | |
|
|
1353 | msgstr "%s 怎麼看都不像是一個 Bazaar 儲存庫" | |
|
|
1354 | ||
|
|
1355 | msgid "Bazaar modules could not be loaded" | |
|
|
1356 | msgstr "Bazaar 模組不能載入" | |
|
|
1357 | ||
|
|
1358 | msgid "" | |
|
|
1359 | "warning: lightweight checkouts may cause conversion failures, try with a " | |
|
|
1360 | "regular branch instead.\n" | |
|
|
1609 | 1361 | msgstr "" |
|
|
1610 | 1362 | |
|
|
1611 | 1363 | msgid "bzr source type could not be determined\n" |
|
|
1612 | msgstr "" | |
|
|
1364 | msgstr "bazaar 來源型態不能被決定\n" | |
|
|
1613 | 1365 | |
|
|
1614 | 1366 | #, python-format |
|
|
1615 | 1367 | msgid "%s is not a valid revision in current branch" |
|
|
1616 | msgstr "" | |
|
|
1368 | msgstr "在目前的分支,%s不是一個有效的修定版" | |
|
|
1617 | 1369 | |
|
|
1618 | 1370 | #, python-format |
|
|
1619 | 1371 | msgid "%s is not available in %s anymore" |
| @@ -1621,15 +1373,15 b' msgstr ""' | |||
|
|
1621 | 1373 | |
|
|
1622 | 1374 | #, python-format |
|
|
1623 | 1375 | msgid "%s.%s symlink has no target" |
|
|
1624 | msgstr "" | |
|
|
1376 | msgstr "%s.%s 符號連結沒有目標" | |
|
|
1625 | 1377 | |
|
|
1626 | 1378 | #, python-format |
|
|
1627 | 1379 | msgid "cannot find required \"%s\" tool" |
|
|
1628 | msgstr "" | |
|
|
1380 | msgstr "找不到需要的 '%s' 工具" | |
|
|
1629 | 1381 | |
|
|
1630 | 1382 | #, python-format |
|
|
1631 | 1383 | msgid "%s error:\n" |
|
|
1632 | msgstr "" | |
|
|
1384 | msgstr "%s 錯誤:\n" | |
|
|
1633 | 1385 | |
|
|
1634 | 1386 | #, python-format |
|
|
1635 | 1387 | msgid "syntax error in %s(%d): key/value pair expected" |
| @@ -1637,23 +1389,40 b' msgstr ""' | |||
|
|
1637 | 1389 | |
|
|
1638 | 1390 | #, python-format |
|
|
1639 | 1391 | msgid "could not open map file %r: %s" |
|
|
1640 | msgstr "" | |
|
|
1392 | msgstr "不能打開 map 檔 %r: %s" | |
|
|
1393 | ||
|
|
1394 | #, python-format | |
|
|
1395 | msgid "%s: invalid source repository type" | |
|
|
1396 | msgstr "%s: 無效的來源儲存庫型態" | |
|
|
1641 | 1397 | |
|
|
1642 | 1398 | #, python-format |
|
|
1643 | 1399 | msgid "%s: missing or unsupported repository" |
|
|
1644 | msgstr "" | |
|
|
1400 | msgstr "%s: 遺失了 或 不支援的儲存庫" | |
|
|
1401 | ||
|
|
1402 | #, python-format | |
|
|
1403 | msgid "%s: invalid destination repository type" | |
|
|
1404 | msgstr "%s: 未知的目的儲存庫型態" | |
|
|
1645 | 1405 | |
|
|
1646 | 1406 | #, python-format |
|
|
1647 | 1407 | msgid "convert: %s\n" |
|
|
1648 | msgstr "" | |
|
|
1408 | msgstr "轉換: %s\n" | |
|
|
1649 | 1409 | |
|
|
1650 | 1410 | #, python-format |
|
|
1651 | 1411 | msgid "%s: unknown repository type" |
|
|
1652 | msgstr "" | |
|
|
1412 | msgstr "%s: 未知的儲存庫型態" | |
|
|
1413 | ||
|
|
1414 | msgid "getting files" | |
|
|
1415 | msgstr "取得檔案中..." | |
|
|
1416 | ||
|
|
1417 | msgid "revisions" | |
|
|
1418 | msgstr "修定版" | |
|
|
1419 | ||
|
|
1420 | msgid "scanning" | |
|
|
1421 | msgstr "掃描中" | |
|
|
1653 | 1422 | |
|
|
1654 | 1423 | #, python-format |
|
|
1655 | 1424 | msgid "unknown sort mode: %s" |
|
|
1656 | msgstr "" | |
|
|
1425 | msgstr "未知的排序模式: %s" | |
|
|
1657 | 1426 | |
|
|
1658 | 1427 | #, python-format |
|
|
1659 | 1428 | msgid "cycle detected between %s and %s" |
| @@ -1683,27 +1452,34 b' msgid "spliced in %s as parents of %s\\n"' | |||
|
|
1683 | 1452 | msgstr "" |
|
|
1684 | 1453 | |
|
|
1685 | 1454 | msgid "scanning source...\n" |
|
|
1686 | msgstr "" | |
|
|
1455 | msgstr "掃描 source 中\n" | |
|
|
1687 | 1456 | |
|
|
1688 | 1457 | msgid "sorting...\n" |
|
|
1689 | msgstr "" | |
|
|
1458 | msgstr "排序中\n" | |
|
|
1690 | 1459 | |
|
|
1691 | 1460 | msgid "converting...\n" |
|
|
1692 | msgstr "" | |
|
|
1461 | msgstr "轉換中...\n" | |
|
|
1693 | 1462 | |
|
|
1694 | 1463 | #, python-format |
|
|
1695 | 1464 | msgid "source: %s\n" |
|
|
1696 | msgstr "" | |
|
|
1465 | msgstr "來源: %s\n" | |
|
|
1466 | ||
|
|
1467 | msgid "converting" | |
|
|
1468 | msgstr "轉換中" | |
|
|
1697 | 1469 | |
|
|
1698 | 1470 | #, python-format |
|
|
1699 | 1471 | msgid "assuming destination %s\n" |
|
|
1700 | 1472 | msgstr "" |
|
|
1701 | 1473 | |
|
|
1702 | 1474 | msgid "more than one sort mode specified" |
|
|
1703 | msgstr "" | |
|
|
1475 | msgstr "描述了不只一個排序模式" | |
|
|
1704 | 1476 | |
|
|
1705 | 1477 | msgid "--sourcesort is not supported by this data source" |
|
|
1706 | msgstr "" | |
|
|
1478 | msgstr "--sourcesort 不支援這個資料來源" | |
|
|
1479 | ||
|
|
1480 | #, python-format | |
|
|
1481 | msgid "%s does not look like a CVS checkout" | |
|
|
1482 | msgstr "%s 怎麼看都不像是一個 CVS 的 checkout" | |
|
|
1707 | 1483 | |
|
|
1708 | 1484 | #, python-format |
|
|
1709 | 1485 | msgid "revision %s is not a patchset number" |
| @@ -1711,33 +1487,40 b' msgstr ""' | |||
|
|
1711 | 1487 | |
|
|
1712 | 1488 | #, python-format |
|
|
1713 | 1489 | msgid "connecting to %s\n" |
|
|
1714 | msgstr "" | |
|
|
1490 | msgstr "連接到 %s\n" | |
|
|
1715 | 1491 | |
|
|
1716 | 1492 | msgid "CVS pserver authentication failed" |
|
|
1717 | 1493 | msgstr "" |
|
|
1718 | 1494 | |
|
|
1719 | 1495 | #, python-format |
|
|
1720 | msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" | |
|
|
1496 | msgid "" | |
|
|
1497 | "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" | |
|
|
1721 | 1498 | msgstr "" |
|
|
1722 | 1499 | |
|
|
1723 | 1500 | #, python-format |
|
|
1724 | 1501 | msgid "%d bytes missing from remote file" |
|
|
1725 | msgstr "" | |
|
|
1502 | msgstr "從遠端檔案遺失了 %d 位元組s" | |
|
|
1503 | ||
|
|
1504 | msgid "malformed response from CVS" | |
|
|
1505 | msgstr "從CVS那收到畸形的回應" | |
|
|
1726 | 1506 | |
|
|
1727 | 1507 | #, python-format |
|
|
1728 | 1508 | msgid "cvs server: %s\n" |
|
|
1729 | msgstr "" | |
|
|
1509 | msgstr "cvs 伺服器: %s\n" | |
|
|
1730 | 1510 | |
|
|
1731 | 1511 | #, python-format |
|
|
1732 | 1512 | msgid "unknown CVS response: %s" |
|
|
1733 | msgstr "" | |
|
|
1513 | msgstr "未知的CVS回應: %s" | |
|
|
1734 | 1514 | |
|
|
1735 | 1515 | msgid "collecting CVS rlog\n" |
|
|
1736 | msgstr "" | |
|
|
1516 | msgstr "收集 CVS rlog\n" | |
|
|
1517 | ||
|
|
1518 | msgid "not a CVS sandbox" | |
|
|
1519 | msgstr "不是一個CVS sandbox" | |
|
|
1737 | 1520 | |
|
|
1738 | 1521 | #, python-format |
|
|
1739 | 1522 | msgid "reading cvs log cache %s\n" |
|
|
1740 | msgstr "" | |
|
|
1523 | msgstr "讀取 cvs 紀錄快取(log cache) %s\n" | |
|
|
1741 | 1524 | |
|
|
1742 | 1525 | #, python-format |
|
|
1743 | 1526 | msgid "cache has %d log entries\n" |
| @@ -1745,11 +1528,11 b' msgstr ""' | |||
|
|
1745 | 1528 | |
|
|
1746 | 1529 | #, python-format |
|
|
1747 | 1530 | msgid "error reading cache: %r\n" |
|
|
1748 | msgstr "" | |
|
|
1531 | msgstr "讀取快取錯誤: %r\n" | |
|
|
1749 | 1532 | |
|
|
1750 | 1533 | #, python-format |
|
|
1751 | 1534 | msgid "running %s\n" |
|
|
1752 | msgstr "" | |
|
|
1535 | msgstr "正在執行 %s\n" | |
|
|
1753 | 1536 | |
|
|
1754 | 1537 | msgid "RCS file must be followed by working file" |
|
|
1755 | 1538 | msgstr "" |
| @@ -1763,9 +1546,12 b' msgstr ""' | |||
|
|
1763 | 1546 | msgid "revision must be followed by date line" |
|
|
1764 | 1547 | msgstr "" |
|
|
1765 | 1548 | |
|
|
1549 | msgid "log cache overlaps with new log entries, re-run without cache." | |
|
|
1550 | msgstr "" | |
|
|
1551 | ||
|
|
1766 | 1552 | #, python-format |
|
|
1767 | 1553 | msgid "writing cvs log cache %s\n" |
|
|
1768 | msgstr "" | |
|
|
1554 | msgstr "寫入 CVS 紀錄快取(log cache) %s\n" | |
|
|
1769 | 1555 | |
|
|
1770 | 1556 | #, python-format |
|
|
1771 | 1557 | msgid "%d log entries\n" |
| @@ -1788,11 +1574,22 b' msgid "%d changeset entries\\n"' | |||
|
|
1788 | 1574 | msgstr "" |
|
|
1789 | 1575 | |
|
|
1790 | 1576 | #, python-format |
|
|
1577 | msgid "%s does not look like a darcs repository" | |
|
|
1578 | msgstr "%s 怎麼看都不像是一個 darcs 儲存庫" | |
|
|
1579 | ||
|
|
1580 | #, python-format | |
|
|
1791 | 1581 | msgid "darcs version 2.1 or newer needed (found %r)" |
|
|
1792 | msgstr "" | |
|
|
1582 | msgstr "需要 darcs 版本2.1以上 (找到的是 %r)" | |
|
|
1793 | 1583 | |
|
|
1794 | 1584 | msgid "Python ElementTree module is not available" |
|
|
1795 | msgstr "" | |
|
|
1585 | msgstr "Python ElementTree module 不能用" | |
|
|
1586 | ||
|
|
1587 | #, python-format | |
|
|
1588 | msgid "%s repository format is unsupported, please upgrade" | |
|
|
1589 | msgstr "%s 儲存庫格式不支援,請更新" | |
|
|
1590 | ||
|
|
1591 | msgid "failed to detect repository format!" | |
|
|
1592 | msgstr "偵測儲存庫格式失敗!" | |
|
|
1796 | 1593 | |
|
|
1797 | 1594 | msgid "internal calling inconsistency" |
|
|
1798 | 1595 | msgstr "" |
| @@ -1801,10 +1598,18 b' msgid "errors in filemap"' | |||
|
|
1801 | 1598 | msgstr "" |
|
|
1802 | 1599 | |
|
|
1803 | 1600 | #, python-format |
|
|
1601 | msgid "%s:%d: path to %s is missing\n" | |
|
|
1602 | msgstr "" | |
|
|
1603 | ||
|
|
1604 | #, python-format | |
|
|
1804 | 1605 | msgid "%s:%d: %r already in %s list\n" |
|
|
1805 | 1606 | msgstr "" |
|
|
1806 | 1607 | |
|
|
1807 | 1608 | #, python-format |
|
|
1609 | msgid "%s:%d: superfluous / in %s %r\n" | |
|
|
1610 | msgstr "" | |
|
|
1611 | ||
|
|
1612 | #, python-format | |
|
|
1808 | 1613 | msgid "%s:%d: unknown directive %r\n" |
|
|
1809 | 1614 | msgstr "" |
|
|
1810 | 1615 | |
| @@ -1812,18 +1617,38 b' msgid "source repository doesn\'t support' | |||
|
|
1812 | 1617 | msgstr "" |
|
|
1813 | 1618 | |
|
|
1814 | 1619 | #, python-format |
|
|
1815 |
msgid "%s does not look like a G |
|
|
|
1816 | msgstr "" | |
|
|
1620 | msgid "%s does not look like a Git repository" | |
|
|
1621 | msgstr "%s 怎麼看都不像是一個 Git 儲存庫" | |
|
|
1622 | ||
|
|
1623 | msgid "cannot retrieve git heads" | |
|
|
1624 | msgstr "不能取回git標頭" | |
|
|
1625 | ||
|
|
1626 | #, python-format | |
|
|
1627 | msgid "cannot read %r object at %s" | |
|
|
1628 | msgstr "" | |
|
|
1629 | ||
|
|
1630 | #, python-format | |
|
|
1631 | msgid "cannot read changes in %s" | |
|
|
1632 | msgstr "不能在%s讀取變更" | |
|
|
1633 | ||
|
|
1634 | #, python-format | |
|
|
1635 | msgid "cannot read tags from %s" | |
|
|
1636 | msgstr "不能從%s讀取標記" | |
|
|
1637 | ||
|
|
1638 | #, python-format | |
|
|
1639 | msgid "%s does not look like a GNU Arch repository" | |
|
|
1640 | msgstr "%s 怎麼看都不像是一個 GNU Arch 儲存庫" | |
|
|
1817 | 1641 | |
|
|
1818 | 1642 | msgid "cannot find a GNU Arch tool" |
|
|
1819 | msgstr "" | |
|
|
1643 | msgstr "找不到 GNU arch 工具" | |
|
|
1820 | 1644 | |
|
|
1821 | 1645 | #, python-format |
|
|
1822 | 1646 | msgid "analyzing tree version %s...\n" |
|
|
1823 | 1647 | msgstr "" |
|
|
1824 | 1648 | |
|
|
1825 | 1649 | #, python-format |
|
|
1826 | msgid "tree analysis stopped because it points to an unregistered archive %s...\n" | |
|
|
1650 | msgid "" | |
|
|
1651 | "tree analysis stopped because it points to an unregistered archive %s...\n" | |
|
|
1827 | 1652 | msgstr "" |
|
|
1828 | 1653 | |
|
|
1829 | 1654 | #, python-format |
| @@ -1831,14 +1656,18 b' msgid "could not parse cat-log of %s"' | |||
|
|
1831 | 1656 | msgstr "" |
|
|
1832 | 1657 | |
|
|
1833 | 1658 | #, python-format |
|
|
1834 | msgid "%s is not a local Mercurial repo" | |
|
|
1835 | msgstr "" | |
|
|
1659 | msgid "%s is not a local Mercurial repository" | |
|
|
1660 | msgstr "%s 不是一個本地端的 Mercurial 儲存庫" | |
|
|
1836 | 1661 | |
|
|
1837 | 1662 | #, python-format |
|
|
1838 | 1663 | msgid "initializing destination %s repository\n" |
|
|
1839 | 1664 | msgstr "" |
|
|
1840 | 1665 | |
|
|
1841 | 1666 | #, python-format |
|
|
1667 | msgid "could not create hg repository %s as sink" | |
|
|
1668 | msgstr "" | |
|
|
1669 | ||
|
|
1670 | #, python-format | |
|
|
1842 | 1671 | msgid "pulling from %s into %s\n" |
|
|
1843 | 1672 | msgstr "" |
|
|
1844 | 1673 | |
| @@ -1846,33 +1675,46 b' msgid "filtering out empty revision\\n"' | |||
|
|
1846 | 1675 | msgstr "" |
|
|
1847 | 1676 | |
|
|
1848 | 1677 | msgid "updating tags\n" |
|
|
1849 | msgstr "" | |
|
|
1678 | msgstr "正在更新標記\n" | |
|
|
1850 | 1679 | |
|
|
1851 | 1680 | #, python-format |
|
|
1852 | 1681 | msgid "%s is not a valid start revision" |
|
|
1853 | msgstr "" | |
|
|
1682 | msgstr "%s 不是一個有效的開始修定版" | |
|
|
1854 | 1683 | |
|
|
1855 | 1684 | #, python-format |
|
|
1856 | 1685 | msgid "ignoring: %s\n" |
|
|
1857 | msgstr "" | |
|
|
1858 | ||
|
|
1859 | #, python-format | |
|
|
1860 | msgid "%s does not look like a monotone repo" | |
|
|
1861 | msgstr "" | |
|
|
1686 | msgstr "忽略: %s\n" | |
|
|
1687 | ||
|
|
1688 | #, python-format | |
|
|
1689 | msgid "%s does not look like a monotone repository" | |
|
|
1690 | msgstr "%s 怎麼看都不像是一個monotone 儲存庫" | |
|
|
1862 | 1691 | |
|
|
1863 | 1692 | #, python-format |
|
|
1864 | 1693 | msgid "copying file in renamed directory from '%s' to '%s'" |
|
|
1865 | 1694 | msgstr "" |
|
|
1866 | 1695 | |
|
|
1696 | #, python-format | |
|
|
1697 | msgid "%s does not look like a P4 repository" | |
|
|
1698 | msgstr "%s 怎麼看都不像是一個 P4 儲存庫" | |
|
|
1699 | ||
|
|
1867 | 1700 | msgid "reading p4 views\n" |
|
|
1868 | msgstr "" | |
|
|
1701 | msgstr "正在讀取P4視區\n" | |
|
|
1869 | 1702 | |
|
|
1870 | 1703 | msgid "collecting p4 changelists\n" |
|
|
1871 | msgstr "" | |
|
|
1704 | msgstr "收集P4變更列表\n" | |
|
|
1872 | 1705 | |
|
|
1873 | 1706 | msgid "Mercurial failed to run itself, check hg executable is in PATH" |
|
|
1874 | 1707 | msgstr "" |
|
|
1875 | 1708 | |
|
|
1709 | msgid "" | |
|
|
1710 | "svn: cannot probe remote repository, assume it could be a subversion " | |
|
|
1711 | "repository. Use --source-type if you know better.\n" | |
|
|
1712 | msgstr "" | |
|
|
1713 | ||
|
|
1714 | #, python-format | |
|
|
1715 | msgid "%s does not look like a Subversion repository" | |
|
|
1716 | msgstr "%s 怎麼看都不像是一個 Subversion 儲存庫" | |
|
|
1717 | ||
|
|
1876 | 1718 | msgid "Subversion python bindings could not be loaded" |
|
|
1877 | 1719 | msgstr "" |
|
|
1878 | 1720 | |
| @@ -1885,15 +1727,15 b' msgstr ""' | |||
|
|
1885 | 1727 | |
|
|
1886 | 1728 | #, python-format |
|
|
1887 | 1729 | msgid "svn: revision %s is not an integer" |
|
|
1888 | msgstr "" | |
|
|
1730 | msgstr "svn:修定版 %s 不是一個整數" | |
|
|
1889 | 1731 | |
|
|
1890 | 1732 | #, python-format |
|
|
1891 | 1733 | msgid "svn: start revision %s is not an integer" |
|
|
1892 | msgstr "" | |
|
|
1734 | msgstr "svn:開始修定版%s不是一個整數" | |
|
|
1893 | 1735 | |
|
|
1894 | 1736 | #, python-format |
|
|
1895 | 1737 | msgid "no revision found in module %s" |
|
|
1896 | msgstr "" | |
|
|
1738 | msgstr "在%s模組中找不到修定版" | |
|
|
1897 | 1739 | |
|
|
1898 | 1740 | #, python-format |
|
|
1899 | 1741 | msgid "expected %s to be at %r, but not found" |
| @@ -1901,15 +1743,15 b' msgstr ""' | |||
|
|
1901 | 1743 | |
|
|
1902 | 1744 | #, python-format |
|
|
1903 | 1745 | msgid "found %s at %r\n" |
|
|
1904 | msgstr "" | |
|
|
1746 | msgstr "找到%s在%r\n" | |
|
|
1905 | 1747 | |
|
|
1906 | 1748 | #, python-format |
|
|
1907 | 1749 | msgid "ignoring empty branch %s\n" |
|
|
1908 | msgstr "" | |
|
|
1750 | msgstr "忽略空白的分支 %s\n" | |
|
|
1909 | 1751 | |
|
|
1910 | 1752 | #, python-format |
|
|
1911 | 1753 | msgid "found branch %s at %d\n" |
|
|
1912 | msgstr "" | |
|
|
1754 | msgstr "找到分支 %s 在 %d\n" | |
|
|
1913 | 1755 | |
|
|
1914 | 1756 | msgid "svn: start revision is not supported with more than one branch" |
|
|
1915 | 1757 | msgstr "" |
| @@ -1919,13 +1761,12 b' msgid "svn: no revision found after star' | |||
|
|
1919 | 1761 | msgstr "" |
|
|
1920 | 1762 | |
|
|
1921 | 1763 | #, python-format |
|
|
1922 | msgid "no tags found at revision %d\n" | |
|
|
1923 | msgstr "" | |
|
|
1924 | ||
|
|
1925 | #, python-format | |
|
|
1926 | 1764 | msgid "%s not found up to revision %d" |
|
|
1927 | 1765 | msgstr "" |
|
|
1928 | 1766 | |
|
|
1767 | msgid "scanning paths" | |
|
|
1768 | msgstr "掃描 補丁 中" | |
|
|
1769 | ||
|
|
1929 | 1770 | #, python-format |
|
|
1930 | 1771 | msgid "found parent of branch %s at %d: %s\n" |
|
|
1931 | 1772 | msgstr "" |
| @@ -1936,23 +1777,132 b' msgstr ""' | |||
|
|
1936 | 1777 | |
|
|
1937 | 1778 | #, python-format |
|
|
1938 | 1779 | msgid "svn: branch has no revision %s" |
|
|
1939 | msgstr "" | |
|
|
1940 | ||
|
|
1941 | #, python-format | |
|
|
1942 | msgid "initializing svn repo %r\n" | |
|
|
1943 | msgstr "" | |
|
|
1944 | ||
|
|
1945 | #, python-format | |
|
|
1946 | msgid "initializing svn wc %r\n" | |
|
|
1947 | msgstr "" | |
|
|
1780 | msgstr "svn:分支沒有修定版 %s" | |
|
|
1781 | ||
|
|
1782 | #, python-format | |
|
|
1783 | msgid "initializing svn repository %r\n" | |
|
|
1784 | msgstr "正在初始化subversion儲存庫%r\n" | |
|
|
1785 | ||
|
|
1786 | #, python-format | |
|
|
1787 | msgid "initializing svn working copy %r\n" | |
|
|
1788 | msgstr "初始 Subversion 工作副本 %r\n" | |
|
|
1948 | 1789 | |
|
|
1949 | 1790 | msgid "unexpected svn output:\n" |
|
|
1950 | msgstr "" | |
|
|
1791 | msgstr "意料之外的Subversion 輸出:\n" | |
|
|
1951 | 1792 | |
|
|
1952 | 1793 | msgid "unable to cope with svn output" |
|
|
1953 | 1794 | msgstr "" |
|
|
1954 | 1795 | |
|
|
1955 | msgid "XXX TAGS NOT IMPLEMENTED YET\n" | |
|
|
1796 | msgid "writing Subversion tags is not yet implemented\n" | |
|
|
1797 | msgstr "還沒有實作 '寫入Subversion標記' 這個功能\n" | |
|
|
1798 | ||
|
|
1799 | msgid "automatically manage newlines in repository files" | |
|
|
1800 | msgstr "" | |
|
|
1801 | ||
|
|
1802 | msgid "" | |
|
|
1803 | "This extension allows you to manage the type of line endings (CRLF or\n" | |
|
|
1804 | "LF) that are used in the repository and in the local working\n" | |
|
|
1805 | "directory. That way you can get CRLF line endings on Windows and LF on\n" | |
|
|
1806 | "Unix/Mac, thereby letting everybody use their OS native line endings." | |
|
|
1807 | msgstr "" | |
|
|
1808 | ||
|
|
1809 | msgid "" | |
|
|
1810 | "The extension reads its configuration from a versioned ``.hgeol``\n" | |
|
|
1811 | "configuration file every time you run an ``hg`` command. The\n" | |
|
|
1812 | "``.hgeol`` file use the same syntax as all other Mercurial\n" | |
|
|
1813 | "configuration files. It uses two sections, ``[patterns]`` and\n" | |
|
|
1814 | "``[repository]``." | |
|
|
1815 | msgstr "" | |
|
|
1816 | ||
|
|
1817 | msgid "" | |
|
|
1818 | "The ``[patterns]`` section specifies the line endings used in the\n" | |
|
|
1819 | "working directory. The format is specified by a file pattern. The\n" | |
|
|
1820 | "first match is used, so put more specific patterns first. The\n" | |
|
|
1821 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." | |
|
|
1822 | msgstr "" | |
|
|
1823 | ||
|
|
1824 | msgid "" | |
|
|
1825 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" | |
|
|
1826 | "checked out in that format and files declared to be binary (``BIN``)\n" | |
|
|
1827 | "are left unchanged. Additionally, ``native`` is an alias for the\n" | |
|
|
1828 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" | |
|
|
1829 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" | |
|
|
1830 | "endings) is Mercurial's default behaviour; it is only needed if you\n" | |
|
|
1831 | "need to override a later, more general pattern." | |
|
|
1832 | msgstr "" | |
|
|
1833 | ||
|
|
1834 | msgid "" | |
|
|
1835 | "The optional ``[repository]`` section specifies the line endings to\n" | |
|
|
1836 | "use for files stored in the repository. It has a single setting,\n" | |
|
|
1837 | "``native``, which determines the storage line endings for files\n" | |
|
|
1838 | "declared as ``native`` in the ``[patterns]`` section. It can be set to\n" | |
|
|
1839 | "``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" | |
|
|
1840 | "that on Windows, files configured as ``native`` (``CRLF`` by default)\n" | |
|
|
1841 | "will be converted to ``LF`` when stored in the repository. Files\n" | |
|
|
1842 | "declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" | |
|
|
1843 | "are always stored as-is in the repository." | |
|
|
1844 | msgstr "" | |
|
|
1845 | ||
|
|
1846 | msgid "Example versioned ``.hgeol`` file::" | |
|
|
1847 | msgstr "" | |
|
|
1848 | ||
|
|
1849 | msgid "" | |
|
|
1850 | " [patterns]\n" | |
|
|
1851 | " **.py = native\n" | |
|
|
1852 | " **.vcproj = CRLF\n" | |
|
|
1853 | " **.txt = native\n" | |
|
|
1854 | " Makefile = LF\n" | |
|
|
1855 | " **.jpg = BIN" | |
|
|
1856 | msgstr "" | |
|
|
1857 | ||
|
|
1858 | msgid "" | |
|
|
1859 | " [repository]\n" | |
|
|
1860 | " native = LF" | |
|
|
1861 | msgstr "" | |
|
|
1862 | ||
|
|
1863 | msgid "" | |
|
|
1864 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" | |
|
|
1865 | "(not the ``.hgeol`` file) for settings that control the overall\n" | |
|
|
1866 | "behavior. There are two settings:" | |
|
|
1867 | msgstr "" | |
|
|
1868 | ||
|
|
1869 | msgid "" | |
|
|
1870 | "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" | |
|
|
1871 | " ``CRLF`` to override the default interpretation of ``native`` for\n" | |
|
|
1872 | " checkout. This can be used with :hg:`archive` on Unix, say, to\n" | |
|
|
1873 | " generate an archive where files have line endings for Windows." | |
|
|
1874 | msgstr "" | |
|
|
1875 | ||
|
|
1876 | msgid "" | |
|
|
1877 | "- ``eol.only-consistent`` (default True) can be set to False to make\n" | |
|
|
1878 | " the extension convert files with inconsistent EOLs. Inconsistent\n" | |
|
|
1879 | " means that there is both ``CRLF`` and ``LF`` present in the file.\n" | |
|
|
1880 | " Such files are normally not touched under the assumption that they\n" | |
|
|
1881 | " have mixed EOLs on purpose." | |
|
|
1882 | msgstr "" | |
|
|
1883 | ||
|
|
1884 | msgid "" | |
|
|
1885 | "See :hg:`help patterns` for more information about the glob patterns\n" | |
|
|
1886 | "used.\n" | |
|
|
1887 | msgstr "" | |
|
|
1888 | ||
|
|
1889 | #, python-format | |
|
|
1890 | msgid "%s should not have CRLF line endings" | |
|
|
1891 | msgstr "%s 不應該有CRLF結束" | |
|
|
1892 | ||
|
|
1893 | #, python-format | |
|
|
1894 | msgid "%s should not have LF line endings" | |
|
|
1895 | msgstr "%s 不應該有LF結束" | |
|
|
1896 | ||
|
|
1897 | msgid "the eol extension is incompatible with the win32text extension" | |
|
|
1898 | msgstr "" | |
|
|
1899 | ||
|
|
1900 | #, python-format | |
|
|
1901 | msgid "ignoring unknown EOL style '%s' from %s\n" | |
|
|
1902 | msgstr "忽略未知的換行型態 '%s' 從 %s\n" | |
|
|
1903 | ||
|
|
1904 | #, python-format | |
|
|
1905 | msgid "inconsistent newline style in %s\n" | |
|
|
1956 | 1906 | msgstr "" |
|
|
1957 | 1907 | |
|
|
1958 | 1908 | msgid "command to allow external programs to compare revisions" |
| @@ -1968,7 +1918,7 b' msgstr ""' | |||
|
|
1968 | 1918 | |
|
|
1969 | 1919 | msgid "" |
|
|
1970 | 1920 | "The extdiff extension also allows to configure new diff commands, so\n" |
|
|
1971 |
"you do not need to type |
|
|
|
1921 | "you do not need to type :hg:`extdiff -p kdiff3` always. ::" | |
|
|
1972 | 1922 | msgstr "" |
|
|
1973 | 1923 | |
|
|
1974 | 1924 | msgid "" |
| @@ -1998,11 +1948,36 b' msgid ""' | |||
|
|
1998 | 1948 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" |
|
|
1999 | 1949 | msgstr "" |
|
|
2000 | 1950 | |
|
|
2001 | msgid "" | |
|
|
2002 | "You can use -I/-X and list of file or directory names like normal \"hg\n" | |
|
|
2003 | "diff\" command. The extdiff extension makes snapshots of only needed\n" | |
|
|
2004 | "files, so running the external diff program will actually be pretty\n" | |
|
|
2005 | "fast (at least faster than having to compare the entire tree).\n" | |
|
|
1951 | msgid "Tool arguments can include variables that are expanded at runtime::" | |
|
|
1952 | msgstr "" | |
|
|
1953 | ||
|
|
1954 | msgid "" | |
|
|
1955 | " $parent1, $plabel1 - filename, descriptive label of first parent\n" | |
|
|
1956 | " $child, $clabel - filename, descriptive label of child revision\n" | |
|
|
1957 | " $parent2, $plabel2 - filename, descriptive label of second parent\n" | |
|
|
1958 | " $parent is an alias for $parent1." | |
|
|
1959 | msgstr "" | |
|
|
1960 | ||
|
|
1961 | msgid "" | |
|
|
1962 | "The extdiff extension will look in your [diff-tools] and [merge-tools]\n" | |
|
|
1963 | "sections for diff tool arguments, when none are specified in [extdiff]." | |
|
|
1964 | msgstr "" | |
|
|
1965 | ||
|
|
1966 | msgid "" | |
|
|
1967 | " [extdiff]\n" | |
|
|
1968 | " kdiff3 =" | |
|
|
1969 | msgstr "" | |
|
|
1970 | ||
|
|
1971 | msgid "" | |
|
|
1972 | " [diff-tools]\n" | |
|
|
1973 | " kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" | |
|
|
1974 | msgstr "" | |
|
|
1975 | ||
|
|
1976 | msgid "" | |
|
|
1977 | "You can use -I/-X and list of file or directory names like normal\n" | |
|
|
1978 | ":hg:`diff` command. The extdiff extension makes snapshots of only\n" | |
|
|
1979 | "needed files, so running the external diff program will actually be\n" | |
|
|
1980 | "pretty fast (at least faster than having to compare the entire tree).\n" | |
|
|
2006 | 1981 | msgstr "" |
|
|
2007 | 1982 | |
|
|
2008 | 1983 | #, python-format |
| @@ -2014,10 +1989,10 b' msgid "making snapshot of %d files from ' | |||
|
|
2014 | 1989 | msgstr "" |
|
|
2015 | 1990 | |
|
|
2016 | 1991 | msgid "cannot specify --rev and --change at the same time" |
|
|
2017 | msgstr "" | |
|
|
1992 | msgstr "不可以同時描述 --rev 跟 --change" | |
|
|
2018 | 1993 | |
|
|
2019 | 1994 | msgid "cleaning up temp directory\n" |
|
|
2020 | msgstr "" | |
|
|
1995 | msgstr "清掉暫存目錄\n" | |
|
|
2021 | 1996 | |
|
|
2022 | 1997 | msgid "use external program to diff repository (or selected files)" |
|
|
2023 | 1998 | msgstr "" |
| @@ -2043,9 +2018,15 b' msgid ""' | |||
|
|
2043 | 2018 | " to its parent." |
|
|
2044 | 2019 | msgstr "" |
|
|
2045 | 2020 | |
|
|
2021 | msgid "CMD" | |
|
|
2022 | msgstr "" | |
|
|
2023 | ||
|
|
2046 | 2024 | msgid "comparison program to run" |
|
|
2047 | 2025 | msgstr "" |
|
|
2048 | 2026 | |
|
|
2027 | msgid "OPT" | |
|
|
2028 | msgstr "" | |
|
|
2029 | ||
|
|
2049 | 2030 | msgid "pass option to comparison program" |
|
|
2050 | 2031 | msgstr "" |
|
|
2051 | 2032 | |
| @@ -2061,16 +2042,8 b' msgstr ""' | |||
|
|
2061 | 2042 | |
|
|
2062 | 2043 | #, python-format |
|
|
2063 | 2044 | msgid "" |
|
|
2064 |
" Show differences between revisions for the specified files, using |
|
|
|
2065 | " %(path)s program." | |
|
|
2066 | msgstr "" | |
|
|
2067 | ||
|
|
2068 | #, python-format | |
|
|
2069 | msgid "" | |
|
|
2070 | " When two revision arguments are given, then changes are shown between\n" | |
|
|
2071 | " those revisions. If only one revision is specified then that revision is\n" | |
|
|
2072 | " compared to the working directory, and, when no revisions are specified,\n" | |
|
|
2073 | " the working directory files are compared to its parent." | |
|
|
2045 | " Show differences between revisions for the specified files, using\n" | |
|
|
2046 | " the %(path)s program." | |
|
|
2074 | 2047 | msgstr "" |
|
|
2075 | 2048 | |
|
|
2076 | 2049 | #, python-format |
| @@ -2102,12 +2075,16 b' msgid ""' | |||
|
|
2102 | 2075 | " order, use --switch-parent." |
|
|
2103 | 2076 | msgstr "" |
|
|
2104 | 2077 | |
|
|
2105 | msgid "" | |
|
|
2106 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
|
|
2078 | msgid " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
|
2079 | msgstr "" | |
|
|
2080 | ||
|
|
2081 | msgid "" | |
|
|
2082 | " Returns 0 on success.\n" | |
|
|
2107 | 2083 | " " |
|
|
2108 | 2084 | msgstr "" |
|
|
2109 | 2085 | |
|
|
2110 | msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
|
|
2086 | msgid "" | |
|
|
2087 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" | |
|
|
2111 | 2088 | msgstr "" |
|
|
2112 | 2089 | |
|
|
2113 | 2090 | msgid "outstanding uncommitted merge" |
| @@ -2117,29 +2094,34 b' msgid "outstanding uncommitted changes"' | |||
|
|
2117 | 2094 | msgstr "" |
|
|
2118 | 2095 | |
|
|
2119 | 2096 | msgid "working directory is missing some files" |
|
|
2120 | msgstr "" | |
|
|
2121 | ||
|
|
2122 | msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
|
|
2123 | msgstr "" | |
|
|
2097 | msgstr "工作目錄遺失了一些檔案" | |
|
|
2098 | ||
|
|
2099 | msgid "" | |
|
|
2100 | "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
|
|
2101 | msgstr "這個分支有多個標頭(使用'hg heads .' 和 'hg merge' 去合併)" | |
|
|
2124 | 2102 | |
|
|
2125 | 2103 | #, python-format |
|
|
2126 | 2104 | msgid "pulling from %s\n" |
|
|
2127 | msgstr "" | |
|
|
2128 | ||
|
|
2129 | msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." | |
|
|
2130 | msgstr "" | |
|
|
2131 | ||
|
|
2132 | #, python-format | |
|
|
2133 | msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" | |
|
|
2105 | msgstr "從 %s 拉回中\n" | |
|
|
2106 | ||
|
|
2107 | msgid "" | |
|
|
2108 | "Other repository doesn't support revision lookup, so a rev cannot be " | |
|
|
2109 | "specified." | |
|
|
2110 | msgstr "其他儲存庫不支援修定版查閱,所以不能描述一個修定版" | |
|
|
2111 | ||
|
|
2112 | #, python-format | |
|
|
2113 | msgid "" | |
|
|
2114 | "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" | |
|
|
2115 | "\" to merge them)\n" | |
|
|
2134 | 2116 | msgstr "" |
|
|
2135 | 2117 | |
|
|
2136 | 2118 | #, python-format |
|
|
2137 | 2119 | msgid "updating to %d:%s\n" |
|
|
2138 | msgstr "" | |
|
|
2120 | msgstr "更新到%d:%s ...\n" | |
|
|
2139 | 2121 | |
|
|
2140 | 2122 | #, python-format |
|
|
2141 | 2123 | msgid "merging with %d:%s\n" |
|
|
2142 | msgstr "" | |
|
|
2124 | msgstr "跟%d合併:%s ...\n" | |
|
|
2143 | 2125 | |
|
|
2144 | 2126 | #, python-format |
|
|
2145 | 2127 | msgid "new changeset %d:%s merges remote changes with local\n" |
| @@ -2149,7 +2131,7 b' msgid "a specific revision you would lik' | |||
|
|
2149 | 2131 | msgstr "" |
|
|
2150 | 2132 | |
|
|
2151 | 2133 | msgid "edit commit message" |
|
|
2152 | msgstr "" | |
|
|
2134 | msgstr "編輯提交訊息" | |
|
|
2153 | 2135 | |
|
|
2154 | 2136 | msgid "edit commit message (DEPRECATED)" |
|
|
2155 | 2137 | msgstr "" |
| @@ -2183,7 +2165,7 b' msgstr ""' | |||
|
|
2183 | 2165 | |
|
|
2184 | 2166 | #, python-format |
|
|
2185 | 2167 | msgid "%s:%d node does not exist\n" |
|
|
2186 | msgstr "" | |
|
|
2168 | msgstr "%s:%d 節點不存在\n" | |
|
|
2187 | 2169 | |
|
|
2188 | 2170 | msgid "verify all the signatures there may be for a particular revision" |
|
|
2189 | 2171 | msgstr "" |
| @@ -2200,13 +2182,24 b' msgid ""' | |||
|
|
2200 | 2182 | " or tip if no revision is checked out." |
|
|
2201 | 2183 | msgstr "" |
|
|
2202 | 2184 | |
|
|
2185 | msgid "" | |
|
|
2186 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
|
|
2187 | " " | |
|
|
2188 | msgstr "" | |
|
|
2189 | ||
|
|
2203 | 2190 | msgid "uncommitted merge - please provide a specific revision" |
|
|
2204 | 2191 | msgstr "" |
|
|
2205 | 2192 | |
|
|
2206 | msgid "Error while signing" | |
|
|
2207 | msgstr "" | |
|
|
2208 | ||
|
|
2209 | msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" | |
|
|
2193 | #, python-format | |
|
|
2194 | msgid "Signing %d:%s\n" | |
|
|
2195 | msgstr "" | |
|
|
2196 | ||
|
|
2197 | msgid "error while signing" | |
|
|
2198 | msgstr "" | |
|
|
2199 | ||
|
|
2200 | msgid "" | |
|
|
2201 | "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" | |
|
|
2202 | "force)" | |
|
|
2210 | 2203 | msgstr "" |
|
|
2211 | 2204 | |
|
|
2212 | 2205 | msgid "unknown signature version" |
| @@ -2221,11 +2214,17 b' msgstr ""' | |||
|
|
2221 | 2214 | msgid "do not commit the sigfile after signing" |
|
|
2222 | 2215 | msgstr "" |
|
|
2223 | 2216 | |
|
|
2217 | msgid "ID" | |
|
|
2218 | msgstr "" | |
|
|
2219 | ||
|
|
2224 | 2220 | msgid "the key id to sign with" |
|
|
2225 | 2221 | msgstr "" |
|
|
2226 | 2222 | |
|
|
2223 | msgid "TEXT" | |
|
|
2224 | msgstr "" | |
|
|
2225 | ||
|
|
2227 | 2226 | msgid "commit message" |
|
|
2228 | msgstr "" | |
|
|
2227 | msgstr "提交訊息" | |
|
|
2229 | 2228 | |
|
|
2230 | 2229 | msgid "hg sign [OPTION]... [REVISION]..." |
|
|
2231 | 2230 | msgstr "" |
| @@ -2263,16 +2262,12 b' msgid ""' | |||
|
|
2263 | 2262 | " " |
|
|
2264 | 2263 | msgstr "" |
|
|
2265 | 2264 | |
|
|
2266 | #, python-format | |
|
|
2267 | msgid "comparing with %s\n" | |
|
|
2268 | msgstr "" | |
|
|
2269 | ||
|
|
2270 | msgid "no changes found\n" | |
|
|
2271 | msgstr "" | |
|
|
2272 | ||
|
|
2273 | 2265 | msgid "show the revision DAG" |
|
|
2274 | 2266 | msgstr "" |
|
|
2275 | 2267 | |
|
|
2268 | msgid "NUM" | |
|
|
2269 | msgstr "" | |
|
|
2270 | ||
|
|
2276 | 2271 | msgid "limit number of changes displayed" |
|
|
2277 | 2272 | msgstr "" |
|
|
2278 | 2273 | |
| @@ -2330,6 +2325,10 b' msgid ""' | |||
|
|
2330 | 2325 | msgstr "" |
|
|
2331 | 2326 | |
|
|
2332 | 2327 | #, python-format |
|
|
2328 | msgid "%s returned an error: %s" | |
|
|
2329 | msgstr "" | |
|
|
2330 | ||
|
|
2331 | #, python-format | |
|
|
2333 | 2332 | msgid "hgcia: sending update to %s\n" |
|
|
2334 | 2333 | msgstr "" |
|
|
2335 | 2334 | |
| @@ -2354,9 +2353,9 b' msgid ""' | |||
|
|
2354 | 2353 | msgstr "" |
|
|
2355 | 2354 | |
|
|
2356 | 2355 | msgid "" |
|
|
2357 |
"The |
|
|
|
2356 | "The :hg:`view` command will launch the hgk Tcl script. For this command\n" | |
|
|
2358 | 2357 | "to work, hgk must be in your search path. Alternately, you can specify\n" |
|
|
2359 |
"the path to hgk in your |
|
|
|
2358 | "the path to hgk in your configuration file::" | |
|
|
2360 | 2359 | msgstr "" |
|
|
2361 | 2360 | |
|
|
2362 | 2361 | msgid "" |
| @@ -2389,7 +2388,7 b' msgid "cat a specific revision"' | |||
|
|
2389 | 2388 | msgstr "" |
|
|
2390 | 2389 | |
|
|
2391 | 2390 | msgid "cat-file: type or revision not supplied\n" |
|
|
2392 | msgstr "" | |
|
|
2391 | msgstr "cat-file:型態或修定版不支援\n" | |
|
|
2393 | 2392 | |
|
|
2394 | 2393 | msgid "aborting hg cat-file only understands commits\n" |
|
|
2395 | 2394 | msgstr "" |
| @@ -2511,22 +2510,22 b' msgstr ""' | |||
|
|
2511 | 2510 | msgid "hg inserve [OPTION]..." |
|
|
2512 | 2511 | msgstr "" |
|
|
2513 | 2512 | |
|
|
2514 |
msgid " |
|
|
|
2515 | msgstr "" | |
|
|
2516 | ||
|
|
2517 | #, python-format | |
|
|
2518 | msgid "could not start inotify server: %s\n" | |
|
|
2519 | msgstr "" | |
|
|
2520 | ||
|
|
2521 | #, python-format | |
|
|
2522 | msgid "could not talk to new inotify server: %s\n" | |
|
|
2523 | msgstr "" | |
|
|
2524 | ||
|
|
2525 | #, python-format | |
|
|
2526 | msgid "failed to contact inotify server: %s\n" | |
|
|
2527 | msgstr "" | |
|
|
2528 | ||
|
|
2529 | msgid "received empty answer from inotify server" | |
|
|
2513 | msgid "inotify-client: found dead inotify server socket; removing it\n" | |
|
|
2514 | msgstr "" | |
|
|
2515 | ||
|
|
2516 | #, python-format | |
|
|
2517 | msgid "inotify-client: could not start inotify server: %s\n" | |
|
|
2518 | msgstr "" | |
|
|
2519 | ||
|
|
2520 | #, python-format | |
|
|
2521 | msgid "inotify-client: could not talk to new inotify server: %s\n" | |
|
|
2522 | msgstr "" | |
|
|
2523 | ||
|
|
2524 | #, python-format | |
|
|
2525 | msgid "inotify-client: failed to contact inotify server: %s\n" | |
|
|
2526 | msgstr "" | |
|
|
2527 | ||
|
|
2528 | msgid "inotify-client: received empty answer from inotify server" | |
|
|
2530 | 2529 | msgstr "" |
|
|
2531 | 2530 | |
|
|
2532 | 2531 | #, python-format |
| @@ -2552,7 +2551,7 b' msgstr ""' | |||
|
|
2552 | 2551 | |
|
|
2553 | 2552 | #, python-format |
|
|
2554 | 2553 | msgid "found %d\n" |
|
|
2555 | msgstr "" | |
|
|
2554 | msgstr "找到 %d\n" | |
|
|
2556 | 2555 | |
|
|
2557 | 2556 | #, python-format |
|
|
2558 | 2557 | msgid "*** to raise the limit from %d to %d (run as root):\n" |
| @@ -2579,21 +2578,6 b' msgid "watching directories under %r\\n"' | |||
|
|
2579 | 2578 | msgstr "" |
|
|
2580 | 2579 | |
|
|
2581 | 2580 | #, python-format |
|
|
2582 | msgid "status: %r %s -> %s\n" | |
|
|
2583 | msgstr "" | |
|
|
2584 | ||
|
|
2585 | #, python-format | |
|
|
2586 | msgid "%s dirstate reload\n" | |
|
|
2587 | msgstr "" | |
|
|
2588 | ||
|
|
2589 | #, python-format | |
|
|
2590 | msgid "%s end dirstate reload\n" | |
|
|
2591 | msgstr "" | |
|
|
2592 | ||
|
|
2593 | msgid "rescanning due to .hgignore change\n" | |
|
|
2594 | msgstr "" | |
|
|
2595 | ||
|
|
2596 | #, python-format | |
|
|
2597 | 2581 | msgid "%s event: created %s\n" |
|
|
2598 | 2582 | msgstr "" |
|
|
2599 | 2583 | |
| @@ -2625,8 +2609,22 b' msgstr ""' | |||
|
|
2625 | 2609 | msgid "%s hooking back up with %d bytes readable\n" |
|
|
2626 | 2610 | msgstr "" |
|
|
2627 | 2611 | |
|
|
2628 | #, python-format | |
|
|
2629 | msgid "could not start server: %s" | |
|
|
2612 | msgid "finished setup\n" | |
|
|
2613 | msgstr "" | |
|
|
2614 | ||
|
|
2615 | #, python-format | |
|
|
2616 | msgid "status: %r %s -> %s\n" | |
|
|
2617 | msgstr "" | |
|
|
2618 | ||
|
|
2619 | msgid "rescanning due to .hgignore change\n" | |
|
|
2620 | msgstr "" | |
|
|
2621 | ||
|
|
2622 | msgid "cannot start: socket is already bound" | |
|
|
2623 | msgstr "" | |
|
|
2624 | ||
|
|
2625 | msgid "" | |
|
|
2626 | "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" | |
|
|
2627 | "inotify.sock already exists" | |
|
|
2630 | 2628 | msgstr "" |
|
|
2631 | 2629 | |
|
|
2632 | 2630 | #, python-format |
| @@ -2641,9 +2639,6 b' msgstr ""' | |||
|
|
2641 | 2639 | msgid "unrecognized query type: %s\n" |
|
|
2642 | 2640 | msgstr "" |
|
|
2643 | 2641 | |
|
|
2644 | msgid "finished setup\n" | |
|
|
2645 | msgstr "" | |
|
|
2646 | ||
|
|
2647 | 2642 | msgid "expand expressions into changelog and summaries" |
|
|
2648 | 2643 | msgstr "" |
|
|
2649 | 2644 | |
| @@ -2661,7 +2656,8 b' msgstr ""' | |||
|
|
2661 | 2656 | msgid "" |
|
|
2662 | 2657 | " [interhg]\n" |
|
|
2663 | 2658 | " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" |
|
|
2664 |
" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>! |
|
|
|
2659 | " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" | |
|
|
2660 | "i\n" | |
|
|
2665 | 2661 | " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" |
|
|
2666 | 2662 | msgstr "" |
|
|
2667 | 2663 | |
| @@ -2688,8 +2684,13 b' msgid ""' | |||
|
|
2688 | 2684 | msgstr "" |
|
|
2689 | 2685 | |
|
|
2690 | 2686 | msgid "" |
|
|
2691 | "Configuration is done in the [keyword] and [keywordmaps] sections of\n" | |
|
|
2692 | "hgrc files." | |
|
|
2687 | "Keywords expand to the changeset data pertaining to the latest change\n" | |
|
|
2688 | "relative to the working directory parent of each file." | |
|
|
2689 | msgstr "" | |
|
|
2690 | ||
|
|
2691 | msgid "" | |
|
|
2692 | "Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" | |
|
|
2693 | "sections of hgrc files." | |
|
|
2693 | 2694 | msgstr "" |
|
|
2694 | 2695 | |
|
|
2695 | 2696 | msgid "Example::" |
| @@ -2703,43 +2704,47 b' msgid ""' | |||
|
|
2703 | 2704 | msgstr "" |
|
|
2704 | 2705 | |
|
|
2705 | 2706 | msgid "" |
|
|
2706 | "NOTE: the more specific you are in your filename patterns the less you\n" | |
|
|
2707 | "lose speed in huge repositories." | |
|
|
2707 | " [keywordset]\n" | |
|
|
2708 | " # prefer svn- over cvs-like default keywordmaps\n" | |
|
|
2709 | " svn = True" | |
|
|
2710 | msgstr "" | |
|
|
2711 | ||
|
|
2712 | msgid "" | |
|
|
2713 | ".. note::\n" | |
|
|
2714 | " The more specific you are in your filename patterns the less you\n" | |
|
|
2715 | " lose speed in huge repositories." | |
|
|
2708 | 2716 | msgstr "" |
|
|
2709 | 2717 | |
|
|
2710 | 2718 | msgid "" |
|
|
2711 | 2719 | "For [keywordmaps] template mapping and expansion demonstration and\n" |
|
|
2712 |
"control run |
|
|
|
2720 | "control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" | |
|
|
2713 | 2721 | "available templates and filters." |
|
|
2714 | 2722 | msgstr "" |
|
|
2715 | 2723 | |
|
|
2716 | msgid "" | |
|
|
2717 | "An additional date template filter {date|utcdate} is provided. It\n" | |
|
|
2718 | "returns a date like \"2006/09/18 15:13:13\"." | |
|
|
2719 |
msg |
|
|
|
2720 | ||
|
|
2721 | msgid "" | |
|
|
2722 | "The default template mappings (view with \"hg kwdemo -d\") can be\n" | |
|
|
2723 | "replaced with customized keywords and templates. Again, run \"hg\n" | |
|
|
2724 | "kwdemo\" to control the results of your config changes." | |
|
|
2725 |
msg |
|
|
|
2726 | ||
|
|
2727 | msgid "" | |
|
|
2728 | "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" | |
|
|
2724 | msgid "Three additional date template filters are provided::" | |
|
|
2725 | msgstr "" | |
|
|
2726 | ||
|
|
2727 | msgid "" | |
|
|
2728 | " utcdate \"2006/09/18 15:13:13\"\n" | |
|
|
2729 | " svnutcdate \"2006-09-18 15:13:13Z\"\n" | |
|
|
2730 | " svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" | |
|
|
2731 | msgstr "" | |
|
|
2732 | ||
|
|
2733 | msgid "" | |
|
|
2734 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" | |
|
|
2735 | "replaced with customized keywords and templates. Again, run\n" | |
|
|
2736 | ":hg:`kwdemo` to control the results of your config changes." | |
|
|
2737 | msgstr "" | |
|
|
2738 | ||
|
|
2739 | msgid "" | |
|
|
2740 | "Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" | |
|
|
2729 | 2741 | "the risk of inadvertently storing expanded keywords in the change\n" |
|
|
2730 | 2742 | "history." |
|
|
2731 | 2743 | msgstr "" |
|
|
2732 | 2744 | |
|
|
2733 | 2745 | msgid "" |
|
|
2734 | 2746 | "To force expansion after enabling it, or a configuration change, run\n" |
|
|
2735 |
" |
|
|
|
2736 | msgstr "" | |
|
|
2737 | ||
|
|
2738 | msgid "" | |
|
|
2739 | "Also, when committing with the record extension or using mq's qrecord,\n" | |
|
|
2740 | "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" | |
|
|
2741 | "the files in question to update keyword expansions after all changes\n" | |
|
|
2742 | "have been checked in." | |
|
|
2747 | ":hg:`kwexpand`." | |
|
|
2743 | 2748 | msgstr "" |
|
|
2744 | 2749 | |
|
|
2745 | 2750 | msgid "" |
| @@ -2779,7 +2784,7 b' msgid " Use -d/--default to disable c' | |||
|
|
2779 | 2784 | msgstr "" |
|
|
2780 | 2785 | |
|
|
2781 | 2786 | msgid "" |
|
|
2782 |
" See |
|
|
|
2787 | " See :hg:`help templates` for information on templates and filters.\n" | |
|
|
2783 | 2788 | " " |
|
|
2784 | 2789 | msgstr "" |
|
|
2785 | 2790 | |
| @@ -2817,7 +2822,7 b' msgid ""' | |||
|
|
2817 | 2822 | "keywords written to %s:\n" |
|
|
2818 | 2823 | msgstr "" |
|
|
2819 | 2824 | |
|
|
2820 | msgid "unhooked all commit hooks\n" | |
|
|
2825 | msgid "hg keyword configuration and expansion example" | |
|
|
2821 | 2826 | msgstr "" |
|
|
2822 | 2827 | |
|
|
2823 | 2828 | msgid "" |
| @@ -2851,7 +2856,7 b' msgid ""' | |||
|
|
2851 | 2856 | msgstr "" |
|
|
2852 | 2857 | |
|
|
2853 | 2858 | msgid "" |
|
|
2854 |
" See |
|
|
|
2859 | " See :hg:`help keyword` on how to construct patterns both for\n" | |
|
|
2855 | 2860 | " inclusion and exclusion of files." |
|
|
2856 | 2861 | msgstr "" |
|
|
2857 | 2862 | |
| @@ -2873,7 +2878,7 b' msgstr ""' | |||
|
|
2873 | 2878 | |
|
|
2874 | 2879 | msgid "" |
|
|
2875 | 2880 | " Run before changing/disabling active keywords or if you experience\n" |
|
|
2876 |
" problems with |
|
|
|
2881 | " problems with :hg:`import` or :hg:`merge`." | |
|
|
2877 | 2882 | msgstr "" |
|
|
2878 | 2883 | |
|
|
2879 | 2884 | msgid "" |
| @@ -2902,12 +2907,6 b' msgstr ""' | |||
|
|
2902 | 2907 | msgid "only show unknown (not tracked) files" |
|
|
2903 | 2908 | msgstr "" |
|
|
2904 | 2909 | |
|
|
2905 | msgid "show keyword status flags of all files (DEPRECATED)" | |
|
|
2906 | msgstr "" | |
|
|
2907 | ||
|
|
2908 | msgid "only show untracked files (DEPRECATED)" | |
|
|
2909 | msgstr "" | |
|
|
2910 | ||
|
|
2911 | 2910 | msgid "hg kwfiles [OPTION]... [FILE]..." |
|
|
2912 | 2911 | msgstr "" |
|
|
2913 | 2912 | |
| @@ -2928,11 +2927,10 b' msgid ""' | |||
|
|
2928 | 2927 | "directory. Applied patches are both patch files and changesets." |
|
|
2929 | 2928 | msgstr "" |
|
|
2930 | 2929 | |
|
|
2931 |
msgid "Common tasks (use |
|
|
|
2932 | msgstr "" | |
|
|
2933 | ||
|
|
2934 | msgid "" | |
|
|
2935 | " prepare repository to work with patches qinit\n" | |
|
|
2930 | msgid "Common tasks (use :hg:`help command` for more details)::" | |
|
|
2931 | msgstr "" | |
|
|
2932 | ||
|
|
2933 | msgid "" | |
|
|
2936 | 2934 | " create new patch qnew\n" |
|
|
2937 | 2935 | " import existing patch qimport" |
|
|
2938 | 2936 | msgstr "" |
| @@ -2945,7 +2943,34 b' msgstr ""' | |||
|
|
2945 | 2943 | msgid "" |
|
|
2946 | 2944 | " add known patch to applied stack qpush\n" |
|
|
2947 | 2945 | " remove patch from applied stack qpop\n" |
|
|
2948 |
" refresh contents of top applied patch qrefresh |
|
|
|
2946 | " refresh contents of top applied patch qrefresh" | |
|
|
2947 | msgstr "" | |
|
|
2948 | ||
|
|
2949 | msgid "" | |
|
|
2950 | "By default, mq will automatically use git patches when required to\n" | |
|
|
2951 | "avoid losing file mode changes, copy records, binary files or empty\n" | |
|
|
2952 | "files creations or deletions. This behaviour can be configured with::" | |
|
|
2953 | msgstr "" | |
|
|
2954 | ||
|
|
2955 | msgid "" | |
|
|
2956 | " [mq]\n" | |
|
|
2957 | " git = auto/keep/yes/no" | |
|
|
2958 | msgstr "" | |
|
|
2959 | ||
|
|
2960 | msgid "" | |
|
|
2961 | "If set to 'keep', mq will obey the [diff] section configuration while\n" | |
|
|
2962 | "preserving existing git patches upon qrefresh. If set to 'yes' or\n" | |
|
|
2963 | "'no', mq will override the [diff] section and always generate git or\n" | |
|
|
2964 | "regular patches, possibly losing data in the second case." | |
|
|
2965 | msgstr "" | |
|
|
2966 | ||
|
|
2967 | msgid "" | |
|
|
2968 | "You will by default be managing a patch queue named \"patches\". You can\n" | |
|
|
2969 | "create other, independent patch queues with the :hg:`qqueue` command.\n" | |
|
|
2970 | msgstr "" | |
|
|
2971 | ||
|
|
2972 | #, python-format | |
|
|
2973 | msgid "mq.git option can be auto/keep/yes/no got %s" | |
|
|
2949 | 2974 | msgstr "" |
|
|
2950 | 2975 | |
|
|
2951 | 2976 | #, python-format |
| @@ -3027,26 +3052,20 b' msgstr ""' | |||
|
|
3027 | 3052 | |
|
|
3028 | 3053 | #, python-format |
|
|
3029 | 3054 | msgid "applying %s\n" |
|
|
3030 | msgstr "" | |
|
|
3055 | msgstr "正在套用 %s\n" | |
|
|
3031 | 3056 | |
|
|
3032 | 3057 | #, python-format |
|
|
3033 | 3058 | msgid "unable to read %s\n" |
|
|
3034 | 3059 | msgstr "" |
|
|
3035 | 3060 | |
|
|
3036 | 3061 | #, python-format |
|
|
3037 | msgid "imported patch %s\n" | |
|
|
3038 | msgstr "" | |
|
|
3039 | ||
|
|
3040 | #, python-format | |
|
|
3041 | msgid "" | |
|
|
3042 | "\n" | |
|
|
3043 | "imported patch %s" | |
|
|
3044 | msgstr "" | |
|
|
3045 | ||
|
|
3046 | #, python-format | |
|
|
3047 | 3062 | msgid "patch %s is empty\n" |
|
|
3048 | 3063 | msgstr "" |
|
|
3049 | 3064 | |
|
|
3065 | #, fuzzy | |
|
|
3066 | msgid "repository commit failed" | |
|
|
3067 | msgstr "找不到 %s 儲存庫" | |
|
|
3068 | ||
|
|
3050 | 3069 | msgid "patch failed, rejects left in working dir\n" |
|
|
3051 | 3070 | msgstr "" |
|
|
3052 | 3071 | |
| @@ -3092,10 +3111,21 b' msgstr ""' | |||
|
|
3092 | 3111 | msgid "\"%s\" cannot be used as the name of a patch" |
|
|
3093 | 3112 | msgstr "" |
|
|
3094 | 3113 | |
|
|
3114 | #, fuzzy, python-format | |
|
|
3115 | msgid "\"%s\" already exists as a directory" | |
|
|
3116 | msgstr "佇列 %s 已存在" | |
|
|
3117 | ||
|
|
3095 | 3118 | #, python-format |
|
|
3096 | 3119 | msgid "patch \"%s\" already exists" |
|
|
3097 | 3120 | msgstr "" |
|
|
3098 | 3121 | |
|
|
3122 | msgid "cannot manage merge changesets" | |
|
|
3123 | msgstr "" | |
|
|
3124 | ||
|
|
3125 | #, fuzzy, python-format | |
|
|
3126 | msgid "cannot write patch \"%s\": %s" | |
|
|
3127 | msgstr "有缺陷的patch %s %s" | |
|
|
3128 | ||
|
|
3099 | 3129 | #, python-format |
|
|
3100 | 3130 | msgid "error unlinking %s\n" |
|
|
3101 | 3131 | msgstr "" |
| @@ -3139,8 +3169,11 b' msgstr ""' | |||
|
|
3139 | 3169 | msgid "patch series already fully applied\n" |
|
|
3140 | 3170 | msgstr "" |
|
|
3141 | 3171 | |
|
|
3172 | msgid "please specify the patch to move" | |
|
|
3173 | msgstr "" | |
|
|
3174 | ||
|
|
3142 | 3175 | msgid "cleaning up working directory..." |
|
|
3143 | msgstr "" | |
|
|
3176 | msgstr "正在清理工作目錄..." | |
|
|
3144 | 3177 | |
|
|
3145 | 3178 | #, python-format |
|
|
3146 | 3179 | msgid "errors during apply, please fix and refresh %s\n" |
| @@ -3174,9 +3207,9 b' msgstr ""' | |||
|
|
3174 | 3207 | msgid "deletions found between repo revs" |
|
|
3175 | 3208 | msgstr "" |
|
|
3176 | 3209 | |
|
|
3177 |
#, |
|
|
|
3210 | #, python-format | |
|
|
3178 | 3211 | msgid "popping %s\n" |
|
|
3179 |
msgstr " |
|
|
|
3212 | msgstr "" | |
|
|
3180 | 3213 | |
|
|
3181 | 3214 | msgid "patch queue now empty\n" |
|
|
3182 | 3215 | msgstr "" |
| @@ -3184,7 +3217,9 b' msgstr ""' | |||
|
|
3184 | 3217 | msgid "cannot refresh a revision with children" |
|
|
3185 | 3218 | msgstr "" |
|
|
3186 | 3219 | |
|
|
3187 | msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" | |
|
|
3220 | msgid "" | |
|
|
3221 | "refresh interrupted while patch was popped! (revert --all, qpush to " | |
|
|
3222 | "recover)\n" | |
|
|
3188 | 3223 | msgstr "" |
|
|
3189 | 3224 | |
|
|
3190 | 3225 | msgid "patch queue directory already exists" |
| @@ -3212,8 +3247,9 b' msgstr ""' | |||
|
|
3212 | 3247 | msgid "saved queue repository parents: %s %s\n" |
|
|
3213 | 3248 | msgstr "" |
|
|
3214 | 3249 | |
|
|
3215 | msgid "queue directory updating\n" | |
|
|
3216 | msgstr "" | |
|
|
3250 | #, fuzzy | |
|
|
3251 | msgid "updating queue directory\n" | |
|
|
3252 | msgstr "更新工作目錄中\n" | |
|
|
3217 | 3253 | |
|
|
3218 | 3254 | msgid "Unable to load queue repository\n" |
|
|
3219 | 3255 | msgstr "" |
| @@ -3271,10 +3307,18 b' msgstr ""' | |||
|
|
3271 | 3307 | msgid "patch %s does not exist" |
|
|
3272 | 3308 | msgstr "" |
|
|
3273 | 3309 | |
|
|
3310 | #, python-format | |
|
|
3311 | msgid "renaming %s to %s\n" | |
|
|
3312 | msgstr "%s 改名字成 %s\n" | |
|
|
3313 | ||
|
|
3274 | 3314 | msgid "need --name to import a patch from -" |
|
|
3275 | 3315 | msgstr "" |
|
|
3276 | 3316 | |
|
|
3277 | 3317 | #, python-format |
|
|
3318 | msgid "unable to read file %s" | |
|
|
3319 | msgstr "不能讀檔案 %s" | |
|
|
3320 | ||
|
|
3321 | #, python-format | |
|
|
3278 | 3322 | msgid "adding %s to series file\n" |
|
|
3279 | 3323 | msgstr "" |
|
|
3280 | 3324 | |
| @@ -3282,18 +3326,22 b' msgid "remove patches from queue"' | |||
|
|
3282 | 3326 | msgstr "" |
|
|
3283 | 3327 | |
|
|
3284 | 3328 | msgid "" |
|
|
3285 |
" The patches must not be applied, and at least one patch is required. |
|
|
|
3329 | " The patches must not be applied, and at least one patch is required. " | |
|
|
3330 | "With\n" | |
|
|
3286 | 3331 | " -k/--keep, the patch files are preserved in the patch directory." |
|
|
3287 | 3332 | msgstr "" |
|
|
3288 | 3333 | |
|
|
3289 | 3334 | msgid "" |
|
|
3290 | 3335 | " To stop managing a patch and move it into permanent history,\n" |
|
|
3291 | " use the qfinish command." | |
|
|
3336 | " use the :hg:`qfinish` command." | |
|
|
3292 | 3337 | msgstr "" |
|
|
3293 | 3338 | |
|
|
3294 | 3339 | msgid "print the patches already applied" |
|
|
3295 | 3340 | msgstr "" |
|
|
3296 | 3341 | |
|
|
3342 | msgid " Returns 0 on success." | |
|
|
3343 | msgstr "" | |
|
|
3344 | ||
|
|
3297 | 3345 | msgid "only one patch applied\n" |
|
|
3298 | 3346 | msgstr "" |
|
|
3299 | 3347 | |
| @@ -3339,11 +3387,21 b' msgstr ""' | |||
|
|
3339 | 3387 | msgid "" |
|
|
3340 | 3388 | " To import a patch from standard input, pass - as the patch file.\n" |
|
|
3341 | 3389 | " When importing from standard input, a patch name must be specified\n" |
|
|
3342 |
" using the --name flag. |
|
|
|
3390 | " using the --name flag." | |
|
|
3391 | msgstr "" | |
|
|
3392 | ||
|
|
3393 | msgid " To import an existing patch while renaming it::" | |
|
|
3394 | msgstr "" | |
|
|
3395 | ||
|
|
3396 | msgid " hg qimport -e existing-patch -n new-name" | |
|
|
3397 | msgstr "" | |
|
|
3398 | ||
|
|
3399 | msgid "" | |
|
|
3400 | " Returns 0 if import succeeded.\n" | |
|
|
3343 | 3401 | " " |
|
|
3344 | 3402 | msgstr "" |
|
|
3345 | 3403 | |
|
|
3346 | msgid "init a new queue repository" | |
|
|
3404 | msgid "init a new queue repository (DEPRECATED)" | |
|
|
3347 | 3405 | msgstr "" |
|
|
3348 | 3406 | |
|
|
3349 | 3407 | msgid "" |
| @@ -3354,6 +3412,11 b' msgid ""' | |||
|
|
3354 | 3412 | " qcommit to commit changes to this queue repository." |
|
|
3355 | 3413 | msgstr "" |
|
|
3356 | 3414 | |
|
|
3415 | msgid "" | |
|
|
3416 | " This command is deprecated. Without -c, it's implied by other relevant\n" | |
|
|
3417 | " commands. With -c, use :hg:`init --mq` instead." | |
|
|
3418 | msgstr "" | |
|
|
3419 | ||
|
|
3357 | 3420 | msgid "clone main and patch repository at same time" |
|
|
3358 | 3421 | msgstr "" |
|
|
3359 | 3422 | |
| @@ -3372,11 +3435,15 b' msgstr ""' | |||
|
|
3372 | 3435 | |
|
|
3373 | 3436 | msgid "" |
|
|
3374 | 3437 | " The patch directory must be a nested Mercurial repository, as\n" |
|
|
3375 |
" would be created by |
|
|
|
3438 | " would be created by :hg:`init --mq`." | |
|
|
3439 | msgstr "" | |
|
|
3440 | ||
|
|
3441 | msgid "" | |
|
|
3442 | " Return 0 on success.\n" | |
|
|
3376 | 3443 | " " |
|
|
3377 | 3444 | msgstr "" |
|
|
3378 | 3445 | |
|
|
3379 |
msgid "versioned patch repository not found (see |
|
|
|
3446 | msgid "versioned patch repository not found (see init --mq)" | |
|
|
3380 | 3447 | msgstr "" |
|
|
3381 | 3448 | |
|
|
3382 | 3449 | msgid "cloning main repository\n" |
| @@ -3391,7 +3458,10 b' msgstr ""' | |||
|
|
3391 | 3458 | msgid "updating destination repository\n" |
|
|
3392 | 3459 | msgstr "" |
|
|
3393 | 3460 | |
|
|
3394 | msgid "commit changes in the queue repository" | |
|
|
3461 | msgid "commit changes in the queue repository (DEPRECATED)" | |
|
|
3462 | msgstr "" | |
|
|
3463 | ||
|
|
3464 | msgid " This command is deprecated; use :hg:`commit --mq` instead." | |
|
|
3395 | 3465 | msgstr "" |
|
|
3396 | 3466 | |
|
|
3397 | 3467 | msgid "print the entire series file" |
| @@ -3411,9 +3481,8 b' msgstr ""' | |||
|
|
3411 | 3481 | |
|
|
3412 | 3482 | msgid "" |
|
|
3413 | 3483 | " qnew creates a new patch on top of the currently-applied patch (if\n" |
|
|
3414 |
" any). |
|
|
|
3415 | " unless -f/--force is specified, in which case the patch will be\n" | |
|
|
3416 | " initialized with them. You may also use -I/--include,\n" | |
|
|
3484 | " any). The patch will be initialized with any outstanding changes\n" | |
|
|
3485 | " in the working directory. You may also use -I/--include,\n" | |
|
|
3417 | 3486 | " -X/--exclude, and/or a list of files after the patch name to add\n" |
|
|
3418 | 3487 | " only changes to matching files to the new patch, leaving the rest\n" |
|
|
3419 | 3488 | " as uncommitted modifications." |
| @@ -3435,7 +3504,11 b' msgid ""' | |||
|
|
3435 | 3504 | " Use the -g/--git option to keep the patch in the git extended diff\n" |
|
|
3436 | 3505 | " format. Read the diffs help topic for more information on why this\n" |
|
|
3437 | 3506 | " is important for preserving permission changes and copy/rename\n" |
|
|
3438 |
" information. |
|
|
|
3507 | " information." | |
|
|
3508 | msgstr "" | |
|
|
3509 | ||
|
|
3510 | msgid "" | |
|
|
3511 | " Returns 0 on successful creation of a new patch.\n" | |
|
|
3439 | 3512 | " " |
|
|
3440 | 3513 | msgstr "" |
|
|
3441 | 3514 | |
| @@ -3454,11 +3527,18 b' msgid ""' | |||
|
|
3454 | 3527 | msgstr "" |
|
|
3455 | 3528 | |
|
|
3456 | 3529 | msgid "" |
|
|
3530 | " If -e/--edit is specified, Mercurial will start your configured editor " | |
|
|
3531 | "for\n" | |
|
|
3532 | " you to enter a message. In case qrefresh fails, you will find a backup " | |
|
|
3533 | "of\n" | |
|
|
3534 | " your message in ``.hg/last-message.txt``." | |
|
|
3535 | msgstr "" | |
|
|
3536 | ||
|
|
3537 | msgid "" | |
|
|
3457 | 3538 | " hg add/remove/copy/rename work as usual, though you might want to\n" |
|
|
3458 | 3539 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" |
|
|
3459 | 3540 | " and renames. See the diffs help topic for more information on the\n" |
|
|
3460 |
" git diff format. |
|
|
|
3461 | " " | |
|
|
3541 | " git diff format." | |
|
|
3462 | 3542 | msgstr "" |
|
|
3463 | 3543 | |
|
|
3464 | 3544 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
| @@ -3475,11 +3555,10 b' msgid ""' | |||
|
|
3475 | 3555 | msgstr "" |
|
|
3476 | 3556 | |
|
|
3477 | 3557 | msgid "" |
|
|
3478 |
" Use |
|
|
|
3479 |
" last qrefresh, or |
|
|
|
3480 | " by the current patch without including changes made since the\n" | |
|
|
3481 |
" qrefresh. |
|
|
|
3482 | " " | |
|
|
3558 | " Use :hg:`diff` if you only want to see the changes made since the\n" | |
|
|
3559 | " last qrefresh, or :hg:`export qtip` if you want to see changes\n" | |
|
|
3560 | " made by the current patch without including changes made since the\n" | |
|
|
3561 | " qrefresh." | |
|
|
3483 | 3562 | msgstr "" |
|
|
3484 | 3563 | |
|
|
3485 | 3564 | msgid "fold the named patches into the current patch" |
| @@ -3496,17 +3575,14 b' msgstr ""' | |||
|
|
3496 | 3575 | |
|
|
3497 | 3576 | msgid "" |
|
|
3498 | 3577 | " The header for each folded patch will be concatenated with the\n" |
|
|
3499 |
" current patch header, separated by a line of |
|
|
|
3578 | " current patch header, separated by a line of ``* * *``." | |
|
|
3500 | 3579 | msgstr "" |
|
|
3501 | 3580 | |
|
|
3502 | 3581 | msgid "qfold requires at least one patch name" |
|
|
3503 | 3582 | msgstr "" |
|
|
3504 | 3583 | |
|
|
3505 | msgid "No patches applied" | |
|
|
3506 | msgstr "" | |
|
|
3507 | ||
|
|
3508 | #, python-format | |
|
|
3509 | msgid "Skipping already folded patch %s" | |
|
|
3584 | #, python-format | |
|
|
3585 | msgid "Skipping already folded patch %s\n" | |
|
|
3510 | 3586 | msgstr "" |
|
|
3511 | 3587 | |
|
|
3512 | 3588 | #, python-format |
| @@ -3514,7 +3590,7 b' msgid "qfold cannot fold already applied' | |||
|
|
3514 | 3590 | msgstr "" |
|
|
3515 | 3591 | |
|
|
3516 | 3592 | #, python-format |
|
|
3517 |
msgid " |
|
|
|
3593 | msgid "error folding patch %s" | |
|
|
3518 | 3594 | msgstr "" |
|
|
3519 | 3595 | |
|
|
3520 | 3596 | msgid "push or pop patches until named patch is at top of stack" |
| @@ -3526,21 +3602,26 b' msgstr ""' | |||
|
|
3526 | 3602 | msgid "" |
|
|
3527 | 3603 | " Guards control whether a patch can be pushed. A patch with no\n" |
|
|
3528 | 3604 | " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" |
|
|
3529 | " pushed only if the qselect command has activated it. A patch with\n" | |
|
|
3530 |
" a negative guard (\"-foo\") is never pushed if the qselect |
|
|
|
3605 | " pushed only if the :hg:`qselect` command has activated it. A patch with\n" | |
|
|
3606 | " a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " | |
|
|
3607 | "command\n" | |
|
|
3531 | 3608 | " has activated it." |
|
|
3532 | 3609 | msgstr "" |
|
|
3533 | 3610 | |
|
|
3534 | 3611 | msgid "" |
|
|
3535 | 3612 | " With no arguments, print the currently active guards.\n" |
|
|
3536 |
" With arguments, set guards for the named patch. |
|
|
|
3537 | " NOTE: Specifying negative guards now requires '--'." | |
|
|
3538 | msgstr "" | |
|
|
3539 | ||
|
|
3540 | msgid "" | |
|
|
3541 | " To set guards on another patch:\n" | |
|
|
3542 | " hg qguard -- other.patch +2.6.17 -stable\n" | |
|
|
3543 | " " | |
|
|
3613 | " With arguments, set guards for the named patch." | |
|
|
3614 | msgstr "" | |
|
|
3615 | ||
|
|
3616 | msgid "" | |
|
|
3617 | " .. note::\n" | |
|
|
3618 | " Specifying negative guards now requires '--'." | |
|
|
3619 | msgstr "" | |
|
|
3620 | ||
|
|
3621 | msgid " To set guards on another patch::" | |
|
|
3622 | msgstr "" | |
|
|
3623 | ||
|
|
3624 | msgid " hg qguard other.patch -- +2.6.17 -stable" | |
|
|
3544 | 3625 | msgstr "" |
|
|
3545 | 3626 | |
|
|
3546 | 3627 | msgid "cannot mix -l/--list with options or arguments" |
| @@ -3561,7 +3642,11 b' msgstr ""' | |||
|
|
3561 | 3642 | |
|
|
3562 | 3643 | msgid "" |
|
|
3563 | 3644 | " When -f/--force is applied, all local changes in patched files\n" |
|
|
3564 |
" will be lost. |
|
|
|
3645 | " will be lost." | |
|
|
3646 | msgstr "" | |
|
|
3647 | ||
|
|
3648 | msgid "" | |
|
|
3649 | " Return 0 on succces.\n" | |
|
|
3565 | 3650 | " " |
|
|
3566 | 3651 | msgstr "" |
|
|
3567 | 3652 | |
| @@ -3578,8 +3663,7 b' msgstr ""' | |||
|
|
3578 | 3663 | msgid "" |
|
|
3579 | 3664 | " By default, pops off the top of the patch stack. If given a patch\n" |
|
|
3580 | 3665 | " name, keeps popping off patches until the named patch is at the\n" |
|
|
3581 |
" top of the stack. |
|
|
|
3582 | " " | |
|
|
3666 | " top of the stack." | |
|
|
3583 | 3667 | msgstr "" |
|
|
3584 | 3668 | |
|
|
3585 | 3669 | #, python-format |
| @@ -3602,10 +3686,13 b' msgstr ""' | |||
|
|
3602 | 3686 | msgid "A patch named %s already exists in the series file" |
|
|
3603 | 3687 | msgstr "" |
|
|
3604 | 3688 | |
|
|
3605 | msgid "restore the queue state saved by a revision" | |
|
|
3606 | msgstr "" | |
|
|
3607 | ||
|
|
3608 | msgid "save current queue state" | |
|
|
3689 | msgid "restore the queue state saved by a revision (DEPRECATED)" | |
|
|
3690 | msgstr "" | |
|
|
3691 | ||
|
|
3692 | msgid " This command is deprecated, use :hg:`rebase` instead." | |
|
|
3693 | msgstr "" | |
|
|
3694 | ||
|
|
3695 | msgid "save current queue state (DEPRECATED)" | |
|
|
3609 | 3696 | msgstr "" |
|
|
3610 | 3697 | |
|
|
3611 | 3698 | #, python-format |
| @@ -3620,25 +3707,48 b' msgstr ""' | |||
|
|
3620 | 3707 | msgid "copy %s to %s\n" |
|
|
3621 | 3708 | msgstr "" |
|
|
3622 | 3709 | |
|
|
3623 |
msgid "strip |
|
|
|
3624 | msgstr "" | |
|
|
3625 | ||
|
|
3626 | msgid "" | |
|
|
3627 | " If one of the working directory's parent revisions is stripped, the\n" | |
|
|
3628 | " working directory will be updated to the parent of the stripped\n" | |
|
|
3629 | " revision.\n" | |
|
|
3630 | " " | |
|
|
3710 | msgid "strip changesets and all their descendants from the repository" | |
|
|
3711 | msgstr "" | |
|
|
3712 | ||
|
|
3713 | msgid "" | |
|
|
3714 | " The strip command removes the specified changesets and all their\n" | |
|
|
3715 | " descendants. If the working directory has uncommitted changes,\n" | |
|
|
3716 | " the operation is aborted unless the --force flag is supplied." | |
|
|
3717 | msgstr "" | |
|
|
3718 | ||
|
|
3719 | msgid "" | |
|
|
3720 | " If a parent of the working directory is stripped, then the working\n" | |
|
|
3721 | " directory will automatically be updated to the most recent\n" | |
|
|
3722 | " available ancestor of the stripped parent after the operation\n" | |
|
|
3723 | " completes." | |
|
|
3724 | msgstr "" | |
|
|
3725 | ||
|
|
3726 | msgid "" | |
|
|
3727 | " Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" | |
|
|
3728 | " bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" | |
|
|
3729 | " be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" | |
|
|
3730 | " where BUNDLE is the bundle file created by the strip. Note that\n" | |
|
|
3731 | " the local revision numbers will in general be different after the\n" | |
|
|
3732 | " restore." | |
|
|
3733 | msgstr "" | |
|
|
3734 | ||
|
|
3735 | msgid "" | |
|
|
3736 | " Use the --no-backup option to discard the backup bundle once the\n" | |
|
|
3737 | " operation completes." | |
|
|
3738 | msgstr "" | |
|
|
3739 | ||
|
|
3740 | msgid "empty revision set" | |
|
|
3631 | 3741 | msgstr "" |
|
|
3632 | 3742 | |
|
|
3633 | 3743 | msgid "set or print guarded patches to push" |
|
|
3634 | 3744 | msgstr "" |
|
|
3635 | 3745 | |
|
|
3636 | 3746 | msgid "" |
|
|
3637 | " Use the qguard command to set or print guards on patch, then use\n" | |
|
|
3747 | " Use the :hg:`qguard` command to set or print guards on patch, then use\n" | |
|
|
3638 | 3748 | " qselect to tell mq which guards to use. A patch will be pushed if\n" |
|
|
3639 | 3749 | " it has no guards or any positive guards match the currently\n" |
|
|
3640 | 3750 | " selected guard, but will not be pushed if any negative guards\n" |
|
|
3641 | " match the current guard. For example:" | |
|
|
3751 | " match the current guard. For example::" | |
|
|
3642 | 3752 | msgstr "" |
|
|
3643 | 3753 | |
|
|
3644 | 3754 | msgid "" |
| @@ -3725,13 +3835,71 b' msgstr ""' | |||
|
|
3725 | 3835 | msgid "" |
|
|
3726 | 3836 | " This can be especially useful if your changes have been applied to\n" |
|
|
3727 | 3837 | " an upstream repository, or if you are about to push your changes\n" |
|
|
3728 |
" to upstream. |
|
|
|
3729 | " " | |
|
|
3838 | " to upstream." | |
|
|
3730 | 3839 | msgstr "" |
|
|
3731 | 3840 | |
|
|
3732 | 3841 | msgid "no revisions specified" |
|
|
3733 | 3842 | msgstr "" |
|
|
3734 | 3843 | |
|
|
3844 | msgid "manage multiple patch queues" | |
|
|
3845 | msgstr "" | |
|
|
3846 | ||
|
|
3847 | msgid "" | |
|
|
3848 | " Supports switching between different patch queues, as well as creating\n" | |
|
|
3849 | " new patch queues and deleting existing ones." | |
|
|
3850 | msgstr "" | |
|
|
3851 | ||
|
|
3852 | msgid "" | |
|
|
3853 | " Omitting a queue name or specifying -l/--list will show you the " | |
|
|
3854 | "registered\n" | |
|
|
3855 | " queues - by default the \"normal\" patches queue is registered. The " | |
|
|
3856 | "currently\n" | |
|
|
3857 | " active queue will be marked with \"(active)\"." | |
|
|
3858 | msgstr "" | |
|
|
3859 | ||
|
|
3860 | msgid "" | |
|
|
3861 | " To create a new queue, use -c/--create. The queue is automatically made\n" | |
|
|
3862 | " active, except in the case where there are applied patches from the\n" | |
|
|
3863 | " currently active queue in the repository. Then the queue will only be\n" | |
|
|
3864 | " created and switching will fail." | |
|
|
3865 | msgstr "" | |
|
|
3866 | ||
|
|
3867 | msgid "" | |
|
|
3868 | " To delete an existing queue, use --delete. You cannot delete the " | |
|
|
3869 | "currently\n" | |
|
|
3870 | " active queue." | |
|
|
3871 | msgstr "" | |
|
|
3872 | ||
|
|
3873 | msgid "patches applied - cannot set new queue active" | |
|
|
3874 | msgstr "" | |
|
|
3875 | ||
|
|
3876 | msgid "cannot delete queue that does not exist" | |
|
|
3877 | msgstr "" | |
|
|
3878 | ||
|
|
3879 | msgid "cannot delete currently active queue" | |
|
|
3880 | msgstr "" | |
|
|
3881 | ||
|
|
3882 | msgid " (active)\n" | |
|
|
3883 | msgstr "" | |
|
|
3884 | ||
|
|
3885 | msgid "invalid queue name, may not contain the characters \":\\/.\"" | |
|
|
3886 | msgstr "" | |
|
|
3887 | ||
|
|
3888 | #, python-format | |
|
|
3889 | msgid "queue \"%s\" already exists" | |
|
|
3890 | msgstr "佇列 %s 已存在" | |
|
|
3891 | ||
|
|
3892 | #, python-format | |
|
|
3893 | msgid "can't rename \"%s\" to its current name" | |
|
|
3894 | msgstr "" | |
|
|
3895 | ||
|
|
3896 | #, python-format | |
|
|
3897 | msgid "non-queue directory \"%s\" already exists" | |
|
|
3898 | msgstr "" | |
|
|
3899 | ||
|
|
3900 | msgid "use --create to create a new queue" | |
|
|
3901 | msgstr "" | |
|
|
3902 | ||
|
|
3735 | 3903 | msgid "cannot commit over an applied mq patch" |
|
|
3736 | 3904 | msgstr "" |
|
|
3737 | 3905 | |
| @@ -3749,6 +3917,29 b' msgstr ""' | |||
|
|
3749 | 3917 | msgid "cannot import over an applied patch" |
|
|
3750 | 3918 | msgstr "" |
|
|
3751 | 3919 | |
|
|
3920 | msgid "only a local queue repository may be initialized" | |
|
|
3921 | msgstr "" | |
|
|
3922 | ||
|
|
3923 | msgid "there is no Mercurial repository here (.hg not found)" | |
|
|
3924 | msgstr "這邊沒有Mercurial 儲存庫(找不到 .hg)" | |
|
|
3925 | ||
|
|
3926 | msgid "no queue repository" | |
|
|
3927 | msgstr "沒有佇列儲存庫" | |
|
|
3928 | ||
|
|
3929 | #, python-format | |
|
|
3930 | msgid "%d applied" | |
|
|
3931 | msgstr "" | |
|
|
3932 | ||
|
|
3933 | #, python-format | |
|
|
3934 | msgid "%d unapplied" | |
|
|
3935 | msgstr "" | |
|
|
3936 | ||
|
|
3937 | msgid "mq: (empty queue)\n" | |
|
|
3938 | msgstr "" | |
|
|
3939 | ||
|
|
3940 | msgid "operate on patch repository" | |
|
|
3941 | msgstr "" | |
|
|
3942 | ||
|
|
3752 | 3943 | msgid "print first line of patch header" |
|
|
3753 | 3944 | msgstr "" |
|
|
3754 | 3945 | |
| @@ -3767,6 +3958,9 b' msgstr ""' | |||
|
|
3767 | 3958 | msgid "use uncompressed transfer (fast over LAN)" |
|
|
3768 | 3959 | msgstr "" |
|
|
3769 | 3960 | |
|
|
3961 | msgid "REPO" | |
|
|
3962 | msgstr "" | |
|
|
3963 | ||
|
|
3770 | 3964 | msgid "location of source patch repository" |
|
|
3771 | 3965 | msgstr "" |
|
|
3772 | 3966 | |
| @@ -3785,7 +3979,7 b' msgstr ""' | |||
|
|
3785 | 3979 | msgid "stop managing a revision (DEPRECATED)" |
|
|
3786 | 3980 | msgstr "" |
|
|
3787 | 3981 | |
|
|
3788 |
msgid "hg qdelete [-k] [ |
|
|
|
3982 | msgid "hg qdelete [-k] [PATCH]..." | |
|
|
3789 | 3983 | msgstr "" |
|
|
3790 | 3984 | |
|
|
3791 | 3985 | msgid "edit patch header" |
| @@ -3809,7 +4003,7 b' msgstr ""' | |||
|
|
3809 | 4003 | msgid "drop all guards" |
|
|
3810 | 4004 | msgstr "" |
|
|
3811 | 4005 | |
|
|
3812 |
msgid "hg qguard [-l] [-n] |
|
|
|
4006 | msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" | |
|
|
3813 | 4007 | msgstr "" |
|
|
3814 | 4008 | |
|
|
3815 | 4009 | msgid "hg qheader [PATCH]" |
| @@ -3842,22 +4036,25 b' msgstr ""' | |||
|
|
3842 | 4036 | msgid "hg qinit [-c]" |
|
|
3843 | 4037 | msgstr "" |
|
|
3844 | 4038 | |
|
|
3845 |
msgid "import uncommitted changes |
|
|
|
4039 | msgid "import uncommitted changes (DEPRECATED)" | |
|
|
3846 | 4040 | msgstr "" |
|
|
3847 | 4041 | |
|
|
3848 | 4042 | msgid "add \"From: <current user>\" to patch" |
|
|
3849 | 4043 | msgstr "" |
|
|
3850 | 4044 | |
|
|
3851 | msgid "add \"From: <given user>\" to patch" | |
|
|
4045 | msgid "USER" | |
|
|
4046 | msgstr "" | |
|
|
4047 | ||
|
|
4048 | msgid "add \"From: <USER>\" to patch" | |
|
|
3852 | 4049 | msgstr "" |
|
|
3853 | 4050 | |
|
|
3854 | 4051 | msgid "add \"Date: <current date>\" to patch" |
|
|
3855 | 4052 | msgstr "" |
|
|
3856 | 4053 | |
|
|
3857 |
msgid "add \"Date: < |
|
|
|
3858 | msgstr "" | |
|
|
3859 | ||
|
|
3860 |
msgid "hg qnew [-e] [-m TEXT] [-l FILE] |
|
|
|
4054 | msgid "add \"Date: <DATE>\" to patch" | |
|
|
4055 | msgstr "" | |
|
|
4056 | ||
|
|
4057 | msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." | |
|
|
3861 | 4058 | msgstr "" |
|
|
3862 | 4059 | |
|
|
3863 | 4060 | msgid "hg qnext [-s]" |
| @@ -3869,16 +4066,16 b' msgstr ""' | |||
|
|
3869 | 4066 | msgid "pop all patches" |
|
|
3870 | 4067 | msgstr "" |
|
|
3871 | 4068 | |
|
|
3872 | msgid "queue name to pop" | |
|
|
4069 | msgid "queue name to pop (DEPRECATED)" | |
|
|
3873 | 4070 | msgstr "" |
|
|
3874 | 4071 | |
|
|
3875 | 4072 | msgid "forget any local changes to patched files" |
|
|
3876 | 4073 | msgstr "" |
|
|
3877 | 4074 | |
|
|
3878 |
msgid "hg qpop [-a] [- |
|
|
|
3879 | msgstr "" | |
|
|
3880 | ||
|
|
3881 | msgid "apply if the patch has rejects" | |
|
|
4075 | msgid "hg qpop [-a] [-f] [PATCH | INDEX]" | |
|
|
4076 | msgstr "" | |
|
|
4077 | ||
|
|
4078 | msgid "apply on top of local changes" | |
|
|
3882 | 4079 | msgstr "" |
|
|
3883 | 4080 | |
|
|
3884 | 4081 | msgid "list patch name in commit text" |
| @@ -3887,13 +4084,16 b' msgstr ""' | |||
|
|
3887 | 4084 | msgid "apply all patches" |
|
|
3888 | 4085 | msgstr "" |
|
|
3889 | 4086 | |
|
|
3890 | msgid "merge from another queue" | |
|
|
3891 | msgstr "" | |
|
|
3892 | ||
|
|
3893 | msgid "merge queue name" | |
|
|
3894 | msgstr "" | |
|
|
3895 | ||
|
|
3896 | msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" | |
|
|
4087 | msgid "merge from another queue (DEPRECATED)" | |
|
|
4088 | msgstr "" | |
|
|
4089 | ||
|
|
4090 | msgid "merge queue name (DEPRECATED)" | |
|
|
4091 | msgstr "" | |
|
|
4092 | ||
|
|
4093 | msgid "reorder patch series and apply only the patch" | |
|
|
4094 | msgstr "" | |
|
|
4095 | ||
|
|
4096 | msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" | |
|
|
3897 | 4097 | msgstr "" |
|
|
3898 | 4098 | |
|
|
3899 | 4099 | msgid "refresh only files already in the patch and specified files" |
| @@ -3962,16 +4162,26 b' msgstr ""' | |||
|
|
3962 | 4162 | msgid "hg qseries [-ms]" |
|
|
3963 | 4163 | msgstr "" |
|
|
3964 | 4164 | |
|
|
3965 | msgid "force removal with local changes" | |
|
|
3966 | msgstr "" | |
|
|
3967 | ||
|
|
3968 | msgid "bundle unrelated changesets" | |
|
|
4165 | msgid "" | |
|
|
4166 | "force removal of changesets even if the working directory has uncommitted " | |
|
|
4167 | "changes" | |
|
|
4168 | msgstr "" | |
|
|
4169 | ||
|
|
4170 | msgid "" | |
|
|
4171 | "bundle only changesets with local revision number greater than REV which are " | |
|
|
4172 | "not descendants of REV (DEPRECATED)" | |
|
|
3969 | 4173 | msgstr "" |
|
|
3970 | 4174 | |
|
|
3971 | 4175 | msgid "no backups" |
|
|
3972 | 4176 | msgstr "" |
|
|
3973 | 4177 | |
|
|
3974 | msgid "hg strip [-f] [-b] [-n] REV" | |
|
|
4178 | msgid "no backups (DEPRECATED)" | |
|
|
4179 | msgstr "" | |
|
|
4180 | ||
|
|
4181 | msgid "do not modify working copy during strip" | |
|
|
4182 | msgstr "" | |
|
|
4183 | ||
|
|
4184 | msgid "hg strip [-k] [-f] [-n] REV..." | |
|
|
3975 | 4185 | msgstr "" |
|
|
3976 | 4186 | |
|
|
3977 | 4187 | msgid "hg qtop [-s]" |
| @@ -3989,6 +4199,24 b' msgstr ""' | |||
|
|
3989 | 4199 | msgid "hg qfinish [-a] [REV]..." |
|
|
3990 | 4200 | msgstr "" |
|
|
3991 | 4201 | |
|
|
4202 | msgid "list all available queues" | |
|
|
4203 | msgstr "" | |
|
|
4204 | ||
|
|
4205 | msgid "create new queue" | |
|
|
4206 | msgstr "" | |
|
|
4207 | ||
|
|
4208 | msgid "rename active queue" | |
|
|
4209 | msgstr "" | |
|
|
4210 | ||
|
|
4211 | msgid "delete reference to queue" | |
|
|
4212 | msgstr "" | |
|
|
4213 | ||
|
|
4214 | msgid "delete queue, and remove patch dir" | |
|
|
4215 | msgstr "" | |
|
|
4216 | ||
|
|
4217 | msgid "[OPTION] [QUEUE]" | |
|
|
4218 | msgstr "" | |
|
|
4219 | ||
|
|
3992 | 4220 | msgid "hooks for sending email notifications at commit/push time" |
|
|
3993 | 4221 | msgstr "" |
|
|
3994 | 4222 | |
| @@ -4040,7 +4268,8 b' msgid ""' | |||
|
|
4040 | 4268 | " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" |
|
|
4041 | 4269 | " maxsubject = 67 # truncate subject line longer than this\n" |
|
|
4042 | 4270 | " diffstat = True # add a diffstat before the diff content\n" |
|
|
4043 |
" sources = serve # notify if source of incoming changes in this |
|
|
|
4271 | " sources = serve # notify if source of incoming changes in this " | |
|
|
4272 | "list\n" | |
|
|
4044 | 4273 | " # (serve == ssh or http, push, pull, bundle)\n" |
|
|
4045 | 4274 | " merge = False # send notification for merges (default True)\n" |
|
|
4046 | 4275 | " [email]\n" |
| @@ -4055,9 +4284,6 b' msgid ""' | |||
|
|
4055 | 4284 | "handier for you." |
|
|
4056 | 4285 | msgstr "" |
|
|
4057 | 4286 | |
|
|
4058 | msgid "::" | |
|
|
4059 | msgstr "" | |
|
|
4060 | ||
|
|
4061 | 4287 | msgid "" |
|
|
4062 | 4288 | " [usersubs]\n" |
|
|
4063 | 4289 | " # key is subscriber email, value is \",\"-separated list of glob patterns\n" |
| @@ -4110,7 +4336,7 b' msgstr ""' | |||
|
|
4110 | 4336 | |
|
|
4111 | 4337 | msgid "" |
|
|
4112 | 4338 | " [pager]\n" |
|
|
4113 |
" pager = |
|
|
|
4339 | " pager = less -FRSX" | |
|
|
4114 | 4340 | msgstr "" |
|
|
4115 | 4341 | |
|
|
4116 | 4342 | msgid "" |
| @@ -4140,20 +4366,34 b' msgstr ""' | |||
|
|
4140 | 4366 | |
|
|
4141 | 4367 | msgid "" |
|
|
4142 | 4368 | "You can also enable the pager only for certain commands using\n" |
|
|
4143 | "pager.attend::" | |
|
|
4369 | "pager.attend. Below is the default list of commands to be paged::" | |
|
|
4144 | 4370 | msgstr "" |
|
|
4145 | 4371 | |
|
|
4146 | 4372 | msgid "" |
|
|
4147 | 4373 | " [pager]\n" |
|
|
4148 | " attend = log" | |
|
|
4374 | " attend = annotate, cat, diff, export, glog, log, qdiff" | |
|
|
4375 | msgstr "" | |
|
|
4376 | ||
|
|
4377 | msgid "" | |
|
|
4378 | "Setting pager.attend to an empty value will cause all commands to be\n" | |
|
|
4379 | "paged." | |
|
|
4149 | 4380 | msgstr "" |
|
|
4150 | 4381 | |
|
|
4151 | 4382 | msgid "If pager.attend is present, pager.ignore will be ignored." |
|
|
4152 | 4383 | msgstr "" |
|
|
4153 | 4384 | |
|
|
4154 | 4385 | msgid "" |
|
|
4155 |
"To ignore global commands like |
|
|
|
4156 | "specify them in the global .hgrc\n" | |
|
|
4386 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" | |
|
|
4387 | "to specify them in your user configuration file." | |
|
|
4388 | msgstr "" | |
|
|
4389 | ||
|
|
4390 | msgid "" | |
|
|
4391 | "The --pager=... option can also be used to control when the pager is\n" | |
|
|
4392 | "used. Use a boolean value like yes, no, on, off, or use auto for\n" | |
|
|
4393 | "normal behavior.\n" | |
|
|
4394 | msgstr "" | |
|
|
4395 | ||
|
|
4396 | msgid "when to paginate (boolean, always, auto, or never)" | |
|
|
4157 | 4397 | msgstr "" |
|
|
4158 | 4398 | |
|
|
4159 | 4399 | msgid "interpret suffixes to refer to ancestor revisions" |
| @@ -4199,7 +4439,7 b' msgstr ""' | |||
|
|
4199 | 4439 | msgid "" |
|
|
4200 | 4440 | "- The changeset description.\n" |
|
|
4201 | 4441 | "- [Optional] The result of running diffstat on the patch.\n" |
|
|
4202 |
"- The patch itself, as generated by |
|
|
|
4442 | "- The patch itself, as generated by :hg:`export`." | |
|
|
4203 | 4443 | msgstr "" |
|
|
4204 | 4444 | |
|
|
4205 | 4445 | msgid "" |
| @@ -4209,12 +4449,6 b' msgid ""' | |||
|
|
4209 | 4449 | msgstr "" |
|
|
4210 | 4450 | |
|
|
4211 | 4451 | msgid "" |
|
|
4212 | "With the -d/--diffstat option, you will be prompted for each changeset\n" | |
|
|
4213 | "with a diffstat summary and the changeset summary, so you can be sure\n" | |
|
|
4214 | "you are sending the right changes." | |
|
|
4215 | msgstr "" | |
|
|
4216 | ||
|
|
4217 | msgid "" | |
|
|
4218 | 4452 | "To configure other defaults, add a section like this to your hgrc\n" |
|
|
4219 | 4453 | "file::" |
|
|
4220 | 4454 | msgstr "" |
| @@ -4224,45 +4458,18 b' msgid ""' | |||
|
|
4224 | 4458 | " from = My Name <my@email>\n" |
|
|
4225 | 4459 | " to = recipient1, recipient2, ...\n" |
|
|
4226 | 4460 | " cc = cc1, cc2, ...\n" |
|
|
4227 | " bcc = bcc1, bcc2, ..." | |
|
|
4228 | msgstr "" | |
|
|
4229 | ||
|
|
4230 | msgid "" | |
|
|
4231 | "Then you can use the \"hg email\" command to mail a series of changesets\n" | |
|
|
4232 | "as a patchbomb." | |
|
|
4233 | msgstr "" | |
|
|
4234 | ||
|
|
4235 | msgid "" | |
|
|
4236 | "To avoid sending patches prematurely, it is a good idea to first run\n" | |
|
|
4237 | "the \"email\" command with the \"-n\" option (test only). You will be\n" | |
|
|
4238 | "prompted for an email recipient address, a subject and an introductory\n" | |
|
|
4239 | "message describing the patches of your patchbomb. Then when all is\n" | |
|
|
4240 | "done, patchbomb messages are displayed. If the PAGER environment\n" | |
|
|
4241 | "variable is set, your pager will be fired up once for each patchbomb\n" | |
|
|
4242 | "message, so you can verify everything is alright." | |
|
|
4243 | msgstr "" | |
|
|
4244 | ||
|
|
4245 | msgid "" | |
|
|
4246 | "The -m/--mbox option is also very useful. Instead of previewing each\n" | |
|
|
4247 | "patchbomb message in a pager or sending the messages directly, it will\n" | |
|
|
4248 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
|
|
4249 | "can be previewed with any mail user agent which supports UNIX mbox\n" | |
|
|
4250 | "files, e.g. with mutt::" | |
|
|
4251 | msgstr "" | |
|
|
4252 | ||
|
|
4253 | msgid " % mutt -R -f mbox" | |
|
|
4254 | msgstr "" | |
|
|
4255 | ||
|
|
4256 | msgid "" | |
|
|
4257 | "When you are previewing the patchbomb messages, you can use ``formail``\n" | |
|
|
4258 | "(a utility that is commonly installed as part of the procmail\n" | |
|
|
4259 | "package), to send each message out::" | |
|
|
4260 | msgstr "" | |
|
|
4261 | ||
|
|
4262 | msgid " % formail -s sendmail -bm -t < mbox" | |
|
|
4263 | msgstr "" | |
|
|
4264 | ||
|
|
4265 | msgid "That should be all. Now your patchbomb is on its way out." | |
|
|
4461 | " bcc = bcc1, bcc2, ...\n" | |
|
|
4462 | " reply-to = address1, address2, ..." | |
|
|
4463 | msgstr "" | |
|
|
4464 | ||
|
|
4465 | msgid "" | |
|
|
4466 | "Use ``[patchbomb]`` as configuration section name if you need to\n" | |
|
|
4467 | "override global ``[email]`` address settings." | |
|
|
4468 | msgstr "" | |
|
|
4469 | ||
|
|
4470 | msgid "" | |
|
|
4471 | "Then you can use the :hg:`email` command to mail a series of\n" | |
|
|
4472 | "changesets as a patchbomb." | |
|
|
4266 | 4473 | msgstr "" |
|
|
4267 | 4474 | |
|
|
4268 | 4475 | msgid "" |
| @@ -4274,35 +4481,40 b' msgid ""' | |||
|
|
4274 | 4481 | msgstr "" |
|
|
4275 | 4482 | |
|
|
4276 | 4483 | #, python-format |
|
|
4277 | msgid "%sPlease enter a valid value" | |
|
|
4484 | msgid "%s Please enter a valid value" | |
|
|
4278 | 4485 | msgstr "" |
|
|
4279 | 4486 | |
|
|
4280 | 4487 | msgid "Please enter a valid value.\n" |
|
|
4281 | 4488 | msgstr "" |
|
|
4282 | 4489 | |
|
|
4283 | msgid "does the diffstat above look okay? " | |
|
|
4284 | msgstr "" | |
|
|
4285 | ||
|
|
4286 | msgid "diffstat rejected" | |
|
|
4287 | msgstr "" | |
|
|
4288 | ||
|
|
4289 | 4490 | msgid "send changesets by email" |
|
|
4290 | 4491 | msgstr "" |
|
|
4291 | 4492 | |
|
|
4292 | 4493 | msgid "" |
|
|
4293 |
" By default, diffs are sent in the format generated by |
|
|
|
4294 |
" one per message. The series starts with a \"[PATCH 0 |
|
|
|
4295 | " introduction, which describes the series as a whole." | |
|
|
4494 | " By default, diffs are sent in the format generated by\n" | |
|
|
4495 | " :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" | |
|
|
4496 | " of N]\" introduction, which describes the series as a whole." | |
|
|
4296 | 4497 | msgstr "" |
|
|
4297 | 4498 | |
|
|
4298 | 4499 | msgid "" |
|
|
4299 | 4500 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
|
4300 | 4501 | " the first line of the changeset description as the subject text.\n" |
|
|
4301 | 4502 | " The message contains two or three parts. First, the changeset\n" |
|
|
4302 | " description. Next, (optionally) if the diffstat program is\n" | |
|
|
4303 | " installed and -d/--diffstat is used, the result of running\n" | |
|
|
4304 | " diffstat on the patch. Finally, the patch itself, as generated by\n" | |
|
|
4305 | " \"hg export\"." | |
|
|
4503 | " description." | |
|
|
4504 | msgstr "" | |
|
|
4505 | ||
|
|
4506 | msgid "" | |
|
|
4507 | " With the -d/--diffstat option, if the diffstat program is\n" | |
|
|
4508 | " installed, the result of running diffstat on the patch is inserted." | |
|
|
4509 | msgstr "" | |
|
|
4510 | ||
|
|
4511 | msgid " Finally, the patch itself, as generated by :hg:`export`." | |
|
|
4512 | msgstr "" | |
|
|
4513 | ||
|
|
4514 | msgid "" | |
|
|
4515 | " With the -d/--diffstat or -c/--confirm options, you will be presented\n" | |
|
|
4516 | " with a final summary of all messages and asked for confirmation before\n" | |
|
|
4517 | " the messages are sent." | |
|
|
4306 | 4518 | msgstr "" |
|
|
4307 | 4519 | |
|
|
4308 | 4520 | msgid "" |
| @@ -4325,6 +4537,23 b' msgid ""' | |||
|
|
4325 | 4537 | msgstr "" |
|
|
4326 | 4538 | |
|
|
4327 | 4539 | msgid "" |
|
|
4540 | " With -m/--mbox, instead of previewing each patchbomb message in a\n" | |
|
|
4541 | " pager or sending the messages directly, it will create a UNIX\n" | |
|
|
4542 | " mailbox file with the patch emails. This mailbox file can be\n" | |
|
|
4543 | " previewed with any mail user agent which supports UNIX mbox\n" | |
|
|
4544 | " files." | |
|
|
4545 | msgstr "" | |
|
|
4546 | ||
|
|
4547 | msgid "" | |
|
|
4548 | " With -n/--test, all steps will run, but mail will not be sent.\n" | |
|
|
4549 | " You will be prompted for an email recipient address, a subject and\n" | |
|
|
4550 | " an introductory message describing the patches of your patchbomb.\n" | |
|
|
4551 | " Then when all is done, patchbomb messages are displayed. If the\n" | |
|
|
4552 | " PAGER environment variable is set, your pager will be fired up once\n" | |
|
|
4553 | " for each patchbomb message, so you can verify everything is alright." | |
|
|
4554 | msgstr "" | |
|
|
4555 | ||
|
|
4556 | msgid "" | |
|
|
4328 | 4557 | " hg email -r 3000 # send patch 3000 only\n" |
|
|
4329 | 4558 | " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" |
|
|
4330 | 4559 | " hg email -r 3000:3005 # send patches 3000 through 3005\n" |
| @@ -4341,16 +4570,29 b' msgstr ""' | |||
|
|
4341 | 4570 | msgid "" |
|
|
4342 | 4571 | " hg email -b # send bundle of all patches not in default\n" |
|
|
4343 | 4572 | " hg email -b DEST # send bundle of all patches not in DEST\n" |
|
|
4344 |
" hg email -b -r 3000 # bundle of all ancestors of 3000 not in |
|
|
|
4573 | " hg email -b -r 3000 # bundle of all ancestors of 3000 not in " | |
|
|
4574 | "default\n" | |
|
|
4345 | 4575 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" |
|
|
4346 | 4576 | msgstr "" |
|
|
4347 | 4577 | |
|
|
4348 | 4578 | msgid "" |
|
|
4579 | " hg email -o -m mbox && # generate an mbox file...\n" | |
|
|
4580 | " mutt -R -f mbox # ... and view it with mutt\n" | |
|
|
4581 | " hg email -o -m mbox && # generate an mbox file ...\n" | |
|
|
4582 | " formail -s sendmail \\ # ... and use formail to send from the " | |
|
|
4583 | "mbox\n" | |
|
|
4584 | " -bm -t < mbox # ... using sendmail" | |
|
|
4585 | msgstr "" | |
|
|
4586 | ||
|
|
4587 | msgid "" | |
|
|
4349 | 4588 | " Before using this command, you will need to enable email in your\n" |
|
|
4350 | 4589 | " hgrc. See the [email] section in hgrc(5) for details.\n" |
|
|
4351 | 4590 | " " |
|
|
4352 | 4591 | msgstr "" |
|
|
4353 | 4592 | |
|
|
4593 | msgid "no changes found\n" | |
|
|
4594 | msgstr "找不到變更\n" | |
|
|
4595 | ||
|
|
4354 | 4596 | msgid "specify at least one changeset with -r or -o" |
|
|
4355 | 4597 | msgstr "" |
|
|
4356 | 4598 | |
| @@ -4370,19 +4612,39 b' msgstr ""' | |||
|
|
4370 | 4612 | |
|
|
4371 | 4613 | #, python-format |
|
|
4372 | 4614 | msgid "This patch series consists of %d patches." |
|
|
4373 | msgstr "" | |
|
|
4374 | ||
|
|
4375 | msgid "Final summary:\n" | |
|
|
4615 | msgstr "這一系列的patch 包含了 %d 個patch" | |
|
|
4616 | ||
|
|
4617 | msgid "" | |
|
|
4618 | "\n" | |
|
|
4619 | "Final summary:" | |
|
|
4620 | msgstr "" | |
|
|
4621 | ||
|
|
4622 | msgid "are you sure you want to send (yn)?" | |
|
|
4623 | msgstr "" | |
|
|
4624 | ||
|
|
4625 | msgid "&No" | |
|
|
4626 | msgstr "" | |
|
|
4627 | ||
|
|
4628 | msgid "&Yes" | |
|
|
4629 | msgstr "" | |
|
|
4630 | ||
|
|
4631 | msgid "patchbomb canceled" | |
|
|
4376 | 4632 | msgstr "" |
|
|
4377 | 4633 | |
|
|
4378 | 4634 | msgid "Displaying " |
|
|
4379 | msgstr "" | |
|
|
4635 | msgstr "顯示中" | |
|
|
4380 | 4636 | |
|
|
4381 | 4637 | msgid "Writing " |
|
|
4382 | msgstr "" | |
|
|
4638 | msgstr "寫入中" | |
|
|
4639 | ||
|
|
4640 | msgid "writing" | |
|
|
4641 | msgstr "寫入中" | |
|
|
4383 | 4642 | |
|
|
4384 | 4643 | msgid "Sending " |
|
|
4385 | msgstr "" | |
|
|
4644 | msgstr "傳送中" | |
|
|
4645 | ||
|
|
4646 | msgid "sending" | |
|
|
4647 | msgstr "傳送中" | |
|
|
4386 | 4648 | |
|
|
4387 | 4649 | msgid "send patches as attachments" |
|
|
4388 | 4650 | msgstr "" |
| @@ -4396,6 +4658,9 b' msgstr ""' | |||
|
|
4396 | 4658 | msgid "email addresses of copy recipients" |
|
|
4397 | 4659 | msgstr "" |
|
|
4398 | 4660 | |
|
|
4661 | msgid "ask for confirmation before sending" | |
|
|
4662 | msgstr "" | |
|
|
4663 | ||
|
|
4399 | 4664 | msgid "add diffstat output to messages" |
|
|
4400 | 4665 | msgstr "" |
|
|
4401 | 4666 | |
| @@ -4414,6 +4679,9 b' msgstr ""' | |||
|
|
4414 | 4679 | msgid "write messages to mbox file instead of sending them" |
|
|
4415 | 4680 | msgstr "" |
|
|
4416 | 4681 | |
|
|
4682 | msgid "email addresses replies should be sent to" | |
|
|
4683 | msgstr "" | |
|
|
4684 | ||
|
|
4417 | 4685 | msgid "subject of first message (intro or single patch)" |
|
|
4418 | 4686 | msgstr "" |
|
|
4419 | 4687 | |
| @@ -4453,6 +4721,39 b' msgstr ""' | |||
|
|
4453 | 4721 | msgid "hg email [OPTION]... [DEST]..." |
|
|
4454 | 4722 | msgstr "" |
|
|
4455 | 4723 | |
|
|
4724 | msgid "show progress bars for some actions" | |
|
|
4725 | msgstr "" | |
|
|
4726 | ||
|
|
4727 | msgid "" | |
|
|
4728 | "This extension uses the progress information logged by hg commands\n" | |
|
|
4729 | "to draw progress bars that are as informative as possible. Some progress\n" | |
|
|
4730 | "bars only offer indeterminate information, while others have a definite\n" | |
|
|
4731 | "end point." | |
|
|
4732 | msgstr "" | |
|
|
4733 | ||
|
|
4734 | msgid "The following settings are available::" | |
|
|
4735 | msgstr "" | |
|
|
4736 | ||
|
|
4737 | msgid "" | |
|
|
4738 | " [progress]\n" | |
|
|
4739 | " delay = 3 # number of seconds (float) before showing the progress bar\n" | |
|
|
4740 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" | |
|
|
4741 | " format = topic bar number # format of the progress bar\n" | |
|
|
4742 | " width = <none> # if set, the maximum width of the progress information\n" | |
|
|
4743 | " # (that is, min(width, term width) will be used)\n" | |
|
|
4744 | " clear-complete = True # clear the progress bar after it's done\n" | |
|
|
4745 | " disable = False # if true, don't show a progress bar\n" | |
|
|
4746 | " assume-tty = False # if true, ALWAYS show a progress bar, unless\n" | |
|
|
4747 | " # disable is given" | |
|
|
4748 | msgstr "" | |
|
|
4749 | ||
|
|
4750 | msgid "" | |
|
|
4751 | "Valid entries for the format field are topic, bar, number, unit, and\n" | |
|
|
4752 | "item. item defaults to the last 20 characters of the item, but this\n" | |
|
|
4753 | "can be changed by adding either ``-<num>`` which would take the last\n" | |
|
|
4754 | "num characters, or ``+<num>`` for the first num characters.\n" | |
|
|
4755 | msgstr "" | |
|
|
4756 | ||
|
|
4456 | 4757 | msgid "command to delete untracked files from the working directory" |
|
|
4457 | 4758 | msgstr "" |
|
|
4458 | 4759 | |
| @@ -4468,7 +4769,7 b' msgid " This means that purge will de' | |||
|
|
4468 | 4769 | msgstr "" |
|
|
4469 | 4770 | |
|
|
4470 | 4771 | msgid "" |
|
|
4471 |
" - Unknown files: files marked with \"?\" by |
|
|
|
4772 | " - Unknown files: files marked with \"?\" by :hg:`status`\n" | |
|
|
4472 | 4773 | " - Empty directories: in fact Mercurial ignores directories unless\n" |
|
|
4473 | 4774 | " they contain files under source control management" |
|
|
4474 | 4775 | msgstr "" |
| @@ -4479,7 +4780,7 b' msgstr ""' | |||
|
|
4479 | 4780 | msgid "" |
|
|
4480 | 4781 | " - Modified and unmodified tracked files\n" |
|
|
4481 | 4782 | " - Ignored files (unless --all is specified)\n" |
|
|
4482 |
" - New files added to the repository (with |
|
|
|
4783 | " - New files added to the repository (with :hg:`add`)" | |
|
|
4483 | 4784 | msgstr "" |
|
|
4484 | 4785 | |
|
|
4485 | 4786 | msgid "" |
| @@ -4544,13 +4845,63 b' msgstr ""' | |||
|
|
4544 | 4845 | |
|
|
4545 | 4846 | msgid "" |
|
|
4546 | 4847 | " Rebase uses repeated merging to graft changesets from one part of\n" |
|
|
4547 | " history onto another. This can be useful for linearizing local\n" | |
|
|
4548 | " changes relative to a master development tree." | |
|
|
4848 | " history (the source) onto another (the destination). This can be\n" | |
|
|
4849 | " useful for linearizing *local* changes relative to a master\n" | |
|
|
4850 | " development tree." | |
|
|
4851 | msgstr "" | |
|
|
4852 | ||
|
|
4853 | msgid "" | |
|
|
4854 | " You should not rebase changesets that have already been shared\n" | |
|
|
4855 | " with others. Doing so will force everybody else to perform the\n" | |
|
|
4856 | " same rebase or they will end up with duplicated changesets after\n" | |
|
|
4857 | " pulling in your rebased changesets." | |
|
|
4858 | msgstr "" | |
|
|
4859 | ||
|
|
4860 | msgid "" | |
|
|
4861 | " If you don't specify a destination changeset (``-d/--dest``),\n" | |
|
|
4862 | " rebase uses the tipmost head of the current named branch as the\n" | |
|
|
4863 | " destination. (The destination changeset is not modified by\n" | |
|
|
4864 | " rebasing, but new changesets are added as its descendants.)" | |
|
|
4865 | msgstr "" | |
|
|
4866 | ||
|
|
4867 | msgid "" | |
|
|
4868 | " You can specify which changesets to rebase in two ways: as a\n" | |
|
|
4869 | " \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" | |
|
|
4870 | " for a topologically related set of changesets (the \"source\n" | |
|
|
4871 | " branch\"). If you specify source (``-s/--source``), rebase will\n" | |
|
|
4872 | " rebase that changeset and all of its descendants onto dest. If you\n" | |
|
|
4873 | " specify base (``-b/--base``), rebase will select ancestors of base\n" | |
|
|
4874 | " back to but not including the common ancestor with dest. Thus,\n" | |
|
|
4875 | " ``-b`` is less precise but more convenient than ``-s``: you can\n" | |
|
|
4876 | " specify any changeset in the source branch, and rebase will select\n" | |
|
|
4877 | " the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" | |
|
|
4878 | " uses the parent of the working directory as the base." | |
|
|
4879 | msgstr "" | |
|
|
4880 | ||
|
|
4881 | msgid "" | |
|
|
4882 | " By default, rebase recreates the changesets in the source branch\n" | |
|
|
4883 | " as descendants of dest and then destroys the originals. Use\n" | |
|
|
4884 | " ``--keep`` to preserve the original source changesets. Some\n" | |
|
|
4885 | " changesets in the source branch (e.g. merges from the destination\n" | |
|
|
4886 | " branch) may be dropped if they no longer contribute any change." | |
|
|
4887 | msgstr "" | |
|
|
4888 | ||
|
|
4889 | msgid "" | |
|
|
4890 | " One result of the rules for selecting the destination changeset\n" | |
|
|
4891 | " and source branch is that, unlike ``merge``, rebase will do\n" | |
|
|
4892 | " nothing if you are at the latest (tipmost) head of a named branch\n" | |
|
|
4893 | " with two heads. You need to explicitly specify source and/or\n" | |
|
|
4894 | " destination (or ``update`` to the other head, if it's the head of\n" | |
|
|
4895 | " the intended source branch)." | |
|
|
4549 | 4896 | msgstr "" |
|
|
4550 | 4897 | |
|
|
4551 | 4898 | msgid "" |
|
|
4552 | 4899 | " If a rebase is interrupted to manually resolve a merge, it can be\n" |
|
|
4553 |
" continued with --continue/-c or aborted with --abort/-a. |
|
|
|
4900 | " continued with --continue/-c or aborted with --abort/-a." | |
|
|
4901 | msgstr "" | |
|
|
4902 | ||
|
|
4903 | msgid "" | |
|
|
4904 | " Returns 0 on success, 1 if nothing to rebase.\n" | |
|
|
4554 | 4905 | " " |
|
|
4555 | 4906 | msgstr "" |
|
|
4556 | 4907 | |
| @@ -4560,18 +4911,40 b' msgstr ""' | |||
|
|
4560 | 4911 | msgid "cannot use collapse with continue or abort" |
|
|
4561 | 4912 | msgstr "" |
|
|
4562 | 4913 | |
|
|
4914 | msgid "cannot use detach with continue or abort" | |
|
|
4915 | msgstr "" | |
|
|
4916 | ||
|
|
4563 | 4917 | msgid "abort and continue do not allow specifying revisions" |
|
|
4564 | 4918 | msgstr "" |
|
|
4565 | 4919 | |
|
|
4566 | 4920 | msgid "cannot specify both a revision and a base" |
|
|
4567 | 4921 | msgstr "" |
|
|
4568 | 4922 | |
|
|
4923 | msgid "detach requires a revision to be specified" | |
|
|
4924 | msgstr "" | |
|
|
4925 | ||
|
|
4926 | msgid "cannot specify a base with detach" | |
|
|
4927 | msgstr "" | |
|
|
4928 | ||
|
|
4569 | 4929 | msgid "nothing to rebase\n" |
|
|
4570 | 4930 | msgstr "" |
|
|
4571 | 4931 | |
|
|
4572 | 4932 | msgid "cannot use both keepbranches and extrafn" |
|
|
4573 | 4933 | msgstr "" |
|
|
4574 | 4934 | |
|
|
4935 | msgid "rebasing" | |
|
|
4936 | msgstr "" | |
|
|
4937 | ||
|
|
4938 | msgid "changesets" | |
|
|
4939 | msgstr "" | |
|
|
4940 | ||
|
|
4941 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | |
|
|
4942 | msgstr "" | |
|
|
4943 | ||
|
|
4944 | #, python-format | |
|
|
4945 | msgid "no changes, revision %d skipped\n" | |
|
|
4946 | msgstr "" | |
|
|
4947 | ||
|
|
4575 | 4948 | msgid "rebase merging completed\n" |
|
|
4576 | 4949 | msgstr "" |
|
|
4577 | 4950 | |
| @@ -4585,11 +4958,7 b' msgstr ""' | |||
|
|
4585 | 4958 | msgid "%d revisions have been skipped\n" |
|
|
4586 | 4959 | msgstr "" |
|
|
4587 | 4960 | |
|
|
4588 | msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" | |
|
|
4589 | msgstr "" | |
|
|
4590 | ||
|
|
4591 | #, python-format | |
|
|
4592 | msgid "no changes, revision %d skipped\n" | |
|
|
4961 | msgid "unable to collapse, there is more than one external parent" | |
|
|
4593 | 4962 | msgstr "" |
|
|
4594 | 4963 | |
|
|
4595 | 4964 | #, python-format |
| @@ -4599,11 +4968,11 b' msgstr ""' | |||
|
|
4599 | 4968 | msgid "no rebase in progress" |
|
|
4600 | 4969 | msgstr "" |
|
|
4601 | 4970 | |
|
|
4602 |
msgid "warning: new changesets detected on target branch, |
|
|
|
4971 | msgid "warning: new changesets detected on target branch, can't abort\n" | |
|
|
4603 | 4972 | msgstr "" |
|
|
4604 | 4973 | |
|
|
4605 | 4974 | msgid "rebase aborted\n" |
|
|
4606 | msgstr "" | |
|
|
4975 | msgstr "rebase 中止了\n" | |
|
|
4607 | 4976 | |
|
|
4608 | 4977 | msgid "cannot rebase onto an applied mq patch" |
|
|
4609 | 4978 | msgstr "" |
| @@ -4614,19 +4983,18 b' msgstr ""' | |||
|
|
4614 | 4983 | msgid "source is descendant of destination" |
|
|
4615 | 4984 | msgstr "" |
|
|
4616 | 4985 | |
|
|
4617 | msgid "unable to collapse, there is more than one external parent" | |
|
|
4618 | msgstr "" | |
|
|
4619 | ||
|
|
4620 | 4986 | msgid "rebase working directory to branch head" |
|
|
4621 | 4987 | msgstr "" |
|
|
4622 | 4988 | |
|
|
4623 |
msgid "rebase from |
|
|
|
4624 | msgstr "" | |
|
|
4625 | ||
|
|
4626 | msgid "rebase from the base of a given revision" | |
|
|
4627 | msgstr "" | |
|
|
4628 | ||
|
|
4629 | msgid "rebase onto a given revision" | |
|
|
4989 | msgid "rebase from the specified changeset" | |
|
|
4990 | msgstr "" | |
|
|
4991 | ||
|
|
4992 | msgid "" | |
|
|
4993 | "rebase from the base of the specified changeset (up to greatest common " | |
|
|
4994 | "ancestor of base and dest)" | |
|
|
4995 | msgstr "" | |
|
|
4996 | ||
|
|
4997 | msgid "rebase onto the specified changeset" | |
|
|
4630 | 4998 | msgstr "" |
|
|
4631 | 4999 | |
|
|
4632 | 5000 | msgid "collapse the rebased changesets" |
| @@ -4638,13 +5006,18 b' msgstr ""' | |||
|
|
4638 | 5006 | msgid "keep original branch names" |
|
|
4639 | 5007 | msgstr "" |
|
|
4640 | 5008 | |
|
|
5009 | msgid "force detaching of source from its original branch" | |
|
|
5010 | msgstr "" | |
|
|
5011 | ||
|
|
4641 | 5012 | msgid "continue an interrupted rebase" |
|
|
4642 | 5013 | msgstr "" |
|
|
4643 | 5014 | |
|
|
4644 | 5015 | msgid "abort an interrupted rebase" |
|
|
4645 | 5016 | msgstr "" |
|
|
4646 | 5017 | |
|
|
4647 | msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]" | |
|
|
5018 | msgid "" | |
|
|
5019 | "hg rebase [-s REV | -b REV] [-d REV] [options]\n" | |
|
|
5020 | "hg rebase {-a|-c}" | |
|
|
4648 | 5021 | msgstr "" |
|
|
4649 | 5022 | |
|
|
4650 | 5023 | msgid "commands to interactively select changes for commit/qrefresh" |
| @@ -4654,7 +5027,7 b' msgid "this modifies a binary file (all ' | |||
|
|
4654 | 5027 | msgstr "" |
|
|
4655 | 5028 | |
|
|
4656 | 5029 | msgid "this is a binary file\n" |
|
|
4657 | msgstr "" | |
|
|
5030 | msgstr "這是一個二進位檔\n" | |
|
|
4658 | 5031 | |
|
|
4659 | 5032 | #, python-format |
|
|
4660 | 5033 | msgid "%d hunks, %d lines changed\n" |
| @@ -4687,9 +5060,6 b' msgstr ""' | |||
|
|
4687 | 5060 | msgid "&?" |
|
|
4688 | 5061 | msgstr "" |
|
|
4689 | 5062 | |
|
|
4690 | msgid "y - record this change" | |
|
|
4691 | msgstr "" | |
|
|
4692 | ||
|
|
4693 | 5063 | msgid "user quit" |
|
|
4694 | 5064 | msgstr "" |
|
|
4695 | 5065 | |
| @@ -4700,9 +5070,6 b' msgstr ""' | |||
|
|
4700 | 5070 | msgid " and " |
|
|
4701 | 5071 | msgstr "" |
|
|
4702 | 5072 | |
|
|
4703 | msgid "y" | |
|
|
4704 | msgstr "" | |
|
|
4705 | ||
|
|
4706 | 5073 | #, python-format |
|
|
4707 | 5074 | msgid "record this change to %r?" |
|
|
4708 | 5075 | msgstr "" |
| @@ -4715,13 +5082,10 b' msgid "interactively select changes to c' | |||
|
|
4715 | 5082 | msgstr "" |
|
|
4716 | 5083 | |
|
|
4717 | 5084 | msgid "" |
|
|
4718 |
" If a list of files is omitted, all changes reported by |
|
|
|
5085 | " If a list of files is omitted, all changes reported by :hg:`status`\n" | |
|
|
4719 | 5086 | " will be candidates for recording." |
|
|
4720 | 5087 | msgstr "" |
|
|
4721 | 5088 | |
|
|
4722 | msgid " See 'hg help dates' for a list of formats valid for -d/--date." | |
|
|
4723 | msgstr "" | |
|
|
4724 | ||
|
|
4725 | 5089 | msgid "" |
|
|
4726 | 5090 | " You will be prompted for whether to record changes to each\n" |
|
|
4727 | 5091 | " modified file, and for files with multiple changes, for each\n" |
| @@ -4748,29 +5112,172 b' msgstr ""' | |||
|
|
4748 | 5112 | msgid " ? - display help" |
|
|
4749 | 5113 | msgstr "" |
|
|
4750 | 5114 | |
|
|
5115 | msgid " This command is not available when committing a merge." | |
|
|
5116 | msgstr "" | |
|
|
5117 | ||
|
|
4751 | 5118 | msgid "'mq' extension not loaded" |
|
|
4752 | 5119 | msgstr "" |
|
|
4753 | 5120 | |
|
|
4754 | 5121 | msgid "running non-interactively, use commit instead" |
|
|
4755 | 5122 | msgstr "" |
|
|
4756 | 5123 | |
|
|
5124 | msgid "cannot partially commit a merge (use hg commit instead)" | |
|
|
5125 | msgstr "" | |
|
|
5126 | ||
|
|
4757 | 5127 | msgid "no changes to record\n" |
|
|
4758 | 5128 | msgstr "" |
|
|
4759 | 5129 | |
|
|
4760 | msgid "patch failed to apply" | |
|
|
4761 | msgstr "" | |
|
|
4762 | ||
|
|
4763 | 5130 | msgid "hg record [OPTION]... [FILE]..." |
|
|
4764 | 5131 | msgstr "" |
|
|
4765 | 5132 | |
|
|
4766 | 5133 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
|
4767 | 5134 | msgstr "" |
|
|
4768 | 5135 | |
|
|
5136 | msgid "recreates hardlinks between repository clones" | |
|
|
5137 | msgstr "" | |
|
|
5138 | ||
|
|
5139 | msgid "recreate hardlinks between two repositories" | |
|
|
5140 | msgstr "" | |
|
|
5141 | ||
|
|
5142 | msgid "" | |
|
|
5143 | " When repositories are cloned locally, their data files will be\n" | |
|
|
5144 | " hardlinked so that they only use the space of a single repository." | |
|
|
5145 | msgstr "" | |
|
|
5146 | ||
|
|
5147 | msgid "" | |
|
|
5148 | " Unfortunately, subsequent pulls into either repository will break\n" | |
|
|
5149 | " hardlinks for any files touched by the new changesets, even if\n" | |
|
|
5150 | " both repositories end up pulling the same changes." | |
|
|
5151 | msgstr "" | |
|
|
5152 | ||
|
|
5153 | msgid "" | |
|
|
5154 | " Similarly, passing --rev to \"hg clone\" will fail to use any\n" | |
|
|
5155 | " hardlinks, falling back to a complete copy of the source\n" | |
|
|
5156 | " repository." | |
|
|
5157 | msgstr "" | |
|
|
5158 | ||
|
|
5159 | msgid "" | |
|
|
5160 | " This command lets you recreate those hardlinks and reclaim that\n" | |
|
|
5161 | " wasted space." | |
|
|
5162 | msgstr "" | |
|
|
5163 | ||
|
|
5164 | msgid "" | |
|
|
5165 | " This repository will be relinked to share space with ORIGIN, which\n" | |
|
|
5166 | " must be on the same local disk. If ORIGIN is omitted, looks for\n" | |
|
|
5167 | " \"default-relink\", then \"default\", in [paths]." | |
|
|
5168 | msgstr "" | |
|
|
5169 | ||
|
|
5170 | msgid "" | |
|
|
5171 | " Do not attempt any read operations on this repository while the\n" | |
|
|
5172 | " command is running. (Both repositories will be locked against\n" | |
|
|
5173 | " writes.)\n" | |
|
|
5174 | " " | |
|
|
5175 | msgstr "" | |
|
|
5176 | ||
|
|
5177 | msgid "hardlinks are not supported on this system" | |
|
|
5178 | msgstr "硬式連結不被支援" | |
|
|
5179 | ||
|
|
5180 | #, python-format | |
|
|
5181 | msgid "relinking %s to %s\n" | |
|
|
5182 | msgstr "%s 重新連結到 %s\n" | |
|
|
5183 | ||
|
|
5184 | #, python-format | |
|
|
5185 | msgid "tip has %d files, estimated total number of files: %s\n" | |
|
|
5186 | msgstr "" | |
|
|
5187 | ||
|
|
5188 | msgid "collecting" | |
|
|
5189 | msgstr "" | |
|
|
5190 | ||
|
|
5191 | msgid "files" | |
|
|
5192 | msgstr "檔案" | |
|
|
5193 | ||
|
|
5194 | #, python-format | |
|
|
5195 | msgid "collected %d candidate storage files\n" | |
|
|
5196 | msgstr "" | |
|
|
5197 | ||
|
|
5198 | msgid "source and destination are on different devices" | |
|
|
5199 | msgstr "來源跟目的在不同的裝置上" | |
|
|
5200 | ||
|
|
5201 | #, python-format | |
|
|
5202 | msgid "not linkable: %s\n" | |
|
|
5203 | msgstr "" | |
|
|
5204 | ||
|
|
5205 | msgid "pruning" | |
|
|
5206 | msgstr "" | |
|
|
5207 | ||
|
|
5208 | #, python-format | |
|
|
5209 | msgid "pruned down to %d probably relinkable files\n" | |
|
|
5210 | msgstr "" | |
|
|
5211 | ||
|
|
5212 | msgid "relinking" | |
|
|
5213 | msgstr "" | |
|
|
5214 | ||
|
|
5215 | #, python-format | |
|
|
5216 | msgid "relinked %d files (%d bytes reclaimed)\n" | |
|
|
5217 | msgstr "" | |
|
|
5218 | ||
|
|
5219 | msgid "[ORIGIN]" | |
|
|
5220 | msgstr "" | |
|
|
5221 | ||
|
|
5222 | msgid "extend schemes with shortcuts to repository swarms" | |
|
|
5223 | msgstr "" | |
|
|
5224 | ||
|
|
5225 | msgid "" | |
|
|
5226 | "This extension allows you to specify shortcuts for parent URLs with a\n" | |
|
|
5227 | "lot of repositories to act like a scheme, for example::" | |
|
|
5228 | msgstr "" | |
|
|
5229 | ||
|
|
5230 | msgid "" | |
|
|
5231 | " [schemes]\n" | |
|
|
5232 | " py = http://code.python.org/hg/" | |
|
|
5233 | msgstr "" | |
|
|
5234 | ||
|
|
5235 | msgid "After that you can use it like::" | |
|
|
5236 | msgstr "" | |
|
|
5237 | ||
|
|
5238 | msgid " hg clone py://trunk/" | |
|
|
5239 | msgstr "" | |
|
|
5240 | ||
|
|
5241 | msgid "" | |
|
|
5242 | "Additionally there is support for some more complex schemas, for\n" | |
|
|
5243 | "example used by Google Code::" | |
|
|
5244 | msgstr "" | |
|
|
5245 | ||
|
|
5246 | msgid "" | |
|
|
5247 | " [schemes]\n" | |
|
|
5248 | " gcode = http://{1}.googlecode.com/hg/" | |
|
|
5249 | msgstr "" | |
|
|
5250 | ||
|
|
5251 | msgid "" | |
|
|
5252 | "The syntax is taken from Mercurial templates, and you have unlimited\n" | |
|
|
5253 | "number of variables, starting with ``{1}`` and continuing with\n" | |
|
|
5254 | "``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n" | |
|
|
5255 | "supplied, split by ``/``. Anything not specified as ``{part}`` will be\n" | |
|
|
5256 | "just appended to an URL." | |
|
|
5257 | msgstr "" | |
|
|
5258 | ||
|
|
5259 | msgid "For convenience, the extension adds these schemes by default::" | |
|
|
5260 | msgstr "" | |
|
|
5261 | ||
|
|
5262 | msgid "" | |
|
|
5263 | " [schemes]\n" | |
|
|
5264 | " py = http://hg.python.org/\n" | |
|
|
5265 | " bb = https://bitbucket.org/\n" | |
|
|
5266 | " bb+ssh = ssh://hg@bitbucket.org/\n" | |
|
|
5267 | " gcode = https://{1}.googlecode.com/hg/\n" | |
|
|
5268 | " kiln = https://{1}.kilnhg.com/Repo/" | |
|
|
5269 | msgstr "" | |
|
|
5270 | ||
|
|
5271 | msgid "" | |
|
|
5272 | "You can override a predefined scheme by defining a new scheme with the\n" | |
|
|
5273 | "same name.\n" | |
|
|
5274 | msgstr "" | |
|
|
5275 | ||
|
|
4769 | 5276 | msgid "share a common history between several working directories" |
|
|
4770 | 5277 | msgstr "" |
|
|
4771 | 5278 | |
|
|
4772 |
msgid "create a new shared repository |
|
|
|
4773 | msgstr "" | |
|
|
5279 | msgid "create a new shared repository" | |
|
|
5280 | msgstr "建立新的共享儲存庫" | |
|
|
4774 | 5281 | |
|
|
4775 | 5282 | msgid "" |
|
|
4776 | 5283 | " Initialize a new repository and working directory that shares its\n" |
| @@ -4778,8 +5285,16 b' msgid ""' | |||
|
|
4778 | 5285 | msgstr "" |
|
|
4779 | 5286 | |
|
|
4780 | 5287 | msgid "" |
|
|
4781 | " NOTE: actions that change history such as rollback or moving the\n" | |
|
|
4782 | " source may confuse sharers.\n" | |
|
|
5288 | " .. note::\n" | |
|
|
5289 | " using rollback or extensions that destroy/modify history (mq,\n" | |
|
|
5290 | " rebase, etc.) can cause considerable confusion with shared\n" | |
|
|
5291 | " clones. In particular, if two shared clones are both updated to\n" | |
|
|
5292 | " the same changeset, and one of them destroys that changeset\n" | |
|
|
5293 | " with rollback, the other clone will suddenly stop working: all\n" | |
|
|
5294 | " operations will fail with \"abort: working directory has unknown\n" | |
|
|
5295 | " parent\". The only known workaround is to use debugsetparents on\n" | |
|
|
5296 | " the broken clone to reset it to a changeset that still exists\n" | |
|
|
5297 | " (e.g. tip).\n" | |
|
|
4783 | 5298 | " " |
|
|
4784 | 5299 | msgstr "" |
|
|
4785 | 5300 | |
| @@ -4830,7 +5345,7 b' msgstr ""' | |||
|
|
4830 | 5345 | msgid "%s: empty changeset" |
|
|
4831 | 5346 | msgstr "" |
|
|
4832 | 5347 | |
|
|
4833 |
msgid " |
|
|
|
5348 | msgid "fix up the merge and run hg transplant --continue" | |
|
|
4834 | 5349 | msgstr "" |
|
|
4835 | 5350 | |
|
|
4836 | 5351 | #, python-format |
| @@ -4847,9 +5362,22 b' msgstr ""' | |||
|
|
4847 | 5362 | msgid "commit failed" |
|
|
4848 | 5363 | msgstr "" |
|
|
4849 | 5364 | |
|
|
5365 | msgid "" | |
|
|
5366 | "y: transplant this changeset\n" | |
|
|
5367 | "n: skip this changeset\n" | |
|
|
5368 | "m: merge at this changeset\n" | |
|
|
5369 | "p: show patch\n" | |
|
|
5370 | "c: commit selected changesets\n" | |
|
|
5371 | "q: cancel transplant\n" | |
|
|
5372 | "?: show this help\n" | |
|
|
5373 | msgstr "" | |
|
|
5374 | ||
|
|
4850 | 5375 | msgid "apply changeset? [ynmpcq?]:" |
|
|
4851 | 5376 | msgstr "" |
|
|
4852 | 5377 | |
|
|
5378 | msgid "no such option\n" | |
|
|
5379 | msgstr "" | |
|
|
5380 | ||
|
|
4853 | 5381 | msgid "transplant changesets from another branch" |
|
|
4854 | 5382 | msgstr "" |
|
|
4855 | 5383 | |
| @@ -4878,7 +5406,7 b' msgid ""' | |||
|
|
4878 | 5406 | msgstr "" |
|
|
4879 | 5407 | |
|
|
4880 | 5408 | msgid "" |
|
|
4881 |
" |
|
|
|
5409 | " :hg:`transplant --branch REVISION --all` will rebase the selected\n" | |
|
|
4882 | 5410 | " branch (up to the named revision) onto your current working\n" |
|
|
4883 | 5411 | " directory." |
|
|
4884 | 5412 | msgstr "" |
| @@ -4891,14 +5419,14 b' msgid ""' | |||
|
|
4891 | 5419 | msgstr "" |
|
|
4892 | 5420 | |
|
|
4893 | 5421 | msgid "" |
|
|
4894 |
" If no merges or revisions are provided, |
|
|
|
4895 | " an interactive changeset browser." | |
|
|
5422 | " If no merges or revisions are provided, :hg:`transplant` will\n" | |
|
|
5423 | " start an interactive changeset browser." | |
|
|
4896 | 5424 | msgstr "" |
|
|
4897 | 5425 | |
|
|
4898 | 5426 | msgid "" |
|
|
4899 | 5427 | " If a changeset application fails, you can fix the merge by hand\n" |
|
|
4900 |
" and then resume where you left off by calling |
|
|
|
4901 | " --continue/-c.\n" | |
|
|
5428 | " and then resume where you left off by calling :hg:`transplant\n" | |
|
|
5429 | " --continue/-c`.\n" | |
|
|
4902 | 5430 | " " |
|
|
4903 | 5431 | msgstr "" |
|
|
4904 | 5432 | |
| @@ -4923,7 +5451,15 b' msgstr ""' | |||
|
|
4923 | 5451 | msgid "outstanding local changes" |
|
|
4924 | 5452 | msgstr "" |
|
|
4925 | 5453 | |
|
|
4926 | msgid "pull patches from REPOSITORY" | |
|
|
5454 | msgid "" | |
|
|
5455 | "``transplanted(set)``\n" | |
|
|
5456 | " Transplanted changesets in set." | |
|
|
5457 | msgstr "" | |
|
|
5458 | ||
|
|
5459 | msgid "pull patches from REPO" | |
|
|
5460 | msgstr "" | |
|
|
5461 | ||
|
|
5462 | msgid "BRANCH" | |
|
|
4927 | 5463 | msgstr "" |
|
|
4928 | 5464 | |
|
|
4929 | 5465 | msgid "pull patches from branch BRANCH" |
| @@ -4944,10 +5480,10 b' msgstr ""' | |||
|
|
4944 | 5480 | msgid "continue last transplant session after repair" |
|
|
4945 | 5481 | msgstr "" |
|
|
4946 | 5482 | |
|
|
4947 |
msgid "filter changesets through |
|
|
|
4948 | msgstr "" | |
|
|
4949 | ||
|
|
4950 |
msgid "hg transplant [-s REPO |
|
|
|
5483 | msgid "filter changesets through command" | |
|
|
5484 | msgstr "" | |
|
|
5485 | ||
|
|
5486 | msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." | |
|
|
4951 | 5487 | msgstr "" |
|
|
4952 | 5488 | |
|
|
4953 | 5489 | msgid "allow the use of MBCS paths with problematic encodings" |
| @@ -4983,16 +5519,21 b' msgstr ""' | |||
|
|
4983 | 5519 | msgid "Note that there are some limitations on using this extension:" |
|
|
4984 | 5520 | msgstr "" |
|
|
4985 | 5521 | |
|
|
4986 | msgid "" | |
|
|
4987 | "- You should use single encoding in one repository.\n" | |
|
|
4988 | "- You should set same encoding for the repository by locale or\n" | |
|
|
4989 | " HGENCODING." | |
|
|
4990 | msgstr "" | |
|
|
4991 | ||
|
|
4992 | msgid "" | |
|
|
4993 | "Path encoding conversion are done between Unicode and\n" | |
|
|
4994 | "encoding.encoding which is decided by Mercurial from current locale\n" | |
|
|
4995 | "setting or HGENCODING.\n" | |
|
|
5522 | msgid "- You should use single encoding in one repository." | |
|
|
5523 | msgstr "" | |
|
|
5524 | ||
|
|
5525 | msgid "" | |
|
|
5526 | "\n" | |
|
|
5527 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" | |
|
|
5528 | "You can specify the encoding by config option::" | |
|
|
5529 | msgstr "" | |
|
|
5530 | ||
|
|
5531 | msgid "" | |
|
|
5532 | " [win32mbcs]\n" | |
|
|
5533 | " encoding = sjis" | |
|
|
5534 | msgstr "" | |
|
|
5535 | ||
|
|
5536 | msgid "It is useful for the users who want to commit with UTF-8 log message.\n" | |
|
|
4996 | 5537 | msgstr "" |
|
|
4997 | 5538 | |
|
|
4998 | 5539 | #, python-format |
| @@ -5005,6 +5546,18 b' msgstr ""' | |||
|
|
5005 | 5546 | msgid "perform automatic newline conversion" |
|
|
5006 | 5547 | msgstr "" |
|
|
5007 | 5548 | |
|
|
5549 | msgid "" | |
|
|
5550 | " Deprecation: The win32text extension requires each user to configure\n" | |
|
|
5551 | " the extension again and again for each clone since the configuration\n" | |
|
|
5552 | " is not copied when cloning." | |
|
|
5553 | msgstr "" | |
|
|
5554 | ||
|
|
5555 | msgid "" | |
|
|
5556 | " We have therefore made the ``eol`` as an alternative. The ``eol``\n" | |
|
|
5557 | " uses a version controlled file for its configuration and each clone\n" | |
|
|
5558 | " will therefore use the right settings from the start." | |
|
|
5559 | msgstr "" | |
|
|
5560 | ||
|
|
5008 | 5561 | msgid "To perform automatic newline conversion, use::" |
|
|
5009 | 5562 | msgstr "" |
|
|
5010 | 5563 | |
| @@ -5022,7 +5575,8 b' msgid ""' | |||
|
|
5022 | 5575 | " # or ** = macdecode:" |
|
|
5023 | 5576 | msgstr "" |
|
|
5024 | 5577 | |
|
|
5025 | msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" | |
|
|
5578 | msgid "" | |
|
|
5579 | "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" | |
|
|
5026 | 5580 | msgstr "" |
|
|
5027 | 5581 | |
|
|
5028 | 5582 | msgid "" |
| @@ -5085,18 +5639,23 b' msgid ""' | |||
|
|
5085 | 5639 | "** = %sdecode:\n" |
|
|
5086 | 5640 | msgstr "" |
|
|
5087 | 5641 | |
|
|
5642 | msgid "" | |
|
|
5643 | "win32text is deprecated: http://mercurial.selenic.com/wiki/" | |
|
|
5644 | "Win32TextExtension\n" | |
|
|
5645 | msgstr "" | |
|
|
5646 | ||
|
|
5088 | 5647 | msgid "discover and advertise repositories on the local network" |
|
|
5089 | 5648 | msgstr "" |
|
|
5090 | 5649 | |
|
|
5091 | 5650 | msgid "" |
|
|
5092 |
"Zeroconf |
|
|
|
5651 | "Zeroconf-enabled repositories will be announced in a network without\n" | |
|
|
5093 | 5652 | "the need to configure a server or a service. They can be discovered\n" |
|
|
5094 | 5653 | "without knowing their actual IP address." |
|
|
5095 | 5654 | msgstr "" |
|
|
5096 | 5655 | |
|
|
5097 | 5656 | msgid "" |
|
|
5098 |
"To allow other people to discover your repository using run |
|
|
|
5099 | "in your repository::" | |
|
|
5657 | "To allow other people to discover your repository using run\n" | |
|
|
5658 | ":hg:`serve` in your repository::" | |
|
|
5100 | 5659 | msgstr "" |
|
|
5101 | 5660 | |
|
|
5102 | 5661 | msgid "" |
| @@ -5104,7 +5663,9 b' msgid ""' | |||
|
|
5104 | 5663 | " $ hg serve" |
|
|
5105 | 5664 | msgstr "" |
|
|
5106 | 5665 | |
|
|
5107 | msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" | |
|
|
5666 | msgid "" | |
|
|
5667 | "You can discover Zeroconf-enabled repositories by running\n" | |
|
|
5668 | ":hg:`paths`::" | |
|
|
5108 | 5669 | msgstr "" |
|
|
5109 | 5670 | |
|
|
5110 | 5671 | msgid "" |
| @@ -5132,18 +5693,6 b' msgstr ""' | |||
|
|
5132 | 5693 | msgid "integrity check failed on %s:%d" |
|
|
5133 | 5694 | msgstr "" |
|
|
5134 | 5695 | |
|
|
5135 | #, python-format | |
|
|
5136 | msgid "%s: not a Mercurial bundle file" | |
|
|
5137 | msgstr "" | |
|
|
5138 | ||
|
|
5139 | #, python-format | |
|
|
5140 | msgid "%s: unknown bundle version" | |
|
|
5141 | msgstr "" | |
|
|
5142 | ||
|
|
5143 | #, python-format | |
|
|
5144 | msgid "%s: unknown bundle compression type" | |
|
|
5145 | msgstr "" | |
|
|
5146 | ||
|
|
5147 | 5696 | msgid "cannot create new bundle repository" |
|
|
5148 | 5697 | msgstr "" |
|
|
5149 | 5698 | |
| @@ -5151,11 +5700,23 b' msgstr ""' | |||
|
|
5151 | 5700 | msgid "premature EOF reading chunk (got %d bytes, expected %d)" |
|
|
5152 | 5701 | msgstr "" |
|
|
5153 | 5702 | |
|
|
5703 | #, python-format | |
|
|
5704 | msgid "%s: not a Mercurial bundle" | |
|
|
5705 | msgstr "%s 不是一個Mercurial bundle" | |
|
|
5706 | ||
|
|
5707 | #, python-format | |
|
|
5708 | msgid "%s: unknown bundle version %s" | |
|
|
5709 | msgstr "%s: 未知的bundle 版本 %s" | |
|
|
5710 | ||
|
|
5154 | 5711 | msgid "empty username" |
|
|
5155 | msgstr "" | |
|
|
5712 | msgstr "使用者名稱是空白的" | |
|
|
5156 | 5713 | |
|
|
5157 | 5714 | #, python-format |
|
|
5158 | 5715 | msgid "username %s contains a newline" |
|
|
5716 | msgstr "使用者名稱 %s 包含一個換行字元" | |
|
|
5717 | ||
|
|
5718 | #, python-format | |
|
|
5719 | msgid "the name '%s' is reserved" | |
|
|
5159 | 5720 | msgstr "" |
|
|
5160 | 5721 | |
|
|
5161 | 5722 | msgid "options --message and --logfile are mutually exclusive" |
| @@ -5163,7 +5724,7 b' msgstr ""' | |||
|
|
5163 | 5724 | |
|
|
5164 | 5725 | #, python-format |
|
|
5165 | 5726 | msgid "can't read commit message '%s': %s" |
|
|
5166 | msgstr "" | |
|
|
5727 | msgstr "不能讀取提交訊息'%s': %s" | |
|
|
5167 | 5728 | |
|
|
5168 | 5729 | msgid "limit must be a positive integer" |
|
|
5169 | 5730 | msgstr "" |
| @@ -5171,26 +5732,27 b' msgstr ""' | |||
|
|
5171 | 5732 | msgid "limit must be positive" |
|
|
5172 | 5733 | msgstr "" |
|
|
5173 | 5734 | |
|
|
5174 | msgid "too many revisions specified" | |
|
|
5175 | msgstr "" | |
|
|
5176 | ||
|
|
5177 | 5735 | #, python-format |
|
|
5178 | 5736 | msgid "invalid format spec '%%%s' in output filename" |
|
|
5179 | 5737 | msgstr "" |
|
|
5180 | 5738 | |
|
|
5181 | 5739 | #, python-format |
|
|
5182 | 5740 | msgid "adding %s\n" |
|
|
5183 | msgstr "" | |
|
|
5741 | msgstr "新增 %s\n" | |
|
|
5184 | 5742 | |
|
|
5185 | 5743 | #, python-format |
|
|
5186 | 5744 | msgid "removing %s\n" |
|
|
5187 | msgstr "" | |
|
|
5745 | msgstr "正在刪除 %s\n" | |
|
|
5188 | 5746 | |
|
|
5189 | 5747 | #, python-format |
|
|
5190 | 5748 | msgid "recording removal of %s as rename to %s (%d%% similar)\n" |
|
|
5191 | 5749 | msgstr "" |
|
|
5192 | 5750 | |
|
|
5193 | 5751 | #, python-format |
|
|
5752 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" | |
|
|
5753 | msgstr "" | |
|
|
5754 | ||
|
|
5755 | #, python-format | |
|
|
5194 | 5756 | msgid "%s: not copying - file is not managed\n" |
|
|
5195 | 5757 | msgstr "" |
|
|
5196 | 5758 | |
| @@ -5204,33 +5766,37 b' msgstr ""' | |||
|
|
5204 | 5766 | |
|
|
5205 | 5767 | #, python-format |
|
|
5206 | 5768 | msgid "%s: not overwriting - file exists\n" |
|
|
5769 | msgstr "%s: 不能蓋寫 - 檔案存在\n" | |
|
|
5770 | ||
|
|
5771 | #, python-format | |
|
|
5772 | msgid "%s: not recording move - %s does not exist\n" | |
|
|
5773 | msgstr "" | |
|
|
5774 | ||
|
|
5775 | #, python-format | |
|
|
5776 | msgid "%s: not recording copy - %s does not exist\n" | |
|
|
5207 | 5777 | msgstr "" |
|
|
5208 | 5778 | |
|
|
5209 | 5779 | #, python-format |
|
|
5210 | 5780 | msgid "%s: deleted in working copy\n" |
|
|
5211 | msgstr "" | |
|
|
5781 | msgstr "%s:在工作複本裡被刪除了\n" | |
|
|
5212 | 5782 | |
|
|
5213 | 5783 | #, python-format |
|
|
5214 | 5784 | msgid "%s: cannot copy - %s\n" |
|
|
5215 | msgstr "" | |
|
|
5785 | msgstr "%s: 不能複製 - %s\n" | |
|
|
5216 | 5786 | |
|
|
5217 | 5787 | #, python-format |
|
|
5218 | 5788 | msgid "moving %s to %s\n" |
|
|
5219 | msgstr "" | |
|
|
5789 | msgstr "%s 搬移到 %s\n" | |
|
|
5220 | 5790 | |
|
|
5221 | 5791 | #, python-format |
|
|
5222 | 5792 | msgid "copying %s to %s\n" |
|
|
5223 | msgstr "" | |
|
|
5224 | ||
|
|
5225 | #, python-format | |
|
|
5226 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" | |
|
|
5227 | msgstr "" | |
|
|
5793 | msgstr "%s 複製到 %s\n" | |
|
|
5228 | 5794 | |
|
|
5229 | 5795 | msgid "no source or destination specified" |
|
|
5230 | msgstr "" | |
|
|
5796 | msgstr "沒有描述來源或目的" | |
|
|
5231 | 5797 | |
|
|
5232 | 5798 | msgid "no destination specified" |
|
|
5233 | msgstr "" | |
|
|
5799 | msgstr "沒有描述目的" | |
|
|
5234 | 5800 | |
|
|
5235 | 5801 | msgid "with multiple sources, destination must be an existing directory" |
|
|
5236 | 5802 | msgstr "" |
| @@ -5240,78 +5806,77 b' msgid "destination %s is not a directory' | |||
|
|
5240 | 5806 | msgstr "" |
|
|
5241 | 5807 | |
|
|
5242 | 5808 | msgid "no files to copy" |
|
|
5243 | msgstr "" | |
|
|
5809 | msgstr "沒有檔案可複製" | |
|
|
5244 | 5810 | |
|
|
5245 | 5811 | msgid "(consider using --after)\n" |
|
|
5246 | 5812 | msgstr "" |
|
|
5247 | 5813 | |
|
|
5814 | msgid "child process failed to start" | |
|
|
5815 | msgstr "" | |
|
|
5816 | ||
|
|
5248 | 5817 | #, python-format |
|
|
5249 | 5818 | msgid "changeset: %d:%s\n" |
|
|
5250 | msgstr "" | |
|
|
5819 | msgstr "changeset:\t%d:%s\n" | |
|
|
5251 | 5820 | |
|
|
5252 | 5821 | #, python-format |
|
|
5253 | 5822 | msgid "branch: %s\n" |
|
|
5254 | msgstr "" | |
|
|
5823 | msgstr "分支:\t\t%s\n" | |
|
|
5255 | 5824 | |
|
|
5256 | 5825 | #, python-format |
|
|
5257 | 5826 | msgid "tag: %s\n" |
|
|
5258 | msgstr "" | |
|
|
5827 | msgstr "標記:\t\t%s\n" | |
|
|
5259 | 5828 | |
|
|
5260 | 5829 | #, python-format |
|
|
5261 | 5830 | msgid "parent: %d:%s\n" |
|
|
5262 | msgstr "" | |
|
|
5831 | msgstr "母系:\t\t%d:%s\n" | |
|
|
5263 | 5832 | |
|
|
5264 | 5833 | #, python-format |
|
|
5265 | 5834 | msgid "manifest: %d:%s\n" |
|
|
5266 | msgstr "" | |
|
|
5835 | msgstr "manifest:\t%d:%s\n" | |
|
|
5267 | 5836 | |
|
|
5268 | 5837 | #, python-format |
|
|
5269 | 5838 | msgid "user: %s\n" |
|
|
5270 | msgstr "" | |
|
|
5839 | msgstr "使用者:\t\t%s\n" | |
|
|
5271 | 5840 | |
|
|
5272 | 5841 | #, python-format |
|
|
5273 | 5842 | msgid "date: %s\n" |
|
|
5274 | msgstr "" | |
|
|
5843 | msgstr "日期:\t\t%s\n" | |
|
|
5275 | 5844 | |
|
|
5276 | 5845 | msgid "files+:" |
|
|
5277 | msgstr "" | |
|
|
5846 | msgstr "檔案+:" | |
|
|
5278 | 5847 | |
|
|
5279 | 5848 | msgid "files-:" |
|
|
5280 | msgstr "" | |
|
|
5849 | msgstr "檔案-:" | |
|
|
5281 | 5850 | |
|
|
5282 | 5851 | msgid "files:" |
|
|
5283 | msgstr "" | |
|
|
5852 | msgstr "檔案:" | |
|
|
5284 | 5853 | |
|
|
5285 | 5854 | #, python-format |
|
|
5286 | 5855 | msgid "files: %s\n" |
|
|
5287 | msgstr "" | |
|
|
5856 | msgstr "檔案:\t\t%s\n" | |
|
|
5288 | 5857 | |
|
|
5289 | 5858 | #, python-format |
|
|
5290 | 5859 | msgid "copies: %s\n" |
|
|
5291 | msgstr "" | |
|
|
5860 | msgstr "複製:\t\t%s\n" | |
|
|
5292 | 5861 | |
|
|
5293 | 5862 | #, python-format |
|
|
5294 | 5863 | msgid "extra: %s=%s\n" |
|
|
5295 | msgstr "" | |
|
|
5864 | msgstr "額外:\t\t%s=%s\n" | |
|
|
5296 | 5865 | |
|
|
5297 | 5866 | msgid "description:\n" |
|
|
5298 | msgstr "" | |
|
|
5867 | msgstr "描述:\n" | |
|
|
5299 | 5868 | |
|
|
5300 | 5869 | #, python-format |
|
|
5301 | 5870 | msgid "summary: %s\n" |
|
|
5302 | msgstr "" | |
|
|
5871 | msgstr "提交摘要:\t%s\n" | |
|
|
5303 | 5872 | |
|
|
5304 | 5873 | #, python-format |
|
|
5305 | 5874 | msgid "%s: no key named '%s'" |
|
|
5306 | 5875 | msgstr "" |
|
|
5307 | 5876 | |
|
|
5308 | 5877 | #, python-format |
|
|
5309 | msgid "%s: %s" | |
|
|
5310 | msgstr "" | |
|
|
5311 | ||
|
|
5312 | #, python-format | |
|
|
5313 | 5878 | msgid "Found revision %s from %s\n" |
|
|
5314 | msgstr "" | |
|
|
5879 | msgstr "找到修定版 %s (從 %s 那邊)\n" | |
|
|
5315 | 5880 | |
|
|
5316 | 5881 | msgid "revision matching date not found" |
|
|
5317 | 5882 | msgstr "" |
| @@ -5320,29 +5885,29 b' msgstr ""' | |||
|
|
5320 | 5885 | msgid "cannot follow nonexistent file: \"%s\"" |
|
|
5321 | 5886 | msgstr "" |
|
|
5322 | 5887 | |
|
|
5323 | #, python-format | |
|
|
5324 | msgid "%s:%s copy source revision cannot be found!\n" | |
|
|
5325 | msgstr "" | |
|
|
5326 | ||
|
|
5327 | 5888 | msgid "can only follow copies/renames for explicit filenames" |
|
|
5328 | 5889 | msgstr "" |
|
|
5329 | 5890 | |
|
|
5891 | #, python-format | |
|
|
5892 | msgid "skipping missing subrepository: %s\n" | |
|
|
5893 | msgstr "" | |
|
|
5894 | ||
|
|
5330 | 5895 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
|
|
5331 | msgstr "" | |
|
|
5896 | msgstr "HG: 輸入提交訊息.'HG:'開頭的行到時候都會被拿掉" | |
|
|
5332 | 5897 | |
|
|
5333 | 5898 | msgid "HG: Leave message empty to abort commit." |
|
|
5334 | msgstr "" | |
|
|
5899 | msgstr "HG: 如果想要取消提交,不要輸入任何訊息然後離開." | |
|
|
5335 | 5900 | |
|
|
5336 | 5901 | #, python-format |
|
|
5337 | 5902 | msgid "HG: user: %s" |
|
|
5338 | msgstr "" | |
|
|
5903 | msgstr "HG: 使用者 : %s" | |
|
|
5339 | 5904 | |
|
|
5340 | 5905 | msgid "HG: branch merge" |
|
|
5341 | 5906 | msgstr "" |
|
|
5342 | 5907 | |
|
|
5343 | 5908 | #, python-format |
|
|
5344 | 5909 | msgid "HG: branch '%s'" |
|
|
5345 | msgstr "" | |
|
|
5910 | msgstr "HG: 分支 '%s'" | |
|
|
5346 | 5911 | |
|
|
5347 | 5912 | #, python-format |
|
|
5348 | 5913 | msgid "HG: subrepo %s" |
| @@ -5350,53 +5915,71 b' msgstr ""' | |||
|
|
5350 | 5915 | |
|
|
5351 | 5916 | #, python-format |
|
|
5352 | 5917 | msgid "HG: added %s" |
|
|
5353 | msgstr "" | |
|
|
5918 | msgstr "HG: 新增 %s" | |
|
|
5354 | 5919 | |
|
|
5355 | 5920 | #, python-format |
|
|
5356 | 5921 | msgid "HG: changed %s" |
|
|
5357 | msgstr "" | |
|
|
5922 | msgstr "HG: 更改 %s" | |
|
|
5358 | 5923 | |
|
|
5359 | 5924 | #, python-format |
|
|
5360 | 5925 | msgid "HG: removed %s" |
|
|
5361 | msgstr "" | |
|
|
5926 | msgstr "HG: 移除 %s" | |
|
|
5362 | 5927 | |
|
|
5363 | 5928 | msgid "HG: no files changed" |
|
|
5364 | msgstr "" | |
|
|
5929 | msgstr "HG: 沒有檔案被改變" | |
|
|
5365 | 5930 | |
|
|
5366 | 5931 | msgid "empty commit message" |
|
|
5367 | msgstr "" | |
|
|
5368 | ||
|
|
5369 | #, fuzzy | |
|
|
5932 | msgstr "空白的提交訊息" | |
|
|
5933 | ||
|
|
5370 | 5934 | msgid "add the specified files on the next commit" |
|
|
5371 |
msgstr "新增下次要 |
|
|
|
5372 | ||
|
|
5373 | #, fuzzy | |
|
|
5935 | msgstr "新增下次要提交的檔案" | |
|
|
5936 | ||
|
|
5374 | 5937 | msgid "" |
|
|
5375 | 5938 | " Schedule files to be version controlled and added to the\n" |
|
|
5376 | 5939 | " repository." |
|
|
5377 | msgstr " 新增要納入版本控制並加到 repository 的檔案。" | |
|
|
5378 | ||
|
|
5379 | #, fuzzy | |
|
|
5940 | msgstr "" | |
|
|
5941 | " 新增要納入版本控制並加到儲存庫的檔案。\n" | |
|
|
5942 | " " | |
|
|
5943 | ||
|
|
5380 | 5944 | msgid "" |
|
|
5381 | 5945 | " The files will be added to the repository at the next commit. To\n" |
|
|
5382 |
" undo an add before that, see |
|
|
|
5383 | msgstr "" | |
|
|
5384 |
" 這些檔案將於下次 |
|
|
|
5385 |
" 若想要回到新增檔案前的狀態，請參閱 |
|
|
|
5386 | ||
|
|
5387 | #, fuzzy | |
|
|
5388 | msgid "" | |
|
|
5389 | " If no names are given, add all files to the repository.\n" | |
|
|
5946 | " undo an add before that, see :hg:`forget`." | |
|
|
5947 | msgstr "" | |
|
|
5948 | " 這些檔案將於下次提交時被加到儲存庫\n" | |
|
|
5949 | " 若想要回到新增檔案前的狀態，請參閱 :hg:`forget`." | |
|
|
5950 | ||
|
|
5951 | msgid " If no names are given, add all files to the repository." | |
|
|
5952 | msgstr " 如果沒有指定檔案,所有的檔案都將會加到儲存庫" | |
|
|
5953 | ||
|
|
5954 | msgid " .. container:: verbose" | |
|
|
5955 | msgstr "" | |
|
|
5956 | ||
|
|
5957 | msgid "" | |
|
|
5958 | " An example showing how new (unknown) files are added\n" | |
|
|
5959 | " automatically by :hg:`add`::" | |
|
|
5960 | msgstr "" | |
|
|
5961 | ||
|
|
5962 | msgid "" | |
|
|
5963 | " $ ls\n" | |
|
|
5964 | " foo.c\n" | |
|
|
5965 | " $ hg status\n" | |
|
|
5966 | " ? foo.c\n" | |
|
|
5967 | " $ hg add\n" | |
|
|
5968 | " adding foo.c\n" | |
|
|
5969 | " $ hg status\n" | |
|
|
5970 | " A foo.c" | |
|
|
5971 | msgstr "" | |
|
|
5972 | ||
|
|
5973 | msgid "" | |
|
|
5974 | " Returns 0 if all files are successfully added.\n" | |
|
|
5390 | 5975 | " " |
|
|
5391 | 5976 | msgstr "" |
|
|
5392 | " 如果沒有指定檔案，則會將所有的檔案都標示為加到 repository。\n" | |
|
|
5977 | " 如果所有檔案新增成功的話就返回0\n" | |
|
|
5393 | 5978 | " " |
|
|
5394 | 5979 | |
|
|
5395 | #, fuzzy | |
|
|
5396 | 5980 | msgid "add all new files, delete all missing files" |
|
|
5397 | 5981 | msgstr "新增所有未受版本控制的檔案，並刪除所有消失的檔案。" |
|
|
5398 | 5982 | |
|
|
5399 | #, fuzzy | |
|
|
5400 | 5983 | msgid "" |
|
|
5401 | 5984 | " Add all new files and remove all missing files from the\n" |
|
|
5402 | 5985 | " repository." |
| @@ -5404,7 +5987,6 b' msgstr ""' | |||
|
|
5404 | 5987 | " 新增所有未加到 repository 的檔案，並移除已加到 repository\n" |
|
|
5405 | 5988 | " 卻消失的檔案。" |
|
|
5406 | 5989 | |
|
|
5407 | #, fuzzy | |
|
|
5408 | 5990 | msgid "" |
|
|
5409 | 5991 | " New files are ignored if they match any of the patterns in\n" |
|
|
5410 | 5992 | " .hgignore. As with add, these changes take effect at the next\n" |
| @@ -5413,15 +5995,14 b' msgstr ""' | |||
|
|
5413 | 5995 | " 如果新的檔案中檔名有符合任一存在於 .hgignore 的樣式，\n" |
|
|
5414 | 5996 | " 則該檔將被忽略。如同 add 命令，這些變更將於下次提交時發生效用。" |
|
|
5415 | 5997 | |
|
|
5416 | #, fuzzy | |
|
|
5417 | 5998 | msgid "" |
|
|
5418 | 5999 | " Use the -s/--similarity option to detect renamed files. With a\n" |
|
|
5419 | 6000 | " parameter greater than 0, this compares every removed file with\n" |
|
|
5420 | 6001 | " every added file and records those similar enough as renames. This\n" |
|
|
5421 | 6002 | " option takes a percentage between 0 (disabled) and 100 (files must\n" |
|
|
5422 | 6003 | " be identical) as its parameter. Detecting renamed files this way\n" |
|
|
5423 | " can be expensive.\n" | |
|
|
5424 | " " | |
|
|
6004 | " can be expensive. After using this option, :hg:`status -C` can be\n" | |
|
|
6005 | " used to check which files were identified as moved or renamed." | |
|
|
5425 | 6006 | msgstr "" |
|
|
5426 | 6007 | " 可使用 -s/--similarity 選項去偵測更名的檔案。後面接著的是一個\n" |
|
|
5427 | 6008 | " 大於 0 的參數，可用來比對每個被新增或移除的檔案，並試圖找出其\n" |
| @@ -5443,28 +6024,18 b' msgid ""' | |||
|
|
5443 | 6024 | " List changes in files, showing the revision id responsible for\n" |
|
|
5444 | 6025 | " each line" |
|
|
5445 | 6026 | msgstr "" |
|
|
5446 | " List changes in files, showing the revision id responsible for\n" | |
|
|
5447 | " each line" | |
|
|
5448 | 6027 | |
|
|
5449 | 6028 | msgid "" |
|
|
5450 | 6029 | " This command is useful for discovering when a change was made and\n" |
|
|
5451 | 6030 | " by whom." |
|
|
5452 | 6031 | msgstr "" |
|
|
5453 | " This command is useful for discovering when a change was made and\n" | |
|
|
5454 | " by whom." | |
|
|
5455 | 6032 | |
|
|
5456 | 6033 | msgid "" |
|
|
5457 | 6034 | " Without the -a/--text option, annotate will avoid processing files\n" |
|
|
5458 | 6035 | " it detects as binary. With -a, annotate will annotate the file\n" |
|
|
5459 | 6036 | " anyway, although the results will probably be neither useful\n" |
|
|
5460 |
" nor desirable. |
|
|
|
5461 | " " | |
|
|
5462 | msgstr "" | |
|
|
5463 | " Without the -a/--text option, annotate will avoid processing files\n" | |
|
|
5464 | " it detects as binary. With -a, annotate will annotate the file\n" | |
|
|
5465 | " anyway, although the results will probably be neither useful\n" | |
|
|
5466 | " nor desirable.\n" | |
|
|
5467 | " " | |
|
|
6037 | " nor desirable." | |
|
|
6038 | msgstr "" | |
|
|
5468 | 6039 | |
|
|
5469 | 6040 | msgid "at least one filename or pattern is required" |
|
|
5470 | 6041 | msgstr "" |
| @@ -5476,66 +6047,45 b' msgstr ""' | |||
|
|
5476 | 6047 | msgid "%s: binary file\n" |
|
|
5477 | 6048 | msgstr "" |
|
|
5478 | 6049 | |
|
|
5479 | #, fuzzy | |
|
|
5480 | 6050 | msgid "create an unversioned archive of a repository revision" |
|
|
5481 | 6051 | msgstr "建立一個沒有版本控制的版本封存" |
|
|
5482 | 6052 | |
|
|
5483 | #, fuzzy | |
|
|
5484 | 6053 | msgid "" |
|
|
5485 | 6054 | " By default, the revision used is the parent of the working\n" |
|
|
5486 | 6055 | " directory; use -r/--rev to specify a different revision." |
|
|
5487 | 6056 | msgstr "" |
|
|
5488 | " By default, the revision used is the parent of the working\n" | |
|
|
5489 | " directory; use -r/--rev to specify a different revision." | |
|
|
5490 | ||
|
|
5491 | #, fuzzy | |
|
|
5492 |
msg |
|
|
|
5493 | " To specify the type of archive to create, use -t/--type. Valid\n" | |
|
|
5494 |
" types are |
|
|
|
5495 | msgstr "" | |
|
|
5496 | " To specify the type of archive to create, use -t/--type. Valid\n" | |
|
|
5497 | " types are:" | |
|
|
5498 | ||
|
|
5499 | #, fuzzy | |
|
|
5500 | msgid "" | |
|
|
5501 | " \"files\" (default): a directory full of files\n" | |
|
|
5502 |
" |
|
|
|
5503 |
" |
|
|
|
5504 | " \"tgz\": tar archive, compressed using gzip\n" | |
|
|
5505 | " \"uzip\": zip archive, uncompressed\n" | |
|
|
5506 | " \"zip\": zip archive, compressed using deflate" | |
|
|
5507 | msgstr "" | |
|
|
5508 | " \"files\" (default): a directory full of files\n" | |
|
|
5509 | " \"tar\": tar archive, uncompressed\n" | |
|
|
5510 | " \"tbz2\": tar archive, compressed using bzip2\n" | |
|
|
5511 | " \"tgz\": tar archive, compressed using gzip\n" | |
|
|
5512 | " \"uzip\": zip archive, uncompressed\n" | |
|
|
5513 | " \"zip\": zip archive, compressed using deflate" | |
|
|
5514 | ||
|
|
5515 | #, fuzzy | |
|
|
6057 | ||
|
|
6058 | msgid "" | |
|
|
6059 | " The archive type is automatically detected based on file\n" | |
|
|
6060 | " extension (or override using -t/--type)." | |
|
|
6061 | msgstr "" | |
|
|
6062 | ||
|
|
6063 | msgid " Valid types are:" | |
|
|
6064 | msgstr "" | |
|
|
6065 | ||
|
|
6066 | msgid "" | |
|
|
6067 | " :``files``: a directory full of files (default)\n" | |
|
|
6068 | " :``tar``: tar archive, uncompressed\n" | |
|
|
6069 | " :``tbz2``: tar archive, compressed using bzip2\n" | |
|
|
6070 | " :``tgz``: tar archive, compressed using gzip\n" | |
|
|
6071 | " :``uzip``: zip archive, uncompressed\n" | |
|
|
6072 | " :``zip``: zip archive, compressed using deflate" | |
|
|
6073 | msgstr "" | |
|
|
6074 | ||
|
|
5516 | 6075 | msgid "" |
|
|
5517 | 6076 | " The exact name of the destination archive or directory is given\n" |
|
|
5518 |
" using a format string; see |
|
|
|
5519 | msgstr "" | |
|
|
5520 | " The exact name of the destination archive or directory is given\n" | |
|
|
5521 | " using a format string; see 'hg help export' for details." | |
|
|
5522 | ||
|
|
5523 | #, fuzzy | |
|
|
6077 | " using a format string; see :hg:`help export` for details." | |
|
|
6078 | msgstr "" | |
|
|
6079 | ||
|
|
5524 | 6080 | msgid "" |
|
|
5525 | 6081 | " Each member added to an archive file has a directory prefix\n" |
|
|
5526 | 6082 | " prepended. Use -p/--prefix to specify a format string for the\n" |
|
|
5527 | 6083 | " prefix. The default is the basename of the archive, with suffixes\n" |
|
|
5528 |
" removed. |
|
|
|
5529 | " " | |
|
|
5530 | msgstr "" | |
|
|
5531 | " Each member added to an archive file has a directory prefix\n" | |
|
|
5532 | " prepended. Use -p/--prefix to specify a format string for the\n" | |
|
|
5533 | " prefix. The default is the basename of the archive, with suffixes\n" | |
|
|
5534 | " removed.\n" | |
|
|
5535 | " " | |
|
|
6084 | " removed." | |
|
|
6085 | msgstr "" | |
|
|
5536 | 6086 | |
|
|
5537 | 6087 | msgid "no working directory: please specify a revision" |
|
|
5538 | msgstr "" | |
|
|
6088 | msgstr "沒有工作目錄:請描述一個版次" | |
|
|
5539 | 6089 | |
|
|
5540 | 6090 | msgid "repository root cannot be destination" |
|
|
5541 | 6091 | msgstr "" |
| @@ -5547,31 +6097,33 b' msgid "reverse effect of earlier changes' | |||
|
|
5547 | 6097 | msgstr "回復先前 changeset 所作的變更" |
|
|
5548 | 6098 | |
|
|
5549 | 6099 | msgid "" |
|
|
5550 | " Commit the backed out changes as a new changeset. The new\n" | |
|
|
5551 |
" changeset i |
|
|
|
5552 | msgstr "" | |
|
|
5553 | " Commit the backed out changes as a new changeset. The new\n" | |
|
|
5554 | " changeset is a child of the backed out changeset." | |
|
|
5555 | ||
|
|
5556 | msgid "" | |
|
|
5557 | " If you backout a changeset other than the tip, a new head is\n" | |
|
|
5558 | " created. This head will be the new tip and you should merge this\n" | |
|
|
5559 | " backout changeset with another head." | |
|
|
5560 | msgstr "" | |
|
|
5561 | " If you backout a changeset other than the tip, a new head is\n" | |
|
|
5562 | " created. This head will be the new tip and you should merge this\n" | |
|
|
5563 | " backout changeset with another head." | |
|
|
5564 | ||
|
|
5565 | msgid "" | |
|
|
6100 | " The backout command merges the reverse effect of the reverted\n" | |
|
|
6101 | " changeset into the working directory." | |
|
|
6102 | msgstr "" | |
|
|
6103 | ||
|
|
6104 | msgid "" | |
|
|
6105 | " With the --merge option, it first commits the reverted changes\n" | |
|
|
6106 | " as a new changeset. This new changeset is a child of the reverted\n" | |
|
|
6107 | " changeset.\n" | |
|
|
5566 | 6108 | " The --merge option remembers the parent of the working directory\n" |
|
|
5567 | 6109 | " before starting the backout, then merges the new head with that\n" |
|
|
5568 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
|
|
5569 | " The result of this merge is not committed, as with a normal merge." | |
|
|
5570 | msgstr "" | |
|
|
5571 | " The --merge option remembers the parent of the working directory\n" | |
|
|
5572 | " before starting the backout, then merges the new head with that\n" | |
|
|
5573 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
|
|
5574 |
" |
|
|
|
6110 | " changeset afterwards.\n" | |
|
|
6111 | " This will result in an explicit merge in the history." | |
|
|
6112 | msgstr "" | |
|
|
6113 | ||
|
|
6114 | msgid "" | |
|
|
6115 | " If you backout a changeset other than the original parent of the\n" | |
|
|
6116 | " working directory, the result of this merge is not committed,\n" | |
|
|
6117 | " as with a normal merge. Otherwise, no merge is needed and the\n" | |
|
|
6118 | " commit is automatic." | |
|
|
6119 | msgstr "" | |
|
|
6120 | ||
|
|
6121 | msgid "" | |
|
|
6122 | " Note that the default behavior (without --merge) has changed in\n" | |
|
|
6123 | " version 1.7. To restore the previous default behavior, use\n" | |
|
|
6124 | " :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" | |
|
|
6125 | " the ongoing merge." | |
|
|
6126 | msgstr "" | |
|
|
5575 | 6127 | |
|
|
5576 | 6128 | msgid "please specify just one revision" |
|
|
5577 | 6129 | msgstr "" |
| @@ -5603,12 +6155,6 b' msgstr ""' | |||
|
|
5603 | 6155 | msgid "merging with changeset %s\n" |
|
|
5604 | 6156 | msgstr "" |
|
|
5605 | 6157 | |
|
|
5606 | msgid "the backout changeset is a new head - do not forget to merge\n" | |
|
|
5607 | msgstr "" | |
|
|
5608 | ||
|
|
5609 | msgid "(use \"backout --merge\" if you want to auto-merge)\n" | |
|
|
5610 | msgstr "" | |
|
|
5611 | ||
|
|
5612 | 6158 | msgid "subdivision search of changesets" |
|
|
5613 | 6159 | msgstr "對 changesets 作二分法搜尋" |
|
|
5614 | 6160 | |
| @@ -5622,36 +6168,19 b' msgid ""' | |||
|
|
5622 | 6168 | " bad, and bisect will either update to another candidate changeset\n" |
|
|
5623 | 6169 | " or announce that it has found the bad revision." |
|
|
5624 | 6170 | msgstr "" |
|
|
5625 | " This command helps to find changesets which introduce problems. To\n" | |
|
|
5626 | " use, mark the earliest changeset you know exhibits the problem as\n" | |
|
|
5627 | " bad, then mark the latest changeset which is free from the problem\n" | |
|
|
5628 | " as good. Bisect will update your working directory to a revision\n" | |
|
|
5629 | " for testing (unless the -U/--noupdate option is specified). Once\n" | |
|
|
5630 | " you have performed tests, mark the working directory as good or\n" | |
|
|
5631 | " bad, and bisect will either update to another candidate changeset\n" | |
|
|
5632 | " or announce that it has found the bad revision." | |
|
|
5633 | 6171 | |
|
|
5634 | 6172 | msgid "" |
|
|
5635 | 6173 | " As a shortcut, you can also use the revision argument to mark a\n" |
|
|
5636 | 6174 | " revision as good or bad without checking it out first." |
|
|
5637 | 6175 | msgstr "" |
|
|
5638 | " As a shortcut, you can also use the revision argument to mark a\n" | |
|
|
5639 | " revision as good or bad without checking it out first." | |
|
|
5640 | 6176 | |
|
|
5641 | 6177 | msgid "" |
|
|
5642 | 6178 | " If you supply a command, it will be used for automatic bisection.\n" |
|
|
5643 | 6179 | " Its exit status will be used to mark revisions as good or bad:\n" |
|
|
5644 | 6180 | " status 0 means good, 125 means to skip the revision, 127\n" |
|
|
5645 | 6181 | " (command not found) will abort the bisection, and any other\n" |
|
|
5646 |
" non-zero exit status means the revision is bad. |
|
|
|
5647 | " " | |
|
|
5648 | msgstr "" | |
|
|
5649 | " If you supply a command, it will be used for automatic bisection.\n" | |
|
|
5650 | " Its exit status will be used to mark revisions as good or bad:\n" | |
|
|
5651 | " status 0 means good, 125 means to skip the revision, 127\n" | |
|
|
5652 | " (command not found) will abort the bisection, and any other\n" | |
|
|
5653 | " non-zero exit status means the revision is bad.\n" | |
|
|
5654 | " " | |
|
|
6182 | " non-zero exit status means the revision is bad." | |
|
|
6183 | msgstr "" | |
|
|
5655 | 6184 | |
|
|
5656 | 6185 | msgid "The first good revision is:\n" |
|
|
5657 | 6186 | msgstr "" |
| @@ -5659,6 +6188,12 b' msgstr ""' | |||
|
|
5659 | 6188 | msgid "The first bad revision is:\n" |
|
|
5660 | 6189 | msgstr "" |
|
|
5661 | 6190 | |
|
|
6191 | #, python-format | |
|
|
6192 | msgid "" | |
|
|
6193 | "Not all ancestors of this changeset have been checked.\n" | |
|
|
6194 | "To check the other ancestors, start from the common ancestor, %s.\n" | |
|
|
6195 | msgstr "" | |
|
|
6196 | ||
|
|
5662 | 6197 | msgid "Due to skipped revisions, the first good revision could be any of:\n" |
|
|
5663 | 6198 | msgstr "" |
|
|
5664 | 6199 | |
| @@ -5693,11 +6228,9 b' msgstr ""' | |||
|
|
5693 | 6228 | msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" |
|
|
5694 | 6229 | msgstr "" |
|
|
5695 | 6230 | |
|
|
5696 | #, fuzzy | |
|
|
5697 | 6231 | msgid "set or show the current branch name" |
|
|
5698 |
msgstr "設定或顯示目前的 |
|
|
|
5699 | ||
|
|
5700 | #, fuzzy | |
|
|
6232 | msgstr "設定或顯示目前的分支名稱" | |
|
|
6233 | ||
|
|
5701 | 6234 | msgid "" |
|
|
5702 | 6235 | " With no argument, show the current branch name. With one argument,\n" |
|
|
5703 | 6236 | " set the working directory branch name (the branch will not exist\n" |
| @@ -5705,236 +6238,100 b' msgid ""' | |||
|
|
5705 | 6238 | " recommends that primary development take place on the 'default'\n" |
|
|
5706 | 6239 | " branch." |
|
|
5707 | 6240 | msgstr "" |
|
|
5708 | " With no argument, show the current branch name. With one argument,\n" | |
|
|
5709 | " set the working directory branch name (the branch will not exist\n" | |
|
|
5710 | " in the repository until the next commit). Standard practice\n" | |
|
|
5711 | " recommends that primary development take place on the 'default'\n" | |
|
|
5712 | " branch." | |
|
|
5713 | ||
|
|
5714 | #, fuzzy | |
|
|
6241 | ||
|
|
5715 | 6242 | msgid "" |
|
|
5716 | 6243 | " Unless -f/--force is specified, branch will not let you set a\n" |
|
|
5717 | 6244 | " branch name that already exists, even if it's inactive." |
|
|
5718 | 6245 | msgstr "" |
|
|
5719 | " Unless -f/--force is specified, branch will not let you set a\n" | |
|
|
5720 | " branch name that already exists, even if it's inactive." | |
|
|
5721 | ||
|
|
5722 | #, fuzzy | |
|
|
6246 | ||
|
|
5723 | 6247 | msgid "" |
|
|
5724 | 6248 | " Use -C/--clean to reset the working directory branch to that of\n" |
|
|
5725 | 6249 | " the parent of the working directory, negating a previous branch\n" |
|
|
5726 | 6250 | " change." |
|
|
5727 | 6251 | msgstr "" |
|
|
5728 | " Use -C/--clean to reset the working directory branch to that of\n" | |
|
|
5729 | " the parent of the working directory, negating a previous branch\n" | |
|
|
5730 | " change." | |
|
|
5731 | ||
|
|
5732 | #, fuzzy | |
|
|
5733 | msgid "" | |
|
|
5734 | " Use the command 'hg update' to switch to an existing branch. Use\n" | |
|
|
5735 | " 'hg commit --close-branch' to mark this branch as closed.\n" | |
|
|
5736 | " " | |
|
|
5737 | msgstr "" | |
|
|
5738 | " Use the command 'hg update' to switch to an existing branch.\n" | |
|
|
5739 | " " | |
|
|
6252 | ||
|
|
6253 | msgid "" | |
|
|
6254 | " Use the command :hg:`update` to switch to an existing branch. Use\n" | |
|
|
6255 | " :hg:`commit --close-branch` to mark this branch as closed." | |
|
|
6256 | msgstr "" | |
|
|
5740 | 6257 | |
|
|
5741 | 6258 | #, python-format |
|
|
5742 | 6259 | msgid "reset working directory to branch %s\n" |
|
|
5743 | msgstr "" | |
|
|
5744 | ||
|
|
5745 | msgid "a branch of the same name already exists (use --force to override)" | |
|
|
6260 | msgstr "重置工作目錄到%s分支\n" | |
|
|
6261 | ||
|
|
6262 | msgid "" | |
|
|
6263 | "a branch of the same name already exists (use 'hg update' to switch to it)" | |
|
|
5746 | 6264 | msgstr "" |
|
|
5747 | 6265 | |
|
|
5748 | 6266 | #, python-format |
|
|
5749 | 6267 | msgid "marked working directory as branch %s\n" |
|
|
5750 | msgstr "" | |
|
|
5751 | ||
|
|
5752 | #, fuzzy | |
|
|
6268 | msgstr "標記工作目錄為%s分支\n" | |
|
|
6269 | ||
|
|
5753 | 6270 | msgid "list repository named branches" |
|
|
5754 | 6271 | msgstr "顯示 repository 的 named branches" |
|
|
5755 | 6272 | |
|
|
5756 | #, fuzzy | |
|
|
5757 | 6273 | msgid "" |
|
|
5758 | 6274 | " List the repository's named branches, indicating which ones are\n" |
|
|
5759 | 6275 | " inactive. If -c/--closed is specified, also list branches which have\n" |
|
|
5760 |
" been marked closed (see |
|
|
|
5761 | msgstr "" | |
|
|
5762 | " List the repository's named branches, indicating which ones are\n" | |
|
|
5763 | " inactive. If active is specified, only show active branches." | |
|
|
5764 | ||
|
|
5765 | #, fuzzy | |
|
|
6276 | " been marked closed (see :hg:`commit --close-branch`)." | |
|
|
6277 | msgstr "" | |
|
|
6278 | ||
|
|
5766 | 6279 | msgid "" |
|
|
5767 | 6280 | " If -a/--active is specified, only show active branches. A branch\n" |
|
|
5768 | 6281 | " is considered active if it contains repository heads." |
|
|
5769 | msgstr " A branch is considered active if it contains repository heads." | |
|
|
5770 | ||
|
|
5771 | #, fuzzy | |
|
|
5772 |
msg |
|
|
|
5773 | " Use the command 'hg update' to switch to an existing branch.\n" | |
|
|
6282 | msgstr "" | |
|
|
6283 | ||
|
|
6284 | msgid " Use the command :hg:`update` to switch to an existing branch." | |
|
|
6285 | msgstr "" | |
|
|
6286 | ||
|
|
6287 | msgid "" | |
|
|
6288 | " Returns 0.\n" | |
|
|
5774 | 6289 | " " |
|
|
5775 | 6290 | msgstr "" |
|
|
5776 | " Use the command 'hg update' to switch to an existing branch.\n" | |
|
|
5777 | " " | |
|
|
5778 | ||
|
|
5779 | #, fuzzy | |
|
|
6291 | ||
|
|
6292 | msgid " (closed)" | |
|
|
6293 | msgstr "" | |
|
|
6294 | ||
|
|
6295 | msgid " (inactive)" | |
|
|
6296 | msgstr "" | |
|
|
6297 | ||
|
|
5780 | 6298 | msgid "create a changegroup file" |
|
|
5781 | msgstr "" | |
|
|
5782 | "建立一個 changegroup 檔案\n" | |
|
|
5783 | "\n" | |
|
|
5784 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5785 | " known to be in another repository.\n" | |
|
|
5786 | "\n" | |
|
|
5787 | " If no destination repository is specified the destination is\n" | |
|
|
5788 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5789 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5790 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5791 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5792 | " compressed using bz2).\n" | |
|
|
5793 | "\n" | |
|
|
5794 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5795 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5796 | " command. This is useful when direct push and pull are not\n" | |
|
|
5797 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5798 | "\n" | |
|
|
5799 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5800 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5801 | " " | |
|
|
5802 | ||
|
|
5803 | #, fuzzy | |
|
|
6299 | msgstr "建立一個 changegroup 檔案" | |
|
|
6300 | ||
|
|
5804 | 6301 | msgid "" |
|
|
5805 | 6302 | " Generate a compressed changegroup file collecting changesets not\n" |
|
|
5806 | 6303 | " known to be in another repository." |
|
|
5807 | 6304 | msgstr "" |
|
|
5808 | "建立一個 changegroup 檔案\n" | |
|
|
5809 | "\n" | |
|
|
5810 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5811 | " known to be in another repository.\n" | |
|
|
5812 | "\n" | |
|
|
5813 | " If no destination repository is specified the destination is\n" | |
|
|
5814 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5815 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5816 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5817 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5818 | " compressed using bz2).\n" | |
|
|
5819 | "\n" | |
|
|
5820 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5821 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5822 | " command. This is useful when direct push and pull are not\n" | |
|
|
5823 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5824 | "\n" | |
|
|
5825 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5826 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5827 | " " | |
|
|
5828 | ||
|
|
5829 | #, fuzzy | |
|
|
5830 | msgid "" | |
|
|
5831 | " If no destination repository is specified the destination is\n" | |
|
|
5832 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
6305 | ||
|
|
6306 | msgid "" | |
|
|
6307 | " If you omit the destination repository, then hg assumes the\n" | |
|
|
6308 | " destination will have all the nodes you specify with --base\n" | |
|
|
5833 | 6309 | " parameters. To create a bundle containing all changesets, use\n" |
|
|
5834 | 6310 | " -a/--all (or --base null)." |
|
|
5835 | 6311 | msgstr "" |
|
|
5836 | "建立一個 changegroup 檔案\n" | |
|
|
5837 | "\n" | |
|
|
5838 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5839 | " known to be in another repository.\n" | |
|
|
5840 | "\n" | |
|
|
5841 | " If no destination repository is specified the destination is\n" | |
|
|
5842 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5843 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5844 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5845 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5846 | " compressed using bz2).\n" | |
|
|
5847 | "\n" | |
|
|
5848 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5849 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5850 | " command. This is useful when direct push and pull are not\n" | |
|
|
5851 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5852 | "\n" | |
|
|
5853 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5854 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5855 | " " | |
|
|
5856 | ||
|
|
5857 | #, fuzzy | |
|
|
6312 | ||
|
|
5858 | 6313 | msgid "" |
|
|
5859 | 6314 | " You can change compression method with the -t/--type option.\n" |
|
|
5860 | 6315 | " The available compression methods are: none, bzip2, and\n" |
|
|
5861 | 6316 | " gzip (by default, bundles are compressed using bzip2)." |
|
|
5862 | 6317 | msgstr "" |
|
|
5863 | "建立一個 changegroup 檔案\n" | |
|
|
5864 | "\n" | |
|
|
5865 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5866 | " known to be in another repository.\n" | |
|
|
5867 | "\n" | |
|
|
5868 | " If no destination repository is specified the destination is\n" | |
|
|
5869 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5870 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5871 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5872 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5873 | " compressed using bz2).\n" | |
|
|
5874 | "\n" | |
|
|
5875 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5876 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5877 | " command. This is useful when direct push and pull are not\n" | |
|
|
5878 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5879 | "\n" | |
|
|
5880 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5881 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5882 | " " | |
|
|
5883 | ||
|
|
5884 | #, fuzzy | |
|
|
6318 | ||
|
|
5885 | 6319 | msgid "" |
|
|
5886 | 6320 | " The bundle file can then be transferred using conventional means\n" |
|
|
5887 | 6321 | " and applied to another repository with the unbundle or pull\n" |
|
|
5888 | 6322 | " command. This is useful when direct push and pull are not\n" |
|
|
5889 | 6323 | " available or when exporting an entire repository is undesirable." |
|
|
5890 | 6324 | msgstr "" |
|
|
5891 | "建立一個 changegroup 檔案\n" | |
|
|
5892 | "\n" | |
|
|
5893 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5894 | " known to be in another repository.\n" | |
|
|
5895 | "\n" | |
|
|
5896 | " If no destination repository is specified the destination is\n" | |
|
|
5897 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5898 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5899 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5900 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5901 | " compressed using bz2).\n" | |
|
|
5902 | "\n" | |
|
|
5903 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5904 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5905 | " command. This is useful when direct push and pull are not\n" | |
|
|
5906 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5907 | "\n" | |
|
|
5908 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5909 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5910 | " " | |
|
|
5911 | ||
|
|
5912 | #, fuzzy | |
|
|
6325 | ||
|
|
5913 | 6326 | msgid "" |
|
|
5914 | 6327 | " Applying bundles preserves all changeset contents including\n" |
|
|
5915 |
" permissions, copy/rename information, and revision history. |
|
|
|
6328 | " permissions, copy/rename information, and revision history." | |
|
|
6329 | msgstr "" | |
|
|
6330 | ||
|
|
6331 | msgid "" | |
|
|
6332 | " Returns 0 on success, 1 if no changes found.\n" | |
|
|
5916 | 6333 | " " |
|
|
5917 | 6334 | msgstr "" |
|
|
5918 | "建立一個 changegroup 檔案\n" | |
|
|
5919 | "\n" | |
|
|
5920 | " Generate a compressed changegroup file collecting changesets not\n" | |
|
|
5921 | " known to be in another repository.\n" | |
|
|
5922 | "\n" | |
|
|
5923 | " If no destination repository is specified the destination is\n" | |
|
|
5924 | " assumed to have all the nodes specified by one or more --base\n" | |
|
|
5925 | " parameters. To create a bundle containing all changesets, use\n" | |
|
|
5926 | " -a/--all (or --base null). To change the compression method\n" | |
|
|
5927 | " applied, use the -t/--type option (by default, bundles are\n" | |
|
|
5928 | " compressed using bz2).\n" | |
|
|
5929 | "\n" | |
|
|
5930 | " The bundle file can then be transferred using conventional means\n" | |
|
|
5931 | " and applied to another repository with the unbundle or pull\n" | |
|
|
5932 | " command. This is useful when direct push and pull are not\n" | |
|
|
5933 | " available or when exporting an entire repository is undesirable.\n" | |
|
|
5934 | "\n" | |
|
|
5935 | " Applying bundles preserves all changeset contents including\n" | |
|
|
5936 | " permissions, copy/rename information, and revision history.\n" | |
|
|
5937 | " " | |
|
|
5938 | 6335 | |
|
|
5939 | 6336 | msgid "--base is incompatible with specifying a destination" |
|
|
5940 | 6337 | msgstr "" |
| @@ -5942,704 +6339,148 b' msgstr ""' | |||
|
|
5942 | 6339 | msgid "unknown bundle type specified with --type" |
|
|
5943 | 6340 | msgstr "" |
|
|
5944 | 6341 | |
|
|
5945 | #, fuzzy | |
|
|
5946 | 6342 | msgid "output the current or given revision of files" |
|
|
5947 |
msgstr "輸出目前或是特定 |
|
|
|
5948 | ||
|
|
5949 | #, fuzzy | |
|
|
6343 | msgstr "輸出目前或是特定修定版的檔案內容" | |
|
|
6344 | ||
|
|
5950 | 6345 | msgid "" |
|
|
5951 | 6346 | " Print the specified files as they were at the given revision. If\n" |
|
|
5952 | 6347 | " no revision is given, the parent of the working directory is used,\n" |
|
|
5953 | 6348 | " or tip if no revision is checked out." |
|
|
5954 | 6349 | msgstr "" |
|
|
5955 | " Print the specified files as they were at the given revision. If\n" | |
|
|
5956 | " no revision is given, the parent of the working directory is used,\n" | |
|
|
5957 | " or tip if no revision is checked out." | |
|
|
5958 | ||
|
|
5959 | #, fuzzy | |
|
|
5960 | msgid "" | |
|
|
5961 | " Output may be to a file, in which case the name of the file is\n" | |
|
|
5962 | " given using a format string. The formatting rules are the same as\n" | |
|
|
5963 | " for the export command, with the following additions::" | |
|
|
5964 | msgstr "" | |
|
|
6350 | ||
|
|
6351 | msgid "" | |
|
|
5965 | 6352 | " Output may be to a file, in which case the name of the file is\n" |
|
|
5966 | 6353 | " given using a format string. The formatting rules are the same as\n" |
|
|
5967 | 6354 | " for the export command, with the following additions:" |
|
|
5968 | ||
|
|
5969 | #, fuzzy | |
|
|
5970 | msgid "" | |
|
|
5971 |
" |
|
|
|
5972 |
" |
|
|
|
5973 |
" |
|
|
|
5974 | " " | |
|
|
5975 | msgstr "" | |
|
|
5976 | " %s basename of file being printed\n" | |
|
|
5977 | " %d dirname of file being printed, or '.' if in repository root\n" | |
|
|
5978 | " %p root-relative path name of file being printed\n" | |
|
|
5979 | " " | |
|
|
5980 | ||
|
|
5981 | #, fuzzy | |
|
|
6355 | msgstr "" | |
|
|
6356 | ||
|
|
6357 | msgid "" | |
|
|
6358 | " :``%s``: basename of file being printed\n" | |
|
|
6359 | " :``%d``: dirname of file being printed, or '.' if in repository root\n" | |
|
|
6360 | " :``%p``: root-relative path name of file being printed" | |
|
|
6361 | msgstr "" | |
|
|
6362 | ||
|
|
5982 | 6363 | msgid "make a copy of an existing repository" |
|
|
5983 | msgstr "" | |
|
|
5984 | "對已存在的 repository 複製一份\n" | |
|
|
5985 | "\n" | |
|
|
5986 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
5987 | "\n" | |
|
|
5988 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
5989 | " basename of the source.\n" | |
|
|
5990 | "\n" | |
|
|
5991 | " The location of the source is added to the new repository's\n" | |
|
|
5992 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
5993 | "\n" | |
|
|
5994 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
5995 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
5996 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
5997 | " on local repositories.\n" | |
|
|
5998 | "\n" | |
|
|
5999 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6000 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6001 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6002 | " parent is the null revision).\n" | |
|
|
6003 | "\n" | |
|
|
6004 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6005 | "\n" | |
|
|
6006 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6007 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6008 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6009 | "\n" | |
|
|
6010 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6011 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6012 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6013 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6014 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6015 | " avoid hardlinking.\n" | |
|
|
6016 | "\n" | |
|
|
6017 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6018 | " using full hardlinks with\n" | |
|
|
6019 | "\n" | |
|
|
6020 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6021 | "\n" | |
|
|
6022 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6023 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6024 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6025 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6026 | " this is not compatible with certain extensions that place their\n" | |
|
|
6027 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6028 | "\n" | |
|
|
6029 | " " | |
|
|
6030 | ||
|
|
6031 | #, fuzzy | |
|
|
6364 | msgstr "對已存在的 repository 複製一份" | |
|
|
6365 | ||
|
|
6032 | 6366 | msgid " Create a copy of an existing repository in a new directory." |
|
|
6033 | 6367 | msgstr "" |
|
|
6034 | "對已存在的 repository 複製一份\n" | |
|
|
6035 | "\n" | |
|
|
6036 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6037 | "\n" | |
|
|
6038 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6039 | " basename of the source.\n" | |
|
|
6040 | "\n" | |
|
|
6041 | " The location of the source is added to the new repository's\n" | |
|
|
6042 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6043 | "\n" | |
|
|
6044 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6045 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6046 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6047 | " on local repositories.\n" | |
|
|
6048 | "\n" | |
|
|
6049 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6050 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6051 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6052 | " parent is the null revision).\n" | |
|
|
6053 | "\n" | |
|
|
6054 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6055 | "\n" | |
|
|
6056 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6057 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6058 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6059 | "\n" | |
|
|
6060 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6061 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6062 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6063 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6064 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6065 | " avoid hardlinking.\n" | |
|
|
6066 | "\n" | |
|
|
6067 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6068 | " using full hardlinks with\n" | |
|
|
6069 | "\n" | |
|
|
6070 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6071 | "\n" | |
|
|
6072 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6073 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6074 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6075 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6076 | " this is not compatible with certain extensions that place their\n" | |
|
|
6077 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6078 | "\n" | |
|
|
6079 | " " | |
|
|
6080 | ||
|
|
6081 | #, fuzzy | |
|
|
6368 | ||
|
|
6082 | 6369 | msgid "" |
|
|
6083 | 6370 | " If no destination directory name is specified, it defaults to the\n" |
|
|
6084 | 6371 | " basename of the source." |
|
|
6085 | 6372 | msgstr "" |
|
|
6086 | "對已存在的 repository 複製一份\n" | |
|
|
6087 | "\n" | |
|
|
6088 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6089 | "\n" | |
|
|
6090 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6091 | " basename of the source.\n" | |
|
|
6092 | "\n" | |
|
|
6093 | " The location of the source is added to the new repository's\n" | |
|
|
6094 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6095 | "\n" | |
|
|
6096 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6097 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6098 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6099 | " on local repositories.\n" | |
|
|
6100 | "\n" | |
|
|
6101 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6102 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6103 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6104 | " parent is the null revision).\n" | |
|
|
6105 | "\n" | |
|
|
6106 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6107 | "\n" | |
|
|
6108 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6109 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6110 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6111 | "\n" | |
|
|
6112 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6113 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6114 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6115 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6116 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6117 | " avoid hardlinking.\n" | |
|
|
6118 | "\n" | |
|
|
6119 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6120 | " using full hardlinks with\n" | |
|
|
6121 | "\n" | |
|
|
6122 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6123 | "\n" | |
|
|
6124 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6125 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6126 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6127 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6128 | " this is not compatible with certain extensions that place their\n" | |
|
|
6129 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6130 | "\n" | |
|
|
6131 | " " | |
|
|
6132 | ||
|
|
6133 | #, fuzzy | |
|
|
6373 | ||
|
|
6134 | 6374 | msgid "" |
|
|
6135 | 6375 | " The location of the source is added to the new repository's\n" |
|
|
6136 | 6376 | " .hg/hgrc file, as the default to be used for future pulls." |
|
|
6137 | 6377 | msgstr "" |
|
|
6138 | "對已存在的 repository 複製一份\n" | |
|
|
6139 | "\n" | |
|
|
6140 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6141 | "\n" | |
|
|
6142 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6143 | " basename of the source.\n" | |
|
|
6144 | "\n" | |
|
|
6145 | " The location of the source is added to the new repository's\n" | |
|
|
6146 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6147 | "\n" | |
|
|
6148 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6149 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6150 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6151 | " on local repositories.\n" | |
|
|
6152 | "\n" | |
|
|
6153 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6154 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6155 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6156 | " parent is the null revision).\n" | |
|
|
6157 | "\n" | |
|
|
6158 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6159 | "\n" | |
|
|
6160 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6161 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6162 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6163 | "\n" | |
|
|
6164 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6165 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6166 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6167 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6168 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6169 | " avoid hardlinking.\n" | |
|
|
6170 | "\n" | |
|
|
6171 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6172 | " using full hardlinks with\n" | |
|
|
6173 | "\n" | |
|
|
6174 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6175 | "\n" | |
|
|
6176 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6177 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6178 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6179 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6180 | " this is not compatible with certain extensions that place their\n" | |
|
|
6181 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6182 | "\n" | |
|
|
6183 | " " | |
|
|
6184 | ||
|
|
6185 | #, fuzzy | |
|
|
6186 | msgid "" | |
|
|
6187 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6188 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6189 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6190 | " on local repositories." | |
|
|
6191 | msgstr "" | |
|
|
6192 | "對已存在的 repository 複製一份\n" | |
|
|
6193 | "\n" | |
|
|
6194 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6195 | "\n" | |
|
|
6196 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6197 | " basename of the source.\n" | |
|
|
6198 | "\n" | |
|
|
6199 | " The location of the source is added to the new repository's\n" | |
|
|
6200 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6201 | "\n" | |
|
|
6202 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6203 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6204 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6205 | " on local repositories.\n" | |
|
|
6206 | "\n" | |
|
|
6207 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6208 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6209 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6210 | " parent is the null revision).\n" | |
|
|
6211 | "\n" | |
|
|
6212 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6213 | "\n" | |
|
|
6214 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6378 | ||
|
|
6379 | msgid " See :hg:`help urls` for valid source format details." | |
|
|
6380 | msgstr "" | |
|
|
6381 | ||
|
|
6382 | msgid "" | |
|
|
6383 | " It is possible to specify an ``ssh://`` URL as the destination, but no\n" | |
|
|
6215 | 6384 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
|
6216 |
" Please see |
|
|
|
6217 | "\n" | |
|
|
6218 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6219 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6220 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6221 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6222 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6223 | " avoid hardlinking.\n" | |
|
|
6224 | "\n" | |
|
|
6225 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6226 | " using full hardlinks with\n" | |
|
|
6227 | "\n" | |
|
|
6228 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6229 | "\n" | |
|
|
6230 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6231 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6232 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6233 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6234 | " this is not compatible with certain extensions that place their\n" | |
|
|
6235 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6236 | "\n" | |
|
|
6237 | " " | |
|
|
6238 | ||
|
|
6239 | #, fuzzy | |
|
|
6240 | msgid "" | |
|
|
6241 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6242 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6243 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6244 | " parent is the null revision)." | |
|
|
6245 | msgstr "" | |
|
|
6246 | "對已存在的 repository 複製一份\n" | |
|
|
6247 | "\n" | |
|
|
6248 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6249 | "\n" | |
|
|
6250 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6251 | " basename of the source.\n" | |
|
|
6252 | "\n" | |
|
|
6253 | " The location of the source is added to the new repository's\n" | |
|
|
6254 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6255 | "\n" | |
|
|
6256 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6257 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6258 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6259 | " on local repositories.\n" | |
|
|
6260 | "\n" | |
|
|
6261 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6262 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6263 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6264 | " parent is the null revision).\n" | |
|
|
6265 | "\n" | |
|
|
6266 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6267 | "\n" | |
|
|
6268 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6269 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6270 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6271 | "\n" | |
|
|
6272 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6273 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6274 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6275 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6276 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6277 | " avoid hardlinking.\n" | |
|
|
6278 | "\n" | |
|
|
6279 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6280 | " using full hardlinks with\n" | |
|
|
6281 | "\n" | |
|
|
6282 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6283 | "\n" | |
|
|
6284 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6285 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6286 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6287 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6288 | " this is not compatible with certain extensions that place their\n" | |
|
|
6289 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6290 | "\n" | |
|
|
6291 | " " | |
|
|
6292 | ||
|
|
6293 | #, fuzzy | |
|
|
6294 | msgid " See 'hg help urls' for valid source format details." | |
|
|
6295 | msgstr "" | |
|
|
6296 | "對已存在的 repository 複製一份\n" | |
|
|
6297 | "\n" | |
|
|
6298 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6299 | "\n" | |
|
|
6300 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6301 | " basename of the source.\n" | |
|
|
6302 | "\n" | |
|
|
6303 | " The location of the source is added to the new repository's\n" | |
|
|
6304 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6305 | "\n" | |
|
|
6306 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6307 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6308 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6309 | " on local repositories.\n" | |
|
|
6310 | "\n" | |
|
|
6311 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6312 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6313 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6314 | " parent is the null revision).\n" | |
|
|
6315 | "\n" | |
|
|
6316 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6317 | "\n" | |
|
|
6318 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6319 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6320 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6321 | "\n" | |
|
|
6322 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6323 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6324 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6325 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6326 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6327 | " avoid hardlinking.\n" | |
|
|
6328 | "\n" | |
|
|
6329 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6330 | " using full hardlinks with\n" | |
|
|
6331 | "\n" | |
|
|
6332 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6333 | "\n" | |
|
|
6334 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6335 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6336 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6337 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6338 | " this is not compatible with certain extensions that place their\n" | |
|
|
6339 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6340 | "\n" | |
|
|
6341 | " " | |
|
|
6342 | ||
|
|
6343 | #, fuzzy | |
|
|
6344 | msgid "" | |
|
|
6345 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6346 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6347 | " Please see 'hg help urls' for important details about ssh:// URLs." | |
|
|
6348 | msgstr "" | |
|
|
6349 | "對已存在的 repository 複製一份\n" | |
|
|
6350 | "\n" | |
|
|
6351 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6352 | "\n" | |
|
|
6353 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6354 | " basename of the source.\n" | |
|
|
6355 | "\n" | |
|
|
6356 | " The location of the source is added to the new repository's\n" | |
|
|
6357 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6358 | "\n" | |
|
|
6359 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6360 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6361 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6362 | " on local repositories.\n" | |
|
|
6363 | "\n" | |
|
|
6364 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6365 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6366 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6367 | " parent is the null revision).\n" | |
|
|
6368 | "\n" | |
|
|
6369 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6370 | "\n" | |
|
|
6371 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6372 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6373 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6374 | "\n" | |
|
|
6375 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6376 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6377 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6378 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6379 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6380 | " avoid hardlinking.\n" | |
|
|
6381 | "\n" | |
|
|
6382 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6383 | " using full hardlinks with\n" | |
|
|
6384 | "\n" | |
|
|
6385 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6386 | "\n" | |
|
|
6387 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6388 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6389 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6390 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6391 | " this is not compatible with certain extensions that place their\n" | |
|
|
6392 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6393 | "\n" | |
|
|
6394 | " " | |
|
|
6395 | ||
|
|
6396 | #, fuzzy | |
|
|
6385 | " Please see :hg:`help urls` for important details about ``ssh://`` URLs." | |
|
|
6386 | msgstr "" | |
|
|
6387 | ||
|
|
6388 | msgid "" | |
|
|
6389 | " A set of changesets (tags, or branch names) to pull may be specified\n" | |
|
|
6390 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" | |
|
|
6391 | " If -r/--rev is used, the cloned repository will contain only a subset\n" | |
|
|
6392 | " of the changesets of the source repository. Only the set of changesets\n" | |
|
|
6393 | " defined by all -r/--rev options (including all their ancestors)\n" | |
|
|
6394 | " will be pulled into the destination repository.\n" | |
|
|
6395 | " No subsequent changesets (including subsequent tags) will be present\n" | |
|
|
6396 | " in the destination." | |
|
|
6397 | msgstr "" | |
|
|
6398 | ||
|
|
6399 | msgid "" | |
|
|
6400 | " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" | |
|
|
6401 | " local source repositories." | |
|
|
6402 | msgstr "" | |
|
|
6403 | ||
|
|
6397 | 6404 | msgid "" |
|
|
6398 | 6405 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
|
6399 | 6406 | " and destination are on the same filesystem (note this applies only\n" |
|
|
6400 |
" to the repository data, not to the |
|
|
|
6407 | " to the repository data, not to the working directory). Some\n" | |
|
|
6401 | 6408 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
|
|
6402 | 6409 | " do not report errors. In these cases, use the --pull option to\n" |
|
|
6403 | 6410 | " avoid hardlinking." |
|
|
6404 | 6411 | msgstr "" |
|
|
6405 | "對已存在的 repository 複製一份\n" | |
|
|
6406 | "\n" | |
|
|
6407 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6408 | "\n" | |
|
|
6409 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6410 | " basename of the source.\n" | |
|
|
6411 | "\n" | |
|
|
6412 | " The location of the source is added to the new repository's\n" | |
|
|
6413 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6414 | "\n" | |
|
|
6415 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6416 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6417 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6418 | " on local repositories.\n" | |
|
|
6419 | "\n" | |
|
|
6420 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6421 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6422 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6423 | " parent is the null revision).\n" | |
|
|
6424 | "\n" | |
|
|
6425 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6426 | "\n" | |
|
|
6427 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6428 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6429 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6430 | "\n" | |
|
|
6431 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6432 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6433 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6434 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6435 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6436 | " avoid hardlinking.\n" | |
|
|
6437 | "\n" | |
|
|
6438 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6439 | " using full hardlinks with\n" | |
|
|
6440 | "\n" | |
|
|
6441 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6442 | "\n" | |
|
|
6443 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6444 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6445 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6446 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6447 | " this is not compatible with certain extensions that place their\n" | |
|
|
6448 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6449 | "\n" | |
|
|
6450 | " " | |
|
|
6451 | ||
|
|
6452 | #, fuzzy | |
|
|
6453 | msgid "" | |
|
|
6454 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6412 | ||
|
|
6413 | msgid "" | |
|
|
6414 | " In some cases, you can clone repositories and the working directory\n" | |
|
|
6455 | 6415 | " using full hardlinks with ::" |
|
|
6456 | 6416 | msgstr "" |
|
|
6457 | "對已存在的 repository 複製一份\n" | |
|
|
6458 | "\n" | |
|
|
6459 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6460 | "\n" | |
|
|
6461 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6462 | " basename of the source.\n" | |
|
|
6463 | "\n" | |
|
|
6464 | " The location of the source is added to the new repository's\n" | |
|
|
6465 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6466 | "\n" | |
|
|
6467 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6468 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6469 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6470 | " on local repositories.\n" | |
|
|
6471 | "\n" | |
|
|
6472 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6473 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6474 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6475 | " parent is the null revision).\n" | |
|
|
6476 | "\n" | |
|
|
6477 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6478 | "\n" | |
|
|
6479 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6480 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6481 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6482 | "\n" | |
|
|
6483 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6484 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6485 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6486 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6487 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6488 | " avoid hardlinking.\n" | |
|
|
6489 | "\n" | |
|
|
6490 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6491 | " using full hardlinks with\n" | |
|
|
6492 | "\n" | |
|
|
6493 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6494 | "\n" | |
|
|
6495 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6496 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6497 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6498 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6499 | " this is not compatible with certain extensions that place their\n" | |
|
|
6500 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6501 | "\n" | |
|
|
6502 | " " | |
|
|
6503 | ||
|
|
6504 | #, fuzzy | |
|
|
6417 | ||
|
|
6505 | 6418 | msgid " $ cp -al REPO REPOCLONE" |
|
|
6506 | 6419 | msgstr "" |
|
|
6507 | "對已存在的 repository 複製一份\n" | |
|
|
6508 | "\n" | |
|
|
6509 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6510 | "\n" | |
|
|
6511 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6512 | " basename of the source.\n" | |
|
|
6513 | "\n" | |
|
|
6514 | " The location of the source is added to the new repository's\n" | |
|
|
6515 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6516 | "\n" | |
|
|
6517 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6518 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6519 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6520 | " on local repositories.\n" | |
|
|
6521 | "\n" | |
|
|
6522 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6523 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6524 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6525 | " parent is the null revision).\n" | |
|
|
6526 | "\n" | |
|
|
6527 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6528 | "\n" | |
|
|
6529 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6530 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6531 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6532 | "\n" | |
|
|
6533 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6534 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6535 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6536 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6537 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6538 | " avoid hardlinking.\n" | |
|
|
6539 | "\n" | |
|
|
6540 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6541 | " using full hardlinks with\n" | |
|
|
6542 | "\n" | |
|
|
6543 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6544 | "\n" | |
|
|
6545 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6546 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6547 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6548 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6549 | " this is not compatible with certain extensions that place their\n" | |
|
|
6550 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6551 | "\n" | |
|
|
6552 | " " | |
|
|
6553 | ||
|
|
6554 | #, fuzzy | |
|
|
6420 | ||
|
|
6555 | 6421 | msgid "" |
|
|
6556 | 6422 | " This is the fastest way to clone, but it is not always safe. The\n" |
|
|
6557 | 6423 | " operation is not atomic (making sure REPO is not modified during\n" |
|
|
6558 | 6424 | " the operation is up to you) and you have to make sure your editor\n" |
|
|
6559 | 6425 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
|
|
6560 | 6426 | " this is not compatible with certain extensions that place their\n" |
|
|
6561 |
" metadata under the .hg directory, such as mq. |
|
|
|
6562 | " " | |
|
|
6563 | msgstr "" | |
|
|
6564 | "對已存在的 repository 複製一份\n" | |
|
|
6565 | "\n" | |
|
|
6566 | " Create a copy of an existing repository in a new directory.\n" | |
|
|
6567 | "\n" | |
|
|
6568 | " If no destination directory name is specified, it defaults to the\n" | |
|
|
6569 | " basename of the source.\n" | |
|
|
6570 | "\n" | |
|
|
6571 | " The location of the source is added to the new repository's\n" | |
|
|
6572 | " .hg/hgrc file, as the default to be used for future pulls.\n" | |
|
|
6573 | "\n" | |
|
|
6574 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
|
6575 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
|
6576 | " present in the cloned repository. This option implies --pull, even\n" | |
|
|
6577 | " on local repositories.\n" | |
|
|
6578 | "\n" | |
|
|
6579 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
|
6580 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
|
6581 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
|
6582 | " parent is the null revision).\n" | |
|
|
6583 | "\n" | |
|
|
6584 | " See 'hg help urls' for valid source format details.\n" | |
|
|
6585 | "\n" | |
|
|
6586 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
|
6587 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
|
6588 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
|
6589 | "\n" | |
|
|
6590 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
|
|
6591 | " and destination are on the same filesystem (note this applies only\n" | |
|
|
6592 | " to the repository data, not to the checked out files). Some\n" | |
|
|
6593 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
|
|
6594 | " do not report errors. In these cases, use the --pull option to\n" | |
|
|
6595 | " avoid hardlinking.\n" | |
|
|
6596 | "\n" | |
|
|
6597 | " In some cases, you can clone repositories and checked out files\n" | |
|
|
6598 | " using full hardlinks with\n" | |
|
|
6599 | "\n" | |
|
|
6600 | " $ cp -al REPO REPOCLONE\n" | |
|
|
6601 | "\n" | |
|
|
6602 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
|
6603 | " operation is not atomic (making sure REPO is not modified during\n" | |
|
|
6604 | " the operation is up to you) and you have to make sure your editor\n" | |
|
|
6605 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
|
6606 | " this is not compatible with certain extensions that place their\n" | |
|
|
6607 | " metadata under the .hg directory, such as mq.\n" | |
|
|
6608 | "\n" | |
|
|
6609 | " " | |
|
|
6427 | " metadata under the .hg directory, such as mq." | |
|
|
6428 | msgstr "" | |
|
|
6429 | ||
|
|
6430 | msgid "" | |
|
|
6431 | " Mercurial will update the working directory to the first applicable\n" | |
|
|
6432 | " revision from this list:" | |
|
|
6433 | msgstr "" | |
|
|
6434 | ||
|
|
6435 | msgid "" | |
|
|
6436 | " a) null if -U or the source repository has no changesets\n" | |
|
|
6437 | " b) if -u . and the source repository is local, the first parent of\n" | |
|
|
6438 | " the source repository's working directory\n" | |
|
|
6439 | " c) the changeset specified with -u (if a branch name, this means the\n" | |
|
|
6440 | " latest head of that branch)\n" | |
|
|
6441 | " d) the changeset specified with -r\n" | |
|
|
6442 | " e) the tipmost head specified with -b\n" | |
|
|
6443 | " f) the tipmost head specified with the url#branch source syntax\n" | |
|
|
6444 | " g) the tipmost head of the default branch\n" | |
|
|
6445 | " h) tip" | |
|
|
6446 | msgstr "" | |
|
|
6447 | ||
|
|
6448 | msgid "cannot specify both --noupdate and --updaterev" | |
|
|
6449 | msgstr "" | |
|
|
6610 | 6450 | |
|
|
6611 | 6451 | msgid "commit the specified files or all outstanding changes" |
|
|
6612 | 6452 | msgstr "將指定的檔案或是目前的變更 commit" |
|
|
6613 | 6453 | |
|
|
6614 | 6454 | msgid "" |
|
|
6615 | 6455 | " Commit changes to the given files into the repository. Unlike a\n" |
|
|
6616 |
" centralized RCS, this operation is a local operation. See |
|
|
|
6617 | " for a way to actively distribute your changes." | |
|
|
6618 | msgstr "" | |
|
|
6619 | " Commit changes to the given files into the repository. Unlike a\n" | |
|
|
6620 | " centralized RCS, this operation is a local operation. See hg push\n" | |
|
|
6621 | " for a way to actively distribute your changes." | |
|
|
6622 | ||
|
|
6623 | msgid "" | |
|
|
6624 | " If a list of files is omitted, all changes reported by \"hg status\"\n" | |
|
|
6456 | " centralized RCS, this operation is a local operation. See\n" | |
|
|
6457 | " :hg:`push` for a way to actively distribute your changes." | |
|
|
6458 | msgstr "" | |
|
|
6459 | ||
|
|
6460 | msgid "" | |
|
|
6461 | " If a list of files is omitted, all changes reported by :hg:`status`\n" | |
|
|
6625 | 6462 | " will be committed." |
|
|
6626 | 6463 | msgstr "" |
|
|
6627 | " If a list of files is omitted, all changes reported by \"hg status\"\n" | |
|
|
6628 | " will be committed." | |
|
|
6629 | 6464 | |
|
|
6630 | 6465 | msgid "" |
|
|
6631 | 6466 | " If you are committing the result of a merge, do not provide any\n" |
|
|
6632 | 6467 | " filenames or -I/-X filters." |
|
|
6633 | 6468 | msgstr "" |
|
|
6634 | " If you are committing the result of a merge, do not provide any\n" | |
|
|
6635 | " filenames or -I/-X filters." | |
|
|
6636 | ||
|
|
6637 | msgid "" | |
|
|
6638 | " If no commit message is specified, the configured editor is\n" | |
|
|
6639 | " started to prompt you for a message." | |
|
|
6640 | msgstr "" | |
|
|
6641 | " If no commit message is specified, the configured editor is\n" | |
|
|
6642 | " started to prompt you for a message." | |
|
|
6469 | ||
|
|
6470 | msgid "" | |
|
|
6471 | " If no commit message is specified, Mercurial starts your\n" | |
|
|
6472 | " configured editor where you can enter a message. In case your\n" | |
|
|
6473 | " commit fails, you will find a backup of your message in\n" | |
|
|
6474 | " ``.hg/last-message.txt``." | |
|
|
6475 | msgstr "" | |
|
|
6476 | ||
|
|
6477 | msgid "" | |
|
|
6478 | " Returns 0 on success, 1 if nothing changed.\n" | |
|
|
6479 | " " | |
|
|
6480 | msgstr "" | |
|
|
6481 | ||
|
|
6482 | msgid "can only close branch heads" | |
|
|
6483 | msgstr "" | |
|
|
6643 | 6484 | |
|
|
6644 | 6485 | msgid "nothing changed\n" |
|
|
6645 | 6486 | msgstr "" |
| @@ -6648,6 +6489,10 b' msgid "created new head\\n"' | |||
|
|
6648 | 6489 | msgstr "" |
|
|
6649 | 6490 | |
|
|
6650 | 6491 | #, python-format |
|
|
6492 | msgid "reopening closed branch head %d\n" | |
|
|
6493 | msgstr "" | |
|
|
6494 | ||
|
|
6495 | #, python-format | |
|
|
6651 | 6496 | msgid "committed changeset %d:%s\n" |
|
|
6652 | 6497 | msgstr "" |
|
|
6653 | 6498 | |
| @@ -6659,40 +6504,96 b' msgid ""' | |||
|
|
6659 | 6504 | " directory, copies are put in that directory. If dest is a file,\n" |
|
|
6660 | 6505 | " the source must be a single file." |
|
|
6661 | 6506 | msgstr "" |
|
|
6662 | " Mark dest as having copies of source files. If dest is a\n" | |
|
|
6663 | " directory, copies are put in that directory. If dest is a file,\n" | |
|
|
6664 | " the source must be a single file." | |
|
|
6665 | 6507 | |
|
|
6666 | 6508 | msgid "" |
|
|
6667 | 6509 | " By default, this command copies the contents of files as they\n" |
|
|
6668 | 6510 | " exist in the working directory. If invoked with -A/--after, the\n" |
|
|
6669 | 6511 | " operation is recorded, but no copying is performed." |
|
|
6670 | 6512 | msgstr "" |
|
|
6671 | " By default, this command copies the contents of files as they\n" | |
|
|
6672 | " exist in the working directory. If invoked with -A/--after, the\n" | |
|
|
6673 | " operation is recorded, but no copying is performed." | |
|
|
6674 | 6513 | |
|
|
6675 | 6514 | msgid "" |
|
|
6676 | 6515 | " This command takes effect with the next commit. To undo a copy\n" |
|
|
6677 |
" before that, see |
|
|
|
6516 | " before that, see :hg:`revert`." | |
|
|
6517 | msgstr "" | |
|
|
6518 | ||
|
|
6519 | msgid "" | |
|
|
6520 | " Returns 0 on success, 1 if errors are encountered.\n" | |
|
|
6678 | 6521 | " " |
|
|
6679 | 6522 | msgstr "" |
|
|
6680 | " This command takes effect with the next commit. To undo a copy\n" | |
|
|
6681 | " before that, see hg revert.\n" | |
|
|
6682 | " " | |
|
|
6683 | 6523 | |
|
|
6684 | 6524 | msgid "find the ancestor revision of two revisions in a given index" |
|
|
6685 | 6525 | msgstr "" |
|
|
6686 | 6526 | |
|
|
6687 | msgid "There is no Mercurial repository here (.hg not found)" | |
|
|
6688 | msgstr "" | |
|
|
6689 | ||
|
|
6690 | 6527 | msgid "either two or three arguments required" |
|
|
6691 | 6528 | msgstr "" |
|
|
6692 | 6529 | |
|
|
6530 | msgid "builds a repo with a given dag from scratch in the current empty repo" | |
|
|
6531 | msgstr "" | |
|
|
6532 | ||
|
|
6533 | msgid " Elements:" | |
|
|
6534 | msgstr "" | |
|
|
6535 | ||
|
|
6536 | msgid "" | |
|
|
6537 | " - \"+n\" is a linear run of n nodes based on the current default " | |
|
|
6538 | "parent\n" | |
|
|
6539 | " - \".\" is a single node based on the current default parent\n" | |
|
|
6540 | " - \"$\" resets the default parent to null (implied at the start);\n" | |
|
|
6541 | " otherwise the default parent is always the last node created\n" | |
|
|
6542 | " - \"<p\" sets the default parent to the backref p\n" | |
|
|
6543 | " - \"*p\" is a fork at parent p, which is a backref\n" | |
|
|
6544 | " - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" | |
|
|
6545 | " - \"/p2\" is a merge of the preceding node and p2\n" | |
|
|
6546 | " - \":tag\" defines a local tag for the preceding node\n" | |
|
|
6547 | " - \"@branch\" sets the named branch for subsequent nodes\n" | |
|
|
6548 | " - \"!command\" runs the command using your shell\n" | |
|
|
6549 | " - \"!!my command\\n\" is like \"!\", but to the end of the line\n" | |
|
|
6550 | " - \"#...\\n\" is a comment up to the end of the line" | |
|
|
6551 | msgstr "" | |
|
|
6552 | ||
|
|
6553 | msgid " Whitespace between the above elements is ignored." | |
|
|
6554 | msgstr "" | |
|
|
6555 | ||
|
|
6556 | msgid " A backref is either" | |
|
|
6557 | msgstr "" | |
|
|
6558 | ||
|
|
6559 | msgid "" | |
|
|
6560 | " - a number n, which references the node curr-n, where curr is the " | |
|
|
6561 | "current\n" | |
|
|
6562 | " node, or\n" | |
|
|
6563 | " - the name of a local tag you placed earlier using \":tag\", or\n" | |
|
|
6564 | " - empty to denote the default parent." | |
|
|
6565 | msgstr "" | |
|
|
6566 | ||
|
|
6567 | msgid "" | |
|
|
6568 | " All string valued-elements are either strictly alphanumeric, or must\n" | |
|
|
6569 | " be enclosed in double quotes (\"...\"), with \"\\\" as escape character." | |
|
|
6570 | msgstr "" | |
|
|
6571 | ||
|
|
6572 | msgid "" | |
|
|
6573 | " Note that the --overwritten-file and --appended-file options imply the\n" | |
|
|
6574 | " use of \"HGMERGE=internal:local\" during DAG buildup.\n" | |
|
|
6575 | " " | |
|
|
6576 | msgstr "" | |
|
|
6577 | ||
|
|
6578 | msgid "need at least one of -m, -a, -o, -n" | |
|
|
6579 | msgstr "" | |
|
|
6580 | ||
|
|
6581 | msgid "repository is not empty" | |
|
|
6582 | msgstr "儲存庫不是空白的" | |
|
|
6583 | ||
|
|
6584 | #, python-format | |
|
|
6585 | msgid "%s command %s" | |
|
|
6586 | msgstr "%s 命令 %s" | |
|
|
6587 | ||
|
|
6588 | msgid "list all available commands and options" | |
|
|
6589 | msgstr "" | |
|
|
6590 | ||
|
|
6693 | 6591 | msgid "returns the completion list associated with the given command" |
|
|
6694 | 6592 | msgstr "" |
|
|
6695 | 6593 | |
|
|
6594 | msgid "show information detected about current filesystem" | |
|
|
6595 | msgstr "" | |
|
|
6596 | ||
|
|
6696 | 6597 | msgid "rebuild the dirstate as it would look like for the given revision" |
|
|
6697 | 6598 | msgstr "" |
|
|
6698 | 6599 | |
| @@ -6722,41 +6623,51 b' msgid "show combined config settings fro' | |||
|
|
6722 | 6623 | msgstr "顯示合併自所有 hgrc 檔案內容的設定值" |
|
|
6723 | 6624 | |
|
|
6724 | 6625 | msgid " With no arguments, print names and values of all config items." |
|
|
6725 | msgstr " With no arguments, print names and values of all config items." | |
|
|
6626 | msgstr "" | |
|
|
6726 | 6627 | |
|
|
6727 | 6628 | msgid "" |
|
|
6728 | 6629 | " With one argument of the form section.name, print just the value\n" |
|
|
6729 | 6630 | " of that config item." |
|
|
6730 | 6631 | msgstr "" |
|
|
6731 | " With one argument of the form section.name, print just the value\n" | |
|
|
6732 | " of that config item." | |
|
|
6733 | 6632 | |
|
|
6734 | 6633 | msgid "" |
|
|
6735 | 6634 | " With multiple arguments, print names and values of all config\n" |
|
|
6736 | 6635 | " items with matching section names." |
|
|
6737 | 6636 | msgstr "" |
|
|
6738 | " With multiple arguments, print names and values of all config\n" | |
|
|
6739 | " items with matching section names." | |
|
|
6740 | 6637 | |
|
|
6741 | 6638 | msgid "" |
|
|
6742 | 6639 | " With --debug, the source (filename and line number) is printed\n" |
|
|
6743 |
" for each config item. |
|
|
|
6744 | " " | |
|
|
6745 | msgstr "" | |
|
|
6746 | " With --debug, the source (filename and line number) is printed\n" | |
|
|
6747 | " for each config item.\n" | |
|
|
6748 | " " | |
|
|
6640 | " for each config item." | |
|
|
6641 | msgstr "" | |
|
|
6642 | ||
|
|
6643 | #, python-format | |
|
|
6644 | msgid "read config from: %s\n" | |
|
|
6645 | msgstr "" | |
|
|
6749 | 6646 | |
|
|
6750 | 6647 | msgid "only one config item permitted" |
|
|
6751 | 6648 | msgstr "" |
|
|
6752 | 6649 | |
|
|
6650 | msgid "access the pushkey key/value protocol" | |
|
|
6651 | msgstr "" | |
|
|
6652 | ||
|
|
6653 | msgid " With two args, list the keys in the given namespace." | |
|
|
6654 | msgstr "" | |
|
|
6655 | ||
|
|
6656 | msgid "" | |
|
|
6657 | " With five args, set a key to new if it currently is set to old.\n" | |
|
|
6658 | " Reports success or failure.\n" | |
|
|
6659 | " " | |
|
|
6660 | msgstr "" | |
|
|
6661 | ||
|
|
6662 | msgid "parse and apply a revision specification" | |
|
|
6663 | msgstr "" | |
|
|
6664 | ||
|
|
6753 | 6665 | msgid "manually set the parents of the current working directory" |
|
|
6754 | 6666 | msgstr "" |
|
|
6755 | 6667 | |
|
|
6756 | 6668 | msgid "" |
|
|
6757 | 6669 | " This is useful for writing repository conversion tools, but should\n" |
|
|
6758 |
" be used with care. |
|
|
|
6759 | " " | |
|
|
6670 | " be used with care." | |
|
|
6760 | 6671 | msgstr "" |
|
|
6761 | 6672 | |
|
|
6762 | 6673 | msgid "show the contents of the current dirstate" |
| @@ -6766,6 +6677,22 b' msgstr ""' | |||
|
|
6766 | 6677 | msgid "copy: %s -> %s\n" |
|
|
6767 | 6678 | msgstr "" |
|
|
6768 | 6679 | |
|
|
6680 | msgid "format the changelog or an index DAG as a concise textual description" | |
|
|
6681 | msgstr "" | |
|
|
6682 | ||
|
|
6683 | msgid "" | |
|
|
6684 | " If you pass a revlog index, the revlog's DAG is emitted. If you list\n" | |
|
|
6685 | " revision numbers, they get labelled in the output as rN." | |
|
|
6686 | msgstr "" | |
|
|
6687 | ||
|
|
6688 | msgid "" | |
|
|
6689 | " Otherwise, the changelog DAG of the current repo is emitted.\n" | |
|
|
6690 | " " | |
|
|
6691 | msgstr "" | |
|
|
6692 | ||
|
|
6693 | msgid "need repo for changelog dag" | |
|
|
6694 | msgstr "" | |
|
|
6695 | ||
|
|
6769 | 6696 | msgid "dump the contents of a data file revision" |
|
|
6770 | 6697 | msgstr "" |
|
|
6771 | 6698 | |
| @@ -6792,8 +6719,9 b' msgstr ""' | |||
|
|
6792 | 6719 | msgid " (check that your locale is properly set)\n" |
|
|
6793 | 6720 | msgstr "" |
|
|
6794 | 6721 | |
|
|
6795 | msgid "Checking extensions...\n" | |
|
|
6796 | msgstr "" | |
|
|
6722 | #, python-format | |
|
|
6723 | msgid "Checking installed modules (%s)...\n" | |
|
|
6724 | msgstr "正在檢查安裝的模組 (%s)...\n" | |
|
|
6797 | 6725 | |
|
|
6798 | 6726 | msgid " One or more extensions could not be found" |
|
|
6799 | 6727 | msgstr "" |
| @@ -6817,183 +6745,152 b' msgid " unexpected patch output!\\n"' | |||
|
|
6817 | 6745 | msgstr "" |
|
|
6818 | 6746 | |
|
|
6819 | 6747 | msgid " patch test failed!\n" |
|
|
6820 | msgstr "" | |
|
|
6821 | ||
|
|
6822 | msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" | |
|
|
6823 | msgstr "" | |
|
|
6824 | ||
|
|
6825 | msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" | |
|
|
6748 | msgstr "路徑測試失敗!\n" | |
|
|
6749 | ||
|
|
6750 | msgid "" | |
|
|
6751 | " (Current patch tool may be incompatible with patch, or misconfigured. " | |
|
|
6752 | "Please check your configuration file)\n" | |
|
|
6753 | msgstr "" | |
|
|
6754 | ||
|
|
6755 | msgid "" | |
|
|
6756 | " Internal patcher failure, please report this error to http://mercurial." | |
|
|
6757 | "selenic.com/wiki/BugTracker\n" | |
|
|
6826 | 6758 | msgstr "" |
|
|
6827 | 6759 | |
|
|
6828 | 6760 | msgid "Checking commit editor...\n" |
|
|
6829 | msgstr "" | |
|
|
6761 | msgstr "檢查提交訊息編輯器...\n" | |
|
|
6830 | 6762 | |
|
|
6831 | 6763 | msgid " No commit editor set and can't find vi in PATH\n" |
|
|
6832 | msgstr "" | |
|
|
6833 | ||
|
|
6834 |
msgid " (specify a commit editor in your |
|
|
|
6835 | msgstr "" | |
|
|
6764 | msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n" | |
|
|
6765 | ||
|
|
6766 | msgid " (specify a commit editor in your configuration file)\n" | |
|
|
6767 | msgstr "(在你的設定檔指明一個用來編輯提交訊息的編輯器)\n" | |
|
|
6836 | 6768 | |
|
|
6837 | 6769 | #, python-format |
|
|
6838 | 6770 | msgid " Can't find editor '%s' in PATH\n" |
|
|
6839 | msgstr "" | |
|
|
6771 | msgstr "在PATH中找不到編輯器 '%s'\n" | |
|
|
6840 | 6772 | |
|
|
6841 | 6773 | msgid "Checking username...\n" |
|
|
6842 | msgstr "" | |
|
|
6843 | ||
|
|
6844 |
msgid " (specify a username in your |
|
|
|
6845 | msgstr "" | |
|
|
6774 | msgstr "檢查使用者名稱...\n" | |
|
|
6775 | ||
|
|
6776 | msgid " (specify a username in your configuration file)\n" | |
|
|
6777 | msgstr "(在你的設定檔指明一個使用者名稱)\n" | |
|
|
6846 | 6778 | |
|
|
6847 | 6779 | msgid "No problems detected\n" |
|
|
6848 | msgstr "" | |
|
|
6780 | msgstr "查不到問題\n" | |
|
|
6849 | 6781 | |
|
|
6850 | 6782 | #, python-format |
|
|
6851 | 6783 | msgid "%s problems detected, please check your install!\n" |
|
|
6852 | msgstr "" | |
|
|
6784 | msgstr "查到%s問題,請檢查你的安裝!\n" | |
|
|
6853 | 6785 | |
|
|
6854 | 6786 | msgid "dump rename information" |
|
|
6855 | msgstr "" | |
|
|
6787 | msgstr "倒出改名資訊" | |
|
|
6856 | 6788 | |
|
|
6857 | 6789 | #, python-format |
|
|
6858 | 6790 | msgid "%s renamed from %s:%s\n" |
|
|
6859 | msgstr "" | |
|
|
6791 | msgstr "%s 改名字從%s:%s\n" | |
|
|
6860 | 6792 | |
|
|
6861 | 6793 | #, python-format |
|
|
6862 | 6794 | msgid "%s not renamed\n" |
|
|
6863 | msgstr "" | |
|
|
6795 | msgstr "%s 沒有被改名\n" | |
|
|
6864 | 6796 | |
|
|
6865 | 6797 | msgid "show how files match on given patterns" |
|
|
6866 | 6798 | msgstr "" |
|
|
6867 | 6799 | |
|
|
6868 | 6800 | msgid "diff repository (or selected files)" |
|
|
6869 |
msgstr "diff |
|
|
|
6801 | msgstr "diff 儲存庫 (或是所選擇的檔案)" | |
|
|
6870 | 6802 | |
|
|
6871 | 6803 | msgid " Show differences between revisions for the specified files." |
|
|
6872 | msgstr " Show differences between revisions for the specified files." | |
|
|
6804 | msgstr "" | |
|
|
6873 | 6805 | |
|
|
6874 | 6806 | msgid " Differences between files are shown using the unified diff format." |
|
|
6875 | msgstr " Differences between files are shown using the unified diff format." | |
|
|
6876 | ||
|
|
6877 | msgid "" | |
|
|
6878 | " NOTE: diff may generate unexpected results for merges, as it will\n" | |
|
|
6879 | " default to comparing against the working directory's first parent\n" | |
|
|
6880 | " changeset if no revisions are specified." | |
|
|
6881 | msgstr "" | |
|
|
6882 | " NOTE: diff may generate unexpected results for merges, as it will\n" | |
|
|
6883 | " default to comparing against the working directory's first parent\n" | |
|
|
6884 | " changeset if no revisions are specified." | |
|
|
6807 | msgstr "" | |
|
|
6808 | ||
|
|
6809 | msgid "" | |
|
|
6810 | " .. note::\n" | |
|
|
6811 | " diff may generate unexpected results for merges, as it will\n" | |
|
|
6812 | " default to comparing against the working directory's first\n" | |
|
|
6813 | " parent changeset if no revisions are specified." | |
|
|
6814 | msgstr "" | |
|
|
6815 | ||
|
|
6816 | msgid "" | |
|
|
6817 | " Alternatively you can specify -c/--change with a revision to see\n" | |
|
|
6818 | " the changes in that changeset relative to its first parent." | |
|
|
6819 | msgstr "" | |
|
|
6885 | 6820 | |
|
|
6886 | 6821 | msgid "" |
|
|
6887 | 6822 | " Without the -a/--text option, diff will avoid generating diffs of\n" |
|
|
6888 | 6823 | " files it detects as binary. With -a, diff will generate a diff\n" |
|
|
6889 | 6824 | " anyway, probably with undesirable results." |
|
|
6890 | 6825 | msgstr "" |
|
|
6891 | " Without the -a/--text option, diff will avoid generating diffs of\n" | |
|
|
6892 | " files it detects as binary. With -a, diff will generate a diff\n" | |
|
|
6893 | " anyway, probably with undesirable results." | |
|
|
6894 | 6826 | |
|
|
6895 | 6827 | msgid "" |
|
|
6896 | 6828 | " Use the -g/--git option to generate diffs in the git extended diff\n" |
|
|
6897 |
" format. For more information, read |
|
|
|
6898 | " " | |
|
|
6899 | msgstr "" | |
|
|
6900 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
|
|
6901 | " format. For more information, read 'hg help diffs'.\n" | |
|
|
6902 | " " | |
|
|
6903 | ||
|
|
6904 | #, fuzzy | |
|
|
6829 | " format. For more information, read :hg:`help diffs`." | |
|
|
6830 | msgstr "" | |
|
|
6831 | ||
|
|
6905 | 6832 | msgid "dump the header and diffs for one or more changesets" |
|
|
6906 | 6833 | msgstr "將一或多個 changesets 的 header 以及 diffs dump 出來" |
|
|
6907 | 6834 | |
|
|
6908 | #, fuzzy | |
|
|
6909 | 6835 | msgid " Print the changeset header and diffs for one or more revisions." |
|
|
6910 | msgstr " Print the changeset header and diffs for one or more revisions." | |
|
|
6911 | ||
|
|
6912 | #, fuzzy | |
|
|
6913 | msgid "" | |
|
|
6914 | " The information shown in the changeset header is: author,\n" | |
|
|
6915 | " changeset hash, parent(s) and commit comment." | |
|
|
6916 | msgstr "" | |
|
|
6917 | " The information shown in the changeset header is: author,\n" | |
|
|
6918 | " changeset hash, parent(s) and commit comment." | |
|
|
6919 | ||
|
|
6920 | #, fuzzy | |
|
|
6921 | msgid "" | |
|
|
6922 | " NOTE: export may generate unexpected diff output for merge\n" | |
|
|
6923 | " changesets, as it will compare the merge changeset against its\n" | |
|
|
6924 | " first parent only." | |
|
|
6925 | msgstr "" | |
|
|
6926 | " NOTE: export may generate unexpected diff output for merge\n" | |
|
|
6927 | " changesets, as it will compare the merge changeset against its\n" | |
|
|
6928 | " first parent only." | |
|
|
6929 | ||
|
|
6930 | #, fuzzy | |
|
|
6836 | msgstr "" | |
|
|
6837 | ||
|
|
6838 | msgid "" | |
|
|
6839 | " The information shown in the changeset header is: author, date,\n" | |
|
|
6840 | " branch name (if non-default), changeset hash, parent(s) and commit\n" | |
|
|
6841 | " comment." | |
|
|
6842 | msgstr "" | |
|
|
6843 | ||
|
|
6844 | msgid "" | |
|
|
6845 | " .. note::\n" | |
|
|
6846 | " export may generate unexpected diff output for merge\n" | |
|
|
6847 | " changesets, as it will compare the merge changeset against its\n" | |
|
|
6848 | " first parent only." | |
|
|
6849 | msgstr "" | |
|
|
6850 | ||
|
|
6931 | 6851 | msgid "" |
|
|
6932 | 6852 | " Output may be to a file, in which case the name of the file is\n" |
|
|
6933 | " given using a format string. The formatting rules are as follows::" | |
|
|
6934 | msgstr "" | |
|
|
6935 | " Output may be to a file, in which case the name of the file is\n" | |
|
|
6936 | 6853 | " given using a format string. The formatting rules are as follows:" |
|
|
6937 | ||
|
|
6938 | #, fuzzy | |
|
|
6939 | msgid "" | |
|
|
6940 |
" |
|
|
|
6941 |
" |
|
|
|
6942 |
" |
|
|
|
6943 |
" |
|
|
|
6944 |
" |
|
|
|
6945 |
" |
|
|
|
6946 |
" |
|
|
|
6947 |
" |
|
|
|
6948 | msgstr "" | |
|
|
6949 | " %% literal \"%\" character\n" | |
|
|
6950 | " %H changeset hash (40 bytes of hexadecimal)\n" | |
|
|
6951 | " %N number of patches being generated\n" | |
|
|
6952 | " %R changeset revision number\n" | |
|
|
6953 | " %b basename of the exporting repository\n" | |
|
|
6954 | " %h short-form changeset hash (12 bytes of hexadecimal)\n" | |
|
|
6955 | " %n zero-padded sequence number, starting at 1\n" | |
|
|
6956 | " %r zero-padded changeset revision number" | |
|
|
6957 | ||
|
|
6958 | #, fuzzy | |
|
|
6854 | msgstr "" | |
|
|
6855 | ||
|
|
6856 | msgid "" | |
|
|
6857 | " :``%%``: literal \"%\" character\n" | |
|
|
6858 | " :``%H``: changeset hash (40 hexadecimal digits)\n" | |
|
|
6859 | " :``%N``: number of patches being generated\n" | |
|
|
6860 | " :``%R``: changeset revision number\n" | |
|
|
6861 | " :``%b``: basename of the exporting repository\n" | |
|
|
6862 | " :``%h``: short-form changeset hash (12 hexadecimal digits)\n" | |
|
|
6863 | " :``%n``: zero-padded sequence number, starting at 1\n" | |
|
|
6864 | " :``%r``: zero-padded changeset revision number" | |
|
|
6865 | msgstr "" | |
|
|
6866 | ||
|
|
6959 | 6867 | msgid "" |
|
|
6960 | 6868 | " Without the -a/--text option, export will avoid generating diffs\n" |
|
|
6961 | 6869 | " of files it detects as binary. With -a, export will generate a\n" |
|
|
6962 | 6870 | " diff anyway, probably with undesirable results." |
|
|
6963 | 6871 | msgstr "" |
|
|
6964 | " Without the -a/--text option, export will avoid generating diffs\n" | |
|
|
6965 | " of files it detects as binary. With -a, export will generate a\n" | |
|
|
6966 | " diff anyway, probably with undesirable results." | |
|
|
6967 | ||
|
|
6968 | #, fuzzy | |
|
|
6872 | ||
|
|
6969 | 6873 | msgid "" |
|
|
6970 | 6874 | " Use the -g/--git option to generate diffs in the git extended diff\n" |
|
|
6971 |
" format. See |
|
|
|
6972 | msgstr "" | |
|
|
6973 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
|
|
6974 | " format. See 'hg help diffs' for more information." | |
|
|
6975 | ||
|
|
6976 | #, fuzzy | |
|
|
6875 | " format. See :hg:`help diffs` for more information." | |
|
|
6876 | msgstr "" | |
|
|
6877 | ||
|
|
6977 | 6878 | msgid "" |
|
|
6978 | 6879 | " With the --switch-parent option, the diff will be against the\n" |
|
|
6979 |
" second parent. It can be useful to review a merge. |
|
|
|
6980 | " " | |
|
|
6981 | msgstr "" | |
|
|
6982 | " With the --switch-parent option, the diff will be against the\n" | |
|
|
6983 | " second parent. It can be useful to review a merge.\n" | |
|
|
6984 | " " | |
|
|
6880 | " second parent. It can be useful to review a merge." | |
|
|
6881 | msgstr "" | |
|
|
6985 | 6882 | |
|
|
6986 | 6883 | msgid "export requires at least one changeset" |
|
|
6987 | 6884 | msgstr "" |
|
|
6988 | 6885 | |
|
|
6989 | 6886 | msgid "exporting patches:\n" |
|
|
6990 | msgstr "" | |
|
|
6887 | msgstr "匯出路徑(s):\n" | |
|
|
6991 | 6888 | |
|
|
6992 | 6889 | msgid "exporting patch:\n" |
|
|
6993 | msgstr "" | |
|
|
6890 | msgstr "匯出路徑:\n" | |
|
|
6994 | 6891 | |
|
|
6995 | 6892 | msgid "forget the specified files on the next commit" |
|
|
6996 | msgstr "" | |
|
|
6893 | msgstr "下次提交時忘記指定的檔案" | |
|
|
6997 | 6894 | |
|
|
6998 | 6895 | msgid "" |
|
|
6999 | 6896 | " Mark the specified files so they will no longer be tracked\n" |
| @@ -7006,9 +6903,7 b' msgid ""' | |||
|
|
7006 | 6903 | " working directory." |
|
|
7007 | 6904 | msgstr "" |
|
|
7008 | 6905 | |
|
|
7009 | msgid "" | |
|
|
7010 | " To undo a forget before the next commit, see hg add.\n" | |
|
|
7011 | " " | |
|
|
6906 | msgid " To undo a forget before the next commit, see :hg:`add`." | |
|
|
7012 | 6907 | msgstr "" |
|
|
7013 | 6908 | |
|
|
7014 | 6909 | msgid "no files specified" |
| @@ -7019,10 +6914,10 b' msgid "not removing %s: file is already ' | |||
|
|
7019 | 6914 | msgstr "" |
|
|
7020 | 6915 | |
|
|
7021 | 6916 | msgid "search for a pattern in specified files and revisions" |
|
|
7022 |
msgstr "從指定的檔案或 |
|
|
|
6917 | msgstr "從指定的檔案或修定版搜尋樣式" | |
|
|
7023 | 6918 | |
|
|
7024 | 6919 | msgid " Search revisions of files for a regular expression." |
|
|
7025 | msgstr " Search revisions of files for a regular expression." | |
|
|
6920 | msgstr "" | |
|
|
7026 | 6921 | |
|
|
7027 | 6922 | msgid "" |
|
|
7028 | 6923 | " This command behaves differently than Unix grep. It only accepts\n" |
| @@ -7030,257 +6925,96 b' msgid ""' | |||
|
|
7030 | 6925 | " working directory. It always prints the revision number in which a\n" |
|
|
7031 | 6926 | " match appears." |
|
|
7032 | 6927 | msgstr "" |
|
|
7033 | " This command behaves differently than Unix grep. It only accepts\n" | |
|
|
7034 | " Python/Perl regexps. It searches repository history, not the\n" | |
|
|
7035 | " working directory. It always prints the revision number in which a\n" | |
|
|
7036 | " match appears." | |
|
|
7037 | 6928 | |
|
|
7038 | 6929 | msgid "" |
|
|
7039 | 6930 | " By default, grep only prints output for the first revision of a\n" |
|
|
7040 | 6931 | " file in which it finds a match. To get it to print every revision\n" |
|
|
7041 | 6932 | " that contains a change in match status (\"-\" for a match that\n" |
|
|
7042 | 6933 | " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" |
|
|
7043 |
" use the --all flag. |
|
|
|
6934 | " use the --all flag." | |
|
|
6935 | msgstr "" | |
|
|
6936 | ||
|
|
6937 | msgid "" | |
|
|
6938 | " Returns 0 if a match is found, 1 otherwise.\n" | |
|
|
7044 | 6939 | " " |
|
|
7045 | 6940 | msgstr "" |
|
|
7046 | " By default, grep only prints output for the first revision of a\n" | |
|
|
7047 | " file in which it finds a match. To get it to print every revision\n" | |
|
|
7048 | " that contains a change in match status (\"-\" for a match that\n" | |
|
|
7049 | " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" | |
|
|
7050 | " use the --all flag.\n" | |
|
|
7051 | " " | |
|
|
7052 | 6941 | |
|
|
7053 | 6942 | #, python-format |
|
|
7054 | 6943 | msgid "grep: invalid match pattern: %s\n" |
|
|
7055 | 6944 | msgstr "" |
|
|
7056 | 6945 | |
|
|
7057 | #, fuzzy | |
|
|
7058 | 6946 | msgid "show current repository heads or show branch heads" |
|
|
7059 | msgstr "" | |
|
|
7060 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7061 | "\n" | |
|
|
7062 | " With no arguments, show all repository head changesets.\n" | |
|
|
7063 | "\n" | |
|
|
7064 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7065 | " changesets. They are where development generally takes place and\n" | |
|
|
7066 | " are the usual targets for update and merge operations.\n" | |
|
|
7067 | "\n" | |
|
|
7068 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7069 | " the named branch associated with that revision. The name of the\n" | |
|
|
7070 | " branch is called the revision's branch tag.\n" | |
|
|
7071 | "\n" | |
|
|
7072 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7073 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7074 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7075 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7076 | " is considered inactive.\n" | |
|
|
7077 | "\n" | |
|
|
7078 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7079 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7080 | " " | |
|
|
7081 | ||
|
|
7082 | #, fuzzy | |
|
|
7083 | msgid " With no arguments, show all repository head changesets." | |
|
|
7084 | msgstr "" | |
|
|
7085 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7086 | "\n" | |
|
|
7087 | " With no arguments, show all repository head changesets.\n" | |
|
|
7088 | "\n" | |
|
|
7089 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7090 | " changesets. They are where development generally takes place and\n" | |
|
|
7091 | " are the usual targets for update and merge operations.\n" | |
|
|
7092 | "\n" | |
|
|
7093 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7094 | " the named branch associated with that revision. The name of the\n" | |
|
|
7095 | " branch is called the revision's branch tag.\n" | |
|
|
7096 | "\n" | |
|
|
7097 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7098 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7099 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7100 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7101 | " is considered inactive.\n" | |
|
|
7102 | "\n" | |
|
|
7103 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7104 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7105 | " " | |
|
|
7106 | ||
|
|
7107 | #, fuzzy | |
|
|
6947 | msgstr "顯示目前的 repository heads 或是 branch heads" | |
|
|
6948 | ||
|
|
6949 | msgid " With no arguments, show all repository branch heads." | |
|
|
6950 | msgstr "" | |
|
|
6951 | ||
|
|
7108 | 6952 | msgid "" |
|
|
7109 | 6953 | " Repository \"heads\" are changesets with no child changesets. They are\n" |
|
|
7110 | 6954 | " where development generally takes place and are the usual targets\n" |
|
|
7111 | " for update and merge operations." | |
|
|
7112 | msgstr "" | |
|
|
7113 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7114 | "\n" | |
|
|
7115 | " With no arguments, show all repository head changesets.\n" | |
|
|
7116 | "\n" | |
|
|
7117 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7118 | " changesets. They are where development generally takes place and\n" | |
|
|
7119 | " are the usual targets for update and merge operations.\n" | |
|
|
7120 | "\n" | |
|
|
7121 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7122 | " the named branch associated with that revision. The name of the\n" | |
|
|
7123 | " branch is called the revision's branch tag.\n" | |
|
|
7124 | "\n" | |
|
|
7125 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7126 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7127 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7128 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7129 | " is considered inactive.\n" | |
|
|
7130 | "\n" | |
|
|
7131 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7132 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7133 | " " | |
|
|
7134 | ||
|
|
7135 | #, fuzzy | |
|
|
7136 | msgid "" | |
|
|
7137 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7138 | " the named branch associated with the specified changeset(s)." | |
|
|
7139 | msgstr "" | |
|
|
7140 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7141 | "\n" | |
|
|
7142 | " With no arguments, show all repository head changesets.\n" | |
|
|
7143 | "\n" | |
|
|
7144 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7145 | " changesets. They are where development generally takes place and\n" | |
|
|
7146 | " are the usual targets for update and merge operations.\n" | |
|
|
7147 | "\n" | |
|
|
7148 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7149 | " the named branch associated with that revision. The name of the\n" | |
|
|
7150 | " branch is called the revision's branch tag.\n" | |
|
|
7151 | "\n" | |
|
|
7152 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7153 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7154 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7155 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7156 | " is considered inactive.\n" | |
|
|
7157 | "\n" | |
|
|
7158 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7159 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7160 | " " | |
|
|
7161 | ||
|
|
7162 | #, fuzzy | |
|
|
7163 | msgid "" | |
|
|
7164 | " Branch heads are changesets on a named branch with no descendants on\n" | |
|
|
7165 | " the same branch. A branch head could be a \"true\" (repository) head,\n" | |
|
|
7166 | " or it could be the last changeset on that branch before it was\n" | |
|
|
7167 | " merged into another branch, or it could be the last changeset on the\n" | |
|
|
7168 | " branch before a new branch was created. If none of the branch heads\n" | |
|
|
7169 | " are true heads, the branch is considered inactive." | |
|
|
7170 | msgstr "" | |
|
|
7171 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7172 | "\n" | |
|
|
7173 | " With no arguments, show all repository head changesets.\n" | |
|
|
7174 | "\n" | |
|
|
7175 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7176 | " changesets. They are where development generally takes place and\n" | |
|
|
7177 | " are the usual targets for update and merge operations.\n" | |
|
|
7178 | "\n" | |
|
|
7179 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7180 | " the named branch associated with that revision. The name of the\n" | |
|
|
7181 | " branch is called the revision's branch tag.\n" | |
|
|
7182 | "\n" | |
|
|
7183 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7184 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7185 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7186 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7187 | " is considered inactive.\n" | |
|
|
7188 | "\n" | |
|
|
7189 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7190 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7191 | " " | |
|
|
7192 | ||
|
|
7193 | #, fuzzy | |
|
|
6955 | " for update and merge operations. Branch heads are changesets that have\n" | |
|
|
6956 | " no child changeset on the same branch." | |
|
|
6957 | msgstr "" | |
|
|
6958 | ||
|
|
6959 | msgid "" | |
|
|
6960 | " If one or more REVs are given, only branch heads on the branches\n" | |
|
|
6961 | " associated with the specified changesets are shown." | |
|
|
6962 | msgstr "" | |
|
|
6963 | ||
|
|
7194 | 6964 | msgid "" |
|
|
7195 | 6965 | " If -c/--closed is specified, also show branch heads marked closed\n" |
|
|
7196 |
" (see |
|
|
|
7197 | msgstr "" | |
|
|
7198 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7199 | "\n" | |
|
|
7200 | " With no arguments, show all repository head changesets.\n" | |
|
|
7201 | "\n" | |
|
|
7202 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7203 | " changesets. They are where development generally takes place and\n" | |
|
|
7204 | " are the usual targets for update and merge operations.\n" | |
|
|
7205 | "\n" | |
|
|
7206 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7207 | " the named branch associated with that revision. The name of the\n" | |
|
|
7208 | " branch is called the revision's branch tag.\n" | |
|
|
7209 | "\n" | |
|
|
7210 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7211 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7212 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7213 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7214 | " is considered inactive.\n" | |
|
|
7215 | "\n" | |
|
|
7216 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7217 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7218 | " " | |
|
|
7219 | ||
|
|
7220 | #, fuzzy | |
|
|
6966 | " (see :hg:`commit --close-branch`)." | |
|
|
6967 | msgstr "" | |
|
|
6968 | ||
|
|
7221 | 6969 | msgid "" |
|
|
7222 | 6970 | " If STARTREV is specified, only those heads that are descendants of\n" |
|
|
7223 |
" STARTREV will be displayed. |
|
|
|
6971 | " STARTREV will be displayed." | |
|
|
6972 | msgstr "" | |
|
|
6973 | ||
|
|
6974 | msgid "" | |
|
|
6975 | " If -t/--topo is specified, named branch mechanics will be ignored and " | |
|
|
6976 | "only\n" | |
|
|
6977 | " changesets without children will be shown." | |
|
|
6978 | msgstr "" | |
|
|
6979 | ||
|
|
6980 | msgid "" | |
|
|
6981 | " Returns 0 if matching heads are found, 1 if not.\n" | |
|
|
7224 | 6982 | " " |
|
|
7225 | 6983 | msgstr "" |
|
|
7226 | "顯示目前的 repository heads 或是 branch heads\n" | |
|
|
7227 | "\n" | |
|
|
7228 | " With no arguments, show all repository head changesets.\n" | |
|
|
7229 | "\n" | |
|
|
7230 | " Repository \"heads\" are changesets that don't have child\n" | |
|
|
7231 | " changesets. They are where development generally takes place and\n" | |
|
|
7232 | " are the usual targets for update and merge operations.\n" | |
|
|
7233 | "\n" | |
|
|
7234 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
|
7235 | " the named branch associated with that revision. The name of the\n" | |
|
|
7236 | " branch is called the revision's branch tag.\n" | |
|
|
7237 | "\n" | |
|
|
7238 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
|
7239 | " any children on the same branch. A branch head could be a true head\n" | |
|
|
7240 | " or it could be the last changeset on a branch before a new branch\n" | |
|
|
7241 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
|
7242 | " is considered inactive.\n" | |
|
|
7243 | "\n" | |
|
|
7244 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
|
7245 | " are descendants of STARTREV will be displayed.\n" | |
|
|
7246 | " " | |
|
|
7247 | ||
|
|
7248 | msgid "you must specify a branch to use --closed" | |
|
|
7249 | msgstr "" | |
|
|
7250 | ||
|
|
7251 | #, python-format | |
|
|
7252 | msgid "no open branch heads on branch %s\n" | |
|
|
7253 | msgstr "" | |
|
|
7254 | ||
|
|
7255 | #, python-format | |
|
|
7256 | msgid "no changes on branch %s containing %s are reachable from %s\n" | |
|
|
7257 | msgstr "" | |
|
|
7258 | ||
|
|
7259 | #, python-format | |
|
|
7260 | msgid "no changes on branch %s are reachable from %s\n" | |
|
|
7261 | msgstr "" | |
|
|
6984 | ||
|
|
6985 | #, python-format | |
|
|
6986 | msgid "no open branch heads found on branches %s" | |
|
|
6987 | msgstr "" | |
|
|
6988 | ||
|
|
6989 | #, python-format | |
|
|
6990 | msgid " (started at %s)" | |
|
|
6991 | msgstr "(開始在: %s)" | |
|
|
7262 | 6992 | |
|
|
7263 | 6993 | msgid "show help for a given topic or a help overview" |
|
|
7264 | 6994 | msgstr "顯示特定主題的 help 說明或是 help overview" |
|
|
7265 | 6995 | |
|
|
7266 | msgid " With no arguments, print a list of commands with short help messages." | |
|
|
7267 |
|
|
|
|
6996 | msgid "" | |
|
|
6997 | " With no arguments, print a list of commands with short help messages." | |
|
|
6998 | msgstr "" | |
|
|
7268 | 6999 | |
|
|
7269 | 7000 | msgid "" |
|
|
7270 | 7001 | " Given a topic, extension, or command name, print help for that\n" |
|
|
7271 | 7002 | " topic." |
|
|
7272 | 7003 | msgstr "" |
|
|
7273 | " Given a topic, extension, or command name, print help for that\n" | |
|
|
7274 | " topic." | |
|
|
7004 | ||
|
|
7005 | msgid "" | |
|
|
7006 | " Returns 0 if successful.\n" | |
|
|
7007 | " " | |
|
|
7008 | msgstr "" | |
|
|
7275 | 7009 | |
|
|
7276 | 7010 | msgid "global options:" |
|
|
7277 | 7011 | msgstr "全域選項:" |
|
|
7278 | 7012 | |
|
|
7279 | 7013 | msgid "use \"hg help\" for the full list of commands" |
|
|
7280 | msgstr "" | |
|
|
7014 | msgstr "使用 'hg help' 列出全部的命令" | |
|
|
7281 | 7015 | |
|
|
7282 | 7016 | msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" |
|
|
7283 | msgstr "" | |
|
|
7017 | msgstr "使用 'hg help' 列出全部的命令或 'hg -v'列出詳細資料" | |
|
|
7284 | 7018 | |
|
|
7285 | 7019 | #, python-format |
|
|
7286 | 7020 | msgid "use \"hg -v help%s\" to show aliases and global options" |
| @@ -7304,25 +7038,49 b' msgstr ""' | |||
|
|
7304 | 7038 | msgid "(no help text available)" |
|
|
7305 | 7039 | msgstr "(沒有可用的說明文字)" |
|
|
7306 | 7040 | |
|
|
7041 | #, python-format | |
|
|
7042 | msgid "shell alias for::" | |
|
|
7043 | msgstr "" | |
|
|
7044 | ||
|
|
7045 | #, python-format | |
|
|
7046 | msgid " %s" | |
|
|
7047 | msgstr "" | |
|
|
7048 | ||
|
|
7049 | #, python-format | |
|
|
7050 | msgid "alias for: hg %s" | |
|
|
7051 | msgstr "別名: hg %s" | |
|
|
7052 | ||
|
|
7053 | #, python-format | |
|
|
7054 | msgid "%s" | |
|
|
7055 | msgstr "" | |
|
|
7056 | ||
|
|
7057 | #, python-format | |
|
|
7058 | msgid "" | |
|
|
7059 | "\n" | |
|
|
7060 | "use \"hg -v help %s\" to show verbose help\n" | |
|
|
7061 | msgstr "" | |
|
|
7062 | "\n" | |
|
|
7063 | "使用 \"hg -v help %s\" 以顯示全域選項\n" | |
|
|
7064 | ||
|
|
7307 | 7065 | msgid "options:\n" |
|
|
7308 | 7066 | msgstr "選項:\n" |
|
|
7309 | 7067 | |
|
|
7310 | 7068 | msgid "no commands defined\n" |
|
|
7311 | 7069 | msgstr "沒有定義的命令\n" |
|
|
7312 | 7070 | |
|
|
7313 | #, fuzzy | |
|
|
7314 | msgid "enabled extensions:" | |
|
|
7315 | msgstr "" | |
|
|
7316 | "\n" | |
|
|
7317 | "已啟用的擴充套件:\n" | |
|
|
7318 | "\n" | |
|
|
7319 | ||
|
|
7320 | 7071 | msgid "no help text available" |
|
|
7321 | 7072 | msgstr "沒有可用的說明文字" |
|
|
7322 | 7073 | |
|
|
7323 |
#, |
|
|
|
7074 | #, python-format | |
|
|
7324 | 7075 | msgid "%s extension - %s" |
|
|
7325 |
msgstr "%s 擴充套件 - %s |
|
|
|
7076 | msgstr "%s 擴充套件 - %s" | |
|
|
7077 | ||
|
|
7078 | msgid "use \"hg help extensions\" for information on enabling extensions\n" | |
|
|
7079 | msgstr "" | |
|
|
7080 | ||
|
|
7081 | #, python-format | |
|
|
7082 | msgid "'%s' is provided by the following extension:" | |
|
|
7083 | msgstr "" | |
|
|
7326 | 7084 | |
|
|
7327 | 7085 | msgid "Mercurial Distributed SCM\n" |
|
|
7328 | 7086 | msgstr "Mercurial 分散式版本控制系統\n" |
| @@ -7330,6 +7088,22 b' msgstr "Mercurial \xe5\x88\x86\xe6\x95\xa3\xe5\xbc\x8f\xe7\x89\x88\xe6\x9c\xac\xe6\x8e\xa7\xe5\x88\xb6\xe7\xb3\xbb\xe7\xb5\xb1\\n"' | |||
|
|
7330 | 7088 | msgid "basic commands:" |
|
|
7331 | 7089 | msgstr "基本命令:" |
|
|
7332 | 7090 | |
|
|
7091 | msgid "enabled extensions:" | |
|
|
7092 | msgstr "已啟用的擴充套件:" | |
|
|
7093 | ||
|
|
7094 | msgid "VALUE" | |
|
|
7095 | msgstr "" | |
|
|
7096 | ||
|
|
7097 | msgid "DEPRECATED" | |
|
|
7098 | msgstr "" | |
|
|
7099 | ||
|
|
7100 | msgid "" | |
|
|
7101 | "\n" | |
|
|
7102 | "[+] marked option can be specified multiple times" | |
|
|
7103 | msgstr "" | |
|
|
7104 | "\n" | |
|
|
7105 | "有標記 [+] 的參數,可以表述多次" | |
|
|
7106 | ||
|
|
7333 | 7107 | msgid "" |
|
|
7334 | 7108 | "\n" |
|
|
7335 | 7109 | "additional help topics:" |
| @@ -7338,52 +7112,38 b' msgstr ""' | |||
|
|
7338 | 7112 | "額外的說明主題:" |
|
|
7339 | 7113 | |
|
|
7340 | 7114 | msgid "identify the working copy or specified revision" |
|
|
7341 | msgstr "識別 working copy 或指定的 revision 完整性" | |
|
|
7115 | msgstr "識別工作副本或描述的修定版" | |
|
|
7342 | 7116 | |
|
|
7343 | 7117 | msgid "" |
|
|
7344 | 7118 | " With no revision, print a summary of the current state of the\n" |
|
|
7345 | 7119 | " repository." |
|
|
7346 | 7120 | msgstr "" |
|
|
7347 | " With no revision, print a summary of the current state of the\n" | |
|
|
7348 | " repository." | |
|
|
7349 | 7121 | |
|
|
7350 | 7122 | msgid "" |
|
|
7351 | 7123 | " Specifying a path to a repository root or Mercurial bundle will\n" |
|
|
7352 | 7124 | " cause lookup to operate on that repository/bundle." |
|
|
7353 | 7125 | msgstr "" |
|
|
7354 | " Specifying a path to a repository root or Mercurial bundle will\n" | |
|
|
7355 | " cause lookup to operate on that repository/bundle." | |
|
|
7356 | 7126 | |
|
|
7357 | 7127 | msgid "" |
|
|
7358 | 7128 | " This summary identifies the repository state using one or two\n" |
|
|
7359 | 7129 | " parent hash identifiers, followed by a \"+\" if there are\n" |
|
|
7360 | 7130 | " uncommitted changes in the working directory, a list of tags for\n" |
|
|
7361 |
" this revision and a branch name for non-default branches. |
|
|
|
7362 | " " | |
|
|
7363 | msgstr "" | |
|
|
7364 | " This summary identifies the repository state using one or two\n" | |
|
|
7365 | " parent hash identifiers, followed by a \"+\" if there are\n" | |
|
|
7366 | " uncommitted changes in the working directory, a list of tags for\n" | |
|
|
7367 | " this revision and a branch name for non-default branches.\n" | |
|
|
7368 | " " | |
|
|
7369 | ||
|
|
7370 | #, fuzzy | |
|
|
7131 | " this revision and a branch name for non-default branches." | |
|
|
7132 | msgstr "" | |
|
|
7133 | ||
|
|
7371 | 7134 | msgid "import an ordered set of patches" |
|
|
7372 | 7135 | msgstr "import 一組有順序的 patches" |
|
|
7373 | 7136 | |
|
|
7374 | #, fuzzy | |
|
|
7375 |
|
|
|
|
7376 | msgstr " Import a list of patches and commit them individually." | |
|
|
7377 | ||
|
|
7378 | #, fuzzy | |
|
|
7137 | msgid "" | |
|
|
7138 | " Import a list of patches and commit them individually (unless\n" | |
|
|
7139 | " --no-commit is specified)." | |
|
|
7140 | msgstr "" | |
|
|
7141 | ||
|
|
7379 | 7142 | msgid "" |
|
|
7380 | 7143 | " If there are outstanding changes in the working directory, import\n" |
|
|
7381 | 7144 | " will abort unless given the -f/--force flag." |
|
|
7382 | 7145 | msgstr "" |
|
|
7383 | " If there are outstanding changes in the working directory, import\n" | |
|
|
7384 | " will abort unless given the -f/--force flag." | |
|
|
7385 | ||
|
|
7386 | #, fuzzy | |
|
|
7146 | ||
|
|
7387 | 7147 | msgid "" |
|
|
7388 | 7148 | " You can import a patch straight from a mail message. Even patches\n" |
|
|
7389 | 7149 | " as attachments work (to use the body part, it must have type\n" |
| @@ -7392,26 +7152,14 b' msgid ""' | |||
|
|
7392 | 7152 | " text/plain body parts before first diff are added to commit\n" |
|
|
7393 | 7153 | " message." |
|
|
7394 | 7154 | msgstr "" |
|
|
7395 | " You can import a patch straight from a mail message. Even patches\n" | |
|
|
7396 | " as attachments work (to use the body part, it must have type\n" | |
|
|
7397 | " text/plain or text/x-patch). From and Subject headers of email\n" | |
|
|
7398 | " message are used as default committer and commit message. All\n" | |
|
|
7399 | " text/plain body parts before first diff are added to commit\n" | |
|
|
7400 | " message." | |
|
|
7401 | ||
|
|
7402 | #, fuzzy | |
|
|
7403 | msgid "" | |
|
|
7404 | " If the imported patch was generated by hg export, user and\n" | |
|
|
7155 | ||
|
|
7156 | msgid "" | |
|
|
7157 | " If the imported patch was generated by :hg:`export`, user and\n" | |
|
|
7405 | 7158 | " description from patch override values from message headers and\n" |
|
|
7406 | 7159 | " body. Values given on command line with -m/--message and -u/--user\n" |
|
|
7407 | 7160 | " override these." |
|
|
7408 | 7161 | msgstr "" |
|
|
7409 | " If the imported patch was generated by hg export, user and\n" | |
|
|
7410 | " description from patch override values from message headers and\n" | |
|
|
7411 | " body. Values given on command line with -m/--message and -u/--user\n" | |
|
|
7412 | " override these." | |
|
|
7413 | ||
|
|
7414 | #, fuzzy | |
|
|
7162 | ||
|
|
7415 | 7163 | msgid "" |
|
|
7416 | 7164 | " If --exact is specified, import will set the working directory to\n" |
|
|
7417 | 7165 | " the parent of each patch before applying it, and will abort if the\n" |
| @@ -7419,36 +7167,20 b' msgid ""' | |||
|
|
7419 | 7167 | " the patch. This may happen due to character set problems or other\n" |
|
|
7420 | 7168 | " deficiencies in the text patch format." |
|
|
7421 | 7169 | msgstr "" |
|
|
7422 | " If --exact is specified, import will set the working directory to\n" | |
|
|
7423 | " the parent of each patch before applying it, and will abort if the\n" | |
|
|
7424 | " resulting changeset has a different ID than the one recorded in\n" | |
|
|
7425 | " the patch. This may happen due to character set problems or other\n" | |
|
|
7426 | " deficiencies in the text patch format." | |
|
|
7427 | ||
|
|
7428 | #, fuzzy | |
|
|
7170 | ||
|
|
7429 | 7171 | msgid "" |
|
|
7430 | 7172 | " With -s/--similarity, hg will attempt to discover renames and\n" |
|
|
7431 | 7173 | " copies in the patch in the same way as 'addremove'." |
|
|
7432 | 7174 | msgstr "" |
|
|
7433 | " With -s/--similarity, hg will attempt to discover renames and\n" | |
|
|
7434 | " copies in the patch in the same way as 'addremove'." | |
|
|
7435 | ||
|
|
7436 | #, fuzzy | |
|
|
7175 | ||
|
|
7437 | 7176 | msgid "" |
|
|
7438 | 7177 | " To read a patch from standard input, use \"-\" as the patch name. If\n" |
|
|
7439 | 7178 | " a URL is specified, the patch will be downloaded from it.\n" |
|
|
7440 |
" See |
|
|
|
7441 | " " | |
|
|
7442 | msgstr "" | |
|
|
7443 | " To read a patch from standard input, use \"-\" as the patch name.\n" | |
|
|
7444 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
|
|
7445 | " " | |
|
|
7446 | ||
|
|
7447 | msgid "applying patch from stdin\n" | |
|
|
7448 | msgstr "" | |
|
|
7449 | ||
|
|
7450 | msgid "no diffs found" | |
|
|
7451 | msgstr "" | |
|
|
7179 | " See :hg:`help dates` for a list of formats valid for -d/--date." | |
|
|
7180 | msgstr "" | |
|
|
7181 | ||
|
|
7182 | msgid "to working directory" | |
|
|
7183 | msgstr "到工作目錄" | |
|
|
7452 | 7184 | |
|
|
7453 | 7185 | msgid "not a Mercurial patch" |
|
|
7454 | 7186 | msgstr "" |
| @@ -7456,6 +7188,16 b' msgstr ""' | |||
|
|
7456 | 7188 | msgid "patch is damaged or loses information" |
|
|
7457 | 7189 | msgstr "" |
|
|
7458 | 7190 | |
|
|
7191 | msgid "applying patch from stdin\n" | |
|
|
7192 | msgstr "" | |
|
|
7193 | ||
|
|
7194 | #, python-format | |
|
|
7195 | msgid "applied %s\n" | |
|
|
7196 | msgstr "" | |
|
|
7197 | ||
|
|
7198 | msgid "no diffs found" | |
|
|
7199 | msgstr "" | |
|
|
7200 | ||
|
|
7459 | 7201 | msgid "show new changesets found in source" |
|
|
7460 | 7202 | msgstr "顯示來源端新的 changesets" |
|
|
7461 | 7203 | |
| @@ -7464,23 +7206,22 b' msgid ""' | |||
|
|
7464 | 7206 | " pull location. These are the changesets that would have been pulled\n" |
|
|
7465 | 7207 | " if a pull at the time you issued this command." |
|
|
7466 | 7208 | msgstr "" |
|
|
7467 | " Show new changesets found in the specified path/URL or the default\n" | |
|
|
7468 | " pull location. These are the changesets that would have been pulled\n" | |
|
|
7469 | " if a pull at the time you issued this command." | |
|
|
7470 | 7209 | |
|
|
7471 | 7210 | msgid "" |
|
|
7472 | 7211 | " For remote repository, using --bundle avoids downloading the\n" |
|
|
7473 | 7212 | " changesets twice if the incoming is followed by a pull." |
|
|
7474 | 7213 | msgstr "" |
|
|
7475 | " For remote repository, using --bundle avoids downloading the\n" | |
|
|
7476 | " changesets twice if the incoming is followed by a pull." | |
|
|
7477 | ||
|
|
7478 | msgid "" | |
|
|
7479 | " See pull for valid source format details.\n" | |
|
|
7214 | ||
|
|
7215 | msgid " See pull for valid source format details." | |
|
|
7216 | msgstr "" | |
|
|
7217 | ||
|
|
7218 | msgid "" | |
|
|
7219 | " Returns 0 if there are incoming changes, 1 otherwise.\n" | |
|
|
7480 | 7220 | " " |
|
|
7481 | 7221 | msgstr "" |
|
|
7482 | " See pull for valid source format details.\n" | |
|
|
7483 | " " | |
|
|
7222 | ||
|
|
7223 | msgid "cannot combine --bundle and --subrepos" | |
|
|
7224 | msgstr "" | |
|
|
7484 | 7225 | |
|
|
7485 | 7226 | msgid "create a new repository in the given directory" |
|
|
7486 | 7227 | msgstr "於指定的目錄建立新的 repository" |
| @@ -7489,20 +7230,14 b' msgid ""' | |||
|
|
7489 | 7230 | " Initialize a new repository in the given directory. If the given\n" |
|
|
7490 | 7231 | " directory does not exist, it will be created." |
|
|
7491 | 7232 | msgstr "" |
|
|
7492 | " Initialize a new repository in the given directory. If the given\n" | |
|
|
7493 | " directory does not exist, it will be created." | |
|
|
7494 | 7233 | |
|
|
7495 | 7234 | msgid " If no directory is given, the current directory is used." |
|
|
7496 | msgstr " If no directory is given, the current directory is used." | |
|
|
7497 | ||
|
|
7498 | msgid "" | |
|
|
7499 | " It is possible to specify an ssh:// URL as the destination.\n" | |
|
|
7500 |
" See |
|
|
|
7501 | " " | |
|
|
7502 | msgstr "" | |
|
|
7503 | " It is possible to specify an ssh:// URL as the destination.\n" | |
|
|
7504 | " See 'hg help urls' for more information.\n" | |
|
|
7505 | " " | |
|
|
7235 | msgstr "" | |
|
|
7236 | ||
|
|
7237 | msgid "" | |
|
|
7238 | " It is possible to specify an ``ssh://`` URL as the destination.\n" | |
|
|
7239 | " See :hg:`help urls` for more information." | |
|
|
7240 | msgstr "" | |
|
|
7506 | 7241 | |
|
|
7507 | 7242 | msgid "locate files matching specific patterns" |
|
|
7508 | 7243 | msgstr "找出符合指定樣式的檔案" |
| @@ -7511,47 +7246,32 b' msgid ""' | |||
|
|
7511 | 7246 | " Print files under Mercurial control in the working directory whose\n" |
|
|
7512 | 7247 | " names match the given patterns." |
|
|
7513 | 7248 | msgstr "" |
|
|
7514 | " Print files under Mercurial control in the working directory whose\n" | |
|
|
7515 | " names match the given patterns." | |
|
|
7516 | 7249 | |
|
|
7517 | 7250 | msgid "" |
|
|
7518 | 7251 | " By default, this command searches all directories in the working\n" |
|
|
7519 | 7252 | " directory. To search just the current directory and its\n" |
|
|
7520 | 7253 | " subdirectories, use \"--include .\"." |
|
|
7521 | 7254 | msgstr "" |
|
|
7522 | " By default, this command searches all directories in the working\n" | |
|
|
7523 | " directory. To search just the current directory and its\n" | |
|
|
7524 | " subdirectories, use \"--include .\"." | |
|
|
7525 | 7255 | |
|
|
7526 | 7256 | msgid "" |
|
|
7527 | 7257 | " If no patterns are given to match, this command prints the names\n" |
|
|
7528 | 7258 | " of all files under Mercurial control in the working directory." |
|
|
7529 | 7259 | msgstr "" |
|
|
7530 | " If no patterns are given to match, this command prints the names\n" | |
|
|
7531 | " of all files under Mercurial control in the working directory." | |
|
|
7532 | 7260 | |
|
|
7533 | 7261 | msgid "" |
|
|
7534 | 7262 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
|
7535 | 7263 | " command, use the -0 option to both this command and \"xargs\". This\n" |
|
|
7536 | 7264 | " will avoid the problem of \"xargs\" treating single filenames that\n" |
|
|
7537 |
" contain whitespace as multiple filenames. |
|
|
|
7538 | " " | |
|
|
7539 | msgstr "" | |
|
|
7540 | " If you want to feed the output of this command into the \"xargs\"\n" | |
|
|
7541 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
|
|
7542 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
|
|
7543 | " contain whitespace as multiple filenames.\n" | |
|
|
7544 | " " | |
|
|
7265 | " contain whitespace as multiple filenames." | |
|
|
7266 | msgstr "" | |
|
|
7545 | 7267 | |
|
|
7546 | 7268 | msgid "show revision history of entire repository or files" |
|
|
7547 | msgstr "顯示整個 repository 或特定檔案的 revision history" | |
|
|
7269 | msgstr "" | |
|
|
7548 | 7270 | |
|
|
7549 | 7271 | msgid "" |
|
|
7550 | 7272 | " Print the revision history of the specified files or the entire\n" |
|
|
7551 | 7273 | " project." |
|
|
7552 | 7274 | msgstr "" |
|
|
7553 | " Print the revision history of the specified files or the entire\n" | |
|
|
7554 | " project." | |
|
|
7555 | 7275 | |
|
|
7556 | 7276 | msgid "" |
|
|
7557 | 7277 | " File history is shown without following rename or copy history of\n" |
| @@ -7560,20 +7280,13 b' msgid ""' | |||
|
|
7560 | 7280 | " ancestors or descendants of the starting revision. --follow-first\n" |
|
|
7561 | 7281 | " only follows the first parent of merge revisions." |
|
|
7562 | 7282 | msgstr "" |
|
|
7563 | " File history is shown without following rename or copy history of\n" | |
|
|
7564 | " files. Use -f/--follow with a filename to follow history across\n" | |
|
|
7565 | " renames and copies. --follow without a filename will only show\n" | |
|
|
7566 | " ancestors or descendants of the starting revision. --follow-first\n" | |
|
|
7567 | " only follows the first parent of merge revisions." | |
|
|
7568 | ||
|
|
7569 | msgid "" | |
|
|
7570 | " If no revision range is specified, the default is tip:0 unless\n" | |
|
|
7283 | ||
|
|
7284 | msgid "" | |
|
|
7285 | " If no revision range is specified, the default is ``tip:0`` unless\n" | |
|
|
7571 | 7286 | " --follow is set, in which case the working directory parent is\n" |
|
|
7572 | " used as the starting revision." | |
|
|
7573 | msgstr "" | |
|
|
7574 | " If no revision range is specified, the default is tip:0 unless\n" | |
|
|
7575 | " --follow is set, in which case the working directory parent is\n" | |
|
|
7576 | " used as the starting revision." | |
|
|
7287 | " used as the starting revision. You can specify a revision set for\n" | |
|
|
7288 | " log, see :hg:`help revsets` for more information." | |
|
|
7289 | msgstr "" | |
|
|
7577 | 7290 | |
|
|
7578 | 7291 | msgid "" |
|
|
7579 | 7292 | " By default this command prints revision number and changeset id,\n" |
| @@ -7581,54 +7294,36 b' msgid ""' | |||
|
|
7581 | 7294 | " each commit. When the -v/--verbose switch is used, the list of\n" |
|
|
7582 | 7295 | " changed files and full commit message are shown." |
|
|
7583 | 7296 | msgstr "" |
|
|
7584 | " By default this command prints revision number and changeset id,\n" | |
|
|
7585 | " tags, non-trivial parents, user, date and time, and a summary for\n" | |
|
|
7586 | " each commit. When the -v/--verbose switch is used, the list of\n" | |
|
|
7587 | " changed files and full commit message are shown." | |
|
|
7588 | ||
|
|
7589 | msgid "" | |
|
|
7590 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
|
|
7591 | " changesets, as it will only compare the merge changeset against\n" | |
|
|
7592 | " its first parent. Also, only files different from BOTH parents\n" | |
|
|
7593 | " will appear in files:.\n" | |
|
|
7594 | " " | |
|
|
7595 | msgstr "" | |
|
|
7596 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
|
|
7597 | " changesets, as it will only compare the merge changeset against\n" | |
|
|
7598 | " its first parent. Also, only files different from BOTH parents\n" | |
|
|
7599 | " will appear in files:.\n" | |
|
|
7600 | " " | |
|
|
7297 | ||
|
|
7298 | msgid "" | |
|
|
7299 | " .. note::\n" | |
|
|
7300 | " log -p/--patch may generate unexpected diff output for merge\n" | |
|
|
7301 | " changesets, as it will only compare the merge changeset against\n" | |
|
|
7302 | " its first parent. Also, only files different from BOTH parents\n" | |
|
|
7303 | " will appear in files:." | |
|
|
7304 | msgstr "" | |
|
|
7601 | 7305 | |
|
|
7602 | 7306 | msgid "output the current or given revision of the project manifest" |
|
|
7603 | msgstr "輸出 project manifest 目前或指定的 revision" | |
|
|
7307 | msgstr "" | |
|
|
7604 | 7308 | |
|
|
7605 | 7309 | msgid "" |
|
|
7606 | 7310 | " Print a list of version controlled files for the given revision.\n" |
|
|
7607 | 7311 | " If no revision is given, the first parent of the working directory\n" |
|
|
7608 | 7312 | " is used, or the null revision if no revision is checked out." |
|
|
7609 | 7313 | msgstr "" |
|
|
7610 | " Print a list of version controlled files for the given revision.\n" | |
|
|
7611 | " If no revision is given, the first parent of the working directory\n" | |
|
|
7612 | " is used, or the null revision if no revision is checked out." | |
|
|
7613 | 7314 | |
|
|
7614 | 7315 | msgid "" |
|
|
7615 | 7316 | " With -v, print file permissions, symlink and executable bits.\n" |
|
|
7616 |
" With --debug, print file revision hashes. |
|
|
|
7617 | " " | |
|
|
7618 | msgstr "" | |
|
|
7619 | " With -v, print file permissions, symlink and executable bits.\n" | |
|
|
7620 | " With --debug, print file revision hashes.\n" | |
|
|
7621 | " " | |
|
|
7317 | " With --debug, print file revision hashes." | |
|
|
7318 | msgstr "" | |
|
|
7622 | 7319 | |
|
|
7623 | 7320 | msgid "merge working directory with another revision" |
|
|
7624 | msgstr "將 working directory 與其他的 revision 合併" | |
|
|
7321 | msgstr "將工作目錄與其他的修定版合併" | |
|
|
7625 | 7322 | |
|
|
7626 | 7323 | msgid "" |
|
|
7627 | 7324 | " The current working directory is updated with all changes made in\n" |
|
|
7628 | 7325 | " the requested revision since the last common predecessor revision." |
|
|
7629 | 7326 | msgstr "" |
|
|
7630 | " The current working directory is updated with all changes made in\n" | |
|
|
7631 | " the requested revision since the last common predecessor revision." | |
|
|
7632 | 7327 | |
|
|
7633 | 7328 | msgid "" |
|
|
7634 | 7329 | " Files that changed between either parent are marked as changed for\n" |
| @@ -7636,30 +7331,44 b' msgid ""' | |||
|
|
7636 | 7331 | " updates to the repository are allowed. The next commit will have\n" |
|
|
7637 | 7332 | " two parents." |
|
|
7638 | 7333 | msgstr "" |
|
|
7639 | " Files that changed between either parent are marked as changed for\n" | |
|
|
7640 | " the next commit and a commit must be performed before any further\n" | |
|
|
7641 | " updates to the repository are allowed. The next commit will have\n" | |
|
|
7642 | " two parents." | |
|
|
7334 | ||
|
|
7335 | msgid "" | |
|
|
7336 | " ``--tool`` can be used to specify the merge tool used for file\n" | |
|
|
7337 | " merges. It overrides the HGMERGE environment variable and your\n" | |
|
|
7338 | " configuration files." | |
|
|
7339 | msgstr "" | |
|
|
7643 | 7340 | |
|
|
7644 | 7341 | msgid "" |
|
|
7645 | 7342 | " If no revision is specified, the working directory's parent is a\n" |
|
|
7646 | 7343 | " head revision, and the current branch contains exactly one other\n" |
|
|
7647 | 7344 | " head, the other head is merged with by default. Otherwise, an\n" |
|
|
7648 |
" explicit revision with which to merge with must be provided. |
|
|
|
7649 | " " | |
|
|
7650 | msgstr "" | |
|
|
7651 | " If no revision is specified, the working directory's parent is a\n" | |
|
|
7652 | " head revision, and the current branch contains exactly one other\n" | |
|
|
7653 | " head, the other head is merged with by default. Otherwise, an\n" | |
|
|
7654 | " explicit revision with which to merge with must be provided.\n" | |
|
|
7345 | " explicit revision with which to merge with must be provided." | |
|
|
7346 | msgstr "" | |
|
|
7347 | ||
|
|
7348 | msgid " :hg:`resolve` must be used to resolve unresolved files." | |
|
|
7349 | msgstr "hg `resolve`必須使用在解決未解決的檔案." | |
|
|
7350 | ||
|
|
7351 | msgid "" | |
|
|
7352 | " To undo an uncommitted merge, use :hg:`update --clean .` which\n" | |
|
|
7353 | " will check out a clean copy of the original merge parent, losing\n" | |
|
|
7354 | " all changes." | |
|
|
7355 | msgstr "" | |
|
|
7356 | ||
|
|
7357 | msgid "" | |
|
|
7358 | " Returns 0 on success, 1 if there are unresolved files.\n" | |
|
|
7655 | 7359 | " " |
|
|
7656 | ||
|
|
7657 | #, python-format | |
|
|
7658 | msgid "branch '%s' has %d heads - please merge with an explicit rev" | |
|
|
7659 |
msg |
|
|
|
7660 | ||
|
|
7661 | #, python-format | |
|
|
7662 | msgid "branch '%s' has one head - please merge with an explicit rev" | |
|
|
7360 | msgstr "" | |
|
|
7361 | ||
|
|
7362 | #, python-format | |
|
|
7363 | msgid "" | |
|
|
7364 | "branch '%s' has %d heads - please merge with an explicit rev\n" | |
|
|
7365 | "(run 'hg heads .' to see heads)" | |
|
|
7366 | msgstr "" | |
|
|
7367 | ||
|
|
7368 | #, python-format | |
|
|
7369 | msgid "" | |
|
|
7370 | "branch '%s' has one head - please merge with an explicit rev\n" | |
|
|
7371 | "(run 'hg heads' to see all heads)" | |
|
|
7663 | 7372 | msgstr "" |
|
|
7664 | 7373 | |
|
|
7665 | 7374 | msgid "there is nothing to merge" |
| @@ -7669,45 +7378,38 b' msgstr ""' | |||
|
|
7669 | 7378 | msgid "%s - use \"hg update\" instead" |
|
|
7670 | 7379 | msgstr "" |
|
|
7671 | 7380 | |
|
|
7672 | msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" | |
|
|
7673 | msgstr "" | |
|
|
7674 | ||
|
|
7675 | msgid "show changesets not found in destination" | |
|
|
7676 | msgstr "顯示目的端沒有的 changesets" | |
|
|
7381 | msgid "" | |
|
|
7382 | "working dir not at a head rev - use \"hg update\" or merge with an explicit " | |
|
|
7383 | "rev" | |
|
|
7384 | msgstr "" | |
|
|
7385 | ||
|
|
7386 | msgid "show changesets not found in the destination" | |
|
|
7387 | msgstr "" | |
|
|
7677 | 7388 | |
|
|
7678 | 7389 | msgid "" |
|
|
7679 | 7390 | " Show changesets not found in the specified destination repository\n" |
|
|
7680 | 7391 | " or the default push location. These are the changesets that would\n" |
|
|
7681 | 7392 | " be pushed if a push was requested." |
|
|
7682 | 7393 | msgstr "" |
|
|
7683 | " Show changesets not found in the specified destination repository\n" | |
|
|
7684 | " or the default push location. These are the changesets that would\n" | |
|
|
7685 | " be pushed if a push was requested." | |
|
|
7686 | ||
|
|
7687 | msgid "" | |
|
|
7688 | " See pull for valid destination format details.\n" | |
|
|
7394 | ||
|
|
7395 | msgid " See pull for details of valid destination formats." | |
|
|
7396 | msgstr "" | |
|
|
7397 | ||
|
|
7398 | msgid "" | |
|
|
7399 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" | |
|
|
7689 | 7400 | " " |
|
|
7690 | 7401 | msgstr "" |
|
|
7691 | " See pull for valid destination format details.\n" | |
|
|
7692 | " " | |
|
|
7693 | 7402 | |
|
|
7694 | 7403 | msgid "show the parents of the working directory or revision" |
|
|
7695 | msgstr "顯示 working directory 或特定 revision 的 parents" | |
|
|
7404 | msgstr "顯示工作目錄或修定版的母系" | |
|
|
7696 | 7405 | |
|
|
7697 | 7406 | msgid "" |
|
|
7698 | 7407 | " Print the working directory's parent revisions. If a revision is\n" |
|
|
7699 | 7408 | " given via -r/--rev, the parent of that revision will be printed.\n" |
|
|
7700 | 7409 | " If a file argument is given, the revision in which the file was\n" |
|
|
7701 | 7410 | " last changed (before the working directory revision or the\n" |
|
|
7702 |
" argument to --rev if given) is printed. |
|
|
|
7703 | " " | |
|
|
7704 | msgstr "" | |
|
|
7705 | " Print the working directory's parent revisions. If a revision is\n" | |
|
|
7706 | " given via -r/--rev, the parent of that revision will be printed.\n" | |
|
|
7707 | " If a file argument is given, the revision in which the file was\n" | |
|
|
7708 | " last changed (before the working directory revision or the\n" | |
|
|
7709 | " argument to --rev if given) is printed.\n" | |
|
|
7710 | " " | |
|
|
7411 | " argument to --rev if given) is printed." | |
|
|
7412 | msgstr "" | |
|
|
7711 | 7413 | |
|
|
7712 | 7414 | msgid "can only specify an explicit filename" |
|
|
7713 | 7415 | msgstr "" |
| @@ -7723,22 +7425,28 b' msgid ""' | |||
|
|
7723 | 7425 | " Show definition of symbolic path name NAME. If no name is given,\n" |
|
|
7724 | 7426 | " show definition of all available names." |
|
|
7725 | 7427 | msgstr "" |
|
|
7726 | " Show definition of symbolic path name NAME. If no name is given,\n" | |
|
|
7727 | " show definition of all available names." | |
|
|
7728 | ||
|
|
7729 | msgid "" | |
|
|
7730 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" | |
|
|
7731 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." | |
|
|
7732 | msgstr "" | |
|
|
7733 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" | |
|
|
7734 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." | |
|
|
7735 | ||
|
|
7736 | msgid "" | |
|
|
7737 | " See 'hg help urls' for more information.\n" | |
|
|
7738 | " " | |
|
|
7739 | msgstr "" | |
|
|
7740 | " See 'hg help urls' for more information.\n" | |
|
|
7741 | " " | |
|
|
7428 | ||
|
|
7429 | msgid "" | |
|
|
7430 | " Path names are defined in the [paths] section of your\n" | |
|
|
7431 | " configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n" | |
|
|
7432 | " repository, ``.hg/hgrc`` is used, too." | |
|
|
7433 | msgstr "" | |
|
|
7434 | ||
|
|
7435 | msgid "" | |
|
|
7436 | " The path names ``default`` and ``default-push`` have a special\n" | |
|
|
7437 | " meaning. When performing a push or pull operation, they are used\n" | |
|
|
7438 | " as fallbacks if no location is specified on the command-line.\n" | |
|
|
7439 | " When ``default-push`` is set, it will be used for push and\n" | |
|
|
7440 | " ``default`` will be used for pull; otherwise ``default`` is used\n" | |
|
|
7441 | " as the fallback for both. When cloning a repository, the clone\n" | |
|
|
7442 | " source is written as ``default`` in ``.hg/hgrc``. Note that\n" | |
|
|
7443 | " ``default`` and ``default-push`` apply to all inbound (e.g.\n" | |
|
|
7444 | " :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" | |
|
|
7445 | " :hg:`bundle`) operations." | |
|
|
7446 | msgstr "" | |
|
|
7447 | ||
|
|
7448 | msgid " See :hg:`help urls` for more information." | |
|
|
7449 | msgstr "\tSee 'hg help urls' for more information." | |
|
|
7742 | 7450 | |
|
|
7743 | 7451 | msgid "not found!\n" |
|
|
7744 | 7452 | msgstr "沒有找到！\n" |
| @@ -7753,7 +7461,7 b' msgid "(run \'hg update\' to get a working' | |||
|
|
7753 | 7461 | msgstr "(執行 'hg update' 來取得 working copy)\n" |
|
|
7754 | 7462 | |
|
|
7755 | 7463 | msgid "pull changes from the specified source" |
|
|
7756 |
msgstr " |
|
|
|
7464 | msgstr "拉收指定來源端的變更" | |
|
|
7757 | 7465 | |
|
|
7758 | 7466 | msgid " Pull changes from a remote repository to a local one." |
|
|
7759 | 7467 | msgstr " Pull changes from a remote repository to a local one." |
| @@ -7764,79 +7472,74 b' msgid ""' | |||
|
|
7764 | 7472 | " -R is specified). By default, this does not update the copy of the\n" |
|
|
7765 | 7473 | " project in the working directory." |
|
|
7766 | 7474 | msgstr "" |
|
|
7767 | " This finds all changes from the repository at the specified path\n" | |
|
|
7768 | " or URL and adds them to a local repository (the current one unless\n" | |
|
|
7769 | " -R is specified). By default, this does not update the copy of the\n" | |
|
|
7770 | " project in the working directory." | |
|
|
7771 | ||
|
|
7772 | msgid "" | |
|
|
7773 | " Use hg incoming if you want to see what would have been added by a\n" | |
|
|
7774 | " pull at the time you issued this command. If you then decide to\n" | |
|
|
7775 | " added those changes to the repository, you should use pull -r X\n" | |
|
|
7776 | " where X is the last changeset listed by hg incoming." | |
|
|
7777 | msgstr "" | |
|
|
7778 | " Use hg incoming if you want to see what would have been added by a\n" | |
|
|
7779 | " pull at the time you issued this command. If you then decide to\n" | |
|
|
7780 | " added those changes to the repository, you should use pull -r X\n" | |
|
|
7781 | " where X is the last changeset listed by hg incoming." | |
|
|
7475 | ||
|
|
7476 | msgid "" | |
|
|
7477 | " Use :hg:`incoming` if you want to see what would have been added\n" | |
|
|
7478 | " by a pull at the time you issued this command. If you then decide\n" | |
|
|
7479 | " to add those changes to the repository, you should use :hg:`pull\n" | |
|
|
7480 | " -r X` where ``X`` is the last changeset listed by :hg:`incoming`." | |
|
|
7481 | msgstr "" | |
|
|
7782 | 7482 | |
|
|
7783 | 7483 | msgid "" |
|
|
7784 | 7484 | " If SOURCE is omitted, the 'default' path will be used.\n" |
|
|
7785 |
" See |
|
|
|
7485 | " See :hg:`help urls` for more information." | |
|
|
7486 | msgstr "" | |
|
|
7487 | ||
|
|
7488 | msgid "" | |
|
|
7489 | " Returns 0 on success, 1 if an update had unresolved files.\n" | |
|
|
7786 | 7490 | " " |
|
|
7787 | 7491 | msgstr "" |
|
|
7788 | " If SOURCE is omitted, the 'default' path will be used.\n" | |
|
|
7789 | " See 'hg help urls' for more information.\n" | |
|
|
7790 | " " | |
|
|
7791 | ||
|
|
7792 | #, fuzzy | |
|
|
7492 | ||
|
|
7493 | msgid "" | |
|
|
7494 | "other repository doesn't support revision lookup, so a rev cannot be " | |
|
|
7495 | "specified." | |
|
|
7496 | msgstr "" | |
|
|
7497 | ||
|
|
7793 | 7498 | msgid "push changes to the specified destination" |
|
|
7794 |
msgstr "將 |
|
|
|
7795 | ||
|
|
7796 | #, fuzzy | |
|
|
7797 |
|
|
|
|
7798 | msgstr " Push changes from the local repository to the given destination." | |
|
|
7799 | ||
|
|
7800 | #, fuzzy | |
|
|
7801 | msgid "" | |
|
|
7802 | " This is the symmetrical operation for pull. It moves changes from\n" | |
|
|
7803 | " the current repository to a different one. If the destination is\n" | |
|
|
7804 | " local this is identical to a pull in that directory from the\n" | |
|
|
7805 | " current one." | |
|
|
7806 |
msg |
|
|
|
7807 | " This is the symmetrical operation for pull. It moves changes from\n" | |
|
|
7808 | " the current repository to a different one. If the destination is\n" | |
|
|
7809 | " local this is identical to a pull in that directory from the\n" | |
|
|
7810 | " current one." | |
|
|
7811 | ||
|
|
7812 | #, fuzzy | |
|
|
7813 | msgid "" | |
|
|
7814 | " By default, push will refuse to run if it detects the result would\n" | |
|
|
7815 | " increase the number of remote heads. This generally indicates the\n" | |
|
|
7816 | " user forgot to pull and merge before pushing." | |
|
|
7817 | msgstr "" | |
|
|
7818 | " By default, push will refuse to run if it detects the result would\n" | |
|
|
7819 | " increase the number of remote heads. This generally indicates the\n" | |
|
|
7820 | " user forgot to pull and merge before pushing." | |
|
|
7821 | ||
|
|
7822 | #, fuzzy | |
|
|
7823 | msgid "" | |
|
|
7824 | " If -r/--rev is used, the named revision and all its ancestors will\n" | |
|
|
7825 | " be pushed to the remote repository." | |
|
|
7826 | msgstr "" | |
|
|
7827 | " If -r/--rev is used, the named revision and all its ancestors will\n" | |
|
|
7828 | " be pushed to the remote repository." | |
|
|
7829 | ||
|
|
7830 | #, fuzzy | |
|
|
7831 | msgid "" | |
|
|
7832 | " Please see 'hg help urls' for important details about ssh://\n" | |
|
|
7833 | " URLs. If DESTINATION is omitted, a default path will be used.\n" | |
|
|
7499 | msgstr "將變更推送到至指定的目的端" | |
|
|
7500 | ||
|
|
7501 | msgid "" | |
|
|
7502 | " Push changesets from the local repository to the specified\n" | |
|
|
7503 | " destination." | |
|
|
7504 | msgstr "" | |
|
|
7505 | ||
|
|
7506 | msgid "" | |
|
|
7507 | " This operation is symmetrical to pull: it is identical to a pull\n" | |
|
|
7508 | " in the destination repository from the current one." | |
|
|
7509 | msgstr "" | |
|
|
7510 | ||
|
|
7511 | msgid "" | |
|
|
7512 | " By default, push will not allow creation of new heads at the\n" | |
|
|
7513 | " destination, since multiple heads would make it unclear which head\n" | |
|
|
7514 | " to use. In this situation, it is recommended to pull and merge\n" | |
|
|
7515 | " before pushing." | |
|
|
7516 | msgstr "" | |
|
|
7517 | ||
|
|
7518 | msgid "" | |
|
|
7519 | " Use --new-branch if you want to allow push to create a new named\n" | |
|
|
7520 | " branch that is not present at the destination. This allows you to\n" | |
|
|
7521 | " only create a new branch without forcing other changes." | |
|
|
7522 | msgstr "" | |
|
|
7523 | ||
|
|
7524 | msgid "" | |
|
|
7525 | " Use -f/--force to override the default behavior and push all\n" | |
|
|
7526 | " changesets on all branches." | |
|
|
7527 | msgstr "" | |
|
|
7528 | ||
|
|
7529 | msgid "" | |
|
|
7530 | " If -r/--rev is used, the specified revision and all its ancestors\n" | |
|
|
7531 | " will be pushed to the remote repository." | |
|
|
7532 | msgstr "" | |
|
|
7533 | ||
|
|
7534 | msgid "" | |
|
|
7535 | " Please see :hg:`help urls` for important details about ``ssh://``\n" | |
|
|
7536 | " URLs. If DESTINATION is omitted, a default path will be used." | |
|
|
7537 | msgstr "" | |
|
|
7538 | ||
|
|
7539 | msgid "" | |
|
|
7540 | " Returns 0 if push was successful, 1 if nothing to push.\n" | |
|
|
7834 | 7541 | " " |
|
|
7835 | 7542 | msgstr "" |
|
|
7836 | " Please see 'hg help urls' for important details about ssh://\n" | |
|
|
7837 | " URLs. If DESTINATION is omitted, a default path will be used.\n" | |
|
|
7838 | " See 'hg help urls' for more information.\n" | |
|
|
7839 | " " | |
|
|
7840 | 7543 | |
|
|
7841 | 7544 | #, python-format |
|
|
7842 | 7545 | msgid "pushing to %s\n" |
| @@ -7846,28 +7549,25 b' msgid "roll back an interrupted transact' | |||
|
|
7846 | 7549 | msgstr "roll back 一個被中斷的 transaction" |
|
|
7847 | 7550 | |
|
|
7848 | 7551 | msgid " Recover from an interrupted commit or pull." |
|
|
7849 | msgstr " Recover from an interrupted commit or pull." | |
|
|
7552 | msgstr "" | |
|
|
7850 | 7553 | |
|
|
7851 | 7554 | msgid "" |
|
|
7852 | 7555 | " This command tries to fix the repository status after an\n" |
|
|
7853 | 7556 | " interrupted operation. It should only be necessary when Mercurial\n" |
|
|
7854 |
" suggests it. |
|
|
|
7557 | " suggests it." | |
|
|
7558 | msgstr "" | |
|
|
7559 | ||
|
|
7560 | msgid "" | |
|
|
7561 | " Returns 0 if successful, 1 if nothing to recover or verify fails.\n" | |
|
|
7855 | 7562 | " " |
|
|
7856 | 7563 | msgstr "" |
|
|
7857 | " This command tries to fix the repository status after an\n" | |
|
|
7858 | " interrupted operation. It should only be necessary when Mercurial\n" | |
|
|
7859 | " suggests it.\n" | |
|
|
7860 | " " | |
|
|
7861 | ||
|
|
7862 | #, fuzzy | |
|
|
7564 | ||
|
|
7863 | 7565 | msgid "remove the specified files on the next commit" |
|
|
7864 | 7566 | msgstr "移除下次要 commit 的檔案" |
|
|
7865 | 7567 | |
|
|
7866 | #, fuzzy | |
|
|
7867 | 7568 | msgid " Schedule the indicated files for removal from the repository." |
|
|
7868 | msgstr " Schedule the indicated files for removal from the repository." | |
|
|
7869 | ||
|
|
7870 | #, fuzzy | |
|
|
7569 | msgstr "" | |
|
|
7570 | ||
|
|
7871 | 7571 | msgid "" |
|
|
7872 | 7572 | " This only removes files from the current branch, not from the\n" |
|
|
7873 | 7573 | " entire project history. -A/--after can be used to remove only\n" |
| @@ -7875,27 +7575,15 b' msgid ""' | |||
|
|
7875 | 7575 | " force deletion, and -Af can be used to remove files from the next\n" |
|
|
7876 | 7576 | " revision without deleting them from the working directory." |
|
|
7877 | 7577 | msgstr "" |
|
|
7878 | " This only removes files from the current branch, not from the\n" | |
|
|
7879 | " entire project history. -A/--after can be used to remove only\n" | |
|
|
7880 | " files that have already been deleted, -f/--force can be used to\n" | |
|
|
7881 | " force deletion, and -Af can be used to remove files from the next\n" | |
|
|
7882 | " revision without deleting them from the working directory." | |
|
|
7883 | ||
|
|
7884 | #, fuzzy | |
|
|
7578 | ||
|
|
7885 | 7579 | msgid "" |
|
|
7886 | 7580 | " The following table details the behavior of remove for different\n" |
|
|
7887 | 7581 | " file states (columns) and option combinations (rows). The file\n" |
|
|
7888 | 7582 | " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" |
|
|
7889 |
" reported by |
|
|
|
7890 | " and Delete (from disk)::" | |
|
|
7891 | msgstr "" | |
|
|
7892 | " The following table details the behavior of remove for different\n" | |
|
|
7893 | " file states (columns) and option combinations (rows). The file\n" | |
|
|
7894 | " states are Added [A], Clean [C], Modified [M] and Missing [!]\n" | |
|
|
7895 | " (as reported by hg status). The actions are Warn, Remove (from\n" | |
|
|
7896 | " branch) and Delete (from disk)." | |
|
|
7897 | ||
|
|
7898 | #, fuzzy | |
|
|
7583 | " reported by :hg:`status`). The actions are Warn, Remove (from\n" | |
|
|
7584 | " branch) and Delete (from disk)::" | |
|
|
7585 | msgstr "" | |
|
|
7586 | ||
|
|
7899 | 7587 | msgid "" |
|
|
7900 | 7588 | " A C M !\n" |
|
|
7901 | 7589 | " none W RD W R\n" |
| @@ -7903,37 +7591,32 b' msgid ""' | |||
|
|
7903 | 7591 | " -A W W W R\n" |
|
|
7904 | 7592 | " -Af R R R R" |
|
|
7905 | 7593 | msgstr "" |
|
|
7906 | " A C M !\n" | |
|
|
7907 | " none W RD W R\n" | |
|
|
7908 | " -f R RD RD R\n" | |
|
|
7909 | " -A W W W R\n" | |
|
|
7910 | " -Af R R R R" | |
|
|
7911 | ||
|
|
7912 | #, fuzzy | |
|
|
7594 | ||
|
|
7913 | 7595 | msgid "" |
|
|
7914 | 7596 | " This command schedules the files to be removed at the next commit.\n" |
|
|
7915 |
" To undo a remove before that, see |
|
|
|
7597 | " To undo a remove before that, see :hg:`revert`." | |
|
|
7598 | msgstr "" | |
|
|
7599 | ||
|
|
7600 | msgid "" | |
|
|
7601 | " Returns 0 on success, 1 if any warnings encountered.\n" | |
|
|
7916 | 7602 | " " |
|
|
7917 | 7603 | msgstr "" |
|
|
7918 | " This command schedules the files to be removed at the next commit.\n" | |
|
|
7919 | " To undo a remove before that, see hg revert.\n" | |
|
|
7920 | " " | |
|
|
7921 | 7604 | |
|
|
7922 | 7605 | #, python-format |
|
|
7923 | 7606 | msgid "not removing %s: file is untracked\n" |
|
|
7924 | 7607 | msgstr "" |
|
|
7925 | 7608 | |
|
|
7926 | 7609 | #, python-format |
|
|
7927 |
msgid "not removing %s: file |
|
|
|
7928 | msgstr "" | |
|
|
7929 | ||
|
|
7930 | msgid "still exists" | |
|
|
7931 | msgstr "" | |
|
|
7932 | ||
|
|
7933 | msgid "is modified" | |
|
|
7934 | msgstr "" | |
|
|
7935 | ||
|
|
7936 | msgid "has been marked for add" | |
|
|
7610 | msgid "not removing %s: file still exists (use -f to force removal)\n" | |
|
|
7611 | msgstr "" | |
|
|
7612 | ||
|
|
7613 | #, python-format | |
|
|
7614 | msgid "not removing %s: file is modified (use -f to force removal)\n" | |
|
|
7615 | msgstr "" | |
|
|
7616 | ||
|
|
7617 | #, python-format | |
|
|
7618 | msgid "" | |
|
|
7619 | "not removing %s: file has been marked for add (use -f to force removal)\n" | |
|
|
7937 | 7620 | msgstr "" |
|
|
7938 | 7621 | |
|
|
7939 | 7622 | msgid "rename files; equivalent of copy + remove" |
| @@ -7944,162 +7627,63 b' msgid ""' | |||
|
|
7944 | 7627 | " is a directory, copies are put in that directory. If dest is a\n" |
|
|
7945 | 7628 | " file, there can only be one source." |
|
|
7946 | 7629 | msgstr "" |
|
|
7947 | " Mark dest as copies of sources; mark sources for deletion. If dest\n" | |
|
|
7948 | " is a directory, copies are put in that directory. If dest is a\n" | |
|
|
7949 | " file, there can only be one source." | |
|
|
7950 | 7630 | |
|
|
7951 | 7631 | msgid "" |
|
|
7952 | 7632 | " This command takes effect at the next commit. To undo a rename\n" |
|
|
7953 |
" before that, see |
|
|
|
7954 | " " | |
|
|
7955 | msgstr "" | |
|
|
7956 | " This command takes effect at the next commit. To undo a rename\n" | |
|
|
7957 | " before that, see hg revert.\n" | |
|
|
7958 | " " | |
|
|
7959 | ||
|
|
7960 | #, fuzzy | |
|
|
7961 | msgid "retry file merges from a merge or update" | |
|
|
7962 | msgstr "" | |
|
|
7963 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
7964 | "\n" | |
|
|
7965 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
7966 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
7967 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
7968 | "\n" | |
|
|
7969 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
7970 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
7971 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
7972 | "\n" | |
|
|
7973 | " This command also allows listing resolved files and manually\n" | |
|
|
7974 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
7975 | " marked as resolved before a commit is permitted.\n" | |
|
|
7976 | "\n" | |
|
|
7977 | " The codes used to show the status of files are:\n" | |
|
|
7978 | " U = unresolved\n" | |
|
|
7979 | " R = resolved\n" | |
|
|
7980 | " " | |
|
|
7981 | ||
|
|
7982 | #, fuzzy | |
|
|
7983 | msgid "" | |
|
|
7984 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
7985 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
7986 | " resolve all unresolved files, use the -a/--all switch." | |
|
|
7987 |
msg |
|
|
|
7988 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
7989 | "\n" | |
|
|
7990 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
7991 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
7992 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
7993 | "\n" | |
|
|
7994 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
7995 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
7996 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
7997 | "\n" | |
|
|
7998 | " This command also allows listing resolved files and manually\n" | |
|
|
7999 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8000 | " marked as resolved before a commit is permitted.\n" | |
|
|
8001 | "\n" | |
|
|
8002 | " The codes used to show the status of files are:\n" | |
|
|
8003 | " U = unresolved\n" | |
|
|
8004 | " R = resolved\n" | |
|
|
7633 | " before that, see :hg:`revert`." | |
|
|
7634 | msgstr "" | |
|
|
7635 | ||
|
|
7636 | msgid "redo merges or set/view the merge status of files" | |
|
|
7637 | msgstr "redo合併 或是 設定/觀看 檔案的合併狀況" | |
|
|
7638 | ||
|
|
7639 | msgid "" | |
|
|
7640 | " Merges with unresolved conflicts are often the result of\n" | |
|
|
7641 | " non-interactive merging using the ``internal:merge`` configuration\n" | |
|
|
7642 | " setting, or a command-line merge tool like ``diff3``. The resolve\n" | |
|
|
7643 | " command is used to manage the files involved in a merge, after\n" | |
|
|
7644 | " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" | |
|
|
7645 | " working directory must have two parents)." | |
|
|
7646 | msgstr "" | |
|
|
7647 | ||
|
|
7648 | msgid " The resolve command can be used in the following ways:" | |
|
|
7649 | msgstr "" | |
|
|
7650 | ||
|
|
7651 | msgid "" | |
|
|
7652 | " - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the " | |
|
|
7653 | "specified\n" | |
|
|
7654 | " files, discarding any previous merge attempts. Re-merging is not\n" | |
|
|
7655 | " performed for files already marked as resolved. Use ``--all/-a``\n" | |
|
|
7656 | " to selects all unresolved files. ``--tool`` can be used to specify\n" | |
|
|
7657 | " the merge tool used for the given files. It overrides the HGMERGE\n" | |
|
|
7658 | " environment variable and your configuration files." | |
|
|
7659 | msgstr "" | |
|
|
7660 | ||
|
|
7661 | msgid "" | |
|
|
7662 | " - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n" | |
|
|
7663 | " (e.g. after having manually fixed-up the files). The default is\n" | |
|
|
7664 | " to mark all unresolved files." | |
|
|
7665 | msgstr "" | |
|
|
7666 | ||
|
|
7667 | msgid "" | |
|
|
7668 | " - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n" | |
|
|
7669 | " default is to mark all resolved files." | |
|
|
7670 | msgstr "" | |
|
|
7671 | ||
|
|
7672 | msgid "" | |
|
|
7673 | " - :hg:`resolve -l`: list files which had or still have conflicts.\n" | |
|
|
7674 | " In the printed list, ``U`` = unresolved and ``R`` = resolved." | |
|
|
7675 | msgstr "" | |
|
|
7676 | ||
|
|
7677 | msgid "" | |
|
|
7678 | " Note that Mercurial will not let you commit files with unresolved\n" | |
|
|
7679 | " merge conflicts. You must use :hg:`resolve -m ...` before you can\n" | |
|
|
7680 | " commit after a conflicting merge." | |
|
|
7681 | msgstr "" | |
|
|
7682 | ||
|
|
7683 | msgid "" | |
|
|
7684 | " Returns 0 on success, 1 if any files fail a resolve attempt.\n" | |
|
|
8005 | 7685 | " " |
|
|
8006 | ||
|
|
8007 | #, fuzzy | |
|
|
8008 | msgid "" | |
|
|
8009 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
8010 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
8011 | " -m/--mark switch should be used to mark the file as resolved." | |
|
|
8012 | msgstr "" | |
|
|
8013 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
8014 | "\n" | |
|
|
8015 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
8016 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
8017 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
8018 | "\n" | |
|
|
8019 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
8020 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
8021 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
8022 | "\n" | |
|
|
8023 | " This command also allows listing resolved files and manually\n" | |
|
|
8024 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8025 | " marked as resolved before a commit is permitted.\n" | |
|
|
8026 | "\n" | |
|
|
8027 | " The codes used to show the status of files are:\n" | |
|
|
8028 | " U = unresolved\n" | |
|
|
8029 | " R = resolved\n" | |
|
|
8030 | " " | |
|
|
8031 | ||
|
|
8032 | #, fuzzy | |
|
|
8033 | msgid "" | |
|
|
8034 | " This command also allows listing resolved files and manually\n" | |
|
|
8035 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8036 | " marked as resolved before a commit is permitted." | |
|
|
8037 | msgstr "" | |
|
|
8038 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
8039 | "\n" | |
|
|
8040 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
8041 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
8042 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
8043 | "\n" | |
|
|
8044 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
8045 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
8046 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
8047 | "\n" | |
|
|
8048 | " This command also allows listing resolved files and manually\n" | |
|
|
8049 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8050 | " marked as resolved before a commit is permitted.\n" | |
|
|
8051 | "\n" | |
|
|
8052 | " The codes used to show the status of files are:\n" | |
|
|
8053 | " U = unresolved\n" | |
|
|
8054 | " R = resolved\n" | |
|
|
8055 | " " | |
|
|
8056 | ||
|
|
8057 | #, fuzzy | |
|
|
8058 | msgid " The codes used to show the status of files are::" | |
|
|
8059 | msgstr "" | |
|
|
8060 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
8061 | "\n" | |
|
|
8062 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
8063 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
8064 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
8065 | "\n" | |
|
|
8066 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
8067 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
8068 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
8069 | "\n" | |
|
|
8070 | " This command also allows listing resolved files and manually\n" | |
|
|
8071 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8072 | " marked as resolved before a commit is permitted.\n" | |
|
|
8073 | "\n" | |
|
|
8074 | " The codes used to show the status of files are:\n" | |
|
|
8075 | " U = unresolved\n" | |
|
|
8076 | " R = resolved\n" | |
|
|
8077 | " " | |
|
|
8078 | ||
|
|
8079 | #, fuzzy | |
|
|
8080 | msgid "" | |
|
|
8081 | " U = unresolved\n" | |
|
|
8082 | " R = resolved\n" | |
|
|
8083 | " " | |
|
|
8084 | msgstr "" | |
|
|
8085 | "重試經由 merge 或 update 命令所造成、卻未完成的合併\n" | |
|
|
8086 | "\n" | |
|
|
8087 | " This command will cleanly retry unresolved file merges using file\n" | |
|
|
8088 | " revisions preserved from the last update or merge. To attempt to\n" | |
|
|
8089 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
|
8090 | "\n" | |
|
|
8091 | " If a conflict is resolved manually, please note that the changes\n" | |
|
|
8092 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
|
8093 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
|
8094 | "\n" | |
|
|
8095 | " This command also allows listing resolved files and manually\n" | |
|
|
8096 | " indicating whether or not files are resolved. All files must be\n" | |
|
|
8097 | " marked as resolved before a commit is permitted.\n" | |
|
|
8098 | "\n" | |
|
|
8099 | " The codes used to show the status of files are:\n" | |
|
|
8100 | " U = unresolved\n" | |
|
|
8101 | " R = resolved\n" | |
|
|
8102 | " " | |
|
|
7686 | msgstr "" | |
|
|
8103 | 7687 | |
|
|
8104 | 7688 | msgid "too many options specified" |
|
|
8105 | 7689 | msgstr "" |
| @@ -8114,37 +7698,30 b' msgid "restore individual files or direc' | |||
|
|
8114 | 7698 | msgstr "將特定的檔案或目錄回復成較早的狀態" |
|
|
8115 | 7699 | |
|
|
8116 | 7700 | msgid "" |
|
|
8117 | " (Use update -r to check out earlier revisions, revert does not\n" | |
|
|
8118 | " change the working directory parents.)" | |
|
|
8119 | msgstr "" | |
|
|
8120 | " (Use update -r to check out earlier revisions, revert does not\n" | |
|
|
8121 | " change the working directory parents.)" | |
|
|
7701 | " .. note::\n" | |
|
|
7702 | " This command is most likely not what you are looking for.\n" | |
|
|
7703 | " Revert will partially overwrite content in the working\n" | |
|
|
7704 | " directory without changing the working directory parents. Use\n" | |
|
|
7705 | " :hg:`update -r rev` to check out earlier revisions, or\n" | |
|
|
7706 | " :hg:`update --clean .` to undo a merge which has added another\n" | |
|
|
7707 | " parent." | |
|
|
7708 | msgstr "" | |
|
|
8122 | 7709 | |
|
|
8123 | 7710 | msgid "" |
|
|
8124 | 7711 | " With no revision specified, revert the named files or directories\n" |
|
|
8125 | 7712 | " to the contents they had in the parent of the working directory.\n" |
|
|
8126 | 7713 | " This restores the contents of the affected files to an unmodified\n" |
|
|
8127 | 7714 | " state and unschedules adds, removes, copies, and renames. If the\n" |
|
|
8128 |
" working directory has two parents, you must explicitly specify |
|
|
|
8129 |
" revision |
|
|
|
8130 | msgstr "" | |
|
|
8131 | " With no revision specified, revert the named files or directories\n" | |
|
|
8132 | " to the contents they had in the parent of the working directory.\n" | |
|
|
8133 | " This restores the contents of the affected files to an unmodified\n" | |
|
|
8134 | " state and unschedules adds, removes, copies, and renames. If the\n" | |
|
|
8135 | " working directory has two parents, you must explicitly specify the\n" | |
|
|
8136 | " revision to revert to." | |
|
|
7715 | " working directory has two parents, you must explicitly specify a\n" | |
|
|
7716 | " revision." | |
|
|
7717 | msgstr "" | |
|
|
8137 | 7718 | |
|
|
8138 | 7719 | msgid "" |
|
|
8139 | 7720 | " Using the -r/--rev option, revert the given files or directories\n" |
|
|
8140 | 7721 | " to their contents as of a specific revision. This can be helpful\n" |
|
|
8141 |
" to \"roll back\" some or all of an earlier change. See |
|
|
|
8142 |
" dates |
|
|
|
8143 | msgstr "" | |
|
|
8144 | " Using the -r/--rev option, revert the given files or directories\n" | |
|
|
8145 | " to their contents as of a specific revision. This can be helpful\n" | |
|
|
8146 | " to \"roll back\" some or all of an earlier change. See 'hg help\n" | |
|
|
8147 | " dates' for a list of formats valid for -d/--date." | |
|
|
7722 | " to \"roll back\" some or all of an earlier change. See :hg:`help\n" | |
|
|
7723 | " dates` for a list of formats valid for -d/--date." | |
|
|
7724 | msgstr "" | |
|
|
8148 | 7725 | |
|
|
8149 | 7726 | msgid "" |
|
|
8150 | 7727 | " Revert modifies the working directory. It does not commit any\n" |
| @@ -8153,34 +7730,21 b' msgid ""' | |||
|
|
8153 | 7730 | " directory, the reverted files will thus appear modified\n" |
|
|
8154 | 7731 | " afterwards." |
|
|
8155 | 7732 | msgstr "" |
|
|
8156 | " Revert modifies the working directory. It does not commit any\n" | |
|
|
8157 | " changes, or change the parent of the working directory. If you\n" | |
|
|
8158 | " revert to a revision other than the parent of the working\n" | |
|
|
8159 | " directory, the reverted files will thus appear modified\n" | |
|
|
8160 | " afterwards." | |
|
|
8161 | 7733 | |
|
|
8162 | 7734 | msgid "" |
|
|
8163 | 7735 | " If a file has been deleted, it is restored. If the executable mode\n" |
|
|
8164 | 7736 | " of a file was changed, it is reset." |
|
|
8165 | 7737 | msgstr "" |
|
|
8166 | " If a file has been deleted, it is restored. If the executable mode\n" | |
|
|
8167 | " of a file was changed, it is reset." | |
|
|
8168 | 7738 | |
|
|
8169 | 7739 | msgid "" |
|
|
8170 | 7740 | " If names are given, all files matching the names are reverted.\n" |
|
|
8171 | 7741 | " If no arguments are given, no files are reverted." |
|
|
8172 | 7742 | msgstr "" |
|
|
8173 | " If names are given, all files matching the names are reverted.\n" | |
|
|
8174 | " If no arguments are given, no files are reverted." | |
|
|
8175 | 7743 | |
|
|
8176 | 7744 | msgid "" |
|
|
8177 | 7745 | " Modified files are saved with a .orig suffix before reverting.\n" |
|
|
8178 |
" To disable these backups, use --no-backup. |
|
|
|
8179 | " " | |
|
|
8180 | msgstr "" | |
|
|
8181 | " Modified files are saved with a .orig suffix before reverting.\n" | |
|
|
8182 | " To disable these backups, use --no-backup.\n" | |
|
|
8183 | " " | |
|
|
7746 | " To disable these backups, use --no-backup." | |
|
|
7747 | msgstr "" | |
|
|
8184 | 7748 | |
|
|
8185 | 7749 | msgid "you can't specify a revision and a date" |
|
|
8186 | 7750 | msgstr "" |
| @@ -8194,7 +7758,7 b' msgstr ""' | |||
|
|
8194 | 7758 | |
|
|
8195 | 7759 | #, python-format |
|
|
8196 | 7760 | msgid "reverting %s\n" |
|
|
8197 | msgstr "" | |
|
|
7761 | msgstr "正在復原 %s\n" | |
|
|
8198 | 7762 | |
|
|
8199 | 7763 | #, python-format |
|
|
8200 | 7764 | msgid "undeleting %s\n" |
| @@ -8210,13 +7774,11 b' msgstr ""' | |||
|
|
8210 | 7774 | |
|
|
8211 | 7775 | #, python-format |
|
|
8212 | 7776 | msgid "no changes needed to %s\n" |
|
|
8213 | msgstr "" | |
|
|
8214 | ||
|
|
8215 | #, fuzzy | |
|
|
8216 |
msg |
|
|
|
8217 | msgstr "roll back 最後一次的 transaction" | |
|
|
8218 | ||
|
|
8219 | #, fuzzy | |
|
|
7777 | msgstr "沒有變更需要去 %s\n" | |
|
|
7778 | ||
|
|
7779 | msgid "roll back the last transaction (dangerous)" | |
|
|
7780 | msgstr "roll back 最後一次的 transaction(危險)" | |
|
|
7781 | ||
|
|
8220 | 7782 | msgid "" |
|
|
8221 | 7783 | " This command should be used with care. There is only one level of\n" |
|
|
8222 | 7784 | " rollback, and there is no way to undo a rollback. It will also\n" |
| @@ -8224,122 +7786,82 b' msgid ""' | |||
|
|
8224 | 7786 | " any dirstate changes since that time. This command does not alter\n" |
|
|
8225 | 7787 | " the working directory." |
|
|
8226 | 7788 | msgstr "" |
|
|
8227 | " This command should be used with care. There is only one level of\n" | |
|
|
8228 | " rollback, and there is no way to undo a rollback. It will also\n" | |
|
|
8229 | " restore the dirstate at the time of the last transaction, losing\n" | |
|
|
8230 | " any dirstate changes since that time." | |
|
|
8231 | ||
|
|
8232 | #, fuzzy | |
|
|
8233 | msgid "" | |
|
|
8234 | " Transactions are used to encapsulate the effects of all commands\n" | |
|
|
8235 | " that create new changesets or propagate existing changesets into a\n" | |
|
|
8236 | " repository. For example, the following commands are transactional,\n" | |
|
|
8237 | " and their effects can be rolled back::" | |
|
|
8238 | msgstr "" | |
|
|
7789 | ||
|
|
7790 | msgid "" | |
|
|
8239 | 7791 | " Transactions are used to encapsulate the effects of all commands\n" |
|
|
8240 | 7792 | " that create new changesets or propagate existing changesets into a\n" |
|
|
8241 | 7793 | " repository. For example, the following commands are transactional,\n" |
|
|
8242 | 7794 | " and their effects can be rolled back:" |
|
|
8243 | ||
|
|
8244 | #, fuzzy | |
|
|
8245 | msgid "" | |
|
|
8246 |
" |
|
|
|
8247 |
" |
|
|
|
8248 |
" |
|
|
|
8249 |
" |
|
|
|
8250 |
" |
|
|
|
8251 | msgstr "" | |
|
|
8252 | " commit\n" | |
|
|
8253 | " import\n" | |
|
|
8254 | " pull\n" | |
|
|
8255 | " push (with this repository as destination)\n" | |
|
|
8256 | " unbundle" | |
|
|
8257 | ||
|
|
8258 | #, fuzzy | |
|
|
7795 | msgstr "" | |
|
|
7796 | ||
|
|
7797 | msgid "" | |
|
|
7798 | " - commit\n" | |
|
|
7799 | " - import\n" | |
|
|
7800 | " - pull\n" | |
|
|
7801 | " - push (with this repository as the destination)\n" | |
|
|
7802 | " - unbundle" | |
|
|
7803 | msgstr "" | |
|
|
7804 | ||
|
|
8259 | 7805 | msgid "" |
|
|
8260 | 7806 | " This command is not intended for use on public repositories. Once\n" |
|
|
8261 | 7807 | " changes are visible for pull by other users, rolling a transaction\n" |
|
|
8262 | 7808 | " back locally is ineffective (someone else may already have pulled\n" |
|
|
8263 | 7809 | " the changes). Furthermore, a race is possible with readers of the\n" |
|
|
8264 | 7810 | " repository; for example an in-progress pull from the repository\n" |
|
|
8265 |
" may fail if a rollback is performed. |
|
|
|
7811 | " may fail if a rollback is performed." | |
|
|
7812 | msgstr "" | |
|
|
7813 | ||
|
|
7814 | msgid "" | |
|
|
7815 | " Returns 0 on success, 1 if no rollback data is available.\n" | |
|
|
8266 | 7816 | " " |
|
|
8267 | 7817 | msgstr "" |
|
|
8268 | " This command is not intended for use on public repositories. Once\n" | |
|
|
8269 | " changes are visible for pull by other users, rolling a transaction\n" | |
|
|
8270 | " back locally is ineffective (someone else may already have pulled\n" | |
|
|
8271 | " the changes). Furthermore, a race is possible with readers of the\n" | |
|
|
8272 | " repository; for example an in-progress pull from the repository\n" | |
|
|
8273 | " may fail if a rollback is performed.\n" | |
|
|
8274 | " " | |
|
|
8275 | 7818 | |
|
|
8276 | 7819 | msgid "print the root (top) of the current working directory" |
|
|
8277 | msgstr "顯示目前 working directory 的 root 目錄" | |
|
|
8278 | ||
|
|
8279 | msgid "" | |
|
|
8280 | " Print the root directory of the current repository.\n" | |
|
|
8281 | " " | |
|
|
8282 | msgstr "" | |
|
|
8283 | " Print the root directory of the current repository.\n" | |
|
|
8284 | " " | |
|
|
8285 | ||
|
|
8286 | msgid "export the repository via HTTP" | |
|
|
8287 | msgstr "將 repository 經由 HTTP 發佈" | |
|
|
8288 | ||
|
|
8289 | msgid " Start a local HTTP repository browser and pull server." | |
|
|
8290 | msgstr " Start a local HTTP repository browser and pull server." | |
|
|
7820 | msgstr "顯示目前工作目錄的 root(top)" | |
|
|
7821 | ||
|
|
7822 | msgid " Print the root directory of the current repository." | |
|
|
7823 | msgstr "顯示目前儲存庫的 root 目錄" | |
|
|
7824 | ||
|
|
7825 | msgid "start stand-alone webserver" | |
|
|
7826 | msgstr "啟動常駐web伺服器" | |
|
|
7827 | ||
|
|
7828 | msgid "" | |
|
|
7829 | " Start a local HTTP repository browser and pull server. You can use\n" | |
|
|
7830 | " this for ad-hoc sharing and browing of repositories. It is\n" | |
|
|
7831 | " recommended to use a real web server to serve a repository for\n" | |
|
|
7832 | " longer periods of time." | |
|
|
7833 | msgstr "" | |
|
|
7834 | ||
|
|
7835 | msgid "" | |
|
|
7836 | " Please note that the server does not implement access control.\n" | |
|
|
7837 | " This means that, by default, anybody can read from the server and\n" | |
|
|
7838 | " nobody can write to it by default. Set the ``web.allow_push``\n" | |
|
|
7839 | " option to ``*`` to allow everybody to push to the server. You\n" | |
|
|
7840 | " should use a real web server if you need to authenticate users." | |
|
|
7841 | msgstr "" | |
|
|
8291 | 7842 | |
|
|
8292 | 7843 | msgid "" |
|
|
8293 | 7844 | " By default, the server logs accesses to stdout and errors to\n" |
|
|
8294 | 7845 | " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" |
|
|
8295 |
" files. |
|
|
|
8296 | " " | |
|
|
8297 | msgstr "" | |
|
|
8298 | " By default, the server logs accesses to stdout and errors to\n" | |
|
|
8299 | " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" | |
|
|
8300 | " files.\n" | |
|
|
8301 | " " | |
|
|
7846 | " files." | |
|
|
7847 | msgstr "" | |
|
|
7848 | ||
|
|
7849 | msgid "" | |
|
|
7850 | " To have the server choose a free port number to listen on, specify\n" | |
|
|
7851 | " a port number of 0; in this case, the server will print the port\n" | |
|
|
7852 | " number it uses." | |
|
|
7853 | msgstr "" | |
|
|
7854 | ||
|
|
7855 | msgid "There is no Mercurial repository here (.hg not found)" | |
|
|
7856 | msgstr "這邊沒有Mercurial 儲存庫(找不到 .hg)" | |
|
|
8302 | 7857 | |
|
|
8303 | 7858 | #, python-format |
|
|
8304 | 7859 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
|
|
8305 | 7860 | msgstr "" |
|
|
8306 | 7861 | |
|
|
8307 | #, fuzzy | |
|
|
8308 | 7862 | msgid "show changed files in the working directory" |
|
|
8309 | msgstr "" | |
|
|
8310 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8311 | "\n" | |
|
|
8312 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8313 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8314 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8315 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8316 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8317 | " options -mardu are used.\n" | |
|
|
8318 | "\n" | |
|
|
8319 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8320 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8321 | "\n" | |
|
|
8322 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8323 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8324 | " report permission changes and diff only reports changes relative\n" | |
|
|
8325 | " to one merge parent.\n" | |
|
|
8326 | "\n" | |
|
|
8327 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8328 | " If two revisions are given, the differences between them are\n" | |
|
|
8329 | " shown.\n" | |
|
|
8330 | "\n" | |
|
|
8331 | " The codes used to show the status of files are:\n" | |
|
|
8332 | " M = modified\n" | |
|
|
8333 | " A = added\n" | |
|
|
8334 | " R = removed\n" | |
|
|
8335 | " C = clean\n" | |
|
|
8336 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8337 | " ? = not tracked\n" | |
|
|
8338 | " I = ignored\n" | |
|
|
8339 | " = origin of the previous file listed as A (added)\n" | |
|
|
8340 | " " | |
|
|
8341 | ||
|
|
8342 | #, fuzzy | |
|
|
7863 | msgstr "顯示工作目錄的狀態" | |
|
|
7864 | ||
|
|
8343 | 7865 | msgid "" |
|
|
8344 | 7866 | " Show status of files in the repository. If names are given, only\n" |
|
|
8345 | 7867 | " files that match are shown. Files that are clean or ignored or\n" |
| @@ -8348,153 +7870,30 b' msgid ""' | |||
|
|
8348 | 7870 | " Unless options described with \"show only ...\" are given, the\n" |
|
|
8349 | 7871 | " options -mardu are used." |
|
|
8350 | 7872 | msgstr "" |
|
|
8351 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8352 | "\n" | |
|
|
8353 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8354 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8355 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8356 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8357 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8358 | " options -mardu are used.\n" | |
|
|
8359 | "\n" | |
|
|
8360 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8361 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8362 | "\n" | |
|
|
8363 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8364 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8365 | " report permission changes and diff only reports changes relative\n" | |
|
|
8366 | " to one merge parent.\n" | |
|
|
8367 | "\n" | |
|
|
8368 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8369 | " If two revisions are given, the differences between them are\n" | |
|
|
8370 | " shown.\n" | |
|
|
8371 | "\n" | |
|
|
8372 | " The codes used to show the status of files are:\n" | |
|
|
8373 | " M = modified\n" | |
|
|
8374 | " A = added\n" | |
|
|
8375 | " R = removed\n" | |
|
|
8376 | " C = clean\n" | |
|
|
8377 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8378 | " ? = not tracked\n" | |
|
|
8379 | " I = ignored\n" | |
|
|
8380 | " = origin of the previous file listed as A (added)\n" | |
|
|
8381 | " " | |
|
|
8382 | ||
|
|
8383 | #, fuzzy | |
|
|
7873 | ||
|
|
8384 | 7874 | msgid "" |
|
|
8385 | 7875 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" |
|
|
8386 | 7876 | " unless explicitly requested with -u/--unknown or -i/--ignored." |
|
|
8387 | 7877 | msgstr "" |
|
|
8388 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8389 | "\n" | |
|
|
8390 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8391 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8392 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8393 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8394 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8395 | " options -mardu are used.\n" | |
|
|
8396 | "\n" | |
|
|
8397 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8398 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8399 | "\n" | |
|
|
8400 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8401 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8402 | " report permission changes and diff only reports changes relative\n" | |
|
|
8403 | " to one merge parent.\n" | |
|
|
8404 | "\n" | |
|
|
8405 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8406 | " If two revisions are given, the differences between them are\n" | |
|
|
8407 | " shown.\n" | |
|
|
8408 | "\n" | |
|
|
8409 | " The codes used to show the status of files are:\n" | |
|
|
8410 | " M = modified\n" | |
|
|
8411 | " A = added\n" | |
|
|
8412 | " R = removed\n" | |
|
|
8413 | " C = clean\n" | |
|
|
8414 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8415 | " ? = not tracked\n" | |
|
|
8416 | " I = ignored\n" | |
|
|
8417 | " = origin of the previous file listed as A (added)\n" | |
|
|
8418 | " " | |
|
|
8419 | ||
|
|
8420 | #, fuzzy | |
|
|
8421 | msgid "" | |
|
|
8422 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8423 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8424 | " report permission changes and diff only reports changes relative\n" | |
|
|
8425 | " to one merge parent." | |
|
|
8426 | msgstr "" | |
|
|
8427 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8428 | "\n" | |
|
|
8429 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8430 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8431 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8432 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8433 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8434 | " options -mardu are used.\n" | |
|
|
8435 | "\n" | |
|
|
8436 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8437 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8438 | "\n" | |
|
|
8439 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8440 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8441 | " report permission changes and diff only reports changes relative\n" | |
|
|
8442 | " to one merge parent.\n" | |
|
|
8443 | "\n" | |
|
|
8444 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8445 | " If two revisions are given, the differences between them are\n" | |
|
|
8446 | " shown.\n" | |
|
|
8447 | "\n" | |
|
|
8448 | " The codes used to show the status of files are:\n" | |
|
|
8449 | " M = modified\n" | |
|
|
8450 | " A = added\n" | |
|
|
8451 | " R = removed\n" | |
|
|
8452 | " C = clean\n" | |
|
|
8453 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8454 | " ? = not tracked\n" | |
|
|
8455 | " I = ignored\n" | |
|
|
8456 | " = origin of the previous file listed as A (added)\n" | |
|
|
8457 | " " | |
|
|
8458 | ||
|
|
8459 | #, fuzzy | |
|
|
7878 | ||
|
|
7879 | msgid "" | |
|
|
7880 | " .. note::\n" | |
|
|
7881 | " status may appear to disagree with diff if permissions have\n" | |
|
|
7882 | " changed or a merge has occurred. The standard diff format does\n" | |
|
|
7883 | " not report permission changes and diff only reports changes\n" | |
|
|
7884 | " relative to one merge parent." | |
|
|
7885 | msgstr "" | |
|
|
7886 | ||
|
|
8460 | 7887 | msgid "" |
|
|
8461 | 7888 | " If one revision is given, it is used as the base revision.\n" |
|
|
8462 | 7889 | " If two revisions are given, the differences between them are\n" |
|
|
8463 | " shown." | |
|
|
8464 | msgstr "" | |
|
|
8465 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8466 | "\n" | |
|
|
8467 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8468 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8469 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8470 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8471 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8472 | " options -mardu are used.\n" | |
|
|
8473 | "\n" | |
|
|
8474 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8475 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8476 | "\n" | |
|
|
8477 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8478 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8479 | " report permission changes and diff only reports changes relative\n" | |
|
|
8480 | " to one merge parent.\n" | |
|
|
8481 | "\n" | |
|
|
8482 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8483 | " If two revisions are given, the differences between them are\n" | |
|
|
8484 | " shown.\n" | |
|
|
8485 | "\n" | |
|
|
8486 | " The codes used to show the status of files are:\n" | |
|
|
8487 | " M = modified\n" | |
|
|
8488 | " A = added\n" | |
|
|
8489 | " R = removed\n" | |
|
|
8490 | " C = clean\n" | |
|
|
8491 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8492 | " ? = not tracked\n" | |
|
|
8493 | " I = ignored\n" | |
|
|
8494 | " = origin of the previous file listed as A (added)\n" | |
|
|
8495 | " " | |
|
|
8496 | ||
|
|
8497 | #, fuzzy | |
|
|
7890 | " shown. The --change option can also be used as a shortcut to list\n" | |
|
|
7891 | " the changed files of a revision from its first parent." | |
|
|
7892 | msgstr "" | |
|
|
7893 | ||
|
|
7894 | msgid " The codes used to show the status of files are::" | |
|
|
7895 | msgstr "" | |
|
|
7896 | ||
|
|
8498 | 7897 | msgid "" |
|
|
8499 | 7898 | " M = modified\n" |
|
|
8500 | 7899 | " A = added\n" |
| @@ -8503,43 +7902,11 b' msgid ""' | |||
|
|
8503 | 7902 | " ! = missing (deleted by non-hg command, but still tracked)\n" |
|
|
8504 | 7903 | " ? = not tracked\n" |
|
|
8505 | 7904 | " I = ignored\n" |
|
|
8506 |
" = origin of the previous file listed as A (added) |
|
|
|
8507 | " " | |
|
|
8508 | msgstr "" | |
|
|
8509 | "顯示 working directory 中已變更的檔案\n" | |
|
|
8510 | "\n" | |
|
|
8511 | " Show status of files in the repository. If names are given, only\n" | |
|
|
8512 | " files that match are shown. Files that are clean or ignored or\n" | |
|
|
8513 | " the source of a copy/move operation, are not listed unless\n" | |
|
|
8514 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
|
8515 | " Unless options described with \"show only ...\" are given, the\n" | |
|
|
8516 | " options -mardu are used.\n" | |
|
|
8517 | "\n" | |
|
|
8518 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" | |
|
|
8519 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
|
8520 | "\n" | |
|
|
8521 | " NOTE: status may appear to disagree with diff if permissions have\n" | |
|
|
8522 | " changed or a merge has occurred. The standard diff format does not\n" | |
|
|
8523 | " report permission changes and diff only reports changes relative\n" | |
|
|
8524 | " to one merge parent.\n" | |
|
|
8525 | "\n" | |
|
|
8526 | " If one revision is given, it is used as the base revision.\n" | |
|
|
8527 | " If two revisions are given, the differences between them are\n" | |
|
|
8528 | " shown.\n" | |
|
|
8529 | "\n" | |
|
|
8530 | " The codes used to show the status of files are:\n" | |
|
|
8531 | " M = modified\n" | |
|
|
8532 | " A = added\n" | |
|
|
8533 | " R = removed\n" | |
|
|
8534 | " C = clean\n" | |
|
|
8535 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
|
8536 | " ? = not tracked\n" | |
|
|
8537 | " I = ignored\n" | |
|
|
8538 | " = origin of the previous file listed as A (added)\n" | |
|
|
8539 | " " | |
|
|
7905 | " = origin of the previous file listed as A (added)" | |
|
|
7906 | msgstr "" | |
|
|
8540 | 7907 | |
|
|
8541 | 7908 | msgid "summarize working directory state" |
|
|
8542 | msgstr "" | |
|
|
7909 | msgstr "摘錄工作目錄的狀態" | |
|
|
8543 | 7910 | |
|
|
8544 | 7911 | msgid "" |
|
|
8545 | 7912 | " This generates a brief summary of the working directory state,\n" |
| @@ -8548,64 +7915,77 b' msgstr ""' | |||
|
|
8548 | 7915 | |
|
|
8549 | 7916 | msgid "" |
|
|
8550 | 7917 | " With the --remote option, this will check the default paths for\n" |
|
|
8551 |
" incoming and outgoing changes. This can be time-consuming. |
|
|
|
8552 | " " | |
|
|
8553 | msgstr "" | |
|
|
7918 | " incoming and outgoing changes. This can be time-consuming." | |
|
|
7919 | msgstr "" | |
|
|
7920 | ||
|
|
7921 | #, python-format | |
|
|
7922 | msgid "parent: %d:%s " | |
|
|
7923 | msgstr "母系:\t\t%d:%s" | |
|
|
8554 | 7924 | |
|
|
8555 | 7925 | msgid " (empty repository)" |
|
|
8556 | msgstr "" | |
|
|
7926 | msgstr "(空白的儲存庫)" | |
|
|
8557 | 7927 | |
|
|
8558 | 7928 | msgid " (no revision checked out)" |
|
|
8559 | 7929 | msgstr "" |
|
|
8560 | 7930 | |
|
|
8561 | 7931 | #, python-format |
|
|
8562 | msgid "parent: %d:%s %s\n" | |
|
|
8563 | msgstr "" | |
|
|
8564 | ||
|
|
8565 | #, fuzzy, python-format | |
|
|
8566 | 7932 | msgid "branch: %s\n" |
|
|
8567 | msgstr "找不到 branch %s" | |
|
|
8568 | ||
|
|
8569 | #, python-format | |
|
|
8570 | msgid "%d added" | |
|
|
8571 | msgstr "" | |
|
|
7933 | msgstr "分支:\t\t %s\n" | |
|
|
8572 | 7934 | |
|
|
8573 | 7935 | #, python-format |
|
|
8574 | 7936 | msgid "%d modified" |
|
|
8575 | msgstr "" | |
|
|
8576 | ||
|
|
8577 |
#, |
|
|
|
7937 | msgstr "%d 修改" | |
|
|
7938 | ||
|
|
7939 | #, python-format | |
|
|
7940 | msgid "%d added" | |
|
|
7941 | msgstr "%d 新增" | |
|
|
7942 | ||
|
|
7943 | #, python-format | |
|
|
8578 | 7944 | msgid "%d removed" |
|
|
8579 |
msgstr " |
|
|
|
7945 | msgstr "%d 移除" | |
|
|
7946 | ||
|
|
7947 | #, python-format | |
|
|
7948 | msgid "%d renamed" | |
|
|
7949 | msgstr "%d 改名字" | |
|
|
7950 | ||
|
|
7951 | #, python-format | |
|
|
7952 | msgid "%d copied" | |
|
|
7953 | msgstr "%d 複製" | |
|
|
8580 | 7954 | |
|
|
8581 | 7955 | #, python-format |
|
|
8582 | 7956 | msgid "%d deleted" |
|
|
8583 | msgstr "" | |
|
|
7957 | msgstr "%d 刪除" | |
|
|
7958 | ||
|
|
7959 | #, python-format | |
|
|
7960 | msgid "%d unknown" | |
|
|
7961 | msgstr "%d 不清楚" | |
|
|
8584 | 7962 | |
|
|
8585 | 7963 | #, python-format |
|
|
8586 | 7964 | msgid "%d ignored" |
|
|
8587 | msgstr "" | |
|
|
8588 | ||
|
|
8589 |
#, |
|
|
|
8590 | msgid "%d unknown" | |
|
|
8591 | msgstr "未知的 base" | |
|
|
8592 | ||
|
|
8593 | #, fuzzy, python-format | |
|
|
7965 | msgstr "%d 忽略" | |
|
|
7966 | ||
|
|
7967 | #, python-format | |
|
|
8594 | 7968 | msgid "%d unresolved" |
|
|
8595 |
msgstr " |
|
|
|
8596 | ||
|
|
8597 | #, fuzzy | |
|
|
7969 | msgstr "%d 未解決" | |
|
|
7970 | ||
|
|
7971 | #, python-format | |
|
|
7972 | msgid "%d subrepos" | |
|
|
7973 | msgstr "" | |
|
|
7974 | ||
|
|
8598 | 7975 | msgid " (merge)" |
|
|
8599 |
msgstr " |
|
|
|
7976 | msgstr "(合併)" | |
|
|
8600 | 7977 | |
|
|
8601 | 7978 | msgid " (new branch)" |
|
|
7979 | msgstr "(新分支)" | |
|
|
7980 | ||
|
|
7981 | msgid " (head closed)" | |
|
|
8602 | 7982 | msgstr "" |
|
|
8603 | 7983 | |
|
|
8604 | 7984 | msgid " (clean)" |
|
|
8605 | 7985 | msgstr "" |
|
|
8606 | 7986 | |
|
|
8607 | 7987 | msgid " (new branch head)" |
|
|
8608 | msgstr "" | |
|
|
7988 | msgstr "(新分支標頭)" | |
|
|
8609 | 7989 | |
|
|
8610 | 7990 | #, python-format |
|
|
8611 | 7991 | msgid "commit: %s\n" |
| @@ -8629,35 +8009,29 b' msgstr ""' | |||
|
|
8629 | 8009 | msgid "%d outgoing" |
|
|
8630 | 8010 | msgstr "" |
|
|
8631 | 8011 | |
|
|
8632 |
#, |
|
|
|
8012 | #, python-format | |
|
|
8633 | 8013 | msgid "remote: %s\n" |
|
|
8634 | msgstr "遠端: " | |
|
|
8635 | ||
|
|
8636 | #, fuzzy | |
|
|
8014 | msgstr "遠端: %s\n" | |
|
|
8015 | ||
|
|
8637 | 8016 | msgid "remote: (synced)\n" |
|
|
8638 |
msgstr " |
|
|
|
8017 | msgstr "" | |
|
|
8639 | 8018 | |
|
|
8640 | 8019 | msgid "add one or more tags for the current or given revision" |
|
|
8641 |
msgstr "對目前或 |
|
|
|
8020 | msgstr "對目前或提供的修定版新增一或多個標記" | |
|
|
8642 | 8021 | |
|
|
8643 | 8022 | msgid " Name a particular revision using <name>." |
|
|
8644 | msgstr " Name a particular revision using <name>." | |
|
|
8023 | msgstr "" | |
|
|
8645 | 8024 | |
|
|
8646 | 8025 | msgid "" |
|
|
8647 | 8026 | " Tags are used to name particular revisions of the repository and are\n" |
|
|
8648 | 8027 | " very useful to compare different revisions, to go back to significant\n" |
|
|
8649 | 8028 | " earlier versions or to mark branch points as releases, etc." |
|
|
8650 | 8029 | msgstr "" |
|
|
8651 | " Tags are used to name particular revisions of the repository and are\n" | |
|
|
8652 | " very useful to compare different revisions, to go back to significant\n" | |
|
|
8653 | " earlier versions or to mark branch points as releases, etc." | |
|
|
8654 | 8030 | |
|
|
8655 | 8031 | msgid "" |
|
|
8656 | 8032 | " If no revision is given, the parent of the working directory is\n" |
|
|
8657 | 8033 | " used, or tip if no revision is checked out." |
|
|
8658 | 8034 | msgstr "" |
|
|
8659 | " If no revision is given, the parent of the working directory is\n" | |
|
|
8660 | " used, or tip if no revision is checked out." | |
|
|
8661 | 8035 | |
|
|
8662 | 8036 | msgid "" |
|
|
8663 | 8037 | " To facilitate version control, distribution, and merging of tags,\n" |
| @@ -8666,17 +8040,16 b' msgid ""' | |||
|
|
8666 | 8040 | " necessary. The file '.hg/localtags' is used for local tags (not\n" |
|
|
8667 | 8041 | " shared among repositories)." |
|
|
8668 | 8042 | msgstr "" |
|
|
8669 | " To facilitate version control, distribution, and merging of tags,\n" | |
|
|
8670 | " they are stored as a file named \".hgtags\" which is managed\n" | |
|
|
8671 | " similarly to other project files and can be hand-edited if\n" | |
|
|
8672 | " necessary. The file '.hg/localtags' is used for local tags (not\n" | |
|
|
8673 | " shared among repositories)." | |
|
|
8043 | ||
|
|
8044 | msgid "" | |
|
|
8045 | " Since tag names have priority over branch names during revision\n" | |
|
|
8046 | " lookup, using an existing branch name as a tag name is discouraged." | |
|
|
8047 | msgstr "" | |
|
|
8674 | 8048 | |
|
|
8675 | 8049 | msgid "tag names must be unique" |
|
|
8676 | msgstr "" | |
|
|
8677 | ||
|
|
8678 | #, python-format | |
|
|
8679 | msgid "the name '%s' is reserved" | |
|
|
8050 | msgstr "標記名稱必須唯一" | |
|
|
8051 | ||
|
|
8052 | msgid "tag names cannot consist entirely of whitespace" | |
|
|
8680 | 8053 | msgstr "" |
|
|
8681 | 8054 | |
|
|
8682 | 8055 | msgid "--rev and --remove are incompatible" |
| @@ -8684,159 +8057,128 b' msgstr ""' | |||
|
|
8684 | 8057 | |
|
|
8685 | 8058 | #, python-format |
|
|
8686 | 8059 | msgid "tag '%s' does not exist" |
|
|
8687 | msgstr "" | |
|
|
8060 | msgstr "標記 '%s' 不存在" | |
|
|
8688 | 8061 | |
|
|
8689 | 8062 | #, python-format |
|
|
8690 | 8063 | msgid "tag '%s' is not a global tag" |
|
|
8691 | msgstr "" | |
|
|
8064 | msgstr "標記'%s' 不是一個全域標記" | |
|
|
8692 | 8065 | |
|
|
8693 | 8066 | #, python-format |
|
|
8694 | 8067 | msgid "tag '%s' is not a local tag" |
|
|
8695 | msgstr "" | |
|
|
8068 | msgstr "標記'%s' 不是一個本地端標記" | |
|
|
8696 | 8069 | |
|
|
8697 | 8070 | #, python-format |
|
|
8698 | 8071 | msgid "tag '%s' already exists (use -f to force)" |
|
|
8699 | msgstr "" | |
|
|
8072 | msgstr "標記 '%s' 己經有了(使用 -f 去強制)" | |
|
|
8700 | 8073 | |
|
|
8701 | 8074 | msgid "list repository tags" |
|
|
8702 | msgstr "列出 repository tags" | |
|
|
8075 | msgstr "列出 儲存庫 標記(s)" | |
|
|
8703 | 8076 | |
|
|
8704 | 8077 | msgid "" |
|
|
8705 | 8078 | " This lists both regular and local tags. When the -v/--verbose\n" |
|
|
8706 |
" switch is used, a third column \"local\" is printed for local tags. |
|
|
|
8707 | " " | |
|
|
8708 | msgstr "" | |
|
|
8709 | " This lists both regular and local tags. When the -v/--verbose\n" | |
|
|
8710 | " switch is used, a third column \"local\" is printed for local tags.\n" | |
|
|
8711 | " " | |
|
|
8079 | " switch is used, a third column \"local\" is printed for local tags." | |
|
|
8080 | msgstr "" | |
|
|
8712 | 8081 | |
|
|
8713 | 8082 | msgid "show the tip revision" |
|
|
8714 |
msgstr "顯示 tip |
|
|
|
8083 | msgstr "顯示 tip 版本" | |
|
|
8715 | 8084 | |
|
|
8716 | 8085 | msgid "" |
|
|
8717 | 8086 | " The tip revision (usually just called the tip) is the changeset\n" |
|
|
8718 | 8087 | " most recently added to the repository (and therefore the most\n" |
|
|
8719 | 8088 | " recently changed head)." |
|
|
8720 | 8089 | msgstr "" |
|
|
8721 | " The tip revision (usually just called the tip) is the changeset\n" | |
|
|
8722 | " most recently added to the repository (and therefore the most\n" | |
|
|
8723 | " recently changed head)." | |
|
|
8724 | 8090 | |
|
|
8725 | 8091 | msgid "" |
|
|
8726 | 8092 | " If you have just made a commit, that commit will be the tip. If\n" |
|
|
8727 | 8093 | " you have just pulled changes from another repository, the tip of\n" |
|
|
8728 | 8094 | " that repository becomes the current tip. The \"tip\" tag is special\n" |
|
|
8729 |
" and cannot be renamed or assigned to a different changeset. |
|
|
|
8730 | " " | |
|
|
8731 | msgstr "" | |
|
|
8732 | " If you have just made a commit, that commit will be the tip. If\n" | |
|
|
8733 | " you have just pulled changes from another repository, the tip of\n" | |
|
|
8734 | " that repository becomes the current tip. The \"tip\" tag is special\n" | |
|
|
8735 | " and cannot be renamed or assigned to a different changeset.\n" | |
|
|
8736 | " " | |
|
|
8095 | " and cannot be renamed or assigned to a different changeset." | |
|
|
8096 | msgstr "" | |
|
|
8737 | 8097 | |
|
|
8738 | 8098 | msgid "apply one or more changegroup files" |
|
|
8739 | 8099 | msgstr "套用一或多個 changegroup 檔案" |
|
|
8740 | 8100 | |
|
|
8741 | 8101 | msgid "" |
|
|
8742 | 8102 | " Apply one or more compressed changegroup files generated by the\n" |
|
|
8743 |
" bundle command. |
|
|
|
8744 | " " | |
|
|
8745 | msgstr "" | |
|
|
8746 | " Apply one or more compressed changegroup files generated by the\n" | |
|
|
8747 | " bundle command.\n" | |
|
|
8103 | " bundle command." | |
|
|
8104 | msgstr "" | |
|
|
8105 | ||
|
|
8106 | msgid "" | |
|
|
8107 | " Returns 0 on success, 1 if an update has unresolved files.\n" | |
|
|
8748 | 8108 | " " |
|
|
8749 | ||
|
|
8750 | #, fuzzy | |
|
|
8751 | msgid "update working directory" | |
|
|
8752 | msgstr "更新 working directory" | |
|
|
8753 | ||
|
|
8754 | #, fuzzy | |
|
|
8109 | msgstr "" | |
|
|
8110 | ||
|
|
8111 | msgid "update working directory (or switch revisions)" | |
|
|
8112 | msgstr "更新工作目錄(也可以用來切換版本號)" | |
|
|
8113 | ||
|
|
8755 | 8114 | msgid "" |
|
|
8756 | 8115 | " Update the repository's working directory to the specified\n" |
|
|
8757 | " revision, or the tip of the current branch if none is specified.\n" | |
|
|
8758 | " Use null as the revision to remove the working copy (like 'hg\n" | |
|
|
8759 | " clone -U')." | |
|
|
8760 | msgstr "" | |
|
|
8761 | " Update the repository's working directory to the specified\n" | |
|
|
8762 | " revision, or the tip of the current branch if none is specified.\n" | |
|
|
8763 | " Use null as the revision to remove the working copy (like 'hg\n" | |
|
|
8764 | " clone -U')." | |
|
|
8765 | ||
|
|
8766 | #, fuzzy | |
|
|
8767 |
msg |
|
|
|
8768 | " When the working directory contains no uncommitted changes, it\n" | |
|
|
8769 | " will be replaced by the state of the requested revision from the\n" | |
|
|
8770 | " repository. When the requested revision is on a different branch,\n" | |
|
|
8771 | " the working directory will additionally be switched to that\n" | |
|
|
8772 | " branch." | |
|
|
8773 | msgstr "" | |
|
|
8774 | " When the working directory contains no uncommitted changes, it\n" | |
|
|
8775 | " will be replaced by the state of the requested revision from the\n" | |
|
|
8776 | " repository. When the requested revision is on a different branch,\n" | |
|
|
8777 | " the working directory will additionally be switched to that\n" | |
|
|
8778 | " branch." | |
|
|
8779 | ||
|
|
8780 | #, fuzzy | |
|
|
8781 | msgid "" | |
|
|
8782 | " When there are uncommitted changes, use option -C/--clean to\n" | |
|
|
8783 | " discard them, forcibly replacing the state of the working\n" | |
|
|
8784 | " directory with the requested revision. Alternately, use -c/--check\n" | |
|
|
8785 | " to abort." | |
|
|
8786 | msgstr "" | |
|
|
8787 | " When there are uncommitted changes, use option -C/--clean to\n" | |
|
|
8788 | " discard them, forcibly replacing the state of the working\n" | |
|
|
8789 | " directory with the requested revision." | |
|
|
8790 | ||
|
|
8791 | #, fuzzy | |
|
|
8792 | msgid "" | |
|
|
8793 | " When there are uncommitted changes and option -C/--clean is not\n" | |
|
|
8794 | " used, and the parent revision and requested revision are on the\n" | |
|
|
8795 | " same branch, and one of them is an ancestor of the other, then the\n" | |
|
|
8796 | " new working directory will contain the requested revision merged\n" | |
|
|
8797 | " with the uncommitted changes. Otherwise, the update will fail with\n" | |
|
|
8798 | " a suggestion to use 'merge' or 'update -C' instead." | |
|
|
8799 | msgstr "" | |
|
|
8800 | " When there are uncommitted changes and option -C/--clean is not\n" | |
|
|
8801 | " used, and the parent revision and requested revision are on the\n" | |
|
|
8802 | " same branch, and one of them is an ancestor of the other, then the\n" | |
|
|
8803 | " new working directory will contain the requested revision merged\n" | |
|
|
8804 | " with the uncommitted changes. Otherwise, the update will fail with\n" | |
|
|
8805 | " a suggestion to use 'merge' or 'update -C' instead." | |
|
|
8806 | ||
|
|
8807 | #, fuzzy | |
|
|
8808 | msgid "" | |
|
|
8809 | " If you want to update just one file to an older revision, use\n" | |
|
|
8810 | " revert." | |
|
|
8811 | msgstr "" | |
|
|
8812 | " If you want to update just one file to an older revision, use\n" | |
|
|
8813 | " revert." | |
|
|
8116 | " changeset. If no changeset is specified, update to the tip of the\n" | |
|
|
8117 | " current named branch." | |
|
|
8118 | msgstr "" | |
|
|
8119 | ||
|
|
8120 | msgid "" | |
|
|
8121 | " If the changeset is not a descendant of the working directory's\n" | |
|
|
8122 | " parent, the update is aborted. With the -c/--check option, the\n" | |
|
|
8123 | " working directory is checked for uncommitted changes; if none are\n" | |
|
|
8124 | " found, the working directory is updated to the specified\n" | |
|
|
8125 | " changeset." | |
|
|
8126 | msgstr "" | |
|
|
8127 | ||
|
|
8128 | msgid "" | |
|
|
8129 | " The following rules apply when the working directory contains\n" | |
|
|
8130 | " uncommitted changes:" | |
|
|
8131 | msgstr "" | |
|
|
8132 | ||
|
|
8133 | msgid "" | |
|
|
8134 | " 1. If neither -c/--check nor -C/--clean is specified, and if\n" | |
|
|
8135 | " the requested changeset is an ancestor or descendant of\n" | |
|
|
8136 | " the working directory's parent, the uncommitted changes\n" | |
|
|
8137 | " are merged into the requested changeset and the merged\n" | |
|
|
8138 | " result is left uncommitted. If the requested changeset is\n" | |
|
|
8139 | " not an ancestor or descendant (that is, it is on another\n" | |
|
|
8140 | " branch), the update is aborted and the uncommitted changes\n" | |
|
|
8141 | " are preserved." | |
|
|
8142 | msgstr "" | |
|
|
8143 | ||
|
|
8144 | msgid "" | |
|
|
8145 | " 2. With the -c/--check option, the update is aborted and the\n" | |
|
|
8146 | " uncommitted changes are preserved." | |
|
|
8147 | msgstr "" | |
|
|
8148 | ||
|
|
8149 | msgid "" | |
|
|
8150 | " 3. With the -C/--clean option, uncommitted changes are discarded and\n" | |
|
|
8151 | " the working directory is updated to the requested changeset." | |
|
|
8152 | msgstr "" | |
|
|
8153 | ||
|
|
8154 | msgid "" | |
|
|
8155 | " Use null as the changeset to remove the working directory (like\n" | |
|
|
8156 | " :hg:`clone -U`)." | |
|
|
8157 | msgstr "" | |
|
|
8158 | ||
|
|
8159 | msgid "" | |
|
|
8160 | " If you want to update just one file to an older changeset, use\n" | |
|
|
8161 | " :hg:`revert`." | |
|
|
8162 | msgstr "" | |
|
|
8814 | 8163 | |
|
|
8815 | 8164 | msgid "cannot specify both -c/--check and -C/--clean" |
|
|
8816 | 8165 | msgstr "" |
|
|
8817 | 8166 | |
|
|
8818 | #, fuzzy | |
|
|
8819 | 8167 | msgid "uncommitted local changes" |
|
|
8820 |
msgstr " |
|
|
|
8168 | msgstr "" | |
|
|
8821 | 8169 | |
|
|
8822 | 8170 | msgid "verify the integrity of the repository" |
|
|
8823 | 8171 | msgstr "驗證 repository 的完整性" |
|
|
8824 | 8172 | |
|
|
8825 | 8173 | msgid " Verify the integrity of the current repository." |
|
|
8826 | msgstr " Verify the integrity of the current repository." | |
|
|
8174 | msgstr "" | |
|
|
8827 | 8175 | |
|
|
8828 | 8176 | msgid "" |
|
|
8829 | 8177 | " This will perform an extensive check of the repository's\n" |
|
|
8830 | 8178 | " integrity, validating the hashes and checksums of each entry in\n" |
|
|
8831 | 8179 | " the changelog, manifest, and tracked files, as well as the\n" |
|
|
8832 |
" integrity of their crosslinks and indices. |
|
|
|
8833 | " " | |
|
|
8834 | msgstr "" | |
|
|
8835 | " This will perform an extensive check of the repository's\n" | |
|
|
8836 | " integrity, validating the hashes and checksums of each entry in\n" | |
|
|
8837 | " the changelog, manifest, and tracked files, as well as the\n" | |
|
|
8838 | " integrity of their crosslinks and indices.\n" | |
|
|
8839 | " " | |
|
|
8180 | " integrity of their crosslinks and indices." | |
|
|
8181 | msgstr "" | |
|
|
8840 | 8182 | |
|
|
8841 | 8183 | msgid "output version and copyright information" |
|
|
8842 | 8184 | msgstr "輸出版本以及版權資訊" |
| @@ -8845,9 +8187,12 b' msgstr "\xe8\xbc\xb8\xe5\x87\xba\xe7\x89\x88\xe6\x9c\xac\xe4\xbb\xa5\xe5\x8f\x8a\xe7\x89\x88\xe6\xac\x8a\xe8\xb3\x87\xe8\xa8\x8a"' | |||
|
|
8845 | 8187 | msgid "Mercurial Distributed SCM (version %s)\n" |
|
|
8846 | 8188 | msgstr "mercurial 分散式版本控制系統 (版本 %s)\n" |
|
|
8847 | 8189 | |
|
|
8848 | msgid "" | |
|
|
8849 | "\n" | |
|
|
8850 | "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n" | |
|
|
8190 | #, fuzzy | |
|
|
8191 | msgid "(see http://mercurial.selenic.com for more information)" | |
|
|
8192 | msgstr "\tSee 'hg help urls' for more information." | |
|
|
8193 | ||
|
|
8194 | msgid "" | |
|
|
8195 | "Copyright (C) 2005-2010 Matt Mackall and others\n" | |
|
|
8851 | 8196 | "This is free software; see the source for copying conditions. There is NO\n" |
|
|
8852 | 8197 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
|
8853 | 8198 | msgstr "" |
| @@ -8855,6 +8200,9 b' msgstr ""' | |||
|
|
8855 | 8200 | msgid "repository root directory or name of overlay bundle file" |
|
|
8856 | 8201 | msgstr "" |
|
|
8857 | 8202 | |
|
|
8203 | msgid "DIR" | |
|
|
8204 | msgstr "" | |
|
|
8205 | ||
|
|
8858 | 8206 | msgid "change working directory" |
|
|
8859 | 8207 | msgstr "" |
|
|
8860 | 8208 | |
| @@ -8867,7 +8215,10 b' msgstr ""' | |||
|
|
8867 | 8215 | msgid "enable additional output" |
|
|
8868 | 8216 | msgstr "" |
|
|
8869 | 8217 | |
|
|
8870 | msgid "set/override config option" | |
|
|
8218 | msgid "set/override config option (use 'section.name=value')" | |
|
|
8219 | msgstr "" | |
|
|
8220 | ||
|
|
8221 | msgid "CONFIG" | |
|
|
8871 | 8222 | msgstr "" |
|
|
8872 | 8223 | |
|
|
8873 | 8224 | msgid "enable debugging output" |
| @@ -8879,10 +8230,16 b' msgstr ""' | |||
|
|
8879 | 8230 | msgid "set the charset encoding" |
|
|
8880 | 8231 | msgstr "" |
|
|
8881 | 8232 | |
|
|
8233 | msgid "ENCODE" | |
|
|
8234 | msgstr "" | |
|
|
8235 | ||
|
|
8236 | msgid "MODE" | |
|
|
8237 | msgstr "" | |
|
|
8238 | ||
|
|
8882 | 8239 | msgid "set the charset encoding mode" |
|
|
8883 | 8240 | msgstr "" |
|
|
8884 | 8241 | |
|
|
8885 | msgid "print traceback on exception" | |
|
|
8242 | msgid "always print a traceback on exception" | |
|
|
8886 | 8243 | msgstr "" |
|
|
8887 | 8244 | |
|
|
8888 | 8245 | msgid "time how long the command takes" |
| @@ -8898,7 +8255,7 b' msgid "display help and exit"' | |||
|
|
8898 | 8255 | msgstr "" |
|
|
8899 | 8256 | |
|
|
8900 | 8257 | msgid "do not perform actions, just print output" |
|
|
8901 | msgstr "" | |
|
|
8258 | msgstr "不要真的行動,只要顯示輸出" | |
|
|
8902 | 8259 | |
|
|
8903 | 8260 | msgid "specify ssh command to use" |
|
|
8904 | 8261 | msgstr "" |
| @@ -8906,16 +8263,19 b' msgstr ""' | |||
|
|
8906 | 8263 | msgid "specify hg command to run on the remote side" |
|
|
8907 | 8264 | msgstr "" |
|
|
8908 | 8265 | |
|
|
8266 | msgid "PATTERN" | |
|
|
8267 | msgstr "" | |
|
|
8268 | ||
|
|
8909 | 8269 | msgid "include names matching the given patterns" |
|
|
8910 | msgstr "" | |
|
|
8270 | msgstr "含括符合檔案表示式的檔案" | |
|
|
8911 | 8271 | |
|
|
8912 | 8272 | msgid "exclude names matching the given patterns" |
|
|
8913 | msgstr "" | |
|
|
8914 | ||
|
|
8915 |
msgid "use |
|
|
|
8916 | msgstr "" | |
|
|
8917 | ||
|
|
8918 |
msgid "read commit message from |
|
|
|
8273 | msgstr "排除符合檔案表示式的檔案" | |
|
|
8274 | ||
|
|
8275 | msgid "use text as commit message" | |
|
|
8276 | msgstr "" | |
|
|
8277 | ||
|
|
8278 | msgid "read commit message from file" | |
|
|
8919 | 8279 | msgstr "" |
|
|
8920 | 8280 | |
|
|
8921 | 8281 | msgid "record datecode as commit date" |
| @@ -8924,6 +8284,9 b' msgstr ""' | |||
|
|
8924 | 8284 | msgid "record the specified user as committer" |
|
|
8925 | 8285 | msgstr "" |
|
|
8926 | 8286 | |
|
|
8287 | msgid "STYLE" | |
|
|
8288 | msgstr "" | |
|
|
8289 | ||
|
|
8927 | 8290 | msgid "display using template map file" |
|
|
8928 | 8291 | msgstr "" |
|
|
8929 | 8292 | |
| @@ -8933,15 +8296,21 b' msgstr ""' | |||
|
|
8933 | 8296 | msgid "do not show merges" |
|
|
8934 | 8297 | msgstr "" |
|
|
8935 | 8298 | |
|
|
8299 | msgid "output diffstat-style summary of changes" | |
|
|
8300 | msgstr "" | |
|
|
8301 | ||
|
|
8936 | 8302 | msgid "treat all files as text" |
|
|
8937 | 8303 | msgstr "" |
|
|
8938 | 8304 | |
|
|
8939 |
msgid " |
|
|
|
8305 | msgid "omit dates from diff headers" | |
|
|
8940 | 8306 | msgstr "" |
|
|
8941 | 8307 | |
|
|
8942 | 8308 | msgid "show which function each change is in" |
|
|
8943 | 8309 | msgstr "" |
|
|
8944 | 8310 | |
|
|
8311 | msgid "produce a diff that undoes the changes" | |
|
|
8312 | msgstr "" | |
|
|
8313 | ||
|
|
8945 | 8314 | msgid "ignore white space when comparing lines" |
|
|
8946 | 8315 | msgstr "" |
|
|
8947 | 8316 | |
| @@ -8954,21 +8323,33 b' msgstr ""' | |||
|
|
8954 | 8323 | msgid "number of lines of context to show" |
|
|
8955 | 8324 | msgstr "" |
|
|
8956 | 8325 | |
|
|
8326 | msgid "SIMILARITY" | |
|
|
8327 | msgstr "" | |
|
|
8328 | ||
|
|
8957 | 8329 | msgid "guess renamed files by similarity (0<=s<=100)" |
|
|
8958 | 8330 | msgstr "" |
|
|
8959 | 8331 | |
|
|
8332 | msgid "recurse into subrepositories" | |
|
|
8333 | msgstr "" | |
|
|
8334 | ||
|
|
8960 | 8335 | msgid "[OPTION]... [FILE]..." |
|
|
8961 | 8336 | msgstr "" |
|
|
8962 | 8337 | |
|
|
8963 | 8338 | msgid "annotate the specified revision" |
|
|
8964 | msgstr "" | |
|
|
8965 | ||
|
|
8966 |
msgid "follow |
|
|
|
8339 | msgstr "追溯描述的版本號" | |
|
|
8340 | ||
|
|
8341 | msgid "follow copies/renames and list the filename (DEPRECATED)" | |
|
|
8342 | msgstr "" | |
|
|
8343 | ||
|
|
8344 | msgid "don't follow copies and renames" | |
|
|
8967 | 8345 | msgstr "" |
|
|
8968 | 8346 | |
|
|
8969 | 8347 | msgid "list the author (long with -v)" |
|
|
8970 | 8348 | msgstr "" |
|
|
8971 | 8349 | |
|
|
8350 | msgid "list the filename" | |
|
|
8351 | msgstr "" | |
|
|
8352 | ||
|
|
8972 | 8353 | msgid "list the date (short with -q)" |
|
|
8973 | 8354 | msgstr "" |
|
|
8974 | 8355 | |
| @@ -8987,6 +8368,9 b' msgstr ""' | |||
|
|
8987 | 8368 | msgid "do not pass files through decoders" |
|
|
8988 | 8369 | msgstr "" |
|
|
8989 | 8370 | |
|
|
8371 | msgid "PREFIX" | |
|
|
8372 | msgstr "" | |
|
|
8373 | ||
|
|
8990 | 8374 | msgid "directory prefix for files in archive" |
|
|
8991 | 8375 | msgstr "" |
|
|
8992 | 8376 | |
| @@ -9005,6 +8389,9 b' msgstr ""' | |||
|
|
9005 | 8389 | msgid "parent to choose when backing out merge" |
|
|
9006 | 8390 | msgstr "" |
|
|
9007 | 8391 | |
|
|
8392 | msgid "specify merge tool" | |
|
|
8393 | msgstr "" | |
|
|
8394 | ||
|
|
9008 | 8395 | msgid "revision to backout" |
|
|
9009 | 8396 | msgstr "" |
|
|
9010 | 8397 | |
| @@ -9029,7 +8416,7 b' msgstr ""' | |||
|
|
9029 | 8416 | msgid "do not update to target" |
|
|
9030 | 8417 | msgstr "" |
|
|
9031 | 8418 | |
|
|
9032 | msgid "[-gbsr] [-c CMD] [REV]" | |
|
|
8419 | msgid "[-gbsr] [-U] [-c CMD] [REV]" | |
|
|
9033 | 8420 | msgstr "" |
|
|
9034 | 8421 | |
|
|
9035 | 8422 | msgid "set branch name even if it shadows an existing branch" |
| @@ -9047,16 +8434,19 b' msgstr ""' | |||
|
|
9047 | 8434 | msgid "show normal and closed branches" |
|
|
9048 | 8435 | msgstr "" |
|
|
9049 | 8436 | |
|
|
9050 | msgid "[-a]" | |
|
|
9051 | msgstr "" | |
|
|
9052 | ||
|
|
9053 |
msgid "run even when |
|
|
|
9054 | msgstr "" | |
|
|
9055 | ||
|
|
9056 | msgid "a changeset up to which you would like to bundle" | |
|
|
9057 | msgstr "" | |
|
|
9058 | ||
|
|
9059 | msgid "a base changeset to specify instead of a destination" | |
|
|
8437 | msgid "[-ac]" | |
|
|
8438 | msgstr "" | |
|
|
8439 | ||
|
|
8440 | msgid "run even when the destination is unrelated" | |
|
|
8441 | msgstr "" | |
|
|
8442 | ||
|
|
8443 | msgid "a changeset intended to be added to the destination" | |
|
|
8444 | msgstr "" | |
|
|
8445 | ||
|
|
8446 | msgid "a specific branch you would like to bundle" | |
|
|
8447 | msgstr "" | |
|
|
8448 | ||
|
|
8449 | msgid "a base changeset assumed to be available at the destination" | |
|
|
9060 | 8450 | msgstr "" |
|
|
9061 | 8451 | |
|
|
9062 | 8452 | msgid "bundle all changesets in the repository" |
| @@ -9065,7 +8455,7 b' msgstr ""' | |||
|
|
9065 | 8455 | msgid "bundle compression type to use" |
|
|
9066 | 8456 | msgstr "" |
|
|
9067 | 8457 | |
|
|
9068 | msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" | |
|
|
8458 | msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" | |
|
|
9069 | 8459 | msgstr "" |
|
|
9070 | 8460 | |
|
|
9071 | 8461 | msgid "print output to file with formatted name" |
| @@ -9080,10 +8470,16 b' msgstr ""' | |||
|
|
9080 | 8470 | msgid "[OPTION]... FILE..." |
|
|
9081 | 8471 | msgstr "" |
|
|
9082 | 8472 | |
|
|
9083 |
msgid "the clone will |
|
|
|
9084 | msgstr "" | |
|
|
9085 | ||
|
|
9086 | msgid "a changeset you would like to have after cloning" | |
|
|
8473 | msgid "the clone will include an empty working copy (only a repository)" | |
|
|
8474 | msgstr "" | |
|
|
8475 | ||
|
|
8476 | msgid "revision, tag or branch to check out" | |
|
|
8477 | msgstr "" | |
|
|
8478 | ||
|
|
8479 | msgid "include the specified changeset" | |
|
|
8480 | msgstr "" | |
|
|
8481 | ||
|
|
8482 | msgid "clone only the specified branch" | |
|
|
9087 | 8483 | msgstr "" |
|
|
9088 | 8484 | |
|
|
9089 | 8485 | msgid "[OPTION]... SOURCE [DEST]" |
| @@ -9107,6 +8503,21 b' msgstr ""' | |||
|
|
9107 | 8503 | msgid "[INDEX] REV1 REV2" |
|
|
9108 | 8504 | msgstr "" |
|
|
9109 | 8505 | |
|
|
8506 | msgid "add single file mergeable changes" | |
|
|
8507 | msgstr "" | |
|
|
8508 | ||
|
|
8509 | msgid "add single file all revs append to" | |
|
|
8510 | msgstr "" | |
|
|
8511 | ||
|
|
8512 | msgid "add single file all revs overwrite" | |
|
|
8513 | msgstr "" | |
|
|
8514 | ||
|
|
8515 | msgid "add new file at each rev" | |
|
|
8516 | msgstr "" | |
|
|
8517 | ||
|
|
8518 | msgid "[OPTION]... TEXT" | |
|
|
8519 | msgstr "" | |
|
|
8520 | ||
|
|
9110 | 8521 | msgid "[COMMAND]" |
|
|
9111 | 8522 | msgstr "" |
|
|
9112 | 8523 | |
| @@ -9116,6 +8527,21 b' msgstr ""' | |||
|
|
9116 | 8527 | msgid "[-o] CMD" |
|
|
9117 | 8528 | msgstr "" |
|
|
9118 | 8529 | |
|
|
8530 | msgid "use tags as labels" | |
|
|
8531 | msgstr "" | |
|
|
8532 | ||
|
|
8533 | msgid "annotate with branch names" | |
|
|
8534 | msgstr "" | |
|
|
8535 | ||
|
|
8536 | msgid "use dots for runs" | |
|
|
8537 | msgstr "" | |
|
|
8538 | ||
|
|
8539 | msgid "separate elements by spaces" | |
|
|
8540 | msgstr "" | |
|
|
8541 | ||
|
|
8542 | msgid "[OPTION]... [FILE [REV]...]" | |
|
|
8543 | msgstr "" | |
|
|
8544 | ||
|
|
9119 | 8545 | msgid "try extended date formats" |
|
|
9120 | 8546 | msgstr "" |
|
|
9121 | 8547 | |
| @@ -9128,7 +8554,10 b' msgstr ""' | |||
|
|
9128 | 8554 | msgid "[PATH]" |
|
|
9129 | 8555 | msgstr "" |
|
|
9130 | 8556 | |
|
|
9131 | msgid "FILE" | |
|
|
8557 | msgid "revlog format" | |
|
|
8558 | msgstr "" | |
|
|
8559 | ||
|
|
8560 | msgid "REPO NAMESPACE [KEY OLD NEW]" | |
|
|
9132 | 8561 | msgstr "" |
|
|
9133 | 8562 | |
|
|
9134 | 8563 | msgid "revision to rebuild to" |
| @@ -9155,12 +8584,15 b' msgstr ""' | |||
|
|
9155 | 8584 | msgid "revision to check" |
|
|
9156 | 8585 | msgstr "" |
|
|
9157 | 8586 | |
|
|
9158 | msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." | |
|
|
8587 | msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." | |
|
|
9159 | 8588 | msgstr "" |
|
|
9160 | 8589 | |
|
|
9161 | 8590 | msgid "diff against the second parent" |
|
|
9162 | 8591 | msgstr "" |
|
|
9163 | 8592 | |
|
|
8593 | msgid "revisions to export" | |
|
|
8594 | msgstr "" | |
|
|
8595 | ||
|
|
9164 | 8596 | msgid "[OPTION]... [-o OUTFILESPEC] REV..." |
|
|
9165 | 8597 | msgstr "" |
|
|
9166 | 8598 | |
| @@ -9182,22 +8614,28 b' msgstr ""' | |||
|
|
9182 | 8614 | msgid "print matching line numbers" |
|
|
9183 | 8615 | msgstr "" |
|
|
9184 | 8616 | |
|
|
9185 |
msgid "search |
|
|
|
8617 | msgid "only search files changed within revision range" | |
|
|
9186 | 8618 | msgstr "" |
|
|
9187 | 8619 | |
|
|
9188 | 8620 | msgid "[OPTION]... PATTERN [FILE]..." |
|
|
9189 | 8621 | msgstr "" |
|
|
9190 | 8622 | |
|
|
9191 | msgid "show only heads which are descendants of REV" | |
|
|
9192 | msgstr "" | |
|
|
9193 | ||
|
|
9194 | msgid "show only the active branch heads from open branches" | |
|
|
8623 | msgid "show only heads which are descendants of STARTREV" | |
|
|
8624 | msgstr "" | |
|
|
8625 | ||
|
|
8626 | msgid "STARTREV" | |
|
|
8627 | msgstr "" | |
|
|
8628 | ||
|
|
8629 | msgid "show topological heads only" | |
|
|
8630 | msgstr "" | |
|
|
8631 | ||
|
|
8632 | msgid "show active branchheads only (DEPRECATED)" | |
|
|
9195 | 8633 | msgstr "" |
|
|
9196 | 8634 | |
|
|
9197 | 8635 | msgid "show normal and closed branch heads" |
|
|
9198 | 8636 | msgstr "" |
|
|
9199 | 8637 | |
|
|
9200 | msgid "[-r STARTREV] [REV]..." | |
|
|
8638 | msgid "[-ac] [-r STARTREV] [REV]..." | |
|
|
9201 | 8639 | msgstr "" |
|
|
9202 | 8640 | |
|
|
9203 | 8641 | msgid "[TOPIC]" |
| @@ -9221,7 +8659,12 b' msgstr ""' | |||
|
|
9221 | 8659 | msgid "[-nibt] [-r REV] [SOURCE]" |
|
|
9222 | 8660 | msgstr "" |
|
|
9223 | 8661 | |
|
|
9224 | msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" | |
|
|
8662 | msgid "" | |
|
|
8663 | "directory strip option for patch. This has the same meaning as the " | |
|
|
8664 | "corresponding patch option" | |
|
|
8665 | msgstr "" | |
|
|
8666 | ||
|
|
8667 | msgid "PATH" | |
|
|
9225 | 8668 | msgstr "" |
|
|
9226 | 8669 | |
|
|
9227 | 8670 | msgid "base path" |
| @@ -9242,13 +8685,19 b' msgstr ""' | |||
|
|
9242 | 8685 | msgid "[OPTION]... PATCH..." |
|
|
9243 | 8686 | msgstr "" |
|
|
9244 | 8687 | |
|
|
8688 | msgid "run even if remote repository is unrelated" | |
|
|
8689 | msgstr "" | |
|
|
8690 | ||
|
|
9245 | 8691 | msgid "show newest record first" |
|
|
9246 | 8692 | msgstr "" |
|
|
9247 | 8693 | |
|
|
9248 | 8694 | msgid "file to store the bundles into" |
|
|
9249 | 8695 | msgstr "" |
|
|
9250 | 8696 | |
|
|
9251 | msgid "a specific revision up to which you would like to pull" | |
|
|
8697 | msgid "a remote changeset intended to be added" | |
|
|
8698 | msgstr "" | |
|
|
8699 | ||
|
|
8700 | msgid "a specific branch you would like to pull" | |
|
|
9252 | 8701 | msgstr "" |
|
|
9253 | 8702 | |
|
|
9254 | 8703 | msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" |
| @@ -9257,7 +8706,7 b' msgstr ""' | |||
|
|
9257 | 8706 | msgid "[-e CMD] [--remotecmd CMD] [DEST]" |
|
|
9258 | 8707 | msgstr "" |
|
|
9259 | 8708 | |
|
|
9260 |
msgid "search the repository as it |
|
|
|
8709 | msgid "search the repository as it is in REV" | |
|
|
9261 | 8710 | msgstr "" |
|
|
9262 | 8711 | |
|
|
9263 | 8712 | msgid "end filenames with NUL, for use with xargs" |
| @@ -9278,7 +8727,7 b' msgstr ""' | |||
|
|
9278 | 8727 | msgid "show copied files" |
|
|
9279 | 8728 | msgstr "" |
|
|
9280 | 8729 | |
|
|
9281 |
msgid "do case-insensitive search for a |
|
|
|
8730 | msgid "do case-insensitive search for a given text" | |
|
|
9282 | 8731 | msgstr "" |
|
|
9283 | 8732 | |
|
|
9284 | 8733 | msgid "include revisions where files were removed" |
| @@ -9290,7 +8739,10 b' msgstr ""' | |||
|
|
9290 | 8739 | msgid "revisions committed by user" |
|
|
9291 | 8740 | msgstr "" |
|
|
9292 | 8741 | |
|
|
9293 | msgid "show only changesets within the given named branch" | |
|
|
8742 | msgid "show only changesets within the given named branch (DEPRECATED)" | |
|
|
8743 | msgstr "" | |
|
|
8744 | ||
|
|
8745 | msgid "show changesets within the given named branch" | |
|
|
9294 | 8746 | msgstr "" |
|
|
9295 | 8747 | |
|
|
9296 | 8748 | msgid "do not display revision or any of its ancestors" |
| @@ -9314,16 +8766,19 b' msgstr ""' | |||
|
|
9314 | 8766 | msgid "review revisions to merge (no merge is performed)" |
|
|
9315 | 8767 | msgstr "" |
|
|
9316 | 8768 | |
|
|
9317 | msgid "[-f] [[-r] REV]" | |
|
|
9318 | msgstr "" | |
|
|
9319 | ||
|
|
9320 | msgid "a specific revision up to which you would like to push" | |
|
|
8769 | msgid "[-P] [-f] [[-r] REV]" | |
|
|
8770 | msgstr "" | |
|
|
8771 | ||
|
|
8772 | msgid "a changeset intended to be included in the destination" | |
|
|
8773 | msgstr "" | |
|
|
8774 | ||
|
|
8775 | msgid "a specific branch you would like to push" | |
|
|
9321 | 8776 | msgstr "" |
|
|
9322 | 8777 | |
|
|
9323 | 8778 | msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" |
|
|
9324 | 8779 | msgstr "" |
|
|
9325 | 8780 | |
|
|
9326 |
msgid "show parents |
|
|
|
8781 | msgid "show parents of the specified revision" | |
|
|
9327 | 8782 | msgstr "" |
|
|
9328 | 8783 | |
|
|
9329 | 8784 | msgid "[-r REV] [FILE]" |
| @@ -9332,7 +8787,10 b' msgstr ""' | |||
|
|
9332 | 8787 | msgid "[NAME]" |
|
|
9333 | 8788 | msgstr "" |
|
|
9334 | 8789 | |
|
|
9335 |
msgid "update to new |
|
|
|
8790 | msgid "update to new branch head if changesets were pulled" | |
|
|
8791 | msgstr "" | |
|
|
8792 | ||
|
|
8793 | msgid "run even when remote repository is unrelated" | |
|
|
9336 | 8794 | msgstr "" |
|
|
9337 | 8795 | |
|
|
9338 | 8796 | msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" |
| @@ -9341,6 +8799,9 b' msgstr ""' | |||
|
|
9341 | 8799 | msgid "force push" |
|
|
9342 | 8800 | msgstr "" |
|
|
9343 | 8801 | |
|
|
8802 | msgid "allow pushing a new branch" | |
|
|
8803 | msgstr "" | |
|
|
8804 | ||
|
|
9344 | 8805 | msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" |
|
|
9345 | 8806 | msgstr "" |
|
|
9346 | 8807 | |
| @@ -9356,7 +8817,7 b' msgstr ""' | |||
|
|
9356 | 8817 | msgid "[OPTION]... SOURCE... DEST" |
|
|
9357 | 8818 | msgstr "" |
|
|
9358 | 8819 | |
|
|
9359 |
msgid " |
|
|
|
8820 | msgid "select all unresolved files" | |
|
|
9360 | 8821 | msgstr "" |
|
|
9361 | 8822 | |
|
|
9362 | 8823 | msgid "list state of files needing merge" |
| @@ -9365,7 +8826,10 b' msgstr ""' | |||
|
|
9365 | 8826 | msgid "mark files as resolved" |
|
|
9366 | 8827 | msgstr "" |
|
|
9367 | 8828 | |
|
|
9368 |
msgid " |
|
|
|
8829 | msgid "mark files as unresolved" | |
|
|
8830 | msgstr "" | |
|
|
8831 | ||
|
|
8832 | msgid "hide status prefix" | |
|
|
9369 | 8833 | msgstr "" |
|
|
9370 | 8834 | |
|
|
9371 | 8835 | msgid "revert all changes when no arguments given" |
| @@ -9374,7 +8838,7 b' msgstr ""' | |||
|
|
9374 | 8838 | msgid "tipmost revision matching date" |
|
|
9375 | 8839 | msgstr "" |
|
|
9376 | 8840 | |
|
|
9377 | msgid "revision to revert to" | |
|
|
8841 | msgid "revert to the specified revision" | |
|
|
9378 | 8842 | msgstr "" |
|
|
9379 | 8843 | |
|
|
9380 | 8844 | msgid "do not save backup copies of files" |
| @@ -9389,9 +8853,15 b' msgstr ""' | |||
|
|
9389 | 8853 | msgid "name of error log file to write to" |
|
|
9390 | 8854 | msgstr "" |
|
|
9391 | 8855 | |
|
|
8856 | msgid "PORT" | |
|
|
8857 | msgstr "" | |
|
|
8858 | ||
|
|
9392 | 8859 | msgid "port to listen on (default: 8000)" |
|
|
9393 | 8860 | msgstr "" |
|
|
9394 | 8861 | |
|
|
8862 | msgid "ADDR" | |
|
|
8863 | msgstr "" | |
|
|
8864 | ||
|
|
9395 | 8865 | msgid "address to listen on (default: all interfaces)" |
|
|
9396 | 8866 | msgstr "" |
|
|
9397 | 8867 | |
| @@ -9401,7 +8871,10 b' msgstr ""' | |||
|
|
9401 | 8871 | msgid "name to show in web pages (default: working directory)" |
|
|
9402 | 8872 | msgstr "" |
|
|
9403 | 8873 | |
|
|
9404 |
msgid "name of the web |
|
|
|
8874 | msgid "name of the hgweb config file (see \"hg help hgweb\")" | |
|
|
8875 | msgstr "" | |
|
|
8876 | ||
|
|
8877 | msgid "name of the hgweb config file (DEPRECATED)" | |
|
|
9405 | 8878 | msgstr "" |
|
|
9406 | 8879 | |
|
|
9407 | 8880 | msgid "for remote clients" |
| @@ -9452,17 +8925,17 b' msgstr ""' | |||
|
|
9452 | 8925 | msgid "show only ignored files" |
|
|
9453 | 8926 | msgstr "" |
|
|
9454 | 8927 | |
|
|
9455 | msgid "hide status prefix" | |
|
|
9456 | msgstr "" | |
|
|
9457 | ||
|
|
9458 | 8928 | msgid "show source of copied files" |
|
|
9459 | 8929 | msgstr "" |
|
|
9460 | 8930 | |
|
|
9461 | 8931 | msgid "show difference from revision" |
|
|
9462 | 8932 | msgstr "" |
|
|
9463 | 8933 | |
|
|
8934 | msgid "list the changed files of a revision" | |
|
|
8935 | msgstr "" | |
|
|
8936 | ||
|
|
9464 | 8937 | msgid "replace existing tag" |
|
|
9465 | msgstr "" | |
|
|
8938 | msgstr "覆蓋已存在的標記" | |
|
|
9466 | 8939 | |
|
|
9467 | 8940 | msgid "make the tag local" |
|
|
9468 | 8941 | msgstr "" |
| @@ -9471,37 +8944,98 b' msgid "revision to tag"' | |||
|
|
9471 | 8944 | msgstr "" |
|
|
9472 | 8945 | |
|
|
9473 | 8946 | msgid "remove a tag" |
|
|
9474 | msgstr "" | |
|
|
9475 | ||
|
|
9476 | msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." | |
|
|
9477 | msgstr "" | |
|
|
9478 | ||
|
|
9479 | msgid "[-p]" | |
|
|
9480 | msgstr "" | |
|
|
9481 | ||
|
|
9482 | msgid "update to new tip if changesets were unbundled" | |
|
|
8947 | msgstr "移除一個標記" | |
|
|
8948 | ||
|
|
8949 | msgid "use <text> as commit message" | |
|
|
8950 | msgstr "" | |
|
|
8951 | ||
|
|
8952 | msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." | |
|
|
8953 | msgstr "" | |
|
|
8954 | ||
|
|
8955 | msgid "[-p] [-g]" | |
|
|
8956 | msgstr "" | |
|
|
8957 | ||
|
|
8958 | msgid "update to new branch head if changesets were unbundled" | |
|
|
9483 | 8959 | msgstr "" |
|
|
9484 | 8960 | |
|
|
9485 | 8961 | msgid "[-u] FILE..." |
|
|
9486 | 8962 | msgstr "" |
|
|
9487 | 8963 | |
|
|
9488 | msgid "overwrite locally modified files (no backup)" | |
|
|
9489 | msgstr "" | |
|
|
9490 | ||
|
|
9491 |
msgid " |
|
|
|
9492 | msgstr "" | |
|
|
9493 | ||
|
|
9494 | msgid "[-C] [-d DATE] [[-r] REV]" | |
|
|
9495 | msgstr "" | |
|
|
9496 | ||
|
|
9497 | #, python-format | |
|
|
9498 | msgid "config error at %s:%d: '%s'" | |
|
|
9499 | msgstr "" | |
|
|
8964 | msgid "discard uncommitted changes (no backup)" | |
|
|
8965 | msgstr "取消沒有提交的變更(沒有備份)" | |
|
|
8966 | ||
|
|
8967 | msgid "update across branches if no uncommitted changes" | |
|
|
8968 | msgstr "" | |
|
|
8969 | ||
|
|
8970 | msgid "[-c] [-C] [-d DATE] [[-r] REV]" | |
|
|
8971 | msgstr "" | |
|
|
8972 | ||
|
|
8973 | #, python-format | |
|
|
8974 | msgid "cannot include %s (%s)" | |
|
|
8975 | msgstr "不能引入 %s (%s)" | |
|
|
9500 | 8976 | |
|
|
9501 | 8977 | msgid "not found in manifest" |
|
|
9502 | 8978 | msgstr "" |
|
|
9503 | 8979 | |
|
|
8980 | #, python-format | |
|
|
8981 | msgid "no such file in rev %s" | |
|
|
8982 | msgstr "" | |
|
|
8983 | ||
|
|
9504 | 8984 | msgid "branch name not in UTF-8!" |
|
|
8985 | msgstr "分支名稱不是UTF-8編碼!" | |
|
|
8986 | ||
|
|
8987 | #, python-format | |
|
|
8988 | msgid "%s does not exist!\n" | |
|
|
8989 | msgstr "%s 不存在喔!\n" | |
|
|
8990 | ||
|
|
8991 | #, python-format | |
|
|
8992 | msgid "" | |
|
|
8993 | "%s: up to %d MB of RAM may be required to manage this file\n" | |
|
|
8994 | "(use 'hg revert %s' to cancel the pending addition)\n" | |
|
|
8995 | msgstr "" | |
|
|
8996 | ||
|
|
8997 | #, python-format | |
|
|
8998 | msgid "%s not added: only files and symlinks supported currently\n" | |
|
|
8999 | msgstr "%s 不能新增 : 目前只有支援檔案跟符號連結檔\n" | |
|
|
9000 | ||
|
|
9001 | #, python-format | |
|
|
9002 | msgid "%s already tracked!\n" | |
|
|
9003 | msgstr "%s 已經追蹤!\n" | |
|
|
9004 | ||
|
|
9005 | #, python-format | |
|
|
9006 | msgid "%s not added!\n" | |
|
|
9007 | msgstr "%s不能新增!\n" | |
|
|
9008 | ||
|
|
9009 | #, python-format | |
|
|
9010 | msgid "%s still exists!\n" | |
|
|
9011 | msgstr "%s仍然存在!\n" | |
|
|
9012 | ||
|
|
9013 | #, python-format | |
|
|
9014 | msgid "%s not tracked!\n" | |
|
|
9015 | msgstr "%s 不能追蹤!\n" | |
|
|
9016 | ||
|
|
9017 | #, python-format | |
|
|
9018 | msgid "%s not removed!\n" | |
|
|
9019 | msgstr "%s 不能移除!\n" | |
|
|
9020 | ||
|
|
9021 | #, python-format | |
|
|
9022 | msgid "copy failed: %s is not a file or a symbolic link\n" | |
|
|
9023 | msgstr "複製失敗: %s 不是檔案或符號連結檔\n" | |
|
|
9024 | ||
|
|
9025 | #, python-format | |
|
|
9026 | msgid "invalid character in dag description: %s..." | |
|
|
9027 | msgstr "" | |
|
|
9028 | ||
|
|
9029 | #, python-format | |
|
|
9030 | msgid "expected id %i, got %i" | |
|
|
9031 | msgstr "" | |
|
|
9032 | ||
|
|
9033 | #, python-format | |
|
|
9034 | msgid "parent id %i is larger than current id %i" | |
|
|
9035 | msgstr "母系id %i 大於目前的id %i" | |
|
|
9036 | ||
|
|
9037 | #, python-format | |
|
|
9038 | msgid "invalid event type in dag: %s" | |
|
|
9505 | 9039 | msgstr "" |
|
|
9506 | 9040 | |
|
|
9507 | 9041 | msgid "working directory state appears damaged!" |
| @@ -9509,7 +9043,7 b' msgstr ""' | |||
|
|
9509 | 9043 | |
|
|
9510 | 9044 | #, python-format |
|
|
9511 | 9045 | msgid "'\\n' and '\\r' disallowed in filenames: %r" |
|
|
9512 | msgstr "" | |
|
|
9046 | msgstr "檔名不准有\\n 跟 \\r: %r" | |
|
|
9513 | 9047 | |
|
|
9514 | 9048 | #, python-format |
|
|
9515 | 9049 | msgid "directory %r already in dirstate" |
| @@ -9520,17 +9054,21 b' msgid "file %r in dirstate clashes with ' | |||
|
|
9520 | 9054 | msgstr "" |
|
|
9521 | 9055 | |
|
|
9522 | 9056 | #, python-format |
|
|
9057 | msgid "setting %r to other parent only allowed in merges" | |
|
|
9058 | msgstr "" | |
|
|
9059 | ||
|
|
9060 | #, python-format | |
|
|
9523 | 9061 | msgid "not in dirstate: %s\n" |
|
|
9524 | 9062 | msgstr "" |
|
|
9525 | 9063 | |
|
|
9526 | 9064 | msgid "unknown" |
|
|
9527 | msgstr "" | |
|
|
9065 | msgstr "不清楚" | |
|
|
9528 | 9066 | |
|
|
9529 | 9067 | msgid "character device" |
|
|
9530 | msgstr "" | |
|
|
9068 | msgstr "字元裝置" | |
|
|
9531 | 9069 | |
|
|
9532 | 9070 | msgid "block device" |
|
|
9533 | msgstr "" | |
|
|
9071 | msgstr "區塊裝置" | |
|
|
9534 | 9072 | |
|
|
9535 | 9073 | msgid "fifo" |
|
|
9536 | 9074 | msgstr "" |
| @@ -9539,18 +9077,70 b' msgid "socket"' | |||
|
|
9539 | 9077 | msgstr "" |
|
|
9540 | 9078 | |
|
|
9541 | 9079 | msgid "directory" |
|
|
9542 | msgstr "" | |
|
|
9080 | msgstr "目錄" | |
|
|
9543 | 9081 | |
|
|
9544 | 9082 | #, python-format |
|
|
9545 | 9083 | msgid "unsupported file type (type is %s)" |
|
|
9084 | msgstr "不支援的檔案型態 (型態是 %s)" | |
|
|
9085 | ||
|
|
9086 | msgid "searching for changes\n" | |
|
|
9087 | msgstr "正在搜尋變更\n" | |
|
|
9088 | ||
|
|
9089 | msgid "queries" | |
|
|
9090 | msgstr "" | |
|
|
9091 | ||
|
|
9092 | msgid "searching" | |
|
|
9093 | msgstr "搜尋中" | |
|
|
9094 | ||
|
|
9095 | msgid "already have changeset " | |
|
|
9096 | msgstr "已經有changeset了" | |
|
|
9097 | ||
|
|
9098 | msgid "warning: repository is unrelated\n" | |
|
|
9099 | msgstr "" | |
|
|
9100 | ||
|
|
9101 | msgid "repository is unrelated" | |
|
|
9102 | msgstr "" | |
|
|
9103 | ||
|
|
9104 | #, python-format | |
|
|
9105 | msgid "push creates new remote branches: %s!" | |
|
|
9106 | msgstr "push 建立新的遠端分支 '%s'!" | |
|
|
9107 | ||
|
|
9108 | msgid "use 'hg push --new-branch' to create new remote branches" | |
|
|
9109 | msgstr "使用 'hg push --new-branch' 建立新的遠端分支" | |
|
|
9110 | ||
|
|
9111 | #, python-format | |
|
|
9112 | msgid "push creates new remote heads on branch '%s'!" | |
|
|
9113 | msgstr "push 在分支 '%s'建立新的遠端標頭!" | |
|
|
9114 | ||
|
|
9115 | msgid "push creates new remote heads!" | |
|
|
9116 | msgstr "push 建立新的遠端標頭(heads)!" | |
|
|
9117 | ||
|
|
9118 | msgid "you should pull and merge or use push -f to force" | |
|
|
9119 | msgstr "" | |
|
|
9120 | ||
|
|
9121 | msgid "did you forget to merge? use push -f to force" | |
|
|
9122 | msgstr "" | |
|
|
9123 | ||
|
|
9124 | msgid "note: unsynced remote changes!\n" | |
|
|
9546 | 9125 | msgstr "" |
|
|
9547 | 9126 | |
|
|
9548 | 9127 | #, python-format |
|
|
9549 | 9128 | msgid "abort: %s\n" |
|
|
9550 | msgstr "" | |
|
|
9551 | ||
|
|
9552 | #, python-format | |
|
|
9553 |
msgid " |
|
|
|
9129 | msgstr "中止: %s\n" | |
|
|
9130 | ||
|
|
9131 | #, python-format | |
|
|
9132 | msgid "(%s)\n" | |
|
|
9133 | msgstr "" | |
|
|
9134 | ||
|
|
9135 | #, python-format | |
|
|
9136 | msgid "hg: parse error at %s: %s\n" | |
|
|
9137 | msgstr "" | |
|
|
9138 | ||
|
|
9139 | #, python-format | |
|
|
9140 | msgid "hg: parse error: %s\n" | |
|
|
9141 | msgstr "" | |
|
|
9142 | ||
|
|
9143 | msgid "entering debugger - type c to continue starting hg or h for help\n" | |
|
|
9554 | 9144 | msgstr "" |
|
|
9555 | 9145 | |
|
|
9556 | 9146 | #, python-format |
| @@ -9569,43 +9159,43 b' msgstr ""' | |||
|
|
9569 | 9159 | |
|
|
9570 | 9160 | #, python-format |
|
|
9571 | 9161 | msgid "abort: %s: %s\n" |
|
|
9572 | msgstr "" | |
|
|
9162 | msgstr "中止: %s: %s\n" | |
|
|
9573 | 9163 | |
|
|
9574 | 9164 | #, python-format |
|
|
9575 | 9165 | msgid "abort: could not lock %s: %s\n" |
|
|
9576 | msgstr "" | |
|
|
9166 | msgstr "中止: 我不能鎖住 %s: %s\n" | |
|
|
9577 | 9167 | |
|
|
9578 | 9168 | #, python-format |
|
|
9579 | 9169 | msgid "hg %s: %s\n" |
|
|
9580 | 9170 | msgstr "" |
|
|
9581 | 9171 | |
|
|
9582 | 9172 | #, python-format |
|
|
9173 | msgid "hg: %s\n" | |
|
|
9174 | msgstr "" | |
|
|
9175 | ||
|
|
9176 | #, python-format | |
|
|
9583 | 9177 | msgid "abort: %s!\n" |
|
|
9584 | msgstr "" | |
|
|
9178 | msgstr "中止: %s!\n" | |
|
|
9585 | 9179 | |
|
|
9586 | 9180 | #, python-format |
|
|
9587 | 9181 | msgid "abort: %s" |
|
|
9588 | msgstr "" | |
|
|
9182 | msgstr "中止: %s" | |
|
|
9589 | 9183 | |
|
|
9590 | 9184 | msgid " empty string\n" |
|
|
9591 | msgstr "" | |
|
|
9185 | msgstr "空字串\n" | |
|
|
9592 | 9186 | |
|
|
9593 | 9187 | msgid "killed!\n" |
|
|
9594 | 9188 | msgstr "" |
|
|
9595 | 9189 | |
|
|
9596 | 9190 | #, python-format |
|
|
9597 | 9191 | msgid "hg: unknown command '%s'\n" |
|
|
9598 | msgstr "" | |
|
|
9599 | ||
|
|
9600 | #, python-format | |
|
|
9601 | msgid "abort: could not import module %s!\n" | |
|
|
9602 | msgstr "" | |
|
|
9192 | msgstr "hg: 不認得'%s'命令\n" | |
|
|
9603 | 9193 | |
|
|
9604 | 9194 | msgid "(did you forget to compile extensions?)\n" |
|
|
9605 | msgstr "" | |
|
|
9195 | msgstr "(你忘記編譯額外功能(extensions)?)\n" | |
|
|
9606 | 9196 | |
|
|
9607 | 9197 | msgid "(is your Python install correct?)\n" |
|
|
9608 | msgstr "" | |
|
|
9198 | msgstr "(python安裝正確嘛?)\n" | |
|
|
9609 | 9199 | |
|
|
9610 | 9200 | #, python-format |
|
|
9611 | 9201 | msgid "abort: error: %s\n" |
| @@ -9623,15 +9213,16 b' msgid ""' | |||
|
|
9623 | 9213 | msgstr "" |
|
|
9624 | 9214 | |
|
|
9625 | 9215 | msgid "abort: out of memory\n" |
|
|
9626 | msgstr "" | |
|
|
9627 | ||
|
|
9628 |
msgid "** unknown exception encountered, |
|
|
|
9629 | msgstr "" | |
|
|
9630 | ||
|
|
9631 |
msgid "** |
|
|
|
9632 | msgstr "" | |
|
|
9633 | ||
|
|
9634 | msgid "** or mercurial@selenic.com\n" | |
|
|
9216 | msgstr "中止: 記憶體沒了\n" | |
|
|
9217 | ||
|
|
9218 | msgid "** unknown exception encountered, please report by visiting\n" | |
|
|
9219 | msgstr "" | |
|
|
9220 | ||
|
|
9221 | msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" | |
|
|
9222 | msgstr "" | |
|
|
9223 | ||
|
|
9224 | #, python-format | |
|
|
9225 | msgid "** Python %s\n" | |
|
|
9635 | 9226 | msgstr "" |
|
|
9636 | 9227 | |
|
|
9637 | 9228 | #, python-format |
| @@ -9640,13 +9231,19 b' msgstr ""' | |||
|
|
9640 | 9231 | |
|
|
9641 | 9232 | #, python-format |
|
|
9642 | 9233 | msgid "** Extensions loaded: %s\n" |
|
|
9643 | msgstr "" | |
|
|
9234 | msgstr "** 載入額外套件: %s\n" | |
|
|
9644 | 9235 | |
|
|
9645 | 9236 | #, python-format |
|
|
9646 | 9237 | msgid "no definition for alias '%s'\n" |
|
|
9647 | 9238 | msgstr "" |
|
|
9648 | 9239 | |
|
|
9649 | 9240 | #, python-format |
|
|
9241 | msgid "" | |
|
|
9242 | "error in definition for alias '%s': %s may only be given on the command " | |
|
|
9243 | "line\n" | |
|
|
9244 | msgstr "" | |
|
|
9245 | ||
|
|
9246 | #, python-format | |
|
|
9650 | 9247 | msgid "alias '%s' resolves to unknown command '%s'\n" |
|
|
9651 | 9248 | msgstr "" |
|
|
9652 | 9249 | |
| @@ -9655,20 +9252,26 b' msgid "alias \'%s\' resolves to ambiguous ' | |||
|
|
9655 | 9252 | msgstr "" |
|
|
9656 | 9253 | |
|
|
9657 | 9254 | #, python-format |
|
|
9658 | msgid "malformed --config option: %s" | |
|
|
9255 | msgid "malformed --config option: %r (use --config section.name=value)" | |
|
|
9256 | msgstr "" | |
|
|
9257 | ||
|
|
9258 | #, python-format | |
|
|
9259 | msgid "error getting current working directory: %s" | |
|
|
9659 | 9260 | msgstr "" |
|
|
9660 | 9261 | |
|
|
9661 | 9262 | #, python-format |
|
|
9662 | 9263 | msgid "extension '%s' overrides commands: %s\n" |
|
|
9663 | 9264 | msgstr "" |
|
|
9664 | 9265 | |
|
|
9665 |
msgid " |
|
|
|
9666 | msgstr "" | |
|
|
9667 | ||
|
|
9668 |
msgid " |
|
|
|
9669 | msgstr "" | |
|
|
9670 | ||
|
|
9671 | msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" | |
|
|
9266 | msgid "option --config may not be abbreviated!" | |
|
|
9267 | msgstr "" | |
|
|
9268 | ||
|
|
9269 | msgid "option --cwd may not be abbreviated!" | |
|
|
9270 | msgstr "" | |
|
|
9271 | ||
|
|
9272 | msgid "" | |
|
|
9273 | "Option -R has to be separated from other options (e.g. not -qR) and --" | |
|
|
9274 | "repository may only be abbreviated as --repo!" | |
|
|
9672 | 9275 | msgstr "" |
|
|
9673 | 9276 | |
|
|
9674 | 9277 | #, python-format |
| @@ -9677,25 +9280,30 b' msgstr ""' | |||
|
|
9677 | 9280 | |
|
|
9678 | 9281 | #, python-format |
|
|
9679 | 9282 | msgid "repository '%s' is not local" |
|
|
9283 | msgstr "'%s' 儲存庫不在本地端" | |
|
|
9284 | ||
|
|
9285 | msgid "warning: --repository ignored\n" | |
|
|
9680 | 9286 | msgstr "" |
|
|
9681 | 9287 | |
|
|
9682 | 9288 | msgid "invalid arguments" |
|
|
9683 | msgstr "" | |
|
|
9289 | msgstr "無效的參數" | |
|
|
9684 | 9290 | |
|
|
9685 | 9291 | #, python-format |
|
|
9686 | 9292 | msgid "unrecognized profiling format '%s' - Ignored\n" |
|
|
9687 | 9293 | msgstr "" |
|
|
9688 | 9294 | |
|
|
9689 | msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" | |
|
|
9295 | msgid "" | |
|
|
9296 | "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" | |
|
|
9297 | "misc/lsprof/" | |
|
|
9690 | 9298 | msgstr "" |
|
|
9691 | 9299 | |
|
|
9692 | 9300 | #, python-format |
|
|
9693 | 9301 | msgid "*** failed to import extension %s from %s: %s\n" |
|
|
9694 |
msgstr "*** 匯入 |
|
|
|
9302 | msgstr "*** 匯入額外套件 %s 失敗，路徑為 %s: %s\n" | |
|
|
9695 | 9303 | |
|
|
9696 | 9304 | #, python-format |
|
|
9697 | 9305 | msgid "*** failed to import extension %s: %s\n" |
|
|
9698 | msgstr "" | |
|
|
9306 | msgstr "*** 匯入額外套件 %s 失敗: %s\n" | |
|
|
9699 | 9307 | |
|
|
9700 | 9308 | #, python-format |
|
|
9701 | 9309 | msgid "couldn't find merge tool %s\n" |
| @@ -9736,35 +9344,39 b' msgid "merging %s\\n"' | |||
|
|
9736 | 9344 | msgstr "合併 %s 中\n" |
|
|
9737 | 9345 | |
|
|
9738 | 9346 | #, python-format |
|
|
9347 | msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" | |
|
|
9348 | msgstr "" | |
|
|
9349 | ||
|
|
9350 | #, python-format | |
|
|
9351 | msgid "was merge of '%s' successful (yn)?" | |
|
|
9352 | msgstr "" | |
|
|
9353 | ||
|
|
9354 | #, python-format | |
|
|
9739 | 9355 | msgid "" |
|
|
9740 | 9356 | " output file %s appears unchanged\n" |
|
|
9741 | 9357 | "was merge successful (yn)?" |
|
|
9742 | 9358 | msgstr "" |
|
|
9743 | 9359 | |
|
|
9744 | msgid "&No" | |
|
|
9745 | msgstr "" | |
|
|
9746 | ||
|
|
9747 | msgid "&Yes" | |
|
|
9748 | msgstr "" | |
|
|
9749 | ||
|
|
9750 | 9360 | #, python-format |
|
|
9751 | 9361 | msgid "merging %s failed!\n" |
|
|
9752 | 9362 | msgstr "合併 %s 失敗！\n" |
|
|
9753 | 9363 | |
|
|
9754 | #, python-format | |
|
|
9755 | msgid "Inconsistent state, %s:%s is good and bad" | |
|
|
9364 | msgid "starting revisions are not directly related" | |
|
|
9365 | msgstr "" | |
|
|
9366 | ||
|
|
9367 | #, python-format | |
|
|
9368 | msgid "inconsistent state, %s:%s is good and bad" | |
|
|
9756 | 9369 | msgstr "" |
|
|
9757 | 9370 | |
|
|
9758 | 9371 | #, python-format |
|
|
9759 | 9372 | msgid "unknown bisect kind %s" |
|
|
9760 | 9373 | msgstr "" |
|
|
9761 | 9374 | |
|
|
9762 | #, fuzzy | |
|
|
9763 | 9375 | msgid "disabled extensions:" |
|
|
9764 | msgstr "" | |
|
|
9765 | "\n" | |
|
|
9766 | "已啟用的擴充套件:\n" | |
|
|
9767 | "\n" | |
|
|
9376 | msgstr "不能使用的額外套件:" | |
|
|
9377 | ||
|
|
9378 | msgid "Configuration Files" | |
|
|
9379 | msgstr "設定檔" | |
|
|
9768 | 9380 | |
|
|
9769 | 9381 | msgid "Date Formats" |
|
|
9770 | 9382 | msgstr "日期格式" |
| @@ -9776,31 +9388,1972 b' msgid "Environment Variables"' | |||
|
|
9776 | 9388 | msgstr "環境變數" |
|
|
9777 | 9389 | |
|
|
9778 | 9390 | msgid "Specifying Single Revisions" |
|
|
9779 | msgstr "" | |
|
|
9391 | msgstr "表述一個版本" | |
|
|
9780 | 9392 | |
|
|
9781 | 9393 | msgid "Specifying Multiple Revisions" |
|
|
9782 | msgstr "" | |
|
|
9394 | msgstr "表述多個版本" | |
|
|
9395 | ||
|
|
9396 | msgid "Specifying Revision Sets" | |
|
|
9397 | msgstr "表述版本集合" | |
|
|
9783 | 9398 | |
|
|
9784 | 9399 | msgid "Diff Formats" |
|
|
9785 | msgstr "" | |
|
|
9400 | msgstr "Diff 格式" | |
|
|
9401 | ||
|
|
9402 | msgid "Merge Tools" | |
|
|
9403 | msgstr "合併工具" | |
|
|
9786 | 9404 | |
|
|
9787 | 9405 | msgid "Template Usage" |
|
|
9788 | msgstr "" | |
|
|
9406 | msgstr "樣式的使用" | |
|
|
9789 | 9407 | |
|
|
9790 | 9408 | msgid "URL Paths" |
|
|
9791 | msgstr "" | |
|
|
9409 | msgstr "URL路徑" | |
|
|
9792 | 9410 | |
|
|
9793 | 9411 | msgid "Using additional features" |
|
|
9794 | msgstr "" | |
|
|
9412 | msgstr "使用額外功能" | |
|
|
9413 | ||
|
|
9414 | #, fuzzy | |
|
|
9415 | msgid "Subrepositories" | |
|
|
9416 | msgstr "儲存庫 %s" | |
|
|
9417 | ||
|
|
9418 | msgid "Configuring hgweb" | |
|
|
9419 | msgstr "設定 hgweb" | |
|
|
9420 | ||
|
|
9421 | msgid "Glossary" | |
|
|
9422 | msgstr "" | |
|
|
9423 | ||
|
|
9424 | msgid "" | |
|
|
9425 | "Mercurial reads configuration data from several files, if they exist.\n" | |
|
|
9426 | "Below we list the most specific file first." | |
|
|
9427 | msgstr "" | |
|
|
9428 | ||
|
|
9429 | msgid "On Windows, these configuration files are read:" | |
|
|
9430 | msgstr "" | |
|
|
9431 | ||
|
|
9432 | msgid "" | |
|
|
9433 | "- ``<repo>\\.hg\\hgrc``\n" | |
|
|
9434 | "- ``%USERPROFILE%\\.hgrc``\n" | |
|
|
9435 | "- ``%USERPROFILE%\\mercurial.ini``\n" | |
|
|
9436 | "- ``%HOME%\\.hgrc``\n" | |
|
|
9437 | "- ``%HOME%\\mercurial.ini``\n" | |
|
|
9438 | "- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." | |
|
|
9439 | "ini found)\n" | |
|
|
9440 | "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." | |
|
|
9441 | "ini found)\n" | |
|
|
9442 | "- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" | |
|
|
9443 | "- ``<hg.exe-dir>\\mercurial.ini``" | |
|
|
9444 | msgstr "" | |
|
|
9445 | ||
|
|
9446 | msgid "On Unix, these files are read:" | |
|
|
9447 | msgstr "" | |
|
|
9448 | ||
|
|
9449 | msgid "" | |
|
|
9450 | "- ``<repo>/.hg/hgrc``\n" | |
|
|
9451 | "- ``$HOME/.hgrc``\n" | |
|
|
9452 | "- ``/etc/mercurial/hgrc``\n" | |
|
|
9453 | "- ``/etc/mercurial/hgrc.d/*.rc``\n" | |
|
|
9454 | "- ``<install-root>/etc/mercurial/hgrc``\n" | |
|
|
9455 | "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``" | |
|
|
9456 | msgstr "" | |
|
|
9457 | ||
|
|
9458 | msgid "" | |
|
|
9459 | "If there is a per-repository configuration file which is not owned by\n" | |
|
|
9460 | "the active user, Mercurial will warn you that the file is skipped::" | |
|
|
9461 | msgstr "" | |
|
|
9462 | ||
|
|
9463 | msgid "" | |
|
|
9464 | " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" | |
|
|
9465 | msgstr "" | |
|
|
9466 | ||
|
|
9467 | msgid "" | |
|
|
9468 | "If this bothers you, the warning can be silenced (the file would still\n" | |
|
|
9469 | "be ignored) or trust can be established. Use one of the following\n" | |
|
|
9470 | "settings, the syntax is explained below:" | |
|
|
9471 | msgstr "" | |
|
|
9472 | ||
|
|
9473 | msgid "" | |
|
|
9474 | "- ``ui.report_untrusted = False``\n" | |
|
|
9475 | "- ``trusted.users = USER``\n" | |
|
|
9476 | "- ``trusted.groups = GROUP``" | |
|
|
9477 | msgstr "" | |
|
|
9478 | ||
|
|
9479 | msgid "" | |
|
|
9480 | "The configuration files for Mercurial use a simple ini-file format. A\n" | |
|
|
9481 | "configuration file consists of sections, led by a ``[section]`` header\n" | |
|
|
9482 | "and followed by ``name = value`` entries::" | |
|
|
9483 | msgstr "" | |
|
|
9484 | ||
|
|
9485 | msgid "" | |
|
|
9486 | " [ui]\n" | |
|
|
9487 | " username = Firstname Lastname <firstname.lastname@example.net>\n" | |
|
|
9488 | " verbose = True" | |
|
|
9489 | msgstr "" | |
|
|
9490 | ||
|
|
9491 | msgid "" | |
|
|
9492 | "The above entries will be referred to as ``ui.username`` and\n" | |
|
|
9493 | "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" | |
|
|
9494 | "description of the possible configuration values:" | |
|
|
9495 | msgstr "" | |
|
|
9496 | ||
|
|
9497 | msgid "" | |
|
|
9498 | "- on Unix-like systems: ``man hgrc``\n" | |
|
|
9499 | "- online: http://www.selenic.com/mercurial/hgrc.5.html\n" | |
|
|
9500 | msgstr "" | |
|
|
9501 | ||
|
|
9502 | msgid "Some commands allow the user to specify a date, e.g.:" | |
|
|
9503 | msgstr "一些命令允許使用者表示時間,e.g.:" | |
|
|
9504 | ||
|
|
9505 | msgid "" | |
|
|
9506 | "- backout, commit, import, tag: Specify the commit date.\n" | |
|
|
9507 | "- log, revert, update: Select revision(s) by date." | |
|
|
9508 | msgstr "" | |
|
|
9509 | "- backout, commit, import, tag: 提交的時間.\n" | |
|
|
9510 | "- log, revert, update: 由時間來選擇修定版(s)" | |
|
|
9511 | ||
|
|
9512 | msgid "Many date formats are valid. Here are some examples:" | |
|
|
9513 | msgstr "支援許多的時間格式,這邊有一些範例::" | |
|
|
9514 | ||
|
|
9515 | msgid "" | |
|
|
9516 | "- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n" | |
|
|
9517 | "- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n" | |
|
|
9518 | "- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n" | |
|
|
9519 | "- ``Dec 6`` (midnight)\n" | |
|
|
9520 | "- ``13:18`` (today assumed)\n" | |
|
|
9521 | "- ``3:39`` (3:39AM assumed)\n" | |
|
|
9522 | "- ``3:39pm`` (15:39)\n" | |
|
|
9523 | "- ``2006-12-06 13:18:29`` (ISO 8601 format)\n" | |
|
|
9524 | "- ``2006-12-6 13:18``\n" | |
|
|
9525 | "- ``2006-12-6``\n" | |
|
|
9526 | "- ``12-6``\n" | |
|
|
9527 | "- ``12/6``\n" | |
|
|
9528 | "- ``12/6/6`` (Dec 6 2006)" | |
|
|
9529 | msgstr "" | |
|
|
9530 | ||
|
|
9531 | msgid "Lastly, there is Mercurial's internal format:" | |
|
|
9532 | msgstr "最後,是Mercurial 的內部格式::" | |
|
|
9533 | ||
|
|
9534 | msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)" | |
|
|
9535 | msgstr "" | |
|
|
9536 | ||
|
|
9537 | msgid "" | |
|
|
9538 | "This is the internal representation format for dates. unixtime is the\n" | |
|
|
9539 | "number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" | |
|
|
9540 | "the offset of the local timezone, in seconds west of UTC (negative if\n" | |
|
|
9541 | "the timezone is east of UTC)." | |
|
|
9542 | msgstr "" | |
|
|
9543 | ||
|
|
9544 | msgid "The log command also accepts date ranges:" | |
|
|
9545 | msgstr "log 命令也接收 時間區間::" | |
|
|
9546 | ||
|
|
9547 | msgid "" | |
|
|
9548 | "- ``<{datetime}`` - at or before a given date/time\n" | |
|
|
9549 | "- ``>{datetime}`` - on or after a given date/time\n" | |
|
|
9550 | "- ``{datetime} to {datetime}`` - a date range, inclusive\n" | |
|
|
9551 | "- ``-{days}`` - within a given number of days of today\n" | |
|
|
9552 | msgstr "" | |
|
|
9553 | ||
|
|
9554 | msgid "" | |
|
|
9555 | "Mercurial's default format for showing changes between two versions of\n" | |
|
|
9556 | "a file is compatible with the unified format of GNU diff, which can be\n" | |
|
|
9557 | "used by GNU patch and many other standard tools." | |
|
|
9558 | msgstr "" | |
|
|
9559 | ||
|
|
9560 | msgid "" | |
|
|
9561 | "While this standard format is often enough, it does not encode the\n" | |
|
|
9562 | "following information:" | |
|
|
9563 | msgstr "" | |
|
|
9564 | ||
|
|
9565 | msgid "" | |
|
|
9566 | "- executable status and other permission bits\n" | |
|
|
9567 | "- copy or rename information\n" | |
|
|
9568 | "- changes in binary files\n" | |
|
|
9569 | "- creation or deletion of empty files" | |
|
|
9570 | msgstr "" | |
|
|
9571 | ||
|
|
9572 | msgid "" | |
|
|
9573 | "Mercurial also supports the extended diff format from the git VCS\n" | |
|
|
9574 | "which addresses these limitations. The git diff format is not produced\n" | |
|
|
9575 | "by default because a few widespread tools still do not understand this\n" | |
|
|
9576 | "format." | |
|
|
9577 | msgstr "" | |
|
|
9578 | ||
|
|
9579 | msgid "" | |
|
|
9580 | "This means that when generating diffs from a Mercurial repository\n" | |
|
|
9581 | "(e.g. with :hg:`export`), you should be careful about things like file\n" | |
|
|
9582 | "copies and renames or other things mentioned above, because when\n" | |
|
|
9583 | "applying a standard diff to a different repository, this extra\n" | |
|
|
9584 | "information is lost. Mercurial's internal operations (like push and\n" | |
|
|
9585 | "pull) are not affected by this, because they use an internal binary\n" | |
|
|
9586 | "format for communicating changes." | |
|
|
9587 | msgstr "" | |
|
|
9588 | ||
|
|
9589 | msgid "" | |
|
|
9590 | "To make Mercurial produce the git extended diff format, use the --git\n" | |
|
|
9591 | "option available for many commands, or set 'git = True' in the [diff]\n" | |
|
|
9592 | "section of your configuration file. You do not need to set this option\n" | |
|
|
9593 | "when importing diffs in this format or using them in the mq extension.\n" | |
|
|
9594 | msgstr "" | |
|
|
9595 | ||
|
|
9596 | msgid "" | |
|
|
9597 | "HG\n" | |
|
|
9598 | " Path to the 'hg' executable, automatically passed when running\n" | |
|
|
9599 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
|
|
9600 | " the hg executable's name if it's frozen, or an executable named\n" | |
|
|
9601 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
|
9602 | " Windows) is searched." | |
|
|
9603 | msgstr "" | |
|
|
9604 | ||
|
|
9605 | msgid "" | |
|
|
9606 | "HGEDITOR\n" | |
|
|
9607 | " This is the name of the editor to run when committing. See EDITOR." | |
|
|
9608 | msgstr "" | |
|
|
9609 | ||
|
|
9610 | msgid " (deprecated, use configuration file)" | |
|
|
9611 | msgstr "" | |
|
|
9612 | ||
|
|
9613 | msgid "" | |
|
|
9614 | "HGENCODING\n" | |
|
|
9615 | " This overrides the default locale setting detected by Mercurial.\n" | |
|
|
9616 | " This setting is used to convert data including usernames,\n" | |
|
|
9617 | " changeset descriptions, tag names, and branches. This setting can\n" | |
|
|
9618 | " be overridden with the --encoding command-line option." | |
|
|
9619 | msgstr "" | |
|
|
9620 | ||
|
|
9621 | msgid "" | |
|
|
9622 | "HGENCODINGMODE\n" | |
|
|
9623 | " This sets Mercurial's behavior for handling unknown characters\n" | |
|
|
9624 | " while transcoding user input. The default is \"strict\", which\n" | |
|
|
9625 | " causes Mercurial to abort if it can't map a character. Other\n" | |
|
|
9626 | " settings include \"replace\", which replaces unknown characters, and\n" | |
|
|
9627 | " \"ignore\", which drops them. This setting can be overridden with\n" | |
|
|
9628 | " the --encodingmode command-line option." | |
|
|
9629 | msgstr "" | |
|
|
9630 | ||
|
|
9631 | msgid "" | |
|
|
9632 | "HGENCODINGAMBIGUOUS\n" | |
|
|
9633 | " This sets Mercurial's behavior for handling characters with\n" | |
|
|
9634 | " \"ambiguous\" widths like accented Latin characters with East Asian\n" | |
|
|
9635 | " fonts. By default, Mercurial assumes ambiguous characters are\n" | |
|
|
9636 | " narrow, set this variable to \"wide\" if such characters cause\n" | |
|
|
9637 | " formatting problems." | |
|
|
9638 | msgstr "" | |
|
|
9639 | ||
|
|
9640 | msgid "" | |
|
|
9641 | "HGMERGE\n" | |
|
|
9642 | " An executable to use for resolving merge conflicts. The program\n" | |
|
|
9643 | " will be executed with three arguments: local file, remote file,\n" | |
|
|
9644 | " ancestor file." | |
|
|
9645 | msgstr "" | |
|
|
9646 | ||
|
|
9647 | msgid "" | |
|
|
9648 | "HGRCPATH\n" | |
|
|
9649 | " A list of files or directories to search for configuration\n" | |
|
|
9650 | " files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n" | |
|
|
9651 | " is not set, platform default search path is used. If empty, only\n" | |
|
|
9652 | " the .hg/hgrc from the current repository is read." | |
|
|
9653 | msgstr "" | |
|
|
9654 | ||
|
|
9655 | msgid " For each element in HGRCPATH:" | |
|
|
9656 | msgstr "" | |
|
|
9657 | ||
|
|
9658 | msgid "" | |
|
|
9659 | " - if it's a directory, all files ending with .rc are added\n" | |
|
|
9660 | " - otherwise, the file itself will be added" | |
|
|
9661 | msgstr "" | |
|
|
9662 | ||
|
|
9663 | msgid "" | |
|
|
9664 | "HGPLAIN\n" | |
|
|
9665 | " When set, this disables any configuration settings that might\n" | |
|
|
9666 | " change Mercurial's default output. This includes encoding,\n" | |
|
|
9667 | " defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n" | |
|
|
9668 | " localization. This can be useful when scripting against Mercurial\n" | |
|
|
9669 | " in the face of existing user configuration." | |
|
|
9670 | msgstr "" | |
|
|
9671 | ||
|
|
9672 | msgid "" | |
|
|
9673 | " Equivalent options set via command line flags or environment\n" | |
|
|
9674 | " variables are not overridden." | |
|
|
9675 | msgstr "" | |
|
|
9676 | ||
|
|
9677 | msgid "" | |
|
|
9678 | "HGUSER\n" | |
|
|
9679 | " This is the string used as the author of a commit. If not set,\n" | |
|
|
9680 | " available values will be considered in this order:" | |
|
|
9681 | msgstr "" | |
|
|
9682 | ||
|
|
9683 | msgid "" | |
|
|
9684 | " - HGUSER (deprecated)\n" | |
|
|
9685 | " - configuration files from the HGRCPATH\n" | |
|
|
9686 | " - EMAIL\n" | |
|
|
9687 | " - interactive prompt\n" | |
|
|
9688 | " - LOGNAME (with ``@hostname`` appended)" | |
|
|
9689 | msgstr "" | |
|
|
9690 | ||
|
|
9691 | msgid "" | |
|
|
9692 | "EMAIL\n" | |
|
|
9693 | " May be used as the author of a commit; see HGUSER." | |
|
|
9694 | msgstr "" | |
|
|
9695 | ||
|
|
9696 | msgid "" | |
|
|
9697 | "LOGNAME\n" | |
|
|
9698 | " May be used as the author of a commit; see HGUSER." | |
|
|
9699 | msgstr "" | |
|
|
9700 | ||
|
|
9701 | msgid "" | |
|
|
9702 | "VISUAL\n" | |
|
|
9703 | " This is the name of the editor to use when committing. See EDITOR." | |
|
|
9704 | msgstr "" | |
|
|
9705 | ||
|
|
9706 | msgid "" | |
|
|
9707 | "EDITOR\n" | |
|
|
9708 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
|
|
9709 | " user to modify, for example when writing commit messages. The\n" | |
|
|
9710 | " editor it uses is determined by looking at the environment\n" | |
|
|
9711 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" | |
|
|
9712 | " non-empty one is chosen. If all of them are empty, the editor\n" | |
|
|
9713 | " defaults to 'vi'." | |
|
|
9714 | msgstr "" | |
|
|
9715 | ||
|
|
9716 | msgid "" | |
|
|
9717 | "PYTHONPATH\n" | |
|
|
9718 | " This is used by Python to find imported modules and may need to be\n" | |
|
|
9719 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
|
|
9720 | msgstr "" | |
|
|
9721 | ||
|
|
9722 | msgid "" | |
|
|
9723 | "Mercurial has the ability to add new features through the use of\n" | |
|
|
9724 | "extensions. Extensions may add new commands, add options to\n" | |
|
|
9725 | "existing commands, change the default behavior of commands, or\n" | |
|
|
9726 | "implement hooks." | |
|
|
9727 | msgstr "" | |
|
|
9728 | ||
|
|
9729 | msgid "" | |
|
|
9730 | "Extensions are not loaded by default for a variety of reasons:\n" | |
|
|
9731 | "they can increase startup overhead; they may be meant for advanced\n" | |
|
|
9732 | "usage only; they may provide potentially dangerous abilities (such\n" | |
|
|
9733 | "as letting you destroy or modify history); they might not be ready\n" | |
|
|
9734 | "for prime time; or they may alter some usual behaviors of stock\n" | |
|
|
9735 | "Mercurial. It is thus up to the user to activate extensions as\n" | |
|
|
9736 | "needed." | |
|
|
9737 | msgstr "" | |
|
|
9738 | ||
|
|
9739 | msgid "" | |
|
|
9740 | "To enable the \"foo\" extension, either shipped with Mercurial or in the\n" | |
|
|
9741 | "Python search path, create an entry for it in your configuration file,\n" | |
|
|
9742 | "like this::" | |
|
|
9743 | msgstr "" | |
|
|
9744 | ||
|
|
9745 | msgid "" | |
|
|
9746 | " [extensions]\n" | |
|
|
9747 | " foo =" | |
|
|
9748 | msgstr "" | |
|
|
9749 | ||
|
|
9750 | msgid "You may also specify the full path to an extension::" | |
|
|
9751 | msgstr "" | |
|
|
9752 | ||
|
|
9753 | msgid "" | |
|
|
9754 | " [extensions]\n" | |
|
|
9755 | " myfeature = ~/.hgext/myfeature.py" | |
|
|
9756 | msgstr "" | |
|
|
9757 | ||
|
|
9758 | msgid "" | |
|
|
9759 | "To explicitly disable an extension enabled in a configuration file of\n" | |
|
|
9760 | "broader scope, prepend its path with !::" | |
|
|
9761 | msgstr "" | |
|
|
9762 | ||
|
|
9763 | msgid "" | |
|
|
9764 | " [extensions]\n" | |
|
|
9765 | " # disabling extension bar residing in /path/to/extension/bar.py\n" | |
|
|
9766 | " bar = !/path/to/extension/bar.py\n" | |
|
|
9767 | " # ditto, but no path was supplied for extension baz\n" | |
|
|
9768 | " baz = !\n" | |
|
|
9769 | msgstr "" | |
|
|
9770 | ||
|
|
9771 | msgid "" | |
|
|
9772 | "Ancestor\n" | |
|
|
9773 | " Any changeset that can be reached by an unbroken chain of parent\n" | |
|
|
9774 | " changesets from a given changeset. More precisely, the ancestors\n" | |
|
|
9775 | " of a changeset can be defined by two properties: a parent of a\n" | |
|
|
9776 | " changeset is an ancestor, and a parent of an ancestor is an\n" | |
|
|
9777 | " ancestor. See also: 'Descendant'." | |
|
|
9778 | msgstr "" | |
|
|
9779 | ||
|
|
9780 | msgid "" | |
|
|
9781 | "Branch\n" | |
|
|
9782 | " (Noun) A child changeset that has been created from a parent that\n" | |
|
|
9783 | " is not a head. These are known as topological branches, see\n" | |
|
|
9784 | " 'Branch, topological'. If a topological branch is named, it becomes\n" | |
|
|
9785 | " a named branch. If a topological branch is not named, it becomes\n" | |
|
|
9786 | " an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." | |
|
|
9787 | msgstr "" | |
|
|
9788 | ||
|
|
9789 | msgid "" | |
|
|
9790 | " Branches may be created when changes are pulled from or pushed to\n" | |
|
|
9791 | " a remote repository, since new heads may be created by these\n" | |
|
|
9792 | " operations. Note that the term branch can also be used informally\n" | |
|
|
9793 | " to describe a development process in which certain development is\n" | |
|
|
9794 | " done independently of other development. This is sometimes done\n" | |
|
|
9795 | " explicitly with a named branch, but it can also be done locally,\n" | |
|
|
9796 | " using bookmarks or clones and anonymous branches." | |
|
|
9797 | msgstr "" | |
|
|
9798 | ||
|
|
9799 | msgid " Example: \"The experimental branch\"." | |
|
|
9800 | msgstr "" | |
|
|
9801 | ||
|
|
9802 | msgid "" | |
|
|
9803 | " (Verb) The action of creating a child changeset which results in\n" | |
|
|
9804 | " its parent having more than one child." | |
|
|
9805 | msgstr "" | |
|
|
9806 | ||
|
|
9807 | msgid " Example: \"I'm going to branch at X\"." | |
|
|
9808 | msgstr "" | |
|
|
9809 | ||
|
|
9810 | msgid "" | |
|
|
9811 | "Branch, anonymous\n" | |
|
|
9812 | " Every time a new child changeset is created from a parent that is not\n" | |
|
|
9813 | " a head and the name of the branch is not changed, a new anonymous\n" | |
|
|
9814 | " branch is created." | |
|
|
9815 | msgstr "" | |
|
|
9816 | ||
|
|
9817 | msgid "" | |
|
|
9818 | "Branch, closed\n" | |
|
|
9819 | " A named branch whose branch heads have all been closed." | |
|
|
9820 | msgstr "" | |
|
|
9821 | ||
|
|
9822 | msgid "" | |
|
|
9823 | "Branch, default\n" | |
|
|
9824 | " The branch assigned to a changeset when no name has previously been\n" | |
|
|
9825 | " assigned." | |
|
|
9826 | msgstr "" | |
|
|
9827 | ||
|
|
9828 | msgid "" | |
|
|
9829 | "Branch head\n" | |
|
|
9830 | " See 'Head, branch'." | |
|
|
9831 | msgstr "" | |
|
|
9832 | ||
|
|
9833 | msgid "" | |
|
|
9834 | "Branch, inactive\n" | |
|
|
9835 | " If a named branch has no topological heads, it is considered to be\n" | |
|
|
9836 | " inactive. As an example, a feature branch becomes inactive when it\n" | |
|
|
9837 | " is merged into the default branch. The :hg:`branches` command\n" | |
|
|
9838 | " shows inactive branches by default, though they can be hidden with\n" | |
|
|
9839 | " :hg:`branches --active`." | |
|
|
9840 | msgstr "" | |
|
|
9841 | ||
|
|
9842 | msgid "" | |
|
|
9843 | " NOTE: this concept is deprecated because it is too implicit.\n" | |
|
|
9844 | " Branches should now be explicitly closed using :hg:`commit\n" | |
|
|
9845 | " --close-branch` when they are no longer needed." | |
|
|
9846 | msgstr "" | |
|
|
9847 | ||
|
|
9848 | msgid "" | |
|
|
9849 | "Branch, named\n" | |
|
|
9850 | " A collection of changesets which have the same branch name. By\n" | |
|
|
9851 | " default, children of a changeset in a named branch belong to the\n" | |
|
|
9852 | " same named branch. A child can be explicitly assigned to a\n" | |
|
|
9853 | " different branch. See :hg:`help branch`, :hg:`help branches` and\n" | |
|
|
9854 | " :hg:`commit --close-branch` for more information on managing\n" | |
|
|
9855 | " branches." | |
|
|
9856 | msgstr "" | |
|
|
9857 | ||
|
|
9858 | msgid "" | |
|
|
9859 | " Named branches can be thought of as a kind of namespace, dividing\n" | |
|
|
9860 | " the collection of changesets that comprise the repository into a\n" | |
|
|
9861 | " collection of disjoint subsets. A named branch is not necessarily\n" | |
|
|
9862 | " a topological branch. If a new named branch is created from the\n" | |
|
|
9863 | " head of another named branch, or the default branch, but no\n" | |
|
|
9864 | " further changesets are added to that previous branch, then that\n" | |
|
|
9865 | " previous branch will be a branch in name only." | |
|
|
9866 | msgstr "" | |
|
|
9867 | ||
|
|
9868 | msgid "" | |
|
|
9869 | "Branch tip\n" | |
|
|
9870 | " See 'Tip, branch'." | |
|
|
9871 | msgstr "" | |
|
|
9872 | ||
|
|
9873 | msgid "" | |
|
|
9874 | "Branch, topological\n" | |
|
|
9875 | " Every time a new child changeset is created from a parent that is\n" | |
|
|
9876 | " not a head, a new topological branch is created. If a topological\n" | |
|
|
9877 | " branch is named, it becomes a named branch. If a topological\n" | |
|
|
9878 | " branch is not named, it becomes an anonymous branch of the\n" | |
|
|
9879 | " current, possibly default, branch." | |
|
|
9880 | msgstr "" | |
|
|
9881 | ||
|
|
9882 | msgid "" | |
|
|
9883 | "Changelog\n" | |
|
|
9884 | " A record of the changesets in the order in which they were added\n" | |
|
|
9885 | " to the repository. This includes details such as changeset id,\n" | |
|
|
9886 | " author, commit message, date, and list of changed files." | |
|
|
9887 | msgstr "" | |
|
|
9888 | ||
|
|
9889 | msgid "" | |
|
|
9890 | "Changeset\n" | |
|
|
9891 | " A snapshot of the state of the repository used to record a change." | |
|
|
9892 | msgstr "" | |
|
|
9893 | ||
|
|
9894 | msgid "" | |
|
|
9895 | "Changeset, child\n" | |
|
|
9896 | " The converse of parent changeset: if P is a parent of C, then C is\n" | |
|
|
9897 | " a child of P. There is no limit to the number of children that a\n" | |
|
|
9898 | " changeset may have." | |
|
|
9899 | msgstr "" | |
|
|
9900 | ||
|
|
9901 | msgid "" | |
|
|
9902 | "Changeset id\n" | |
|
|
9903 | " A SHA-1 hash that uniquely identifies a changeset. It may be\n" | |
|
|
9904 | " represented as either a \"long\" 40 hexadecimal digit string, or a\n" | |
|
|
9905 | " \"short\" 12 hexadecimal digit string." | |
|
|
9906 | msgstr "" | |
|
|
9907 | ||
|
|
9908 | msgid "" | |
|
|
9909 | "Changeset, merge\n" | |
|
|
9910 | " A changeset with two parents. This occurs when a merge is\n" | |
|
|
9911 | " committed." | |
|
|
9912 | msgstr "" | |
|
|
9913 | ||
|
|
9914 | msgid "" | |
|
|
9915 | "Changeset, parent\n" | |
|
|
9916 | " A revision upon which a child changeset is based. Specifically, a\n" | |
|
|
9917 | " parent changeset of a changeset C is a changeset whose node\n" | |
|
|
9918 | " immediately precedes C in the DAG. Changesets have at most two\n" | |
|
|
9919 | " parents." | |
|
|
9920 | msgstr "" | |
|
|
9921 | ||
|
|
9922 | msgid "" | |
|
|
9923 | "Checkout\n" | |
|
|
9924 | " (Noun) The working directory being updated to a specific\n" | |
|
|
9925 | " revision. This use should probably be avoided where possible, as\n" | |
|
|
9926 | " changeset is much more appropriate than checkout in this context." | |
|
|
9927 | msgstr "" | |
|
|
9928 | ||
|
|
9929 | msgid " Example: \"I'm using checkout X.\"" | |
|
|
9930 | msgstr "" | |
|
|
9931 | ||
|
|
9932 | msgid "" | |
|
|
9933 | " (Verb) Updating the working directory to a specific changeset. See\n" | |
|
|
9934 | " :hg:`help update`." | |
|
|
9935 | msgstr "" | |
|
|
9936 | ||
|
|
9937 | msgid " Example: \"I'm going to check out changeset X.\"" | |
|
|
9938 | msgstr "" | |
|
|
9939 | ||
|
|
9940 | msgid "" | |
|
|
9941 | "Child changeset\n" | |
|
|
9942 | " See 'Changeset, child'." | |
|
|
9943 | msgstr "" | |
|
|
9944 | ||
|
|
9945 | msgid "" | |
|
|
9946 | "Close changeset\n" | |
|
|
9947 | " See 'Changeset, close'." | |
|
|
9948 | msgstr "" | |
|
|
9949 | ||
|
|
9950 | msgid "" | |
|
|
9951 | "Closed branch\n" | |
|
|
9952 | " See 'Branch, closed'." | |
|
|
9953 | msgstr "" | |
|
|
9954 | ||
|
|
9955 | msgid "" | |
|
|
9956 | "Clone\n" | |
|
|
9957 | " (Noun) An entire or partial copy of a repository. The partial\n" | |
|
|
9958 | " clone must be in the form of a revision and its ancestors." | |
|
|
9959 | msgstr "" | |
|
|
9960 | ||
|
|
9961 | msgid " Example: \"Is your clone up to date?\"." | |
|
|
9962 | msgstr "" | |
|
|
9963 | ||
|
|
9964 | msgid " (Verb) The process of creating a clone, using :hg:`clone`." | |
|
|
9965 | msgstr "" | |
|
|
9966 | ||
|
|
9967 | msgid " Example: \"I'm going to clone the repository\"." | |
|
|
9968 | msgstr "" | |
|
|
9969 | ||
|
|
9970 | msgid "" | |
|
|
9971 | "Closed branch head\n" | |
|
|
9972 | " See 'Head, closed branch'." | |
|
|
9973 | msgstr "" | |
|
|
9974 | ||
|
|
9975 | msgid "" | |
|
|
9976 | "Commit\n" | |
|
|
9977 | " (Noun) A synonym for changeset." | |
|
|
9978 | msgstr "" | |
|
|
9979 | ||
|
|
9980 | msgid " Example: \"Is the bug fixed in your recent commit?\"" | |
|
|
9981 | msgstr "" | |
|
|
9982 | ||
|
|
9983 | msgid "" | |
|
|
9984 | " (Verb) The act of recording changes to a repository. When files\n" | |
|
|
9985 | " are committed in a working directory, Mercurial finds the\n" | |
|
|
9986 | " differences between the committed files and their parent\n" | |
|
|
9987 | " changeset, creating a new changeset in the repository." | |
|
|
9988 | msgstr "" | |
|
|
9989 | ||
|
|
9990 | msgid " Example: \"You should commit those changes now.\"" | |
|
|
9991 | msgstr "" | |
|
|
9992 | ||
|
|
9993 | msgid "" | |
|
|
9994 | "Cset\n" | |
|
|
9995 | " A common abbreviation of the term changeset." | |
|
|
9996 | msgstr "" | |
|
|
9997 | ||
|
|
9998 | msgid "" | |
|
|
9999 | "DAG\n" | |
|
|
10000 | " The repository of changesets of a distributed version control\n" | |
|
|
10001 | " system (DVCS) can be described as a directed acyclic graph (DAG),\n" | |
|
|
10002 | " consisting of nodes and edges, where nodes correspond to\n" | |
|
|
10003 | " changesets and edges imply a parent -> child relation. This graph\n" | |
|
|
10004 | " can be visualized by graphical tools such as :hg:`glog`\n" | |
|
|
10005 | " (graphlog). In Mercurial, the DAG is limited by the requirement\n" | |
|
|
10006 | " for children to have at most two parents." | |
|
|
10007 | msgstr "" | |
|
|
10008 | ||
|
|
10009 | msgid "" | |
|
|
10010 | "Default branch\n" | |
|
|
10011 | " See 'Branch, default'." | |
|
|
10012 | msgstr "" | |
|
|
10013 | ||
|
|
10014 | msgid "" | |
|
|
10015 | "Descendant\n" | |
|
|
10016 | " Any changeset that can be reached by a chain of child changesets\n" | |
|
|
10017 | " from a given changeset. More precisely, the descendants of a\n" | |
|
|
10018 | " changeset can be defined by two properties: the child of a\n" | |
|
|
10019 | " changeset is a descendant, and the child of a descendant is a\n" | |
|
|
10020 | " descendant. See also: 'Ancestor'." | |
|
|
10021 | msgstr "" | |
|
|
10022 | ||
|
|
10023 | msgid "" | |
|
|
10024 | "Diff\n" | |
|
|
10025 | " (Noun) The difference between the contents and attributes of files\n" | |
|
|
10026 | " in two changesets or a changeset and the current working\n" | |
|
|
10027 | " directory. The difference is usually represented in a standard\n" | |
|
|
10028 | " form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" | |
|
|
10029 | " when the changes include copies, renames, or changes to file\n" | |
|
|
10030 | " attributes, none of which can be represented/handled by classic\n" | |
|
|
10031 | " \"diff\" and \"patch\"." | |
|
|
10032 | msgstr "" | |
|
|
10033 | ||
|
|
10034 | msgid " Example: \"Did you see my correction in the diff?\"" | |
|
|
10035 | msgstr "" | |
|
|
10036 | ||
|
|
10037 | msgid "" | |
|
|
10038 | " (Verb) Diffing two changesets is the action of creating a diff or\n" | |
|
|
10039 | " patch." | |
|
|
10040 | msgstr "" | |
|
|
10041 | ||
|
|
10042 | msgid "" | |
|
|
10043 | " Example: \"If you diff with changeset X, you will see what I mean.\"" | |
|
|
10044 | msgstr "" | |
|
|
10045 | ||
|
|
10046 | msgid "" | |
|
|
10047 | "Directory, working\n" | |
|
|
10048 | " The working directory represents the state of the files tracked by\n" | |
|
|
10049 | " Mercurial, that will be recorded in the next commit. The working\n" | |
|
|
10050 | " directory initially corresponds to the snapshot at an existing\n" | |
|
|
10051 | " changeset, known as the parent of the working directory. See\n" | |
|
|
10052 | " 'Parent, working directory'. The state may be modified by changes\n" | |
|
|
10053 | " to the files introduced manually or by a merge. The repository\n" | |
|
|
10054 | " metadata exists in the .hg directory inside the working directory." | |
|
|
10055 | msgstr "" | |
|
|
10056 | ||
|
|
10057 | msgid "" | |
|
|
10058 | "Graph\n" | |
|
|
10059 | " See DAG and :hg:`help graphlog`." | |
|
|
10060 | msgstr "" | |
|
|
10061 | ||
|
|
10062 | msgid "" | |
|
|
10063 | "Head\n" | |
|
|
10064 | " The term 'head' may be used to refer to both a branch head or a\n" | |
|
|
10065 | " repository head, depending on the context. See 'Head, branch' and\n" | |
|
|
10066 | " 'Head, repository' for specific definitions." | |
|
|
10067 | msgstr "" | |
|
|
10068 | ||
|
|
10069 | msgid "" | |
|
|
10070 | " Heads are where development generally takes place and are the\n" | |
|
|
10071 | " usual targets for update and merge operations." | |
|
|
10072 | msgstr "" | |
|
|
10073 | ||
|
|
10074 | msgid "" | |
|
|
10075 | "Head, branch\n" | |
|
|
10076 | " A changeset with no descendants on the same named branch." | |
|
|
10077 | msgstr "" | |
|
|
10078 | ||
|
|
10079 | msgid "" | |
|
|
10080 | "Head, closed branch\n" | |
|
|
10081 | " A changeset that marks a head as no longer interesting. The closed\n" | |
|
|
10082 | " head is no longer listed by :hg:`heads`. A branch is considered\n" | |
|
|
10083 | " closed when all its heads are closed and consequently is not\n" | |
|
|
10084 | " listed by :hg:`branches`." | |
|
|
10085 | msgstr "" | |
|
|
10086 | ||
|
|
10087 | msgid "" | |
|
|
10088 | "Head, repository\n" | |
|
|
10089 | " A topological head which has not been closed." | |
|
|
10090 | msgstr "" | |
|
|
10091 | ||
|
|
10092 | msgid "" | |
|
|
10093 | "Head, topological\n" | |
|
|
10094 | " A changeset with no children in the repository." | |
|
|
10095 | msgstr "" | |
|
|
10096 | ||
|
|
10097 | msgid "" | |
|
|
10098 | "History, immutable\n" | |
|
|
10099 | " Once committed, changesets cannot be altered. Extensions which\n" | |
|
|
10100 | " appear to change history actually create new changesets that\n" | |
|
|
10101 | " replace existing ones, and then destroy the old changesets. Doing\n" | |
|
|
10102 | " so in public repositories can result in old changesets being\n" | |
|
|
10103 | " reintroduced to the repository." | |
|
|
10104 | msgstr "" | |
|
|
10105 | ||
|
|
10106 | msgid "" | |
|
|
10107 | "History, rewriting\n" | |
|
|
10108 | " The changesets in a repository are immutable. However, extensions\n" | |
|
|
10109 | " to Mercurial can be used to alter the repository, usually in such\n" | |
|
|
10110 | " a way as to preserve changeset contents." | |
|
|
10111 | msgstr "" | |
|
|
10112 | ||
|
|
10113 | msgid "" | |
|
|
10114 | "Immutable history\n" | |
|
|
10115 | " See 'History, immutable'." | |
|
|
10116 | msgstr "" | |
|
|
10117 | ||
|
|
10118 | msgid "" | |
|
|
10119 | "Merge changeset\n" | |
|
|
10120 | " See 'Changeset, merge'." | |
|
|
10121 | msgstr "" | |
|
|
10122 | ||
|
|
10123 | msgid "" | |
|
|
10124 | "Manifest\n" | |
|
|
10125 | " Each changeset has a manifest, which is the list of files that are\n" | |
|
|
10126 | " tracked by the changeset." | |
|
|
10127 | msgstr "" | |
|
|
10128 | ||
|
|
10129 | msgid "" | |
|
|
10130 | "Merge\n" | |
|
|
10131 | " Used to bring together divergent branches of work. When you update\n" | |
|
|
10132 | " to a changeset and then merge another changeset, you bring the\n" | |
|
|
10133 | " history of the latter changeset into your working directory. Once\n" | |
|
|
10134 | " conflicts are resolved (and marked), this merge may be committed\n" | |
|
|
10135 | " as a merge changeset, bringing two branches together in the DAG." | |
|
|
10136 | msgstr "" | |
|
|
10137 | ||
|
|
10138 | msgid "" | |
|
|
10139 | "Named branch\n" | |
|
|
10140 | " See 'Branch, named'." | |
|
|
10141 | msgstr "" | |
|
|
10142 | ||
|
|
10143 | msgid "" | |
|
|
10144 | "Null changeset\n" | |
|
|
10145 | " The empty changeset. It is the parent state of newly-initialized\n" | |
|
|
10146 | " repositories and repositories with no checked out revision. It is\n" | |
|
|
10147 | " thus the parent of root changesets and the effective ancestor when\n" | |
|
|
10148 | " merging unrelated changesets. Can be specified by the alias 'null'\n" | |
|
|
10149 | " or by the changeset ID '000000000000'." | |
|
|
10150 | msgstr "" | |
|
|
10151 | ||
|
|
10152 | msgid "" | |
|
|
10153 | "Parent\n" | |
|
|
10154 | " See 'Changeset, parent'." | |
|
|
10155 | msgstr "" | |
|
|
10156 | ||
|
|
10157 | msgid "" | |
|
|
10158 | "Parent changeset\n" | |
|
|
10159 | " See 'Changeset, parent'." | |
|
|
10160 | msgstr "" | |
|
|
10161 | ||
|
|
10162 | msgid "" | |
|
|
10163 | "Parent, working directory\n" | |
|
|
10164 | " The working directory parent reflects a virtual revision which is\n" | |
|
|
10165 | " the child of the changeset (or two changesets with an uncommitted\n" | |
|
|
10166 | " merge) shown by :hg:`parents`. This is changed with\n" | |
|
|
10167 | " :hg:`update`. Other commands to see the working directory parent\n" | |
|
|
10168 | " are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." | |
|
|
10169 | msgstr "" | |
|
|
10170 | ||
|
|
10171 | msgid "" | |
|
|
10172 | "Patch\n" | |
|
|
10173 | " (Noun) The product of a diff operation." | |
|
|
10174 | msgstr "" | |
|
|
10175 | ||
|
|
10176 | msgid " Example: \"I've sent you my patch.\"" | |
|
|
10177 | msgstr "" | |
|
|
10178 | ||
|
|
10179 | msgid "" | |
|
|
10180 | " (Verb) The process of using a patch file to transform one\n" | |
|
|
10181 | " changeset into another." | |
|
|
10182 | msgstr "" | |
|
|
10183 | ||
|
|
10184 | msgid " Example: \"You will need to patch that revision.\"" | |
|
|
10185 | msgstr "" | |
|
|
10186 | ||
|
|
10187 | msgid "" | |
|
|
10188 | "Pull\n" | |
|
|
10189 | " An operation in which changesets in a remote repository which are\n" | |
|
|
10190 | " not in the local repository are brought into the local\n" | |
|
|
10191 | " repository. Note that this operation without special arguments\n" | |
|
|
10192 | " only updates the repository, it does not update the files in the\n" | |
|
|
10193 | " working directory. See :hg:`help pull`." | |
|
|
10194 | msgstr "" | |
|
|
10195 | ||
|
|
10196 | msgid "" | |
|
|
10197 | "Push\n" | |
|
|
10198 | " An operation in which changesets in a local repository which are\n" | |
|
|
10199 | " not in a remote repository are sent to the remote repository. Note\n" | |
|
|
10200 | " that this operation only adds changesets which have been committed\n" | |
|
|
10201 | " locally to the remote repository. Uncommitted changes are not\n" | |
|
|
10202 | " sent. See :hg:`help push`." | |
|
|
10203 | msgstr "" | |
|
|
10204 | ||
|
|
10205 | msgid "" | |
|
|
10206 | "Repository\n" | |
|
|
10207 | " The metadata describing all recorded states of a collection of\n" | |
|
|
10208 | " files. Each recorded state is represented by a changeset. A\n" | |
|
|
10209 | " repository is usually (but not always) found in the ``.hg``\n" | |
|
|
10210 | " subdirectory of a working directory. Any recorded state can be\n" | |
|
|
10211 | " recreated by \"updating\" a working directory to a specific\n" | |
|
|
10212 | " changeset." | |
|
|
10213 | msgstr "" | |
|
|
10214 | ||
|
|
10215 | msgid "" | |
|
|
10216 | "Repository head\n" | |
|
|
10217 | " See 'Head, repository'." | |
|
|
10218 | msgstr "" | |
|
|
10219 | ||
|
|
10220 | msgid "" | |
|
|
10221 | "Revision\n" | |
|
|
10222 | " A state of the repository at some point in time. Earlier revisions\n" | |
|
|
10223 | " can be updated to by using :hg:`update`. See also 'Revision\n" | |
|
|
10224 | " number'; See also 'Changeset'." | |
|
|
10225 | msgstr "" | |
|
|
10226 | ||
|
|
10227 | msgid "" | |
|
|
10228 | "Revision number\n" | |
|
|
10229 | " This integer uniquely identifies a changeset in a specific\n" | |
|
|
10230 | " repository. It represents the order in which changesets were added\n" | |
|
|
10231 | " to a repository, starting with revision number 0. Note that the\n" | |
|
|
10232 | " revision number may be different in each clone of a repository. To\n" | |
|
|
10233 | " identify changesets uniquely between different clones, see\n" | |
|
|
10234 | " 'Changeset id'." | |
|
|
10235 | msgstr "" | |
|
|
10236 | ||
|
|
10237 | msgid "" | |
|
|
10238 | "Revlog\n" | |
|
|
10239 | " History storage mechanism used by Mercurial. It is a form of delta\n" | |
|
|
10240 | " encoding, with occasional full revision of data followed by delta\n" | |
|
|
10241 | " of each successive revision. It includes data and an index\n" | |
|
|
10242 | " pointing to the data." | |
|
|
10243 | msgstr "" | |
|
|
10244 | ||
|
|
10245 | msgid "" | |
|
|
10246 | "Rewriting history\n" | |
|
|
10247 | " See 'History, rewriting'." | |
|
|
10248 | msgstr "" | |
|
|
10249 | ||
|
|
10250 | msgid "" | |
|
|
10251 | "Root\n" | |
|
|
10252 | " A changeset that has only the null changeset as its parent. Most\n" | |
|
|
10253 | " repositories have only a single root changeset." | |
|
|
10254 | msgstr "" | |
|
|
10255 | ||
|
|
10256 | msgid "" | |
|
|
10257 | "Tip\n" | |
|
|
10258 | " The changeset with the highest revision number. It is the changeset\n" | |
|
|
10259 | " most recently added in a repository." | |
|
|
10260 | msgstr "" | |
|
|
10261 | ||
|
|
10262 | msgid "" | |
|
|
10263 | "Tip, branch\n" | |
|
|
10264 | " The head of a given branch with the highest revision number. When\n" | |
|
|
10265 | " a branch name is used as a revision identifier, it refers to the\n" | |
|
|
10266 | " branch tip. See also 'Branch, head'. Note that because revision\n" | |
|
|
10267 | " numbers may be different in different repository clones, the\n" | |
|
|
10268 | " branch tip may be different in different cloned repositories." | |
|
|
10269 | msgstr "" | |
|
|
10270 | ||
|
|
10271 | msgid "" | |
|
|
10272 | "Update\n" | |
|
|
10273 | " (Noun) Another synonym of changeset." | |
|
|
10274 | msgstr "" | |
|
|
10275 | ||
|
|
10276 | msgid " Example: \"I've pushed an update\"." | |
|
|
10277 | msgstr "" | |
|
|
10278 | ||
|
|
10279 | msgid "" | |
|
|
10280 | " (Verb) This term is usually used to describe updating the state of\n" | |
|
|
10281 | " the working directory to that of a specific changeset. See\n" | |
|
|
10282 | " :hg:`help update`." | |
|
|
10283 | msgstr "" | |
|
|
10284 | ||
|
|
10285 | msgid " Example: \"You should update\"." | |
|
|
10286 | msgstr "" | |
|
|
10287 | ||
|
|
10288 | msgid "" | |
|
|
10289 | "Working directory\n" | |
|
|
10290 | " See 'Directory, working'." | |
|
|
10291 | msgstr "" | |
|
|
10292 | ||
|
|
10293 | msgid "" | |
|
|
10294 | "Working directory parent\n" | |
|
|
10295 | " See 'Parent, working directory'.\n" | |
|
|
10296 | msgstr "" | |
|
|
10297 | ||
|
|
10298 | msgid "" | |
|
|
10299 | "Mercurial's internal web server, hgweb, can serve either a single\n" | |
|
|
10300 | "repository, or a collection of them. In the latter case, a special\n" | |
|
|
10301 | "configuration file can be used to specify the repository paths to use\n" | |
|
|
10302 | "and global web configuration options." | |
|
|
10303 | msgstr "" | |
|
|
10304 | ||
|
|
10305 | msgid "" | |
|
|
10306 | "This file uses the same syntax as hgrc configuration files, but only\n" | |
|
|
10307 | "the following sections are recognized:" | |
|
|
10308 | msgstr "" | |
|
|
10309 | ||
|
|
10310 | msgid "" | |
|
|
10311 | " - web\n" | |
|
|
10312 | " - paths\n" | |
|
|
10313 | " - collections" | |
|
|
10314 | msgstr "" | |
|
|
10315 | ||
|
|
10316 | msgid "" | |
|
|
10317 | "The ``web`` section can specify all the settings described in the web\n" | |
|
|
10318 | "section of the hgrc documentation." | |
|
|
10319 | msgstr "" | |
|
|
10320 | ||
|
|
10321 | msgid "" | |
|
|
10322 | "The ``paths`` section provides mappings of physical repository\n" | |
|
|
10323 | "paths to virtual ones. For instance::" | |
|
|
10324 | msgstr "" | |
|
|
10325 | ||
|
|
10326 | msgid "" | |
|
|
10327 | " [paths]\n" | |
|
|
10328 | " projects/a = /foo/bar\n" | |
|
|
10329 | " projects/b = /baz/quux\n" | |
|
|
10330 | " web/root = /real/root/*\n" | |
|
|
10331 | " / = /real/root2/*\n" | |
|
|
10332 | " virtual/root2 = /real/root2/**" | |
|
|
10333 | msgstr "" | |
|
|
10334 | ||
|
|
10335 | msgid "" | |
|
|
10336 | "- The first two entries make two repositories in different directories\n" | |
|
|
10337 | " appear under the same directory in the web interface\n" | |
|
|
10338 | "- The third entry maps every Mercurial repository found in '/real/root'\n" | |
|
|
10339 | " into 'web/root'. This format is preferred over the [collections] one,\n" | |
|
|
10340 | " since using absolute paths as configuration keys is not supported on " | |
|
|
10341 | "every\n" | |
|
|
10342 | " platform (especially on Windows).\n" | |
|
|
10343 | "- The fourth entry is a special case mapping all repositories in\n" | |
|
|
10344 | " '/real/root2' in the root of the virtual directory.\n" | |
|
|
10345 | "- The fifth entry recursively finds all repositories under the real\n" | |
|
|
10346 | " root, and maps their relative paths under the virtual root." | |
|
|
10347 | msgstr "" | |
|
|
10348 | ||
|
|
10349 | msgid "" | |
|
|
10350 | "The ``collections`` section provides mappings of trees of physical\n" | |
|
|
10351 | "repositories paths to virtual ones, though the paths syntax is generally\n" | |
|
|
10352 | "preferred. For instance::" | |
|
|
10353 | msgstr "" | |
|
|
10354 | ||
|
|
10355 | msgid "" | |
|
|
10356 | " [collections]\n" | |
|
|
10357 | " /foo = /foo" | |
|
|
10358 | msgstr "" | |
|
|
10359 | ||
|
|
10360 | msgid "" | |
|
|
10361 | "Here, the left side will be stripped off all repositories found in the\n" | |
|
|
10362 | "right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" | |
|
|
10363 | "``bar`` and ``quux/baz`` respectively.\n" | |
|
|
10364 | msgstr "" | |
|
|
10365 | ||
|
|
10366 | msgid "To merge files Mercurial uses merge tools." | |
|
|
10367 | msgstr "" | |
|
|
10368 | ||
|
|
10369 | msgid "" | |
|
|
10370 | "A merge tool combines two different versions of a file into a merged\n" | |
|
|
10371 | "file. Merge tools are given the two files and the greatest common\n" | |
|
|
10372 | "ancestor of the two file versions, so they can determine the changes\n" | |
|
|
10373 | "made on both branches." | |
|
|
10374 | msgstr "" | |
|
|
10375 | ||
|
|
10376 | msgid "" | |
|
|
10377 | "Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" | |
|
|
10378 | ":hg:`backout` and in several extensions." | |
|
|
10379 | msgstr "" | |
|
|
10380 | ||
|
|
10381 | msgid "" | |
|
|
10382 | "Usually, the merge tool tries to automatically reconcile the files by\n" | |
|
|
10383 | "combining all non-overlapping changes that occurred separately in\n" | |
|
|
10384 | "the two different evolutions of the same initial base file. Furthermore, " | |
|
|
10385 | "some\n" | |
|
|
10386 | "interactive merge programs make it easier to manually resolve\n" | |
|
|
10387 | "conflicting merges, either in a graphical way, or by inserting some\n" | |
|
|
10388 | "conflict markers. Mercurial does not include any interactive merge\n" | |
|
|
10389 | "programs but relies on external tools for that." | |
|
|
10390 | msgstr "" | |
|
|
10391 | ||
|
|
10392 | msgid "" | |
|
|
10393 | "Available merge tools\n" | |
|
|
10394 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |
|
|
10395 | msgstr "" | |
|
|
10396 | ||
|
|
10397 | msgid "" | |
|
|
10398 | "External merge tools and their properties are configured in the\n" | |
|
|
10399 | "merge-tools configuration section - see hgrc(5) - but they can often just\n" | |
|
|
10400 | "be named by their executable." | |
|
|
10401 | msgstr "" | |
|
|
10402 | ||
|
|
10403 | msgid "" | |
|
|
10404 | "A merge tool is generally usable if its executable can be found on the\n" | |
|
|
10405 | "system and if it can handle the merge. The executable is found if it\n" | |
|
|
10406 | "is an absolute or relative executable path or the name of an\n" | |
|
|
10407 | "application in the executable search path. The tool is assumed to be\n" | |
|
|
10408 | "able to handle the merge if it can handle symlinks if the file is a\n" | |
|
|
10409 | "symlink, if it can handle binary files if the file is binary, and if a\n" | |
|
|
10410 | "GUI is available if the tool requires a GUI." | |
|
|
10411 | msgstr "" | |
|
|
10412 | ||
|
|
10413 | msgid "" | |
|
|
10414 | "There are some internal merge tools which can be used. The internal\n" | |
|
|
10415 | "merge tools are:" | |
|
|
10416 | msgstr "" | |
|
|
10417 | ||
|
|
10418 | msgid "" | |
|
|
10419 | "``internal:merge``\n" | |
|
|
10420 | " Uses the internal non-interactive simple merge algorithm for merging\n" | |
|
|
10421 | " files. It will fail if there are any conflicts and leave markers in\n" | |
|
|
10422 | " the partially merged file." | |
|
|
10423 | msgstr "" | |
|
|
10424 | ||
|
|
10425 | msgid "" | |
|
|
10426 | "``internal:fail``\n" | |
|
|
10427 | " Rather than attempting to merge files that were modified on both\n" | |
|
|
10428 | " branches, it marks them as unresolved. The resolve command must be\n" | |
|
|
10429 | " used to resolve these conflicts." | |
|
|
10430 | msgstr "" | |
|
|
10431 | ||
|
|
10432 | msgid "" | |
|
|
10433 | "``internal:local``\n" | |
|
|
10434 | " Uses the local version of files as the merged version." | |
|
|
10435 | msgstr "" | |
|
|
10436 | ||
|
|
10437 | msgid "" | |
|
|
10438 | "``internal:other``\n" | |
|
|
10439 | " Uses the other version of files as the merged version." | |
|
|
10440 | msgstr "" | |
|
|
10441 | ||
|
|
10442 | msgid "" | |
|
|
10443 | "``internal:prompt``\n" | |
|
|
10444 | " Asks the user which of the local or the other version to keep as\n" | |
|
|
10445 | " the merged version." | |
|
|
10446 | msgstr "" | |
|
|
10447 | ||
|
|
10448 | msgid "" | |
|
|
10449 | "``internal:dump``\n" | |
|
|
10450 | " Creates three versions of the files to merge, containing the\n" | |
|
|
10451 | " contents of local, other and base. These files can then be used to\n" | |
|
|
10452 | " perform a merge manually. If the file to be merged is named\n" | |
|
|
10453 | " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" | |
|
|
10454 | " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" | |
|
|
10455 | " same directory as ``a.txt``." | |
|
|
10456 | msgstr "" | |
|
|
10457 | ||
|
|
10458 | msgid "" | |
|
|
10459 | "Internal tools are always available and do not require a GUI but will by " | |
|
|
10460 | "default\n" | |
|
|
10461 | "not handle symlinks or binary files." | |
|
|
10462 | msgstr "" | |
|
|
10463 | ||
|
|
10464 | msgid "" | |
|
|
10465 | "Choosing a merge tool\n" | |
|
|
10466 | "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" | |
|
|
10467 | msgstr "" | |
|
|
10468 | ||
|
|
10469 | msgid "Mercurial uses these rules when deciding which merge tool to use:" | |
|
|
10470 | msgstr "" | |
|
|
10471 | ||
|
|
10472 | msgid "" | |
|
|
10473 | "1. If a tool has been specified with the --tool option to merge or resolve, " | |
|
|
10474 | "it\n" | |
|
|
10475 | " is used. If it is the name of a tool in the merge-tools configuration, " | |
|
|
10476 | "its\n" | |
|
|
10477 | " configuration is used. Otherwise the specified tool must be executable " | |
|
|
10478 | "by\n" | |
|
|
10479 | " the shell." | |
|
|
10480 | msgstr "" | |
|
|
10481 | ||
|
|
10482 | msgid "" | |
|
|
10483 | "2. If the ``HGMERGE`` environment variable is present, its value is used " | |
|
|
10484 | "and\n" | |
|
|
10485 | " must be executable by the shell." | |
|
|
10486 | msgstr "" | |
|
|
10487 | ||
|
|
10488 | msgid "" | |
|
|
10489 | "3. If the filename of the file to be merged matches any of the patterns in " | |
|
|
10490 | "the\n" | |
|
|
10491 | " merge-patterns configuration section, the first usable merge tool\n" | |
|
|
10492 | " corresponding to a matching pattern is used. Here, binary capabilities of " | |
|
|
10493 | "the\n" | |
|
|
10494 | " merge tool are not considered." | |
|
|
10495 | msgstr "" | |
|
|
10496 | ||
|
|
10497 | msgid "" | |
|
|
10498 | "4. If ui.merge is set it will be considered next. If the value is not the " | |
|
|
10499 | "name\n" | |
|
|
10500 | " of a configured tool, the specified value is used and must be executable " | |
|
|
10501 | "by\n" | |
|
|
10502 | " the shell. Otherwise the named tool is used if it is usable." | |
|
|
10503 | msgstr "" | |
|
|
10504 | ||
|
|
10505 | msgid "" | |
|
|
10506 | "5. If any usable merge tools are present in the merge-tools configuration\n" | |
|
|
10507 | " section, the one with the highest priority is used." | |
|
|
10508 | msgstr "" | |
|
|
10509 | ||
|
|
10510 | msgid "" | |
|
|
10511 | "6. If a program named ``hgmerge`` can be found on the system, it is used - " | |
|
|
10512 | "but\n" | |
|
|
10513 | " it will by default not be used for symlinks and binary files." | |
|
|
10514 | msgstr "" | |
|
|
10515 | ||
|
|
10516 | msgid "" | |
|
|
10517 | "7. If the file to be merged is not binary and is not a symlink, then\n" | |
|
|
10518 | " ``internal:merge`` is used." | |
|
|
10519 | msgstr "" | |
|
|
10520 | ||
|
|
10521 | msgid "8. The merge of the file fails and must be resolved before commit." | |
|
|
10522 | msgstr "" | |
|
|
10523 | ||
|
|
10524 | msgid "" | |
|
|
10525 | ".. note::\n" | |
|
|
10526 | " After selecting a merge program, Mercurial will by default attempt\n" | |
|
|
10527 | " to merge the files using a simple merge algorithm first. Only if it " | |
|
|
10528 | "doesn't\n" | |
|
|
10529 | " succeed because of conflicting changes Mercurial will actually execute " | |
|
|
10530 | "the\n" | |
|
|
10531 | " merge program. Whether to use the simple merge algorithm first can be\n" | |
|
|
10532 | " controlled by the premerge setting of the merge tool. Premerge is enabled " | |
|
|
10533 | "by\n" | |
|
|
10534 | " default unless the file is binary or a symlink." | |
|
|
10535 | msgstr "" | |
|
|
10536 | ||
|
|
10537 | msgid "" | |
|
|
10538 | "See the merge-tools and ui sections of hgrc(5) for details on the\n" | |
|
|
10539 | "configuration of merge tools.\n" | |
|
|
10540 | msgstr "" | |
|
|
10541 | ||
|
|
10542 | msgid "" | |
|
|
10543 | "When Mercurial accepts more than one revision, they may be specified\n" | |
|
|
10544 | "individually, or provided as a topologically continuous range,\n" | |
|
|
10545 | "separated by the \":\" character." | |
|
|
10546 | msgstr "" | |
|
|
10547 | ||
|
|
10548 | msgid "" | |
|
|
10549 | "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" | |
|
|
10550 | "revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n" | |
|
|
10551 | "specified, it defaults to revision number 0. If END is not specified,\n" | |
|
|
10552 | "it defaults to the tip. The range \":\" thus means \"all revisions\"." | |
|
|
10553 | msgstr "" | |
|
|
10554 | ||
|
|
10555 | msgid "If BEGIN is greater than END, revisions are treated in reverse order." | |
|
|
10556 | msgstr "" | |
|
|
10557 | ||
|
|
10558 | msgid "" | |
|
|
10559 | "A range acts as a closed interval. This means that a range of 3:5\n" | |
|
|
10560 | "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" | |
|
|
10561 | msgstr "" | |
|
|
10562 | ||
|
|
10563 | msgid "" | |
|
|
10564 | "Mercurial accepts several notations for identifying one or more files\n" | |
|
|
10565 | "at a time." | |
|
|
10566 | msgstr "" | |
|
|
10567 | ||
|
|
10568 | msgid "" | |
|
|
10569 | "By default, Mercurial treats filenames as shell-style extended glob\n" | |
|
|
10570 | "patterns." | |
|
|
10571 | msgstr "" | |
|
|
10572 | ||
|
|
10573 | msgid "Alternate pattern notations must be specified explicitly." | |
|
|
10574 | msgstr "" | |
|
|
10575 | ||
|
|
10576 | msgid "" | |
|
|
10577 | "To use a plain path name without any pattern matching, start it with\n" | |
|
|
10578 | "``path:``. These path names must completely match starting at the\n" | |
|
|
10579 | "current repository root." | |
|
|
10580 | msgstr "" | |
|
|
10581 | ||
|
|
10582 | msgid "" | |
|
|
10583 | "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" | |
|
|
10584 | "at the current directory; a glob such as ``*.c`` will only match files\n" | |
|
|
10585 | "in the current directory ending with ``.c``." | |
|
|
10586 | msgstr "" | |
|
|
10587 | ||
|
|
10588 | msgid "" | |
|
|
10589 | "The supported glob syntax extensions are ``**`` to match any string\n" | |
|
|
10590 | "across path separators and ``{a,b}`` to mean \"a or b\"." | |
|
|
10591 | msgstr "" | |
|
|
10592 | ||
|
|
10593 | msgid "" | |
|
|
10594 | "To use a Perl/Python regular expression, start a name with ``re:``.\n" | |
|
|
10595 | "Regexp pattern matching is anchored at the root of the repository." | |
|
|
10596 | msgstr "" | |
|
|
10597 | ||
|
|
10598 | msgid "Plain examples::" | |
|
|
10599 | msgstr "" | |
|
|
10600 | ||
|
|
10601 | msgid "" | |
|
|
10602 | " path:foo/bar a name bar in a directory named foo in the root\n" | |
|
|
10603 | " of the repository\n" | |
|
|
10604 | " path:path:name a file or directory named \"path:name\"" | |
|
|
10605 | msgstr "" | |
|
|
10606 | ||
|
|
10607 | msgid "Glob examples::" | |
|
|
10608 | msgstr "" | |
|
|
10609 | ||
|
|
10610 | msgid "" | |
|
|
10611 | " glob:*.c any name ending in \".c\" in the current directory\n" | |
|
|
10612 | " *.c any name ending in \".c\" in the current directory\n" | |
|
|
10613 | " **.c any name ending in \".c\" in any subdirectory of the\n" | |
|
|
10614 | " current directory including itself.\n" | |
|
|
10615 | " foo/*.c any name ending in \".c\" in the directory foo\n" | |
|
|
10616 | " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" | |
|
|
10617 | " including itself." | |
|
|
10618 | msgstr "" | |
|
|
10619 | ||
|
|
10620 | msgid "Regexp examples::" | |
|
|
10621 | msgstr "" | |
|
|
10622 | ||
|
|
10623 | msgid "" | |
|
|
10624 | " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" | |
|
|
10625 | msgstr "" | |
|
|
10626 | ||
|
|
10627 | msgid "Mercurial supports several ways to specify individual revisions." | |
|
|
10628 | msgstr "" | |
|
|
10629 | ||
|
|
10630 | msgid "" | |
|
|
10631 | "A plain integer is treated as a revision number. Negative integers are\n" | |
|
|
10632 | "treated as sequential offsets from the tip, with -1 denoting the tip,\n" | |
|
|
10633 | "-2 denoting the revision prior to the tip, and so forth." | |
|
|
10634 | msgstr "" | |
|
|
10635 | ||
|
|
10636 | msgid "" | |
|
|
10637 | "A 40-digit hexadecimal string is treated as a unique revision\n" | |
|
|
10638 | "identifier." | |
|
|
10639 | msgstr "" | |
|
|
10640 | ||
|
|
10641 | msgid "" | |
|
|
10642 | "A hexadecimal string less than 40 characters long is treated as a\n" | |
|
|
10643 | "unique revision identifier and is referred to as a short-form\n" | |
|
|
10644 | "identifier. A short-form identifier is only valid if it is the prefix\n" | |
|
|
10645 | "of exactly one full-length identifier." | |
|
|
10646 | msgstr "" | |
|
|
10647 | ||
|
|
10648 | msgid "" | |
|
|
10649 | "Any other string is treated as a tag or branch name. A tag name is a\n" | |
|
|
10650 | "symbolic name associated with a revision identifier. A branch name\n" | |
|
|
10651 | "denotes the tipmost revision of that branch. Tag and branch names must\n" | |
|
|
10652 | "not contain the \":\" character." | |
|
|
10653 | msgstr "" | |
|
|
10654 | ||
|
|
10655 | msgid "" | |
|
|
10656 | "The reserved name \"tip\" is a special tag that always identifies the\n" | |
|
|
10657 | "most recent revision." | |
|
|
10658 | msgstr "" | |
|
|
10659 | ||
|
|
10660 | msgid "" | |
|
|
10661 | "The reserved name \"null\" indicates the null revision. This is the\n" | |
|
|
10662 | "revision of an empty repository, and the parent of revision 0." | |
|
|
10663 | msgstr "" | |
|
|
10664 | ||
|
|
10665 | msgid "" | |
|
|
10666 | "The reserved name \".\" indicates the working directory parent. If no\n" | |
|
|
10667 | "working directory is checked out, it is equivalent to null. If an\n" | |
|
|
10668 | "uncommitted merge is in progress, \".\" is the revision of the first\n" | |
|
|
10669 | "parent.\n" | |
|
|
10670 | msgstr "" | |
|
|
10671 | ||
|
|
10672 | msgid "" | |
|
|
10673 | "Mercurial supports a functional language for selecting a set of\n" | |
|
|
10674 | "revisions." | |
|
|
10675 | msgstr "" | |
|
|
10676 | ||
|
|
10677 | msgid "" | |
|
|
10678 | "The language supports a number of predicates which are joined by infix\n" | |
|
|
10679 | "operators. Parenthesis can be used for grouping." | |
|
|
10680 | msgstr "" | |
|
|
10681 | ||
|
|
10682 | msgid "" | |
|
|
10683 | "Identifiers such as branch names must be quoted with single or double\n" | |
|
|
10684 | "quotes if they contain characters outside of\n" | |
|
|
10685 | "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" | |
|
|
10686 | "predicates." | |
|
|
10687 | msgstr "" | |
|
|
10688 | ||
|
|
10689 | msgid "" | |
|
|
10690 | "Special characters can be used in quoted identifiers by escaping them,\n" | |
|
|
10691 | "e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" | |
|
|
10692 | "interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." | |
|
|
10693 | msgstr "" | |
|
|
10694 | ||
|
|
10695 | msgid "There is a single prefix operator:" | |
|
|
10696 | msgstr "" | |
|
|
10697 | ||
|
|
10698 | msgid "" | |
|
|
10699 | "``not x``\n" | |
|
|
10700 | " Changesets not in x. Short form is ``! x``." | |
|
|
10701 | msgstr "" | |
|
|
10702 | ||
|
|
10703 | msgid "These are the supported infix operators:" | |
|
|
10704 | msgstr "" | |
|
|
10705 | ||
|
|
10706 | msgid "" | |
|
|
10707 | "``x::y``\n" | |
|
|
10708 | " A DAG range, meaning all changesets that are descendants of x and\n" | |
|
|
10709 | " ancestors of y, including x and y themselves. If the first endpoint\n" | |
|
|
10710 | " is left out, this is equivalent to ``ancestors(y)``, if the second\n" | |
|
|
10711 | " is left out it is equivalent to ``descendants(x)``." | |
|
|
10712 | msgstr "" | |
|
|
10713 | ||
|
|
10714 | msgid " An alternative syntax is ``x..y``." | |
|
|
10715 | msgstr "" | |
|
|
10716 | ||
|
|
10717 | msgid "" | |
|
|
10718 | "``x:y``\n" | |
|
|
10719 | " All changesets with revision numbers between x and y, both\n" | |
|
|
10720 | " inclusive. Either endpoint can be left out, they default to 0 and\n" | |
|
|
10721 | " tip." | |
|
|
10722 | msgstr "" | |
|
|
10723 | ||
|
|
10724 | msgid "" | |
|
|
10725 | "``x and y``\n" | |
|
|
10726 | " The intersection of changesets in x and y. Short form is ``x & y``." | |
|
|
10727 | msgstr "" | |
|
|
10728 | ||
|
|
10729 | msgid "" | |
|
|
10730 | "``x or y``\n" | |
|
|
10731 | " The union of changesets in x and y. There are two alternative short\n" | |
|
|
10732 | " forms: ``x | y`` and ``x + y``." | |
|
|
10733 | msgstr "" | |
|
|
10734 | ||
|
|
10735 | msgid "" | |
|
|
10736 | "``x - y``\n" | |
|
|
10737 | " Changesets in x but not in y." | |
|
|
10738 | msgstr "" | |
|
|
10739 | ||
|
|
10740 | msgid "The following predicates are supported:" | |
|
|
10741 | msgstr "" | |
|
|
10742 | ||
|
|
10743 | msgid ".. predicatesmarker" | |
|
|
10744 | msgstr "" | |
|
|
10745 | ||
|
|
10746 | msgid "Command line equivalents for :hg:`log`::" | |
|
|
10747 | msgstr "" | |
|
|
10748 | ||
|
|
10749 | msgid "" | |
|
|
10750 | " -f -> ::.\n" | |
|
|
10751 | " -d x -> date(x)\n" | |
|
|
10752 | " -k x -> keyword(x)\n" | |
|
|
10753 | " -m -> merge()\n" | |
|
|
10754 | " -u x -> user(x)\n" | |
|
|
10755 | " -b x -> branch(x)\n" | |
|
|
10756 | " -P x -> !::x\n" | |
|
|
10757 | " -l x -> limit(expr, x)" | |
|
|
10758 | msgstr "" | |
|
|
10759 | ||
|
|
10760 | msgid "Some sample queries:" | |
|
|
10761 | msgstr "" | |
|
|
10762 | ||
|
|
10763 | msgid "- Changesets on the default branch::" | |
|
|
10764 | msgstr "" | |
|
|
10765 | ||
|
|
10766 | msgid " hg log -r \"branch(default)\"" | |
|
|
10767 | msgstr "" | |
|
|
10768 | ||
|
|
10769 | msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" | |
|
|
10770 | msgstr "" | |
|
|
10771 | ||
|
|
10772 | msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" | |
|
|
10773 | msgstr "" | |
|
|
10774 | ||
|
|
10775 | msgid "- Open branch heads::" | |
|
|
10776 | msgstr "" | |
|
|
10777 | ||
|
|
10778 | msgid " hg log -r \"head() and not closed()\"" | |
|
|
10779 | msgstr "" | |
|
|
10780 | ||
|
|
10781 | msgid "" | |
|
|
10782 | "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" | |
|
|
10783 | " ``hgext/*``::" | |
|
|
10784 | msgstr "" | |
|
|
10785 | ||
|
|
10786 | msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" | |
|
|
10787 | msgstr "" | |
|
|
10788 | ||
|
|
10789 | msgid "- Changesets in committed May 2008, sorted by user::" | |
|
|
10790 | msgstr "" | |
|
|
10791 | ||
|
|
10792 | msgid " hg log -r \"sort(date('May 2008'), user)\"" | |
|
|
10793 | msgstr "" | |
|
|
10794 | ||
|
|
10795 | msgid "" | |
|
|
10796 | "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" | |
|
|
10797 | " release::" | |
|
|
10798 | msgstr "" | |
|
|
10799 | ||
|
|
10800 | msgid "" | |
|
|
10801 | " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" | |
|
|
10802 | "())\"\n" | |
|
|
10803 | msgstr "" | |
|
|
10804 | ||
|
|
10805 | msgid "" | |
|
|
10806 | "Subrepositories let you nest external repositories or projects into a\n" | |
|
|
10807 | "parent Mercurial repository, and make commands operate on them as a\n" | |
|
|
10808 | "group. External Mercurial and Subversion projects are currently\n" | |
|
|
10809 | "supported." | |
|
|
10810 | msgstr "" | |
|
|
10811 | ||
|
|
10812 | msgid "Subrepositories are made of three components:" | |
|
|
10813 | msgstr "" | |
|
|
10814 | ||
|
|
10815 | msgid "" | |
|
|
10816 | "1. Nested repository checkouts. They can appear anywhere in the\n" | |
|
|
10817 | " parent working directory, and are Mercurial clones or Subversion\n" | |
|
|
10818 | " checkouts." | |
|
|
10819 | msgstr "" | |
|
|
10820 | ||
|
|
10821 | msgid "" | |
|
|
10822 | "2. Nested repository references. They are defined in ``.hgsub`` and\n" | |
|
|
10823 | " tell where the subrepository checkouts come from. Mercurial\n" | |
|
|
10824 | " subrepositories are referenced like:" | |
|
|
10825 | msgstr "" | |
|
|
10826 | ||
|
|
10827 | msgid " path/to/nested = https://example.com/nested/repo/path" | |
|
|
10828 | msgstr "" | |
|
|
10829 | ||
|
|
10830 | msgid "" | |
|
|
10831 | " where ``path/to/nested`` is the checkout location relatively to the\n" | |
|
|
10832 | " parent Mercurial root, and ``https://example.com/nested/repo/path``\n" | |
|
|
10833 | " is the source repository path. The source can also reference a\n" | |
|
|
10834 | " filesystem path. Subversion repositories are defined with:" | |
|
|
10835 | msgstr "" | |
|
|
10836 | ||
|
|
10837 | msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" | |
|
|
10838 | msgstr "" | |
|
|
10839 | ||
|
|
10840 | msgid "" | |
|
|
10841 | " Note that ``.hgsub`` does not exist by default in Mercurial\n" | |
|
|
10842 | " repositories, you have to create and add it to the parent\n" | |
|
|
10843 | " repository before using subrepositories." | |
|
|
10844 | msgstr "" | |
|
|
10845 | ||
|
|
10846 | msgid "" | |
|
|
10847 | "3. Nested repository states. They are defined in ``.hgsubstate`` and\n" | |
|
|
10848 | " capture whatever information is required to restore the\n" | |
|
|
10849 | " subrepositories to the state they were committed in a parent\n" | |
|
|
10850 | " repository changeset. Mercurial automatically record the nested\n" | |
|
|
10851 | " repositories states when committing in the parent repository." | |
|
|
10852 | msgstr "" | |
|
|
10853 | ||
|
|
10854 | msgid "" | |
|
|
10855 | " .. note::\n" | |
|
|
10856 | " The ``.hgsubstate`` file should not be edited manually." | |
|
|
10857 | msgstr "" | |
|
|
10858 | ||
|
|
10859 | msgid "" | |
|
|
10860 | "\n" | |
|
|
10861 | "Adding a Subrepository\n" | |
|
|
10862 | "----------------------" | |
|
|
10863 | msgstr "" | |
|
|
10864 | ||
|
|
10865 | msgid "" | |
|
|
10866 | "If ``.hgsub`` does not exist, create it and add it to the parent\n" | |
|
|
10867 | "repository. Clone or checkout the external projects where you want it\n" | |
|
|
10868 | "to live in the parent repository. Edit ``.hgsub`` and add the\n" | |
|
|
10869 | "subrepository entry as described above. At this point, the\n" | |
|
|
10870 | "subrepository is tracked and the next commit will record its state in\n" | |
|
|
10871 | "``.hgsubstate`` and bind it to the committed changeset." | |
|
|
10872 | msgstr "" | |
|
|
10873 | ||
|
|
10874 | msgid "" | |
|
|
10875 | "Synchronizing a Subrepository\n" | |
|
|
10876 | "-----------------------------" | |
|
|
10877 | msgstr "" | |
|
|
10878 | ||
|
|
10879 | msgid "" | |
|
|
10880 | "Subrepos do not automatically track the latest changeset of their\n" | |
|
|
10881 | "sources. Instead, they are updated to the changeset that corresponds\n" | |
|
|
10882 | "with the changeset checked out in the top-level changeset. This is so\n" | |
|
|
10883 | "developers always get a consistent set of compatible code and\n" | |
|
|
10884 | "libraries when they update." | |
|
|
10885 | msgstr "" | |
|
|
10886 | ||
|
|
10887 | msgid "" | |
|
|
10888 | "Thus, updating subrepos is a manual process. Simply check out target\n" | |
|
|
10889 | "subrepo at the desired revision, test in the top-level repo, then\n" | |
|
|
10890 | "commit in the parent repository to record the new combination." | |
|
|
10891 | msgstr "" | |
|
|
10892 | ||
|
|
10893 | msgid "" | |
|
|
10894 | "Deleting a Subrepository\n" | |
|
|
10895 | "------------------------" | |
|
|
10896 | msgstr "" | |
|
|
10897 | ||
|
|
10898 | msgid "" | |
|
|
10899 | "To remove a subrepository from the parent repository, delete its\n" | |
|
|
10900 | "reference from ``.hgsub``, then remove its files." | |
|
|
10901 | msgstr "" | |
|
|
10902 | ||
|
|
10903 | msgid "" | |
|
|
10904 | "Interaction with Mercurial Commands\n" | |
|
|
10905 | "-----------------------------------" | |
|
|
10906 | msgstr "" | |
|
|
10907 | ||
|
|
10908 | msgid "" | |
|
|
10909 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" | |
|
|
10910 | " specified. Subversion subrepositories are currently silently\n" | |
|
|
10911 | " ignored." | |
|
|
10912 | msgstr "" | |
|
|
10913 | ||
|
|
10914 | msgid "" | |
|
|
10915 | ":archive: archive does not recurse in subrepositories unless\n" | |
|
|
10916 | " -S/--subrepos is specified." | |
|
|
10917 | msgstr "" | |
|
|
10918 | ||
|
|
10919 | msgid "" | |
|
|
10920 | ":commit: commit creates a consistent snapshot of the state of the\n" | |
|
|
10921 | " entire project and its subrepositories. It does this by first\n" | |
|
|
10922 | " attempting to commit all modified subrepositories, then recording\n" | |
|
|
10923 | " their state and finally committing it in the parent repository." | |
|
|
10924 | msgstr "" | |
|
|
10925 | ||
|
|
10926 | msgid "" | |
|
|
10927 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" | |
|
|
10928 | " specified. Changes are displayed as usual, on the subrepositories\n" | |
|
|
10929 | " elements. Subversion subrepositories are currently silently\n" | |
|
|
10930 | " ignored." | |
|
|
10931 | msgstr "" | |
|
|
10932 | ||
|
|
10933 | msgid "" | |
|
|
10934 | ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" | |
|
|
10935 | " is specified. Subversion subrepositories are currently silently\n" | |
|
|
10936 | " ignored." | |
|
|
10937 | msgstr "" | |
|
|
10938 | ||
|
|
10939 | msgid "" | |
|
|
10940 | ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" | |
|
|
10941 | " is specified. Subversion subrepositories are currently silently\n" | |
|
|
10942 | " ignored." | |
|
|
10943 | msgstr "" | |
|
|
10944 | ||
|
|
10945 | msgid "" | |
|
|
10946 | ":pull: pull is not recursive since it is not clear what to pull prior\n" | |
|
|
10947 | " to running :hg:`update`. Listing and retrieving all\n" | |
|
|
10948 | " subrepositories changes referenced by the parent repository pulled\n" | |
|
|
10949 | " changesets is expensive at best, impossible in the Subversion\n" | |
|
|
10950 | " case." | |
|
|
10951 | msgstr "" | |
|
|
10952 | ||
|
|
10953 | msgid "" | |
|
|
10954 | ":push: Mercurial will automatically push all subrepositories first\n" | |
|
|
10955 | " when the parent repository is being pushed. This ensures new\n" | |
|
|
10956 | " subrepository changes are available when referenced by top-level\n" | |
|
|
10957 | " repositories." | |
|
|
10958 | msgstr "" | |
|
|
10959 | ||
|
|
10960 | msgid "" | |
|
|
10961 | ":status: status does not recurse into subrepositories unless\n" | |
|
|
10962 | " -S/--subrepos is specified. Subrepository changes are displayed as\n" | |
|
|
10963 | " regular Mercurial changes on the subrepository\n" | |
|
|
10964 | " elements. Subversion subrepositories are currently silently\n" | |
|
|
10965 | " ignored." | |
|
|
10966 | msgstr "" | |
|
|
10967 | ||
|
|
10968 | msgid "" | |
|
|
10969 | ":update: update restores the subrepos in the state they were\n" | |
|
|
10970 | " originally committed in target changeset. If the recorded\n" | |
|
|
10971 | " changeset is not available in the current subrepository, Mercurial\n" | |
|
|
10972 | " will pull it in first before updating. This means that updating\n" | |
|
|
10973 | " can require network access when using subrepositories." | |
|
|
10974 | msgstr "" | |
|
|
10975 | ||
|
|
10976 | msgid "" | |
|
|
10977 | "Remapping Subrepositories Sources\n" | |
|
|
10978 | "---------------------------------" | |
|
|
10979 | msgstr "" | |
|
|
10980 | ||
|
|
10981 | msgid "" | |
|
|
10982 | "A subrepository source location may change during a project life,\n" | |
|
|
10983 | "invalidating references stored in the parent repository history. To\n" | |
|
|
10984 | "fix this, rewriting rules can be defined in parent repository ``hgrc``\n" | |
|
|
10985 | "file or in Mercurial configuration. See the ``[subpaths]`` section in\n" | |
|
|
10986 | "hgrc(5) for more details." | |
|
|
10987 | msgstr "" | |
|
|
10988 | ||
|
|
10989 | msgid "" | |
|
|
10990 | "Mercurial allows you to customize output of commands through\n" | |
|
|
10991 | "templates. You can either pass in a template from the command\n" | |
|
|
10992 | "line, via the --template option, or select an existing\n" | |
|
|
10993 | "template-style (--style)." | |
|
|
10994 | msgstr "" | |
|
|
10995 | ||
|
|
10996 | msgid "" | |
|
|
10997 | "You can customize output for any \"log-like\" command: log,\n" | |
|
|
10998 | "outgoing, incoming, tip, parents, heads and glog." | |
|
|
10999 | msgstr "" | |
|
|
11000 | ||
|
|
11001 | msgid "" | |
|
|
11002 | "Four styles are packaged with Mercurial: default (the style used\n" | |
|
|
11003 | "when no explicit preference is passed), compact, changelog,\n" | |
|
|
11004 | "and xml.\n" | |
|
|
11005 | "Usage::" | |
|
|
11006 | msgstr "" | |
|
|
11007 | ||
|
|
11008 | msgid " $ hg log -r1 --style changelog" | |
|
|
11009 | msgstr "" | |
|
|
11010 | ||
|
|
11011 | msgid "" | |
|
|
11012 | "A template is a piece of text, with markup to invoke variable\n" | |
|
|
11013 | "expansion::" | |
|
|
11014 | msgstr "" | |
|
|
11015 | ||
|
|
11016 | msgid "" | |
|
|
11017 | " $ hg log -r1 --template \"{node}\\n\"\n" | |
|
|
11018 | " b56ce7b07c52de7d5fd79fb89701ea538af65746" | |
|
|
11019 | msgstr "" | |
|
|
11020 | ||
|
|
11021 | msgid "" | |
|
|
11022 | "Strings in curly braces are called keywords. The availability of\n" | |
|
|
11023 | "keywords depends on the exact context of the templater. These\n" | |
|
|
11024 | "keywords are usually available for templating a log-like command:" | |
|
|
11025 | msgstr "" | |
|
|
11026 | ||
|
|
11027 | msgid ":author: String. The unmodified author of the changeset." | |
|
|
11028 | msgstr "" | |
|
|
11029 | ||
|
|
11030 | msgid "" | |
|
|
11031 | ":branches: String. The name of the branch on which the changeset was\n" | |
|
|
11032 | " committed. Will be empty if the branch name was default." | |
|
|
11033 | msgstr "" | |
|
|
11034 | ||
|
|
11035 | msgid ":children: List of strings. The children of the changeset." | |
|
|
11036 | msgstr "" | |
|
|
11037 | ||
|
|
11038 | msgid ":date: Date information. The date when the changeset was committed." | |
|
|
11039 | msgstr "" | |
|
|
11040 | ||
|
|
11041 | msgid ":desc: String. The text of the changeset description." | |
|
|
11042 | msgstr "" | |
|
|
11043 | ||
|
|
11044 | msgid "" | |
|
|
11045 | ":diffstat: String. Statistics of changes with the following format:\n" | |
|
|
11046 | " \"modified files: +added/-removed lines\"" | |
|
|
11047 | msgstr "" | |
|
|
11048 | ||
|
|
11049 | msgid "" | |
|
|
11050 | ":files: List of strings. All files modified, added, or removed by this\n" | |
|
|
11051 | " changeset." | |
|
|
11052 | msgstr "" | |
|
|
11053 | ||
|
|
11054 | msgid ":file_adds: List of strings. Files added by this changeset." | |
|
|
11055 | msgstr "" | |
|
|
11056 | ||
|
|
11057 | msgid "" | |
|
|
11058 | ":file_copies: List of strings. Files copied in this changeset with\n" | |
|
|
11059 | " their sources." | |
|
|
11060 | msgstr "" | |
|
|
11061 | ||
|
|
11062 | msgid "" | |
|
|
11063 | ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" | |
|
|
11064 | " only if the --copied switch is set." | |
|
|
11065 | msgstr "" | |
|
|
11066 | ||
|
|
11067 | msgid ":file_mods: List of strings. Files modified by this changeset." | |
|
|
11068 | msgstr "" | |
|
|
11069 | ||
|
|
11070 | msgid ":file_dels: List of strings. Files removed by this changeset." | |
|
|
11071 | msgstr "" | |
|
|
11072 | ||
|
|
11073 | msgid "" | |
|
|
11074 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" | |
|
|
11075 | " digit string." | |
|
|
11076 | msgstr "" | |
|
|
11077 | ||
|
|
11078 | msgid ":parents: List of strings. The parents of the changeset." | |
|
|
11079 | msgstr "" | |
|
|
11080 | ||
|
|
11081 | msgid ":rev: Integer. The repository-local changeset revision number." | |
|
|
11082 | msgstr "" | |
|
|
11083 | ||
|
|
11084 | msgid ":tags: List of strings. Any tags associated with the changeset." | |
|
|
11085 | msgstr "" | |
|
|
11086 | ||
|
|
11087 | msgid "" | |
|
|
11088 | ":latesttag: String. Most recent global tag in the ancestors of this\n" | |
|
|
11089 | " changeset." | |
|
|
11090 | msgstr "" | |
|
|
11091 | ||
|
|
11092 | msgid ":latesttagdistance: Integer. Longest path to the latest tag." | |
|
|
11093 | msgstr "" | |
|
|
11094 | ||
|
|
11095 | msgid "" | |
|
|
11096 | "The \"date\" keyword does not produce human-readable output. If you\n" | |
|
|
11097 | "want to use a date in your output, you can use a filter to process\n" | |
|
|
11098 | "it. Filters are functions which return a string based on the input\n" | |
|
|
11099 | "variable. Be sure to use the stringify filter first when you're\n" | |
|
|
11100 | "applying a string-input filter to a list-like input variable.\n" | |
|
|
11101 | "You can also use a chain of filters to get the desired output::" | |
|
|
11102 | msgstr "" | |
|
|
11103 | ||
|
|
11104 | msgid "" | |
|
|
11105 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |
|
|
11106 | " 2008-08-21 18:22 +0000" | |
|
|
11107 | msgstr "" | |
|
|
11108 | ||
|
|
11109 | msgid "List of filters:" | |
|
|
11110 | msgstr "" | |
|
|
11111 | ||
|
|
11112 | msgid "" | |
|
|
11113 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
|
|
11114 | " every line except the last." | |
|
|
11115 | msgstr "" | |
|
|
11116 | ||
|
|
11117 | msgid "" | |
|
|
11118 | ":age: Date. Returns a human-readable date/time difference between the\n" | |
|
|
11119 | " given date/time and the current date/time." | |
|
|
11120 | msgstr "" | |
|
|
11121 | ||
|
|
11122 | msgid "" | |
|
|
11123 | ":basename: Any text. Treats the text as a path, and returns the last\n" | |
|
|
11124 | " component of the path after splitting by the path separator\n" | |
|
|
11125 | " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n" | |
|
|
11126 | " \"baz\" and \"foo/bar//\" becomes \"bar\"." | |
|
|
11127 | msgstr "" | |
|
|
11128 | ||
|
|
11129 | msgid "" | |
|
|
11130 | ":stripdir: Treat the text as path and strip a directory level, if\n" | |
|
|
11131 | " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"." | |
|
|
11132 | msgstr "" | |
|
|
11133 | ||
|
|
11134 | msgid "" | |
|
|
11135 | ":date: Date. Returns a date in a Unix date format, including the\n" | |
|
|
11136 | " timezone: \"Mon Sep 04 15:13:13 2006 0700\"." | |
|
|
11137 | msgstr "" | |
|
|
11138 | ||
|
|
11139 | msgid "" | |
|
|
11140 | ":domain: Any text. Finds the first string that looks like an email\n" | |
|
|
11141 | " address, and extracts just the domain component. Example: ``User\n" | |
|
|
11142 | " <user@example.com>`` becomes ``example.com``." | |
|
|
11143 | msgstr "" | |
|
|
11144 | ||
|
|
11145 | msgid "" | |
|
|
11146 | ":email: Any text. Extracts the first string that looks like an email\n" | |
|
|
11147 | " address. Example: ``User <user@example.com>`` becomes\n" | |
|
|
11148 | " ``user@example.com``." | |
|
|
11149 | msgstr "" | |
|
|
11150 | ||
|
|
11151 | msgid "" | |
|
|
11152 | ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" | |
|
|
11153 | " and \">\" with XML entities." | |
|
|
11154 | msgstr "" | |
|
|
11155 | ||
|
|
11156 | msgid "" | |
|
|
11157 | ":hex: Any text. Convert a binary Mercurial node identifier into\n" | |
|
|
11158 | " its long hexadecimal representation." | |
|
|
11159 | msgstr "" | |
|
|
11160 | ||
|
|
11161 | msgid ":fill68: Any text. Wraps the text to fit in 68 columns." | |
|
|
11162 | msgstr "" | |
|
|
11163 | ||
|
|
11164 | msgid ":fill76: Any text. Wraps the text to fit in 76 columns." | |
|
|
11165 | msgstr "" | |
|
|
11166 | ||
|
|
11167 | msgid ":firstline: Any text. Returns the first line of text." | |
|
|
11168 | msgstr "" | |
|
|
11169 | ||
|
|
11170 | msgid ":nonempty: Any text. Returns '(none)' if the string is empty." | |
|
|
11171 | msgstr "" | |
|
|
11172 | ||
|
|
11173 | msgid "" | |
|
|
11174 | ":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n" | |
|
|
11175 | " 25200\" (Unix timestamp, timezone offset)." | |
|
|
11176 | msgstr "" | |
|
|
11177 | ||
|
|
11178 | msgid "" | |
|
|
11179 | ":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n" | |
|
|
11180 | " +0200\"." | |
|
|
11181 | msgstr "" | |
|
|
11182 | ||
|
|
11183 | msgid "" | |
|
|
11184 | ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |
|
|
11185 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n" | |
|
|
11186 | " filter." | |
|
|
11187 | msgstr "" | |
|
|
11188 | ||
|
|
11189 | msgid ":localdate: Date. Converts a date to local date." | |
|
|
11190 | msgstr "" | |
|
|
11191 | ||
|
|
11192 | msgid "" | |
|
|
11193 | ":obfuscate: Any text. Returns the input text rendered as a sequence of\n" | |
|
|
11194 | " XML entities." | |
|
|
11195 | msgstr "" | |
|
|
11196 | ||
|
|
11197 | msgid ":person: Any text. Returns the text before an email address." | |
|
|
11198 | msgstr "" | |
|
|
11199 | ||
|
|
11200 | msgid "" | |
|
|
11201 | ":rfc822date: Date. Returns a date using the same format used in email\n" | |
|
|
11202 | " headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"." | |
|
|
11203 | msgstr "" | |
|
|
11204 | ||
|
|
11205 | msgid "" | |
|
|
11206 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
|
|
11207 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." | |
|
|
11208 | msgstr "" | |
|
|
11209 | ||
|
|
11210 | msgid "" | |
|
|
11211 | ":short: Changeset hash. Returns the short form of a changeset hash,\n" | |
|
|
11212 | " i.e. a 12 hexadecimal digit string." | |
|
|
11213 | msgstr "" | |
|
|
11214 | ||
|
|
11215 | msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." | |
|
|
11216 | msgstr "" | |
|
|
11217 | ||
|
|
11218 | msgid "" | |
|
|
11219 | ":stringify: Any type. Turns the value into text by converting values into\n" | |
|
|
11220 | " text and concatenating them." | |
|
|
11221 | msgstr "" | |
|
|
11222 | ||
|
|
11223 | msgid ":strip: Any text. Strips all leading and trailing whitespace." | |
|
|
11224 | msgstr "" | |
|
|
11225 | ||
|
|
11226 | msgid "" | |
|
|
11227 | ":tabindent: Any text. Returns the text, with every line except the\n" | |
|
|
11228 | " first starting with a tab character." | |
|
|
11229 | msgstr "" | |
|
|
11230 | ||
|
|
11231 | msgid "" | |
|
|
11232 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" | |
|
|
11233 | " \"foo bar\" becomes \"foo%20bar\"." | |
|
|
11234 | msgstr "" | |
|
|
11235 | ||
|
|
11236 | msgid ":user: Any text. Returns the user portion of an email address.\n" | |
|
|
11237 | msgstr "" | |
|
|
11238 | ||
|
|
11239 | msgid "Valid URLs are of the form::" | |
|
|
11240 | msgstr "" | |
|
|
11241 | ||
|
|
11242 | msgid "" | |
|
|
11243 | " local/filesystem/path[#revision]\n" | |
|
|
11244 | " file://local/filesystem/path[#revision]\n" | |
|
|
11245 | " http://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
|
11246 | " https://[user[:pass]@]host[:port]/[path][#revision]\n" | |
|
|
11247 | " ssh://[user[:pass]@]host[:port]/[path][#revision]" | |
|
|
11248 | msgstr "" | |
|
|
11249 | ||
|
|
11250 | msgid "" | |
|
|
11251 | "Paths in the local filesystem can either point to Mercurial\n" | |
|
|
11252 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" | |
|
|
11253 | "incoming --bundle`)." | |
|
|
11254 | msgstr "" | |
|
|
11255 | ||
|
|
11256 | msgid "" | |
|
|
11257 | "An optional identifier after # indicates a particular branch, tag, or\n" | |
|
|
11258 | "changeset to use from the remote repository. See also :hg:`help\n" | |
|
|
11259 | "revisions`." | |
|
|
11260 | msgstr "" | |
|
|
11261 | ||
|
|
11262 | msgid "" | |
|
|
11263 | "Some features, such as pushing to http:// and https:// URLs are only\n" | |
|
|
11264 | "possible if the feature is explicitly enabled on the remote Mercurial\n" | |
|
|
11265 | "server." | |
|
|
11266 | msgstr "" | |
|
|
11267 | ||
|
|
11268 | msgid "" | |
|
|
11269 | "Note that the security of HTTPS URLs depends on proper configuration of\n" | |
|
|
11270 | "web.cacerts." | |
|
|
11271 | msgstr "" | |
|
|
11272 | ||
|
|
11273 | msgid "Some notes about using SSH with Mercurial:" | |
|
|
11274 | msgstr "" | |
|
|
11275 | ||
|
|
11276 | msgid "" | |
|
|
11277 | "- SSH requires an accessible shell account on the destination machine\n" | |
|
|
11278 | " and a copy of hg in the remote path or specified with as remotecmd.\n" | |
|
|
11279 | "- path is relative to the remote user's home directory by default. Use\n" | |
|
|
11280 | " an extra slash at the start of a path to specify an absolute path::" | |
|
|
11281 | msgstr "" | |
|
|
11282 | ||
|
|
11283 | msgid " ssh://example.com//tmp/repository" | |
|
|
11284 | msgstr "" | |
|
|
11285 | ||
|
|
11286 | msgid "" | |
|
|
11287 | "- Mercurial doesn't use its own compression via SSH; the right thing\n" | |
|
|
11288 | " to do is to configure it in your ~/.ssh/config, e.g.::" | |
|
|
11289 | msgstr "" | |
|
|
11290 | ||
|
|
11291 | msgid "" | |
|
|
11292 | " Host *.mylocalnetwork.example.com\n" | |
|
|
11293 | " Compression no\n" | |
|
|
11294 | " Host *\n" | |
|
|
11295 | " Compression yes" | |
|
|
11296 | msgstr "" | |
|
|
11297 | ||
|
|
11298 | msgid "" | |
|
|
11299 | " Alternatively specify \"ssh -C\" as your ssh command in your\n" | |
|
|
11300 | " configuration file or with the --ssh command line option." | |
|
|
11301 | msgstr "" | |
|
|
11302 | ||
|
|
11303 | msgid "" | |
|
|
11304 | "These URLs can all be stored in your configuration file with path\n" | |
|
|
11305 | "aliases under the [paths] section like so::" | |
|
|
11306 | msgstr "" | |
|
|
11307 | ||
|
|
11308 | msgid "" | |
|
|
11309 | " [paths]\n" | |
|
|
11310 | " alias1 = URL1\n" | |
|
|
11311 | " alias2 = URL2\n" | |
|
|
11312 | " ..." | |
|
|
11313 | msgstr "" | |
|
|
11314 | ||
|
|
11315 | msgid "" | |
|
|
11316 | "You can then use the alias for any command that uses a URL (for\n" | |
|
|
11317 | "example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." | |
|
|
11318 | msgstr "" | |
|
|
11319 | ||
|
|
11320 | msgid "" | |
|
|
11321 | "Two path aliases are special because they are used as defaults when\n" | |
|
|
11322 | "you do not provide the URL to a command:" | |
|
|
11323 | msgstr "" | |
|
|
11324 | ||
|
|
11325 | msgid "" | |
|
|
11326 | "default:\n" | |
|
|
11327 | " When you create a repository with hg clone, the clone command saves\n" | |
|
|
11328 | " the location of the source repository as the new repository's\n" | |
|
|
11329 | " 'default' path. This is then used when you omit path from push- and\n" | |
|
|
11330 | " pull-like commands (including incoming and outgoing)." | |
|
|
11331 | msgstr "" | |
|
|
11332 | ||
|
|
11333 | msgid "" | |
|
|
11334 | "default-push:\n" | |
|
|
11335 | " The push command will look for a path named 'default-push', and\n" | |
|
|
11336 | " prefer it over 'default' if both are defined.\n" | |
|
|
11337 | msgstr "" | |
|
|
11338 | ||
|
|
11339 | msgid "remote branch lookup not supported" | |
|
|
11340 | msgstr "不支援遠端分支查閱" | |
|
|
11341 | ||
|
|
11342 | msgid "dirstate branch not accessible" | |
|
|
11343 | msgstr "" | |
|
|
11344 | ||
|
|
11345 | #, python-format | |
|
|
11346 | msgid "unknown branch '%s'" | |
|
|
11347 | msgstr "不知道的分支 '%s'" | |
|
|
9795 | 11348 | |
|
|
9796 | 11349 | msgid "can only share local repositories" |
|
|
9797 | msgstr "" | |
|
|
11350 | msgstr "只能分享本地端儲存庫(s)" | |
|
|
9798 | 11351 | |
|
|
9799 | 11352 | msgid "destination already exists" |
|
|
9800 | 11353 | msgstr "目的端已存在" |
|
|
9801 | 11354 | |
|
|
9802 | 11355 | msgid "updating working directory\n" |
|
|
9803 | msgstr "更新 working directory 中\n" | |
|
|
11356 | msgstr "更新工作目錄中\n" | |
|
|
9804 | 11357 | |
|
|
9805 | 11358 | #, python-format |
|
|
9806 | 11359 | msgid "destination directory: %s\n" |
| @@ -9814,35 +11367,44 b' msgstr "\xe7\x9b\xae\xe7\x9a\x84\xe7\xab\xaf \'%s\' \xe5\xb7\xb2\xe5\xad\x98\xe5\x9c\xa8"' | |||
|
|
9814 | 11367 | msgid "destination '%s' is not empty" |
|
|
9815 | 11368 | msgstr "目的端 '%s' 不是空的" |
|
|
9816 | 11369 | |
|
|
9817 | msgid "src repository does not support revision lookup and so doesn't support clone by revision" | |
|
|
11370 | msgid "" | |
|
|
11371 | "src repository does not support revision lookup and so doesn't support clone " | |
|
|
11372 | "by revision" | |
|
|
9818 | 11373 | msgstr "" |
|
|
9819 | 11374 | |
|
|
9820 | 11375 | msgid "clone from remote to remote not supported" |
|
|
9821 | msgstr "" | |
|
|
9822 | ||
|
|
9823 |
#, |
|
|
|
11376 | msgstr "從一個遠端clone到另一個遠端的功能是不支援的 " | |
|
|
11377 | ||
|
|
11378 | #, python-format | |
|
|
9824 | 11379 | msgid "updating to branch %s\n" |
|
|
9825 |
msgstr "正在 |
|
|
|
9826 | ||
|
|
9827 | #, python-format | |
|
|
9828 | msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" | |
|
|
9829 | msgstr "" | |
|
|
11380 | msgstr "正在更新到%s分支\n" | |
|
|
11381 | ||
|
|
11382 | #, python-format | |
|
|
11383 | msgid "" | |
|
|
11384 | "%d files updated, %d files merged, %d files removed, %d files unresolved\n" | |
|
|
11385 | msgstr "%d個更新 %d個合併 %d個移除 %d個未解決\n" | |
|
|
9830 | 11386 | |
|
|
9831 | 11387 | msgid "use 'hg resolve' to retry unresolved file merges\n" |
|
|
9832 | msgstr "" | |
|
|
9833 | ||
|
|
9834 | msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" | |
|
|
9835 | msgstr "" | |
|
|
11388 | msgstr "使用'hg resolve'重新嘗試合併未解決的檔案\n" | |
|
|
11389 | ||
|
|
11390 | msgid "" | |
|
|
11391 | "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to " | |
|
|
11392 | "abandon\n" | |
|
|
11393 | msgstr "使用'hg resolve'重新嘗試合併未解決的檔案或用 'hg update -C'放棄\n" | |
|
|
9836 | 11394 | |
|
|
9837 | 11395 | msgid "(branch merge, don't forget to commit)\n" |
|
|
9838 | msgstr "" | |
|
|
11396 | msgstr "(分支已經合併了,別忘了要commit喔)\n" | |
|
|
9839 | 11397 | |
|
|
9840 | 11398 | #, python-format |
|
|
9841 | 11399 | msgid "error reading %s/.hg/hgrc: %s\n" |
|
|
11400 | msgstr "! %s/.hg/hgrc 讀取錯誤:%s\n" | |
|
|
11401 | ||
|
|
11402 | #, python-format | |
|
|
11403 | msgid "error accessing repository at %s\n" | |
|
|
9842 | 11404 | msgstr "" |
|
|
9843 | 11405 | |
|
|
9844 | 11406 | msgid "SSL support is unavailable" |
|
|
9845 | msgstr "" | |
|
|
11407 | msgstr "SSL 支援不能用" | |
|
|
9846 | 11408 | |
|
|
9847 | 11409 | msgid "IPv6 is not available on this system" |
|
|
9848 | 11410 | msgstr "此作業系統不支援 IPv6" |
| @@ -9859,6 +11421,12 b' msgstr ""' | |||
|
|
9859 | 11421 | msgid "%s hook is invalid (\"%s\" not in a module)" |
|
|
9860 | 11422 | msgstr "" |
|
|
9861 | 11423 | |
|
|
11424 | msgid "exception from first failed import attempt:\n" | |
|
|
11425 | msgstr "" | |
|
|
11426 | ||
|
|
11427 | msgid "exception from second failed import attempt:\n" | |
|
|
11428 | msgstr "" | |
|
|
11429 | ||
|
|
9862 | 11430 | #, python-format |
|
|
9863 | 11431 | msgid "%s hook is invalid (import of \"%s\" failed)" |
|
|
9864 | 11432 | msgstr "" |
| @@ -9900,27 +11468,31 b' msgid "warning: %s hook %s\\n"' | |||
|
|
9900 | 11468 | msgstr "" |
|
|
9901 | 11469 | |
|
|
9902 | 11470 | msgid "connection ended unexpectedly" |
|
|
9903 | msgstr "" | |
|
|
11471 | msgstr "連線意外的結束了" | |
|
|
9904 | 11472 | |
|
|
9905 | 11473 | #, python-format |
|
|
9906 | 11474 | msgid "unsupported URL component: \"%s\"" |
|
|
9907 | msgstr "" | |
|
|
11475 | msgstr "不支援的URL元件:'%s'" | |
|
|
9908 | 11476 | |
|
|
9909 | 11477 | msgid "operation not supported over http" |
|
|
9910 | 11478 | msgstr "" |
|
|
9911 | 11479 | |
|
|
9912 | 11480 | msgid "authorization failed" |
|
|
9913 | msgstr "" | |
|
|
11481 | msgstr "身份認證失敗" | |
|
|
9914 | 11482 | |
|
|
9915 | 11483 | msgid "http error, possibly caused by proxy setting" |
|
|
9916 | msgstr "" | |
|
|
11484 | msgstr "http 錯誤,可能是由proxy產生的" | |
|
|
9917 | 11485 | |
|
|
9918 | 11486 | #, python-format |
|
|
9919 | 11487 | msgid "real URL is %s\n" |
|
|
9920 | msgstr "" | |
|
|
9921 | ||
|
|
9922 | #, python-format | |
|
|
9923 | msgid "'%s' does not appear to be an hg repository" | |
|
|
11488 | msgstr "真正的URL是 %s\n" | |
|
|
11489 | ||
|
|
11490 | #, python-format | |
|
|
11491 | msgid "" | |
|
|
11492 | "'%s' does not appear to be an hg repository:\n" | |
|
|
11493 | "---%%<--- (%s)\n" | |
|
|
11494 | "%s\n" | |
|
|
11495 | "---%%<---\n" | |
|
|
9924 | 11496 | msgstr "" |
|
|
9925 | 11497 | |
|
|
9926 | 11498 | #, python-format |
| @@ -9929,49 +11501,37 b' msgstr ""' | |||
|
|
9929 | 11501 | |
|
|
9930 | 11502 | #, python-format |
|
|
9931 | 11503 | msgid "'%s' uses newer protocol %s" |
|
|
9932 | msgstr "" | |
|
|
9933 | ||
|
|
9934 | msgid "look up remote revision" | |
|
|
9935 | msgstr "" | |
|
|
9936 | ||
|
|
9937 | msgid "unexpected response:" | |
|
|
9938 | msgstr "" | |
|
|
9939 | ||
|
|
9940 | msgid "look up remote changes" | |
|
|
9941 | msgstr "" | |
|
|
9942 | ||
|
|
9943 | msgid "push failed (unexpected response):" | |
|
|
9944 | msgstr "" | |
|
|
11504 | msgstr "'%s'使用最新的通訊協定 %s" | |
|
|
9945 | 11505 | |
|
|
9946 | 11506 | #, python-format |
|
|
9947 | 11507 | msgid "push failed: %s" |
|
|
9948 | msgstr "" | |
|
|
11508 | msgstr "push 失敗: %s" | |
|
|
9949 | 11509 | |
|
|
9950 | 11510 | msgid "Python support for SSL and HTTPS is not installed" |
|
|
9951 | msgstr "" | |
|
|
11511 | msgstr "SSL 和HTTPS 的python support 沒有安裝" | |
|
|
9952 | 11512 | |
|
|
9953 | 11513 | msgid "cannot create new http repository" |
|
|
9954 | msgstr "" | |
|
|
11514 | msgstr "不能建立新的 http 儲存庫" | |
|
|
9955 | 11515 | |
|
|
9956 | 11516 | #, python-format |
|
|
9957 | 11517 | msgid "ignoring invalid syntax '%s'" |
|
|
9958 | msgstr "" | |
|
|
11518 | msgstr "忽略無效的語法 '%s'" | |
|
|
9959 | 11519 | |
|
|
9960 | 11520 | #, python-format |
|
|
9961 | 11521 | msgid "skipping unreadable ignore file '%s': %s\n" |
|
|
9962 | msgstr "" | |
|
|
11522 | msgstr "略過不能讀取的忽略檔 '%s' : %s\n" | |
|
|
9963 | 11523 | |
|
|
9964 | 11524 | #, python-format |
|
|
9965 | 11525 | msgid "repository %s not found" |
|
|
9966 | msgstr "" | |
|
|
11526 | msgstr "找不到 %s 儲存庫" | |
|
|
9967 | 11527 | |
|
|
9968 | 11528 | #, python-format |
|
|
9969 | 11529 | msgid "repository %s already exists" |
|
|
9970 | msgstr "" | |
|
|
11530 | msgstr "%s 儲存庫已經在了" | |
|
|
9971 | 11531 | |
|
|
9972 | 11532 | #, python-format |
|
|
9973 | 11533 | msgid "requirement '%s' not supported" |
|
|
9974 | msgstr "" | |
|
|
11534 | msgstr "要求 '%s' 不被支援" | |
|
|
9975 | 11535 | |
|
|
9976 | 11536 | #, python-format |
|
|
9977 | 11537 | msgid ".hg/sharedpath points to nonexistent directory %s" |
| @@ -9979,20 +11539,24 b' msgstr ""' | |||
|
|
9979 | 11539 | |
|
|
9980 | 11540 | #, python-format |
|
|
9981 | 11541 | msgid "%r cannot be used in a tag name" |
|
|
9982 | msgstr "" | |
|
|
11542 | msgstr "%r 不能當成標記名稱來用" | |
|
|
11543 | ||
|
|
11544 | #, python-format | |
|
|
11545 | msgid "warning: tag %s conflicts with existing branch name\n" | |
|
|
11546 | msgstr "警告: 標記 %s 跟現有的分支名稱衝突。\n" | |
|
|
9983 | 11547 | |
|
|
9984 | 11548 | msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
|
|
9985 | msgstr "" | |
|
|
11549 | msgstr ".hgtags 的工作複本已經被改變了(請手工提交 .hgtags)" | |
|
|
9986 | 11550 | |
|
|
9987 | 11551 | #, python-format |
|
|
9988 | 11552 | msgid "working directory has unknown parent '%s'!" |
|
|
9989 | msgstr "" | |
|
|
11553 | msgstr "工作目錄有未知的母系'%s'!" | |
|
|
9990 | 11554 | |
|
|
9991 | 11555 | #, python-format |
|
|
9992 | 11556 | msgid "unknown revision '%s'" |
|
|
9993 | msgstr "" | |
|
|
9994 | ||
|
|
9995 | msgid "journal already exists - run hg recover" | |
|
|
11557 | msgstr "未知的修定版 '%s'" | |
|
|
11558 | ||
|
|
11559 | msgid "abandoned transaction found - run hg recover" | |
|
|
9996 | 11560 | msgstr "" |
|
|
9997 | 11561 | |
|
|
9998 | 11562 | msgid "rolling back interrupted transaction\n" |
| @@ -10001,15 +11565,23 b' msgstr ""' | |||
|
|
10001 | 11565 | msgid "no interrupted transaction available\n" |
|
|
10002 | 11566 | msgstr "" |
|
|
10003 | 11567 | |
|
|
10004 | msgid "rolling back last transaction\n" | |
|
|
11568 | #, python-format | |
|
|
11569 | msgid "rolling back to revision %s (undo %s: %s)\n" | |
|
|
11570 | msgstr "" | |
|
|
11571 | ||
|
|
11572 | #, python-format | |
|
|
11573 | msgid "rolling back to revision %s (undo %s)\n" | |
|
|
11574 | msgstr "" | |
|
|
11575 | ||
|
|
11576 | msgid "rolling back unknown transaction\n" | |
|
|
10005 | 11577 | msgstr "" |
|
|
10006 | 11578 | |
|
|
10007 | 11579 | #, python-format |
|
|
10008 | 11580 | msgid "Named branch could not be reset, current branch still is: %s\n" |
|
|
10009 | msgstr "" | |
|
|
11581 | msgstr "指名的分支不能被重置,目前分支依然是: %s\n" | |
|
|
10010 | 11582 | |
|
|
10011 | 11583 | msgid "no rollback information available\n" |
|
|
10012 | msgstr "" | |
|
|
11584 | msgstr "沒有 rollback 資訊可以用\n" | |
|
|
10013 | 11585 | |
|
|
10014 | 11586 | #, python-format |
|
|
10015 | 11587 | msgid "waiting for lock on %s held by %r\n" |
| @@ -10017,126 +11589,91 b' msgstr ""' | |||
|
|
10017 | 11589 | |
|
|
10018 | 11590 | #, python-format |
|
|
10019 | 11591 | msgid "repository %s" |
|
|
10020 | msgstr "" | |
|
|
11592 | msgstr "儲存庫 %s" | |
|
|
10021 | 11593 | |
|
|
10022 | 11594 | #, python-format |
|
|
10023 | 11595 | msgid "working directory of %s" |
|
|
10024 | msgstr "" | |
|
|
11596 | msgstr "%s 的工作目錄" | |
|
|
10025 | 11597 | |
|
|
10026 | 11598 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
|
10027 | 11599 | msgstr "" |
|
|
10028 | 11600 | |
|
|
11601 | msgid "can't commit subrepos without .hgsub" | |
|
|
11602 | msgstr "" | |
|
|
11603 | ||
|
|
10029 | 11604 | msgid "file not found!" |
|
|
10030 | msgstr "" | |
|
|
11605 | msgstr "找不到檔案!" | |
|
|
10031 | 11606 | |
|
|
10032 | 11607 | msgid "no match under directory!" |
|
|
10033 | 11608 | msgstr "" |
|
|
10034 | 11609 | |
|
|
10035 | 11610 | msgid "file not tracked!" |
|
|
10036 | msgstr "" | |
|
|
11611 | msgstr "檔案沒有被追蹤!" | |
|
|
10037 | 11612 | |
|
|
10038 | 11613 | msgid "unresolved merge conflicts (see hg resolve)" |
|
|
10039 | msgstr "" | |
|
|
11614 | msgstr "未解決的合併衝突(詳見 hg resolve)" | |
|
|
10040 | 11615 | |
|
|
10041 | 11616 | #, python-format |
|
|
10042 | 11617 | msgid "committing subrepository %s\n" |
|
|
10043 | msgstr "" | |
|
|
11618 | msgstr "正在提交子儲存庫 %s\n" | |
|
|
11619 | ||
|
|
11620 | #, python-format | |
|
|
11621 | msgid "note: commit message saved in %s\n" | |
|
|
11622 | msgstr "注意: 提交訊息存放在%s\n" | |
|
|
10044 | 11623 | |
|
|
10045 | 11624 | #, python-format |
|
|
10046 | 11625 | msgid "trouble committing %s!\n" |
|
|
10047 | 11626 | msgstr "" |
|
|
10048 | 11627 | |
|
|
10049 | #, python-format | |
|
|
10050 | msgid "%s does not exist!\n" | |
|
|
10051 | msgstr "" | |
|
|
10052 | ||
|
|
10053 | #, python-format | |
|
|
10054 | msgid "" | |
|
|
10055 | "%s: files over 10MB may cause memory and performance problems\n" | |
|
|
10056 | "(use 'hg revert %s' to unadd the file)\n" | |
|
|
10057 | msgstr "" | |
|
|
10058 | ||
|
|
10059 | #, python-format | |
|
|
10060 | msgid "%s not added: only files and symlinks supported currently\n" | |
|
|
10061 | msgstr "" | |
|
|
10062 | ||
|
|
10063 | #, python-format | |
|
|
10064 | msgid "%s already tracked!\n" | |
|
|
10065 | msgstr "" | |
|
|
10066 | ||
|
|
10067 | #, python-format | |
|
|
10068 | msgid "%s not added!\n" | |
|
|
10069 | msgstr "" | |
|
|
10070 | ||
|
|
10071 | #, python-format | |
|
|
10072 | msgid "%s still exists!\n" | |
|
|
10073 | msgstr "" | |
|
|
10074 | ||
|
|
10075 | #, python-format | |
|
|
10076 | msgid "%s not tracked!\n" | |
|
|
10077 | msgstr "" | |
|
|
10078 | ||
|
|
10079 | #, python-format | |
|
|
10080 | msgid "%s not removed!\n" | |
|
|
10081 | msgstr "" | |
|
|
10082 | ||
|
|
10083 | #, python-format | |
|
|
10084 | msgid "copy failed: %s is not a file or a symbolic link\n" | |
|
|
10085 | msgstr "" | |
|
|
10086 | ||
|
|
10087 | msgid "searching for changes\n" | |
|
|
10088 | msgstr "" | |
|
|
10089 | ||
|
|
10090 | msgid "already have changeset " | |
|
|
10091 | msgstr "" | |
|
|
10092 | ||
|
|
10093 | msgid "warning: repository is unrelated\n" | |
|
|
10094 | msgstr "" | |
|
|
10095 | ||
|
|
10096 | msgid "repository is unrelated" | |
|
|
10097 | msgstr "" | |
|
|
10098 | ||
|
|
10099 | 11628 | msgid "requesting all changes\n" |
|
|
10100 | msgstr "" | |
|
|
10101 | ||
|
|
10102 | msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." | |
|
|
10103 | msgstr "" | |
|
|
10104 | ||
|
|
10105 | #, python-format | |
|
|
10106 | msgid "abort: push creates new remote branch '%s'!\n" | |
|
|
10107 | msgstr "" | |
|
|
10108 | ||
|
|
10109 | msgid "abort: push creates new remote heads!\n" | |
|
|
10110 | msgstr "" | |
|
|
10111 | ||
|
|
10112 | msgid "(did you forget to merge? use push -f to force)\n" | |
|
|
10113 | msgstr "" | |
|
|
10114 | ||
|
|
10115 | msgid "note: unsynced remote changes!\n" | |
|
|
10116 | msgstr "" | |
|
|
11629 | msgstr "正在重新要求所有的changes\n" | |
|
|
11630 | ||
|
|
11631 | msgid "" | |
|
|
11632 | "partial pull cannot be done because other repository doesn't support " | |
|
|
11633 | "changegroupsubset." | |
|
|
11634 | msgstr "局部pull 不能完成,因為其他儲存庫不支援changegroupsubset." | |
|
|
10117 | 11635 | |
|
|
10118 | 11636 | #, python-format |
|
|
10119 | 11637 | msgid "%d changesets found\n" |
|
|
11638 | msgstr "找到%d個changesets\n" | |
|
|
11639 | ||
|
|
11640 | msgid "bundling changes" | |
|
|
11641 | msgstr "" | |
|
|
11642 | ||
|
|
11643 | msgid "chunks" | |
|
|
11644 | msgstr "" | |
|
|
11645 | ||
|
|
11646 | msgid "bundling manifests" | |
|
|
10120 | 11647 | msgstr "" |
|
|
10121 | 11648 | |
|
|
10122 | 11649 | #, python-format |
|
|
10123 | 11650 | msgid "empty or missing revlog for %s" |
|
|
10124 | 11651 | msgstr "" |
|
|
10125 | 11652 | |
|
|
11653 | msgid "bundling files" | |
|
|
11654 | msgstr "" | |
|
|
11655 | ||
|
|
10126 | 11656 | msgid "adding changesets\n" |
|
|
10127 | msgstr "" | |
|
|
11657 | msgstr "新增changesets\n" | |
|
|
10128 | 11658 | |
|
|
10129 | 11659 | msgid "received changelog group is empty" |
|
|
10130 | msgstr "" | |
|
|
11660 | msgstr "接收的changelog group是空白的" | |
|
|
10131 | 11661 | |
|
|
10132 | 11662 | msgid "adding manifests\n" |
|
|
10133 | msgstr "" | |
|
|
11663 | msgstr "新增清單\n" | |
|
|
11664 | ||
|
|
11665 | msgid "manifests" | |
|
|
11666 | msgstr "清單" | |
|
|
10134 | 11667 | |
|
|
10135 | 11668 | msgid "adding file changes\n" |
|
|
10136 | msgstr "" | |
|
|
11669 | msgstr "新增檔案變更\n" | |
|
|
10137 | 11670 | |
|
|
10138 | 11671 | msgid "received file revlog group is empty" |
|
|
10139 | msgstr "" | |
|
|
11672 | msgstr "接收的file revlog group是空白的" | |
|
|
11673 | ||
|
|
11674 | #, python-format | |
|
|
11675 | msgid "missing file data for %s:%s - run hg verify" | |
|
|
11676 | msgstr "遺失檔案資料 for %s:%s - 執行 hg verify" | |
|
|
10140 | 11677 | |
|
|
10141 | 11678 | #, python-format |
|
|
10142 | 11679 | msgid " (%+d heads)" |
| @@ -10144,19 +11681,19 b' msgstr ""' | |||
|
|
10144 | 11681 | |
|
|
10145 | 11682 | #, python-format |
|
|
10146 | 11683 | msgid "added %d changesets with %d changes to %d files%s\n" |
|
|
10147 | msgstr "" | |
|
|
11684 | msgstr "增加%d個changesets with %d個變更到%d個檔案%s\n" | |
|
|
10148 | 11685 | |
|
|
10149 | 11686 | msgid "Unexpected response from remote server:" |
|
|
10150 | msgstr "" | |
|
|
11687 | msgstr "遠端伺服器回傳一個意料之外的回應:" | |
|
|
10151 | 11688 | |
|
|
10152 | 11689 | msgid "operation forbidden by server" |
|
|
10153 | 11690 | msgstr "" |
|
|
10154 | 11691 | |
|
|
10155 | 11692 | msgid "locking the remote repository failed" |
|
|
10156 | msgstr "" | |
|
|
11693 | msgstr "鎖住遠端儲存庫失敗了" | |
|
|
10157 | 11694 | |
|
|
10158 | 11695 | msgid "the server sent an unknown error code" |
|
|
10159 | msgstr "" | |
|
|
11696 | msgstr "伺服器傳送了一個未知的錯誤碼" | |
|
|
10160 | 11697 | |
|
|
10161 | 11698 | msgid "streaming all changes\n" |
|
|
10162 | 11699 | msgstr "" |
| @@ -10169,56 +11706,65 b' msgstr ""' | |||
|
|
10169 | 11706 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
|
10170 | 11707 | msgstr "" |
|
|
10171 | 11708 | |
|
|
10172 |
msgid " |
|
|
|
10173 | msgstr "" | |
|
|
11709 | msgid "smtp.host not configured - cannot send mail" | |
|
|
11710 | msgstr "smtp.host 沒有設定 - hg沒有辦法寄信" | |
|
|
10174 | 11711 | |
|
|
10175 | 11712 | #, python-format |
|
|
10176 | 11713 | msgid "sending mail: smtp host %s, port %s\n" |
|
|
10177 | msgstr "" | |
|
|
11714 | msgstr "正在寄mail: smtp host %s,port %s\n" | |
|
|
10178 | 11715 | |
|
|
10179 | 11716 | msgid "can't use TLS: Python SSL support not installed" |
|
|
10180 | msgstr "" | |
|
|
11717 | msgstr "不能用 TLS: python 的 SSL 支援沒有安裝(?)" | |
|
|
10181 | 11718 | |
|
|
10182 | 11719 | msgid "(using tls)\n" |
|
|
10183 | msgstr "" | |
|
|
11720 | msgstr "(使用 TLS)\n" | |
|
|
10184 | 11721 | |
|
|
10185 | 11722 | #, python-format |
|
|
10186 | 11723 | msgid "(authenticating to mail server as %s)\n" |
|
|
10187 | msgstr "" | |
|
|
11724 | msgstr "(用 %s 認証到 mail 伺服器)\n" | |
|
|
10188 | 11725 | |
|
|
10189 | 11726 | #, python-format |
|
|
10190 | 11727 | msgid "sending mail: %s\n" |
|
|
10191 | msgstr "" | |
|
|
11728 | msgstr "正在寄mail: %s\n" | |
|
|
10192 | 11729 | |
|
|
10193 | 11730 | msgid "smtp specified as email transport, but no smtp host configured" |
|
|
10194 | msgstr "" | |
|
|
11731 | msgstr "smtp 被描述成是一個email 傳輸器,但是沒有設定 smtp host" | |
|
|
10195 | 11732 | |
|
|
10196 | 11733 | #, python-format |
|
|
10197 | 11734 | msgid "%r specified as email transport, but not in PATH" |
|
|
10198 | msgstr "" | |
|
|
11735 | msgstr "描述%r是一個email傳輸器,但是他不在PATH裡" | |
|
|
10199 | 11736 | |
|
|
10200 | 11737 | #, python-format |
|
|
10201 | 11738 | msgid "ignoring invalid sendcharset: %s\n" |
|
|
10202 | msgstr "" | |
|
|
11739 | msgstr "忽略無效的傳送字元集: %s\n" | |
|
|
10203 | 11740 | |
|
|
10204 | 11741 | #, python-format |
|
|
10205 | 11742 | msgid "invalid email address: %s" |
|
|
10206 | msgstr "" | |
|
|
11743 | msgstr "不能用的E mail 位址: %s" | |
|
|
10207 | 11744 | |
|
|
10208 | 11745 | #, python-format |
|
|
10209 | 11746 | msgid "invalid local address: %s" |
|
|
10210 | msgstr "" | |
|
|
11747 | msgstr "不能用的本地位址: %s" | |
|
|
10211 | 11748 | |
|
|
10212 | 11749 | #, python-format |
|
|
10213 | 11750 | msgid "failed to remove %s from manifest" |
|
|
10214 | msgstr "" | |
|
|
11751 | msgstr "從清單移除 %s 失敗了" | |
|
|
11752 | ||
|
|
11753 | #, python-format | |
|
|
11754 | msgid "invalid pattern (%s): %s" | |
|
|
11755 | msgstr "無效的表達式(%s): %s" | |
|
|
11756 | ||
|
|
11757 | msgid "invalid pattern" | |
|
|
11758 | msgstr "無效的表達式" | |
|
|
10215 | 11759 | |
|
|
10216 | 11760 | #, python-format |
|
|
10217 | 11761 | msgid "diff context lines count must be an integer, not %r" |
|
|
10218 | msgstr "" | |
|
|
10219 | ||
|
|
10220 | #, python-format | |
|
|
10221 | msgid "untracked file in working directory differs from file in requested revision: '%s'" | |
|
|
11762 | msgstr "\"diff context lines count\" 必須是一個整數,不是 %r" | |
|
|
11763 | ||
|
|
11764 | #, python-format | |
|
|
11765 | msgid "" | |
|
|
11766 | "untracked file in working directory differs from file in requested revision: " | |
|
|
11767 | "'%s'" | |
|
|
10222 | 11768 | msgstr "" |
|
|
10223 | 11769 | |
|
|
10224 | 11770 | #, python-format |
| @@ -10241,7 +11787,7 b' msgid "Sym&link"' | |||
|
|
10241 | 11787 | msgstr "" |
|
|
10242 | 11788 | |
|
|
10243 | 11789 | msgid "resolving manifests\n" |
|
|
10244 | msgstr "" | |
|
|
11790 | msgstr "解決清單中\n" | |
|
|
10245 | 11791 | |
|
|
10246 | 11792 | #, python-format |
|
|
10247 | 11793 | msgid "" |
| @@ -10264,6 +11810,9 b' msgstr ""' | |||
|
|
10264 | 11810 | msgid "&Deleted" |
|
|
10265 | 11811 | msgstr "" |
|
|
10266 | 11812 | |
|
|
11813 | msgid "updating" | |
|
|
11814 | msgstr "更新中" | |
|
|
11815 | ||
|
|
10267 | 11816 | #, python-format |
|
|
10268 | 11817 | msgid "update failed to remove %s: %s!\n" |
|
|
10269 | 11818 | msgstr "" |
| @@ -10277,15 +11826,15 b' msgid "getting %s to %s\\n"' | |||
|
|
10277 | 11826 | msgstr "" |
|
|
10278 | 11827 | |
|
|
10279 | 11828 | #, python-format |
|
|
10280 | msgid "warning: detected divergent renames of %s to:\n" | |
|
|
11829 | msgid "note: possible conflict - %s was renamed multiple times to:\n" | |
|
|
10281 | 11830 | msgstr "" |
|
|
10282 | 11831 | |
|
|
10283 | 11832 | #, python-format |
|
|
10284 | 11833 | msgid "branch %s not found" |
|
|
10285 | 11834 | msgstr "找不到 branch %s" |
|
|
10286 | 11835 | |
|
|
10287 | msgid "can't merge with ancestor" | |
|
|
10288 | msgstr "不能和 ancestor 合併" | |
|
|
11836 | msgid "merging with a working directory ancestor has no effect" | |
|
|
11837 | msgstr "" | |
|
|
10289 | 11838 | |
|
|
10290 | 11839 | msgid "nothing to merge (use 'hg update' or check 'hg heads')" |
|
|
10291 | 11840 | msgstr "沒有可合併的變更 (請使用 'hg update' 或 'hg heads' 檢查)" |
| @@ -10293,14 +11842,38 b' msgstr "\xe6\xb2\x92\xe6\x9c\x89\xe5\x8f\xaf\xe5\x90\x88\xe4\xbd\xb5\xe7\x9a\x84\xe8\xae\x8a\xe6\x9b\xb4 (\xe8\xab\x8b\xe4\xbd\xbf\xe7\x94\xa8 \'hg update\' \xe6\x88\x96 \'hg heads\' \xe6\xaa\xa2\xe6\x9f\xa5)"' | |||
|
|
10293 | 11842 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" |
|
|
10294 | 11843 | msgstr "還有未 commit 的變更 (請使用 'hg status' 來列出變更)" |
|
|
10295 | 11844 | |
|
|
10296 |
msgid "crosses branches ( |
|
|
|
10297 | msgstr "" | |
|
|
10298 | ||
|
|
10299 |
msgid "crosses branches ( |
|
|
|
10300 | msgstr "" | |
|
|
10301 | ||
|
|
10302 | msgid "crosses named branches (use 'hg update -C' to discard changes)" | |
|
|
10303 | msgstr "" | |
|
|
11845 | msgid "crosses branches (merge branches or use --clean to discard changes)" | |
|
|
11846 | msgstr "" | |
|
|
11847 | ||
|
|
11848 | msgid "crosses branches (merge branches or use --check to force update)" | |
|
|
11849 | msgstr "" | |
|
|
11850 | ||
|
|
11851 | msgid "Attention:" | |
|
|
11852 | msgstr "" | |
|
|
11853 | ||
|
|
11854 | msgid "Caution:" | |
|
|
11855 | msgstr "" | |
|
|
11856 | ||
|
|
11857 | msgid "!Danger!" | |
|
|
11858 | msgstr "!!危險!!" | |
|
|
11859 | ||
|
|
11860 | msgid "Error:" | |
|
|
11861 | msgstr "錯誤:" | |
|
|
11862 | ||
|
|
11863 | msgid "Hint:" | |
|
|
11864 | msgstr "" | |
|
|
11865 | ||
|
|
11866 | msgid "Important:" | |
|
|
11867 | msgstr "重要:" | |
|
|
11868 | ||
|
|
11869 | msgid "Note:" | |
|
|
11870 | msgstr "備注:" | |
|
|
11871 | ||
|
|
11872 | msgid "Tip:" | |
|
|
11873 | msgstr "提示:" | |
|
|
11874 | ||
|
|
11875 | msgid "Warning!" | |
|
|
11876 | msgstr "警報!" | |
|
|
10304 | 11877 | |
|
|
10305 | 11878 | #, python-format |
|
|
10306 | 11879 | msgid "cannot create %s: destination already exists" |
| @@ -10331,11 +11904,11 b' msgid "file %s already exists\\n"' | |||
|
|
10331 | 11904 | msgstr "檔案 %s 已存在\n" |
|
|
10332 | 11905 | |
|
|
10333 | 11906 | #, python-format |
|
|
10334 |
msgid "Hunk #%d succeeded at %d |
|
|
|
10335 | msgstr "" | |
|
|
10336 | ||
|
|
10337 | #, python-format | |
|
|
10338 |
msgid "Hunk #%d succeeded at %d |
|
|
|
11907 | msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n" | |
|
|
11908 | msgstr "" | |
|
|
11909 | ||
|
|
11910 | #, python-format | |
|
|
11911 | msgid "Hunk #%d succeeded at %d (offset %d lines).\n" | |
|
|
10339 | 11912 | msgstr "" |
|
|
10340 | 11913 | |
|
|
10341 | 11914 | #, python-format |
| @@ -10358,31 +11931,34 b' msgid "binary patch is %d bytes, not %d"' | |||
|
|
10358 | 11931 | msgstr "binary patch 是 %d bytes，而不是 %d" |
|
|
10359 | 11932 | |
|
|
10360 | 11933 | #, python-format |
|
|
10361 | msgid "unable to strip away %d dirs from %s" | |
|
|
10362 | msgstr "" | |
|
|
11934 | msgid "unable to strip away %d of %d dirs from %s" | |
|
|
11935 | msgstr "不能去除(strip away) %d of %d個目錄從 %s" | |
|
|
10363 | 11936 | |
|
|
10364 | 11937 | msgid "undefined source and destination files" |
|
|
10365 | msgstr "" | |
|
|
11938 | msgstr "沒有定義來源跟目標檔案" | |
|
|
10366 | 11939 | |
|
|
10367 | 11940 | #, python-format |
|
|
10368 | 11941 | msgid "malformed patch %s %s" |
|
|
10369 | msgstr "" | |
|
|
11942 | msgstr "有缺陷的patch %s %s" | |
|
|
10370 | 11943 | |
|
|
10371 | 11944 | #, python-format |
|
|
10372 | 11945 | msgid "unsupported parser state: %s" |
|
|
10373 | msgstr "" | |
|
|
11946 | msgstr "不支援的解析器狀態: %s" | |
|
|
10374 | 11947 | |
|
|
10375 | 11948 | #, python-format |
|
|
10376 | 11949 | msgid "patch command failed: %s" |
|
|
10377 | 11950 | msgstr "patch 命令失敗: %s" |
|
|
10378 | 11951 | |
|
|
10379 | 11952 | #, python-format |
|
|
10380 |
msgid " |
|
|
|
11953 | msgid "unsupported line endings type: %s" | |
|
|
10381 | 11954 | msgstr "不支援的行尾結束類型: %s" |
|
|
10382 | 11955 | |
|
|
11956 | msgid "patch failed to apply" | |
|
|
11957 | msgstr "" | |
|
|
11958 | ||
|
|
10383 | 11959 | #, python-format |
|
|
10384 | 11960 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
|
|
10385 | msgstr "" | |
|
|
11961 | msgstr "%d 修改,%d 插入(+),%d 刪除(-)\n" | |
|
|
10386 | 11962 | |
|
|
10387 | 11963 | #, python-format |
|
|
10388 | 11964 | msgid "exited with status %d" |
| @@ -10393,20 +11969,31 b' msgid "killed by signal %d"' | |||
|
|
10393 | 11969 | msgstr "已被信號 %d 終止" |
|
|
10394 | 11970 | |
|
|
10395 | 11971 | #, python-format |
|
|
10396 |
msgid "sav |
|
|
|
10397 | msgstr "正在儲存 bundle 至 %s\n" | |
|
|
11972 | msgid "saved backup bundle to %s\n" | |
|
|
11973 | msgstr "" | |
|
|
10398 | 11974 | |
|
|
10399 | 11975 | msgid "adding branch\n" |
|
|
10400 | 11976 | msgstr "正在新增 branch\n" |
|
|
10401 | 11977 | |
|
|
10402 | 11978 | #, python-format |
|
|
11979 | msgid "strip failed, full bundle stored in '%s'\n" | |
|
|
11980 | msgstr "" | |
|
|
11981 | ||
|
|
11982 | #, python-format | |
|
|
11983 | msgid "strip failed, partial bundle stored in '%s'\n" | |
|
|
11984 | msgstr "" | |
|
|
11985 | ||
|
|
11986 | #, python-format | |
|
|
10403 | 11987 | msgid "cannot %s; remote repository does not support the %r capability" |
|
|
10404 | msgstr "" | |
|
|
11988 | msgstr "不能 %s;遠端儲存庫不支援 %r 功能" | |
|
|
10405 | 11989 | |
|
|
10406 | 11990 | #, python-format |
|
|
10407 | 11991 | msgid "unknown compression type %r" |
|
|
10408 | 11992 | msgstr "未知的壓縮類型 %r" |
|
|
10409 | 11993 | |
|
|
11994 | msgid "index entry flags need RevlogNG" | |
|
|
11995 | msgstr "" | |
|
|
11996 | ||
|
|
10410 | 11997 | #, python-format |
|
|
10411 | 11998 | msgid "index %s unknown flags %#04x for format v0" |
|
|
10412 | 11999 | msgstr "" |
| @@ -10430,21 +12017,370 b' msgid "ambiguous identifier"' | |||
|
|
10430 | 12017 | msgstr "不明確的 identifier" |
|
|
10431 | 12018 | |
|
|
10432 | 12019 | msgid "no match found" |
|
|
10433 | msgstr "" | |
|
|
12020 | msgstr "找不到符合的" | |
|
|
10434 | 12021 | |
|
|
10435 | 12022 | #, python-format |
|
|
10436 | 12023 | msgid "incompatible revision flag %x" |
|
|
10437 | msgstr "" | |
|
|
12024 | msgstr "不相容的修定版旗標 %x" | |
|
|
10438 | 12025 | |
|
|
10439 | 12026 | #, python-format |
|
|
10440 | 12027 | msgid "%s not found in the transaction" |
|
|
10441 | 12028 | msgstr "於 transaction 中找不到 %s" |
|
|
10442 | 12029 | |
|
|
12030 | msgid "consistency error in delta" | |
|
|
12031 | msgstr "" | |
|
|
12032 | ||
|
|
10443 | 12033 | msgid "unknown base" |
|
|
10444 | 12034 | msgstr "未知的 base" |
|
|
10445 | 12035 | |
|
|
10446 | msgid "consistency error adding group" | |
|
|
10447 | msgstr "" | |
|
|
12036 | msgid "unterminated string" | |
|
|
12037 | msgstr "沒有結束的字串" | |
|
|
12038 | ||
|
|
12039 | msgid "syntax error" | |
|
|
12040 | msgstr "語法錯誤" | |
|
|
12041 | ||
|
|
12042 | msgid "missing argument" | |
|
|
12043 | msgstr "參數遺失" | |
|
|
12044 | ||
|
|
12045 | #, python-format | |
|
|
12046 | msgid "can't use %s here" | |
|
|
12047 | msgstr "不能再這裡使用 %s" | |
|
|
12048 | ||
|
|
12049 | msgid "can't use a list in this context" | |
|
|
12050 | msgstr "" | |
|
|
12051 | ||
|
|
12052 | #, python-format | |
|
|
12053 | msgid "not a function: %s" | |
|
|
12054 | msgstr "%s 不是函式(function)" | |
|
|
12055 | ||
|
|
12056 | msgid "" | |
|
|
12057 | "``id(string)``\n" | |
|
|
12058 | " Revision non-ambiguously specified by the given hex string prefix." | |
|
|
12059 | msgstr "" | |
|
|
12060 | ||
|
|
12061 | #. i18n: "id" is a keyword | |
|
|
12062 | msgid "id requires one argument" | |
|
|
12063 | msgstr "id 需要一個參數" | |
|
|
12064 | ||
|
|
12065 | #. i18n: "id" is a keyword | |
|
|
12066 | msgid "id requires a string" | |
|
|
12067 | msgstr "id 需要一個字串" | |
|
|
12068 | ||
|
|
12069 | msgid "" | |
|
|
12070 | "``rev(number)``\n" | |
|
|
12071 | " Revision with the given numeric identifier." | |
|
|
12072 | msgstr "" | |
|
|
12073 | ||
|
|
12074 | #. i18n: "rev" is a keyword | |
|
|
12075 | msgid "rev requires one argument" | |
|
|
12076 | msgstr "rev 需要一個參數" | |
|
|
12077 | ||
|
|
12078 | #. i18n: "rev" is a keyword | |
|
|
12079 | msgid "rev requires a number" | |
|
|
12080 | msgstr "rev 需要一個數字" | |
|
|
12081 | ||
|
|
12082 | #. i18n: "rev" is a keyword | |
|
|
12083 | msgid "rev expects a number" | |
|
|
12084 | msgstr "" | |
|
|
12085 | ||
|
|
12086 | msgid "" | |
|
|
12087 | "``p1(set)``\n" | |
|
|
12088 | " First parent of changesets in set." | |
|
|
12089 | msgstr "" | |
|
|
12090 | ||
|
|
12091 | msgid "" | |
|
|
12092 | "``p2(set)``\n" | |
|
|
12093 | " Second parent of changesets in set." | |
|
|
12094 | msgstr "" | |
|
|
12095 | ||
|
|
12096 | msgid "" | |
|
|
12097 | "``parents(set)``\n" | |
|
|
12098 | " The set of all parents for all changesets in set." | |
|
|
12099 | msgstr "" | |
|
|
12100 | ||
|
|
12101 | msgid "" | |
|
|
12102 | "``max(set)``\n" | |
|
|
12103 | " Changeset with highest revision number in set." | |
|
|
12104 | msgstr "" | |
|
|
12105 | ||
|
|
12106 | msgid "" | |
|
|
12107 | "``min(set)``\n" | |
|
|
12108 | " Changeset with lowest revision number in set." | |
|
|
12109 | msgstr "" | |
|
|
12110 | ||
|
|
12111 | msgid "" | |
|
|
12112 | "``limit(set, n)``\n" | |
|
|
12113 | " First n members of set." | |
|
|
12114 | msgstr "" | |
|
|
12115 | ||
|
|
12116 | #. i18n: "limit" is a keyword | |
|
|
12117 | msgid "limit requires two arguments" | |
|
|
12118 | msgstr "limit 需要兩個參數" | |
|
|
12119 | ||
|
|
12120 | #. i18n: "limit" is a keyword | |
|
|
12121 | msgid "limit requires a number" | |
|
|
12122 | msgstr "limit 需要一個數字" | |
|
|
12123 | ||
|
|
12124 | #. i18n: "limit" is a keyword | |
|
|
12125 | msgid "limit expects a number" | |
|
|
12126 | msgstr "" | |
|
|
12127 | ||
|
|
12128 | msgid "" | |
|
|
12129 | "``children(set)``\n" | |
|
|
12130 | " Child changesets of changesets in set." | |
|
|
12131 | msgstr "" | |
|
|
12132 | ||
|
|
12133 | msgid "" | |
|
|
12134 | "``branch(set)``\n" | |
|
|
12135 | " All changesets belonging to the branches of changesets in set." | |
|
|
12136 | msgstr "" | |
|
|
12137 | ||
|
|
12138 | msgid "" | |
|
|
12139 | "``ancestor(single, single)``\n" | |
|
|
12140 | " Greatest common ancestor of the two changesets." | |
|
|
12141 | msgstr "" | |
|
|
12142 | ||
|
|
12143 | #. i18n: "ancestor" is a keyword | |
|
|
12144 | msgid "ancestor requires two arguments" | |
|
|
12145 | msgstr "ancestor 需要兩個參數" | |
|
|
12146 | ||
|
|
12147 | #. i18n: "ancestor" is a keyword | |
|
|
12148 | msgid "ancestor arguments must be single revisions" | |
|
|
12149 | msgstr "ancestor的參數必須是單個修訂版" | |
|
|
12150 | ||
|
|
12151 | msgid "" | |
|
|
12152 | "``ancestors(set)``\n" | |
|
|
12153 | " Changesets that are ancestors of a changeset in set." | |
|
|
12154 | msgstr "" | |
|
|
12155 | ||
|
|
12156 | msgid "" | |
|
|
12157 | "``descendants(set)``\n" | |
|
|
12158 | " Changesets which are descendants of changesets in set." | |
|
|
12159 | msgstr "" | |
|
|
12160 | ||
|
|
12161 | msgid "" | |
|
|
12162 | "``follow()``\n" | |
|
|
12163 | " An alias for ``::.`` (ancestors of the working copy's first parent)." | |
|
|
12164 | msgstr "" | |
|
|
12165 | ||
|
|
12166 | #. i18n: "follow" is a keyword | |
|
|
12167 | msgid "follow takes no arguments" | |
|
|
12168 | msgstr "follow 不需要參數" | |
|
|
12169 | ||
|
|
12170 | msgid "" | |
|
|
12171 | "``date(interval)``\n" | |
|
|
12172 | " Changesets within the interval, see :hg:`help dates`." | |
|
|
12173 | msgstr "" | |
|
|
12174 | ||
|
|
12175 | #. i18n: "date" is a keyword | |
|
|
12176 | msgid "date requires a string" | |
|
|
12177 | msgstr "date 需要一個字串" | |
|
|
12178 | ||
|
|
12179 | msgid "" | |
|
|
12180 | "``keyword(string)``\n" | |
|
|
12181 | " Search commit message, user name, and names of changed files for\n" | |
|
|
12182 | " string." | |
|
|
12183 | msgstr "" | |
|
|
12184 | ||
|
|
12185 | #. i18n: "keyword" is a keyword | |
|
|
12186 | msgid "keyword requires a string" | |
|
|
12187 | msgstr "keyword 需要一個字串" | |
|
|
12188 | ||
|
|
12189 | msgid "" | |
|
|
12190 | "``grep(regex)``\n" | |
|
|
12191 | " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" | |
|
|
12192 | " to ensure special escape characters are handled correctly." | |
|
|
12193 | msgstr "" | |
|
|
12194 | ||
|
|
12195 | #. i18n: "grep" is a keyword | |
|
|
12196 | msgid "grep requires a string" | |
|
|
12197 | msgstr "grep 需要一個字串" | |
|
|
12198 | ||
|
|
12199 | #, python-format | |
|
|
12200 | msgid "invalid match pattern: %s" | |
|
|
12201 | msgstr "無效的符合表達式: %s" | |
|
|
12202 | ||
|
|
12203 | msgid "" | |
|
|
12204 | "``author(string)``\n" | |
|
|
12205 | " Alias for ``user(string)``." | |
|
|
12206 | msgstr "" | |
|
|
12207 | ||
|
|
12208 | #. i18n: "author" is a keyword | |
|
|
12209 | msgid "author requires a string" | |
|
|
12210 | msgstr "author 需要一個字串" | |
|
|
12211 | ||
|
|
12212 | msgid "" | |
|
|
12213 | "``user(string)``\n" | |
|
|
12214 | " User name is string." | |
|
|
12215 | msgstr "" | |
|
|
12216 | ||
|
|
12217 | msgid "" | |
|
|
12218 | "``file(pattern)``\n" | |
|
|
12219 | " Changesets affecting files matched by pattern." | |
|
|
12220 | msgstr "" | |
|
|
12221 | ||
|
|
12222 | #. i18n: "file" is a keyword | |
|
|
12223 | msgid "file requires a pattern" | |
|
|
12224 | msgstr "file 需要一個檔名表達式" | |
|
|
12225 | ||
|
|
12226 | msgid "" | |
|
|
12227 | "``contains(pattern)``\n" | |
|
|
12228 | " Revision contains pattern." | |
|
|
12229 | msgstr "" | |
|
|
12230 | ||
|
|
12231 | #. i18n: "contains" is a keyword | |
|
|
12232 | msgid "contains requires a pattern" | |
|
|
12233 | msgstr "contains 需要一個表示式" | |
|
|
12234 | ||
|
|
12235 | msgid "" | |
|
|
12236 | "``modifies(pattern)``\n" | |
|
|
12237 | " Changesets modifying files matched by pattern." | |
|
|
12238 | msgstr "" | |
|
|
12239 | ||
|
|
12240 | #. i18n: "modifies" is a keyword | |
|
|
12241 | msgid "modifies requires a pattern" | |
|
|
12242 | msgstr "modifies 需要一個檔名表達式" | |
|
|
12243 | ||
|
|
12244 | msgid "" | |
|
|
12245 | "``adds(pattern)``\n" | |
|
|
12246 | " Changesets that add a file matching pattern." | |
|
|
12247 | msgstr "" | |
|
|
12248 | ||
|
|
12249 | #. i18n: "adds" is a keyword | |
|
|
12250 | msgid "adds requires a pattern" | |
|
|
12251 | msgstr "adds 需要一個檔名表達式" | |
|
|
12252 | ||
|
|
12253 | msgid "" | |
|
|
12254 | "``removes(pattern)``\n" | |
|
|
12255 | " Changesets which remove files matching pattern." | |
|
|
12256 | msgstr "" | |
|
|
12257 | ||
|
|
12258 | #. i18n: "removes" is a keyword | |
|
|
12259 | msgid "removes requires a pattern" | |
|
|
12260 | msgstr "removes 需要一個檔名表達式" | |
|
|
12261 | ||
|
|
12262 | msgid "" | |
|
|
12263 | "``merge()``\n" | |
|
|
12264 | " Changeset is a merge changeset." | |
|
|
12265 | msgstr "" | |
|
|
12266 | ||
|
|
12267 | #. i18n: "merge" is a keyword | |
|
|
12268 | msgid "merge takes no arguments" | |
|
|
12269 | msgstr "merge 不需要參數" | |
|
|
12270 | ||
|
|
12271 | msgid "" | |
|
|
12272 | "``closed()``\n" | |
|
|
12273 | " Changeset is closed." | |
|
|
12274 | msgstr "" | |
|
|
12275 | ||
|
|
12276 | #. i18n: "closed" is a keyword | |
|
|
12277 | msgid "closed takes no arguments" | |
|
|
12278 | msgstr "closed 不需要參數" | |
|
|
12279 | ||
|
|
12280 | msgid "" | |
|
|
12281 | "``head()``\n" | |
|
|
12282 | " Changeset is a named branch head." | |
|
|
12283 | msgstr "" | |
|
|
12284 | ||
|
|
12285 | #. i18n: "head" is a keyword | |
|
|
12286 | msgid "head takes no arguments" | |
|
|
12287 | msgstr "head 不需要參數" | |
|
|
12288 | ||
|
|
12289 | msgid "" | |
|
|
12290 | "``reverse(set)``\n" | |
|
|
12291 | " Reverse order of set." | |
|
|
12292 | msgstr "" | |
|
|
12293 | ||
|
|
12294 | msgid "" | |
|
|
12295 | "``present(set)``\n" | |
|
|
12296 | " An empty set, if any revision in set isn't found; otherwise,\n" | |
|
|
12297 | " all revisions in set." | |
|
|
12298 | msgstr "" | |
|
|
12299 | ||
|
|
12300 | msgid "" | |
|
|
12301 | "``sort(set[, [-]key...])``\n" | |
|
|
12302 | " Sort set by keys. The default sort order is ascending, specify a key\n" | |
|
|
12303 | " as ``-key`` to sort in descending order." | |
|
|
12304 | msgstr "" | |
|
|
12305 | ||
|
|
12306 | msgid " The keys can be:" | |
|
|
12307 | msgstr "" | |
|
|
12308 | ||
|
|
12309 | msgid "" | |
|
|
12310 | " - ``rev`` for the revision number,\n" | |
|
|
12311 | " - ``branch`` for the branch name,\n" | |
|
|
12312 | " - ``desc`` for the commit message (description),\n" | |
|
|
12313 | " - ``user`` for user name (``author`` can be used as an alias),\n" | |
|
|
12314 | " - ``date`` for the commit date" | |
|
|
12315 | msgstr "" | |
|
|
12316 | ||
|
|
12317 | #. i18n: "sort" is a keyword | |
|
|
12318 | msgid "sort requires one or two arguments" | |
|
|
12319 | msgstr "sort 需要1個或2個參數" | |
|
|
12320 | ||
|
|
12321 | msgid "sort spec must be a string" | |
|
|
12322 | msgstr "排序描述必須是一個字串" | |
|
|
12323 | ||
|
|
12324 | #, python-format | |
|
|
12325 | msgid "unknown sort key %r" | |
|
|
12326 | msgstr "未知的排序鍵值 %r" | |
|
|
12327 | ||
|
|
12328 | msgid "" | |
|
|
12329 | "``all()``\n" | |
|
|
12330 | " All changesets, the same as ``0:tip``." | |
|
|
12331 | msgstr "" | |
|
|
12332 | ||
|
|
12333 | #. i18n: "all" is a keyword | |
|
|
12334 | msgid "all takes no arguments" | |
|
|
12335 | msgstr "all 不需要參數" | |
|
|
12336 | ||
|
|
12337 | msgid "" | |
|
|
12338 | "``heads(set)``\n" | |
|
|
12339 | " Members of set with no children in set." | |
|
|
12340 | msgstr "" | |
|
|
12341 | ||
|
|
12342 | msgid "" | |
|
|
12343 | "``roots(set)``\n" | |
|
|
12344 | " Changesets with no parent changeset in set." | |
|
|
12345 | msgstr "" | |
|
|
12346 | ||
|
|
12347 | msgid "" | |
|
|
12348 | "``outgoing([path])``\n" | |
|
|
12349 | " Changesets not found in the specified destination repository, or the\n" | |
|
|
12350 | " default push location." | |
|
|
12351 | msgstr "" | |
|
|
12352 | ||
|
|
12353 | #. i18n: "outgoing" is a keyword | |
|
|
12354 | msgid "outgoing requires a repository path" | |
|
|
12355 | msgstr "outgoing需要一個儲存庫路徑" | |
|
|
12356 | ||
|
|
12357 | msgid "" | |
|
|
12358 | "``tag(name)``\n" | |
|
|
12359 | " The specified tag by name, or all tagged revisions if no name is given." | |
|
|
12360 | msgstr "" | |
|
|
12361 | ||
|
|
12362 | #. i18n: "tag" is a keyword | |
|
|
12363 | msgid "tag takes one or no arguments" | |
|
|
12364 | msgstr "tag 需要一個參數或不需要參數" | |
|
|
12365 | ||
|
|
12366 | #. i18n: "tag" is a keyword | |
|
|
12367 | msgid "the argument to tag must be a string" | |
|
|
12368 | msgstr "tag的參數必須是一個字串" | |
|
|
12369 | ||
|
|
12370 | msgid "can't negate that" | |
|
|
12371 | msgstr "不能否定那個" | |
|
|
12372 | ||
|
|
12373 | msgid "not a symbol" | |
|
|
12374 | msgstr "不是一個符號" | |
|
|
12375 | ||
|
|
12376 | msgid "empty query" | |
|
|
12377 | msgstr "空白的查詢" | |
|
|
12378 | ||
|
|
12379 | msgid "searching for exact renames" | |
|
|
12380 | msgstr "" | |
|
|
12381 | ||
|
|
12382 | msgid "searching for similar files" | |
|
|
12383 | msgstr "搜尋類似的檔案" | |
|
|
10448 | 12384 | |
|
|
10449 | 12385 | #, python-format |
|
|
10450 | 12386 | msgid "%s looks like a binary file." |
| @@ -10464,17 +12400,21 b' msgid "could not create remote repo"' | |||
|
|
10464 | 12400 | msgstr "無法建立遠端 repo" |
|
|
10465 | 12401 | |
|
|
10466 | 12402 | msgid "no suitable response from remote hg" |
|
|
10467 | msgstr "" | |
|
|
12403 | msgstr "遠端hg沒有適當的回應" | |
|
|
10468 | 12404 | |
|
|
10469 | 12405 | msgid "remote: " |
|
|
10470 | 12406 | msgstr "遠端: " |
|
|
10471 | 12407 | |
|
|
12408 | msgid "unexpected response:" | |
|
|
12409 | msgstr "意料之外的回應:" | |
|
|
12410 | ||
|
|
10472 | 12411 | #, python-format |
|
|
10473 | 12412 | msgid "push refused: %s" |
|
|
10474 | 12413 | msgstr "push 被拒絕: %s" |
|
|
10475 | 12414 | |
|
|
10476 | msgid "unsynced changes" | |
|
|
10477 | msgstr "未同步的變更" | |
|
|
12415 | #, python-format | |
|
|
12416 | msgid "'%s' does not appear to be an hg repository" | |
|
|
12417 | msgstr "" | |
|
|
10478 | 12418 | |
|
|
10479 | 12419 | msgid "cannot lock static-http repository" |
|
|
10480 | 12420 | msgstr "無法鎖定 static-http repository" |
| @@ -10487,6 +12427,17 b' msgid "invalid entry in fncache, line %s' | |||
|
|
10487 | 12427 | msgstr "" |
|
|
10488 | 12428 | |
|
|
10489 | 12429 | #, python-format |
|
|
12430 | msgid "subrepo spec file %s not found" | |
|
|
12431 | msgstr "子儲存庫描述檔 %s 找不到" | |
|
|
12432 | ||
|
|
12433 | msgid "missing ] in subrepo source" | |
|
|
12434 | msgstr "" | |
|
|
12435 | ||
|
|
12436 | #, python-format | |
|
|
12437 | msgid "bad subrepository pattern in %s: %s" | |
|
|
12438 | msgstr "" | |
|
|
12439 | ||
|
|
12440 | #, python-format | |
|
|
10490 | 12441 | msgid "" |
|
|
10491 | 12442 | " subrepository sources for %s differ\n" |
|
|
10492 | 12443 | "use (l)ocal source (%s) or (r)emote source (%s)?" |
| @@ -10508,16 +12459,35 b' msgid ""' | |||
|
|
10508 | 12459 | msgstr "" |
|
|
10509 | 12460 | |
|
|
10510 | 12461 | #, python-format |
|
|
12462 | msgid "default path for subrepository %s not found" | |
|
|
12463 | msgstr "" | |
|
|
12464 | ||
|
|
12465 | #, python-format | |
|
|
12466 | msgid "unknown subrepo type %s" | |
|
|
12467 | msgstr "未知的子儲存庫類型 %s" | |
|
|
12468 | ||
|
|
12469 | #, python-format | |
|
|
12470 | msgid "warning: error \"%s\" in subrepository \"%s\"\n" | |
|
|
12471 | msgstr "" | |
|
|
12472 | ||
|
|
12473 | #, python-format | |
|
|
10511 | 12474 | msgid "removing subrepo %s\n" |
|
|
10512 | msgstr "" | |
|
|
10513 | ||
|
|
10514 | #, python-format | |
|
|
10515 | msgid "pulling subrepo %s\n" | |
|
|
10516 | msgstr "" | |
|
|
10517 | ||
|
|
10518 | #, python-format | |
|
|
10519 | msgid "pushing subrepo %s\n" | |
|
|
10520 | msgstr "" | |
|
|
12475 | msgstr "移除子儲存庫 %s\n" | |
|
|
12476 | ||
|
|
12477 | #, python-format | |
|
|
12478 | msgid "pulling subrepo %s from %s\n" | |
|
|
12479 | msgstr "拉收子儲存庫 %s 從 %s\n" | |
|
|
12480 | ||
|
|
12481 | #, python-format | |
|
|
12482 | msgid "pushing subrepo %s to %s\n" | |
|
|
12483 | msgstr "推送子儲存庫 %s 到 %s\n" | |
|
|
12484 | ||
|
|
12485 | msgid "cannot commit svn externals" | |
|
|
12486 | msgstr "不能提交 svn externals" | |
|
|
12487 | ||
|
|
12488 | #, python-format | |
|
|
12489 | msgid "not removing repo %s because it has changes.\n" | |
|
|
12490 | msgstr "不能移除儲存庫 %s 因為他已經改變了.\n" | |
|
|
10521 | 12491 | |
|
|
10522 | 12492 | #, python-format |
|
|
10523 | 12493 | msgid "%s, line %s: %s\n" |
| @@ -10530,111 +12500,139 b' msgstr ""' | |||
|
|
10530 | 12500 | msgid "node '%s' is not well formed" |
|
|
10531 | 12501 | msgstr "" |
|
|
10532 | 12502 | |
|
|
12503 | msgid ".hg/tags.cache is corrupt, rebuilding it\n" | |
|
|
12504 | msgstr "" | |
|
|
12505 | ||
|
|
10533 | 12506 | msgid "unmatched quotes" |
|
|
10534 | msgstr "" | |
|
|
12507 | msgstr "沒有配對的引號" | |
|
|
10535 | 12508 | |
|
|
10536 | 12509 | #, python-format |
|
|
10537 | 12510 | msgid "error expanding '%s%%%s'" |
|
|
10538 | msgstr "" | |
|
|
12511 | msgstr "'%s%%%s'展開失敗" | |
|
|
10539 | 12512 | |
|
|
10540 | 12513 | #, python-format |
|
|
10541 | 12514 | msgid "unknown filter '%s'" |
|
|
10542 | msgstr "" | |
|
|
12515 | msgstr "未知的過濾器 '%s'" | |
|
|
10543 | 12516 | |
|
|
10544 | 12517 | #, python-format |
|
|
10545 | 12518 | msgid "style not found: %s" |
|
|
10546 | msgstr "" | |
|
|
12519 | msgstr "找不到style: %s" | |
|
|
10547 | 12520 | |
|
|
10548 | 12521 | #, python-format |
|
|
10549 | 12522 | msgid "template file %s: %s" |
|
|
10550 | msgstr "" | |
|
|
12523 | msgstr "佔存檔 %s: %s" | |
|
|
10551 | 12524 | |
|
|
10552 | 12525 | msgid "cannot use transaction when it is already committed/aborted" |
|
|
10553 | 12526 | msgstr "" |
|
|
10554 | 12527 | |
|
|
10555 | 12528 | #, python-format |
|
|
10556 | 12529 | msgid "failed to truncate %s\n" |
|
|
10557 | msgstr "" | |
|
|
12530 | msgstr "不能清除(truncate) %s\n" | |
|
|
10558 | 12531 | |
|
|
10559 | 12532 | msgid "transaction abort!\n" |
|
|
10560 | 12533 | msgstr "" |
|
|
10561 | 12534 | |
|
|
10562 | 12535 | msgid "rollback completed\n" |
|
|
10563 | msgstr "" | |
|
|
12536 | msgstr "rollback 完成了\n" | |
|
|
10564 | 12537 | |
|
|
10565 | 12538 | msgid "rollback failed - please run hg recover\n" |
|
|
10566 | msgstr "" | |
|
|
12539 | msgstr "rollback 失敗 - 請執行 hg recover 命令\n" | |
|
|
10567 | 12540 | |
|
|
10568 | 12541 | #, python-format |
|
|
10569 | 12542 | msgid "Not trusting file %s from untrusted user %s, group %s\n" |
|
|
10570 | msgstr "" | |
|
|
12543 | msgstr "不受信任的檔案 %s 從不受信任的使用者 %s,群組 %s\n" | |
|
|
10571 | 12544 | |
|
|
10572 | 12545 | #, python-format |
|
|
10573 | 12546 | msgid "Ignored: %s\n" |
|
|
12547 | msgstr "忽略: %s\n" | |
|
|
12548 | ||
|
|
12549 | #, python-format | |
|
|
12550 | msgid "(deprecated '%%' in path %s=%s from %s)\n" | |
|
|
10574 | 12551 | msgstr "" |
|
|
10575 | 12552 | |
|
|
10576 | 12553 | #, python-format |
|
|
10577 | 12554 | msgid "ignoring untrusted configuration option %s.%s = %s\n" |
|
|
10578 | msgstr "" | |
|
|
12555 | msgstr "忽略未受信任的設定選項 %s.%s=%s\n" | |
|
|
10579 | 12556 | |
|
|
10580 | 12557 | #, python-format |
|
|
10581 | 12558 | msgid "%s.%s not a boolean ('%s')" |
|
|
10582 | 12559 | msgstr "" |
|
|
10583 | 12560 | |
|
|
10584 | 12561 | msgid "enter a commit username:" |
|
|
10585 | msgstr "" | |
|
|
12562 | msgstr "請輸入一個提交的使用者名稱:" | |
|
|
10586 | 12563 | |
|
|
10587 | 12564 | #, python-format |
|
|
10588 | 12565 | msgid "No username found, using '%s' instead\n" |
|
|
10589 | msgstr "" | |
|
|
10590 | ||
|
|
10591 | msgid "Please specify a username." | |
|
|
10592 | msgstr "" | |
|
|
12566 | msgstr "找不到名字,用 '%s'代替\n" | |
|
|
12567 | ||
|
|
12568 | msgid "no username supplied (see \"hg help config\")" | |
|
|
12569 | msgstr "沒有提供使用者名稱(查閱 'hg help config')" | |
|
|
10593 | 12570 | |
|
|
10594 | 12571 | #, python-format |
|
|
10595 | 12572 | msgid "username %s contains a newline\n" |
|
|
10596 | msgstr "" | |
|
|
12573 | msgstr "使用者名稱 '%s' 裏面有換行字元\n" | |
|
|
10597 | 12574 | |
|
|
10598 | 12575 | msgid "response expected" |
|
|
10599 | msgstr "" | |
|
|
12576 | msgstr "預期之中的回應" | |
|
|
10600 | 12577 | |
|
|
10601 | 12578 | msgid "unrecognized response\n" |
|
|
10602 | msgstr "" | |
|
|
12579 | msgstr "辨認不出來的回應\n" | |
|
|
10603 | 12580 | |
|
|
10604 | 12581 | msgid "password: " |
|
|
10605 | msgstr "" | |
|
|
12582 | msgstr "密碼:" | |
|
|
10606 | 12583 | |
|
|
10607 | 12584 | msgid "edit failed" |
|
|
10608 | msgstr "" | |
|
|
12585 | msgstr "編輯失敗" | |
|
|
10609 | 12586 | |
|
|
10610 | 12587 | msgid "http authorization required" |
|
|
10611 | msgstr "" | |
|
|
12588 | msgstr "http 需要認証" | |
|
|
10612 | 12589 | |
|
|
10613 | 12590 | msgid "http authorization required\n" |
|
|
10614 | msgstr "" | |
|
|
12591 | msgstr "http 需要認証\n" | |
|
|
10615 | 12592 | |
|
|
10616 | 12593 | #, python-format |
|
|
10617 | 12594 | msgid "realm: %s\n" |
|
|
10618 | msgstr "" | |
|
|
12595 | msgstr "領域: %s\n" | |
|
|
10619 | 12596 | |
|
|
10620 | 12597 | #, python-format |
|
|
10621 | 12598 | msgid "user: %s\n" |
|
|
10622 | msgstr "" | |
|
|
12599 | msgstr "使用者: %s\n" | |
|
|
10623 | 12600 | |
|
|
10624 | 12601 | msgid "user:" |
|
|
10625 | msgstr "" | |
|
|
12602 | msgstr "使用者:" | |
|
|
10626 | 12603 | |
|
|
10627 | 12604 | #, python-format |
|
|
10628 | 12605 | msgid "http auth: user %s, password %s\n" |
|
|
10629 | msgstr "" | |
|
|
12606 | msgstr "http 認証: 使用者 %s , 密碼 %s\n" | |
|
|
12607 | ||
|
|
12608 | #, python-format | |
|
|
12609 | msgid "ignoring invalid [auth] key '%s'\n" | |
|
|
12610 | msgstr "忽略無效的[認証]鍵碼 '%s' \n" | |
|
|
12611 | ||
|
|
12612 | msgid "certificate checking requires Python 2.6" | |
|
|
12613 | msgstr "憑證檢驗需要Python 2.6版" | |
|
|
12614 | ||
|
|
12615 | msgid "no certificate received" | |
|
|
12616 | msgstr "" | |
|
|
12617 | ||
|
|
12618 | #, python-format | |
|
|
12619 | msgid "certificate is for %s" | |
|
|
12620 | msgstr "憑證是for %s" | |
|
|
12621 | ||
|
|
12622 | msgid "no commonName found in certificate" | |
|
|
12623 | msgstr "" | |
|
|
12624 | ||
|
|
12625 | #, python-format | |
|
|
12626 | msgid "%s certificate error: %s" | |
|
|
12627 | msgstr "%s 憑證錯誤: %s" | |
|
|
10630 | 12628 | |
|
|
10631 | 12629 | #, python-format |
|
|
10632 | 12630 | msgid "command '%s' failed: %s" |
|
|
10633 | msgstr "" | |
|
|
12631 | msgstr "命令 '%s' 失敗了: %s" | |
|
|
10634 | 12632 | |
|
|
10635 | 12633 | #, python-format |
|
|
10636 | 12634 | msgid "path contains illegal component: %s" |
|
|
10637 | msgstr "" | |
|
|
12635 | msgstr "path 包含了非法的組成元件: %s" | |
|
|
10638 | 12636 | |
|
|
10639 | 12637 | #, python-format |
|
|
10640 | 12638 | msgid "path %r is inside repo %r" |
| @@ -10645,19 +12643,19 b' msgid "path %r traverses symbolic link %' | |||
|
|
10645 | 12643 | msgstr "" |
|
|
10646 | 12644 | |
|
|
10647 | 12645 | msgid "Hardlinks not supported" |
|
|
10648 | msgstr "" | |
|
|
12646 | msgstr "硬式連結不被支援" | |
|
|
10649 | 12647 | |
|
|
10650 | 12648 | #, python-format |
|
|
10651 | 12649 | msgid "could not symlink to %r: %s" |
|
|
10652 | msgstr "" | |
|
|
10653 | ||
|
|
10654 | #, python-format | |
|
|
10655 |
msgid "invalid date: %r |
|
|
|
10656 | msgstr "" | |
|
|
12650 | msgstr "不能產生符號連結到 %r: %s" | |
|
|
12651 | ||
|
|
12652 | #, python-format | |
|
|
12653 | msgid "invalid date: %r" | |
|
|
12654 | msgstr "%r 是無效的日期" | |
|
|
10657 | 12655 | |
|
|
10658 | 12656 | #, python-format |
|
|
10659 | 12657 | msgid "date exceeds 32 bits: %d" |
|
|
10660 | msgstr "" | |
|
|
12658 | msgstr "日期超出 32位元(s) 了 : %d" | |
|
|
10661 | 12659 | |
|
|
10662 | 12660 | #, python-format |
|
|
10663 | 12661 | msgid "impossible time zone offset: %d" |
| @@ -10665,7 +12663,7 b' msgstr ""' | |||
|
|
10665 | 12663 | |
|
|
10666 | 12664 | #, python-format |
|
|
10667 | 12665 | msgid "invalid day spec: %s" |
|
|
10668 | msgstr "" | |
|
|
12666 | msgstr "無效的時間: %s" | |
|
|
10669 | 12667 | |
|
|
10670 | 12668 | #, python-format |
|
|
10671 | 12669 | msgid "%.0f GB" |
| @@ -10707,15 +12705,19 b' msgstr ""' | |||
|
|
10707 | 12705 | msgid "%.0f bytes" |
|
|
10708 | 12706 | msgstr "" |
|
|
10709 | 12707 | |
|
|
12708 | #, python-format | |
|
|
12709 | msgid "no port number associated with service '%s'" | |
|
|
12710 | msgstr "" | |
|
|
12711 | ||
|
|
10710 | 12712 | msgid "cannot verify bundle or remote repos" |
|
|
10711 | msgstr "" | |
|
|
12713 | msgstr "不能 verify bundle 或 遠端儲存庫" | |
|
|
10712 | 12714 | |
|
|
10713 | 12715 | msgid "interrupted" |
|
|
10714 | msgstr "" | |
|
|
12716 | msgstr "中斷" | |
|
|
10715 | 12717 | |
|
|
10716 | 12718 | #, python-format |
|
|
10717 | 12719 | msgid "empty or missing %s" |
|
|
10718 | msgstr "" | |
|
|
12720 | msgstr "空白的或遺失 %s" | |
|
|
10719 | 12721 | |
|
|
10720 | 12722 | #, python-format |
|
|
10721 | 12723 | msgid "data length off by %d bytes" |
| @@ -10723,23 +12725,23 b' msgstr ""' | |||
|
|
10723 | 12725 | |
|
|
10724 | 12726 | #, python-format |
|
|
10725 | 12727 | msgid "index contains %d extra bytes" |
|
|
10726 | msgstr "" | |
|
|
12728 | msgstr "index 包含 %d個額外的位元組" | |
|
|
10727 | 12729 | |
|
|
10728 | 12730 | #, python-format |
|
|
10729 | 12731 | msgid "warning: `%s' uses revlog format 1" |
|
|
10730 | msgstr "" | |
|
|
12732 | msgstr "警報:`%s' 使用 revlog 格式 1" | |
|
|
10731 | 12733 | |
|
|
10732 | 12734 | #, python-format |
|
|
10733 | 12735 | msgid "warning: `%s' uses revlog format 0" |
|
|
10734 | msgstr "" | |
|
|
12736 | msgstr "警報:`%s' 使用 revlog 格式 0" | |
|
|
10735 | 12737 | |
|
|
10736 | 12738 | #, python-format |
|
|
10737 | 12739 | msgid "rev %d points to nonexistent changeset %d" |
|
|
10738 | msgstr "" | |
|
|
12740 | msgstr "rev %d 指到不存在的 changeset %d" | |
|
|
10739 | 12741 | |
|
|
10740 | 12742 | #, python-format |
|
|
10741 | 12743 | msgid "rev %d points to unexpected changeset %d" |
|
|
10742 | msgstr "" | |
|
|
12744 | msgstr "rev %d 指到意料之外的changeset %d" | |
|
|
10743 | 12745 | |
|
|
10744 | 12746 | #, python-format |
|
|
10745 | 12747 | msgid " (expected %s)" |
| @@ -10747,75 +12749,84 b' msgstr ""' | |||
|
|
10747 | 12749 | |
|
|
10748 | 12750 | #, python-format |
|
|
10749 | 12751 | msgid "unknown parent 1 %s of %s" |
|
|
10750 | msgstr "" | |
|
|
12752 | msgstr "未知的母系 1 %s of %s" | |
|
|
10751 | 12753 | |
|
|
10752 | 12754 | #, python-format |
|
|
10753 | 12755 | msgid "unknown parent 2 %s of %s" |
|
|
10754 | msgstr "" | |
|
|
12756 | msgstr "未知的母系 2 %s of %s" | |
|
|
10755 | 12757 | |
|
|
10756 | 12758 | #, python-format |
|
|
10757 | 12759 | msgid "checking parents of %s" |
|
|
10758 | msgstr "" | |
|
|
12760 | msgstr "正在檢查 %s 的 parents" | |
|
|
10759 | 12761 | |
|
|
10760 | 12762 | #, python-format |
|
|
10761 | 12763 | msgid "duplicate revision %d (%d)" |
|
|
12764 | msgstr "重複的修定版 %d (%d)" | |
|
|
12765 | ||
|
|
12766 | msgid "abandoned transaction found - run hg recover\n" | |
|
|
10762 | 12767 | msgstr "" |
|
|
10763 | 12768 | |
|
|
10764 | 12769 | #, python-format |
|
|
10765 | 12770 | msgid "repository uses revlog format %d\n" |
|
|
10766 | msgstr "" | |
|
|
12771 | msgstr "儲存庫使用 revlog 格式 %d\n" | |
|
|
10767 | 12772 | |
|
|
10768 | 12773 | msgid "checking changesets\n" |
|
|
10769 | msgstr "" | |
|
|
12774 | msgstr "檢查changeset中...\n" | |
|
|
12775 | ||
|
|
12776 | msgid "checking" | |
|
|
12777 | msgstr "檢查中..." | |
|
|
10770 | 12778 | |
|
|
10771 | 12779 | #, python-format |
|
|
10772 | 12780 | msgid "unpacking changeset %s" |
|
|
10773 | msgstr "" | |
|
|
12781 | msgstr "解包(unpacking)changeset %s" | |
|
|
10774 | 12782 | |
|
|
10775 | 12783 | msgid "checking manifests\n" |
|
|
10776 | msgstr "" | |
|
|
12784 | msgstr "檢查清單中...\n" | |
|
|
10777 | 12785 | |
|
|
10778 | 12786 | #, python-format |
|
|
10779 | 12787 | msgid "%s not in changesets" |
|
|
10780 | msgstr "" | |
|
|
12788 | msgstr "%s 不在changesets裡" | |
|
|
10781 | 12789 | |
|
|
10782 | 12790 | msgid "file without name in manifest" |
|
|
10783 | 12791 | msgstr "" |
|
|
10784 | 12792 | |
|
|
10785 | 12793 | #, python-format |
|
|
10786 | 12794 | msgid "reading manifest delta %s" |
|
|
10787 | msgstr "" | |
|
|
12795 | msgstr "讀取manifest delta %s" | |
|
|
10788 | 12796 | |
|
|
10789 | 12797 | msgid "crosschecking files in changesets and manifests\n" |
|
|
10790 | msgstr "" | |
|
|
12798 | msgstr "在 changesets 和 manifests裡交叉檢查\n" | |
|
|
12799 | ||
|
|
12800 | msgid "crosschecking" | |
|
|
12801 | msgstr "交叉檢查中" | |
|
|
10791 | 12802 | |
|
|
10792 | 12803 | #, python-format |
|
|
10793 | 12804 | msgid "changeset refers to unknown manifest %s" |
|
|
10794 | msgstr "" | |
|
|
12805 | msgstr "changeset 參考到未知的清單 %s" | |
|
|
10795 | 12806 | |
|
|
10796 | 12807 | msgid "in changeset but not in manifest" |
|
|
10797 | msgstr "" | |
|
|
12808 | msgstr "在changeset 但不在清單裡" | |
|
|
10798 | 12809 | |
|
|
10799 | 12810 | msgid "in manifest but not in changeset" |
|
|
10800 | msgstr "" | |
|
|
12811 | msgstr "在清單裡但不在changeset" | |
|
|
10801 | 12812 | |
|
|
10802 | 12813 | msgid "checking files\n" |
|
|
10803 | msgstr "" | |
|
|
12814 | msgstr "檢查檔案中...\n" | |
|
|
10804 | 12815 | |
|
|
10805 | 12816 | #, python-format |
|
|
10806 | 12817 | msgid "cannot decode filename '%s'" |
|
|
10807 | msgstr "" | |
|
|
12818 | msgstr "檔名 '%s' 不能被解碼" | |
|
|
10808 | 12819 | |
|
|
10809 | 12820 | #, python-format |
|
|
10810 | 12821 | msgid "broken revlog! (%s)" |
|
|
10811 | 12822 | msgstr "" |
|
|
10812 | 12823 | |
|
|
10813 | 12824 | msgid "missing revlog!" |
|
|
10814 | msgstr "" | |
|
|
12825 | msgstr "遺失 revlog!" | |
|
|
10815 | 12826 | |
|
|
10816 | 12827 | #, python-format |
|
|
10817 | 12828 | msgid "%s not in manifests" |
|
|
10818 | msgstr "" | |
|
|
12829 | msgstr "%s 不在清單裡面" | |
|
|
10819 | 12830 | |
|
|
10820 | 12831 | #, python-format |
|
|
10821 | 12832 | msgid "unpacked size is %s, %s expected" |
| @@ -10823,11 +12834,11 b' msgstr ""' | |||
|
|
10823 | 12834 | |
|
|
10824 | 12835 | #, python-format |
|
|
10825 | 12836 | msgid "unpacking %s" |
|
|
10826 | msgstr "" | |
|
|
12837 | msgstr "%s 拆包中(unpacking)" | |
|
|
10827 | 12838 | |
|
|
10828 | 12839 | #, python-format |
|
|
10829 | 12840 | msgid "warning: copy source of '%s' not in parents of %s" |
|
|
10830 | msgstr "" | |
|
|
12841 | msgstr "警報: '%s'的複製來源不在 %s 的母系" | |
|
|
10831 | 12842 | |
|
|
10832 | 12843 | #, python-format |
|
|
10833 | 12844 | msgid "empty or missing copy source revlog %s:%s" |
| @@ -10839,31 +12850,81 b' msgstr ""' | |||
|
|
10839 | 12850 | |
|
|
10840 | 12851 | #, python-format |
|
|
10841 | 12852 | msgid "checking rename of %s" |
|
|
10842 | msgstr "" | |
|
|
12853 | msgstr "正在檢查 %s 的更名" | |
|
|
10843 | 12854 | |
|
|
10844 | 12855 | #, python-format |
|
|
10845 | 12856 | msgid "%s in manifests not found" |
|
|
10846 | msgstr "" | |
|
|
12857 | msgstr "%s 在清單找不到" | |
|
|
10847 | 12858 | |
|
|
10848 | 12859 | #, python-format |
|
|
10849 | 12860 | msgid "warning: orphan revlog '%s'" |
|
|
10850 | msgstr "" | |
|
|
12861 | msgstr "警告: '%s' 是單獨的revlog" | |
|
|
10851 | 12862 | |
|
|
10852 | 12863 | #, python-format |
|
|
10853 | 12864 | msgid "%d files, %d changesets, %d total revisions\n" |
|
|
10854 | msgstr "" | |
|
|
12865 | msgstr "%d個檔案,%d個changesets,%d個總修訂版\n" | |
|
|
10855 | 12866 | |
|
|
10856 | 12867 | #, python-format |
|
|
10857 | 12868 | msgid "%d warnings encountered!\n" |
|
|
10858 | msgstr "" | |
|
|
12869 | msgstr "遇到了 %d 個警告\n" | |
|
|
10859 | 12870 | |
|
|
10860 | 12871 | #, python-format |
|
|
10861 | 12872 | msgid "%d integrity errors encountered!\n" |
|
|
10862 | msgstr "" | |
|
|
12873 | msgstr "遇到了 %d 個完整性錯誤\n" | |
|
|
10863 | 12874 | |
|
|
10864 | 12875 | #, python-format |
|
|
10865 | 12876 | msgid "(first damaged changeset appears to be %d)\n" |
|
|
10866 | msgstr "" | |
|
|
12877 | msgstr "(第一個危險的changeset 出現在%d)\n" | |
|
|
10867 | 12878 | |
|
|
10868 | 12879 | msgid "user name not available - set USERNAME environment variable" |
|
|
10869 | msgstr "" | |
|
|
12880 | msgstr "使用者名字(user name)不能用耶,設一下 USERNAME 吧" | |
|
|
12881 | ||
|
|
12882 | msgid "look up remote revision" | |
|
|
12883 | msgstr "查看遠端修訂版" | |
|
|
12884 | ||
|
|
12885 | msgid "look up remote changes" | |
|
|
12886 | msgstr "查看遠端changes" | |
|
|
12887 | ||
|
|
12888 | msgid "push failed:" | |
|
|
12889 | msgstr "push 失敗:" | |
|
|
12890 | ||
|
|
12891 | msgid "push failed (unexpected response):" | |
|
|
12892 | msgstr "push 失敗(意料之外的回應):" | |
|
|
12893 | ||
|
|
12894 | #~ msgid "" | |
|
|
12895 | #~ "%s: files over 10MB may cause memory and performance problems\n" | |
|
|
12896 | #~ "(use 'hg revert %s' to unadd the file)\n" | |
|
|
12897 | #~ msgstr "" | |
|
|
12898 | #~ "%s: 檔案超過10M可能產生記憶體跟效能問題\n" | |
|
|
12899 | #~ "(使用 'hg revert %s'來取消新增)\n" | |
|
|
12900 | ||
|
|
12901 | #~ msgid "journal already exists - run hg recover" | |
|
|
12902 | #~ msgstr "日誌已經存在 - 執行 hg recover" | |
|
|
12903 | ||
|
|
12904 | #~ msgid "abort: could not import module %s!\n" | |
|
|
12905 | #~ msgstr "中止: 不能匯入 %s 模組!\n" | |
|
|
12906 | ||
|
|
12907 | #~ msgid "overwrite locally modified files (no backup)" | |
|
|
12908 | #~ msgstr "蓋過去本地端修改檔案(沒有備份)" | |
|
|
12909 | ||
|
|
12910 | #~ msgid "export the repository via HTTP" | |
|
|
12911 | #~ msgstr "將 repository 經由 HTTP 發佈" | |
|
|
12912 | ||
|
|
12913 | #, fuzzy | |
|
|
12914 | #~ msgid "retry file merges from a merge or update" | |
|
|
12915 | #~ msgstr "重試經由 merge 或 update 命令所造成、卻未完成的合併" | |
|
|
12916 | ||
|
|
12917 | #~ msgid "COMMANDS" | |
|
|
12918 | #~ msgstr "命令" | |
|
|
12919 | ||
|
|
12920 | #~ msgid "certificate not valid before %s" | |
|
|
12921 | #~ msgstr "在%s 之前憑證不是有效的" | |
|
|
12922 | ||
|
|
12923 | #~ msgid "unsynced changes" | |
|
|
12924 | #~ msgstr "未同步的變更" | |
|
|
12925 | ||
|
|
12926 | #~ msgid " files" | |
|
|
12927 | #~ msgstr "檔案" | |
|
|
12928 | ||
|
|
12929 | #~ msgid " options:" | |
|
|
12930 | #~ msgstr "\t選項:" | |
General Comments 0
You need to be logged in to leave comments.
Login now