Show More
This diff has been collapsed as it changes many lines, (3819 lines changed) Show them Hide them | |||
@@ -5,7 +5,7 b'' | |||
|
5 | 5 | # Copyright (C) 2009 the Mercurial team |
|
6 | 6 | # Dongsheng Song <dongsheng.song@gmail.com>, 2009 |
|
7 | 7 | # |
|
8 |
# $Id: zh |
|
|
8 | # $Id: zh_CN.po 1313 2009-06-24 02:08:02Z songdongsheng@live.cn $ | |
|
9 | 9 | # |
|
10 | 10 | # Update with pot file: |
|
11 | 11 | # msgmerge --update zh_CN.po hg.pot |
@@ -48,9 +48,9 b'' | |||
|
48 | 48 | # |
|
49 | 49 | msgid "" |
|
50 | 50 | msgstr "" |
|
51 |
"Project-Id-Version: Mercurial 1. |
|
|
52 | "Report-Msgid-Bugs-To: \n" | |
|
53 |
"POT-Creation-Date: 2009-0 |
|
|
51 | "Project-Id-Version: Mercurial 1.3\n" | |
|
52 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
|
53 | "POT-Creation-Date: 2009-06-24 10:03+0800\n" | |
|
54 | 54 | "PO-Revision-Date: 2009-03-31 20:38+0200\n" |
|
55 | 55 | "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" |
|
56 | 56 | "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" |
@@ -82,8 +82,53 b' msgstr ""' | |||
|
82 | 82 | " 别名: %s\n" |
|
83 | 83 | "\n" |
|
84 | 84 | |
|
85 | msgid "return tuple of (match function, list enabled)." | |
|
86 | msgstr "返回 tuple (匹配函数,启用列表)" | |
|
85 | msgid "" | |
|
86 | "control access to a repository using simple hooks\n" | |
|
87 | "\n" | |
|
88 | "This hook makes it possible to allow or deny write access to portions\n" | |
|
89 | "of a repository when receiving incoming changesets.\n" | |
|
90 | "\n" | |
|
91 | "The authorization is matched based on the local user name on the\n" | |
|
92 | "system where the hook runs, and not the committer of the original\n" | |
|
93 | "changeset (since the latter is merely informative).\n" | |
|
94 | "\n" | |
|
95 | "The acl hook is best used along with a restricted shell like hgsh,\n" | |
|
96 | "preventing authenticating users from doing anything other than\n" | |
|
97 | "pushing or pulling. The hook is not safe to use if users have\n" | |
|
98 | "interactive shell access, as they can then disable the hook.\n" | |
|
99 | "Nor is it safe if remote users share an account, because then there\n" | |
|
100 | "is no way to distinguish them.\n" | |
|
101 | "\n" | |
|
102 | "To use this hook, configure the acl extension in your hgrc like this:\n" | |
|
103 | "\n" | |
|
104 | " [extensions]\n" | |
|
105 | " hgext.acl =\n" | |
|
106 | "\n" | |
|
107 | " [hooks]\n" | |
|
108 | " pretxnchangegroup.acl = python:hgext.acl.hook\n" | |
|
109 | "\n" | |
|
110 | " [acl]\n" | |
|
111 | " # Check whether the source of incoming changes is in this list\n" | |
|
112 | " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" | |
|
113 | " sources = serve\n" | |
|
114 | "\n" | |
|
115 | "The allow and deny sections take a subtree pattern as key (with a\n" | |
|
116 | "glob syntax by default), and a comma separated list of users as\n" | |
|
117 | "the corresponding value. The deny list is checked before the allow\n" | |
|
118 | "list is.\n" | |
|
119 | "\n" | |
|
120 | " [acl.allow]\n" | |
|
121 | " # If acl.allow is not present, all users are allowed by default.\n" | |
|
122 | " # An empty acl.allow section means no users allowed.\n" | |
|
123 | " docs/** = doc_writer\n" | |
|
124 | " .hgtags = release_engineer\n" | |
|
125 | "\n" | |
|
126 | " [acl.deny]\n" | |
|
127 | " # If acl.deny is not present, no users are refused by default.\n" | |
|
128 | " # An empty acl.deny section means all users allowed.\n" | |
|
129 | " glob pattern = user4, user5\n" | |
|
130 | " ** = user6\n" | |
|
131 | msgstr "" | |
|
87 | 132 | |
|
88 | 133 | #, python-format |
|
89 | 134 | msgid "acl: %s not enabled\n" |
@@ -118,115 +163,41 b' msgid "acl: allowing changeset %s\\n"' | |||
|
118 | 163 | msgstr "acl: 允许修改集 %s\n" |
|
119 | 164 | |
|
120 | 165 | msgid "" |
|
121 | "allow user-defined command aliases\n" | |
|
122 | "\n" | |
|
123 | "To use, create entries in your hgrc of the form\n" | |
|
124 | "\n" | |
|
125 | "[alias]\n" | |
|
126 | "mycmd = cmd --args\n" | |
|
127 | msgstr "" | |
|
128 | "允许用户自定义命令的别名\n" | |
|
129 | "\n" | |
|
130 | "要使用别名,在你的 hgrc 中创建如下格式的条目:\n" | |
|
131 | "\n" | |
|
132 | "[alias]\n" | |
|
133 | "mycmd = cmd --args\n" | |
|
134 | ||
|
135 | msgid "" | |
|
136 | "defer command lookup until needed, so that extensions loaded\n" | |
|
137 | " after alias can be aliased" | |
|
138 | msgstr "查找命令会推迟到需要时,所以可以在定义别名后加载模块" | |
|
139 | ||
|
140 | #, python-format | |
|
141 | msgid "*** [alias] %s: command %s is unknown" | |
|
142 | msgstr "*** [alias] %s: 未知命令 %s" | |
|
143 | ||
|
144 | #, python-format | |
|
145 | msgid "*** [alias] %s: command %s is ambiguous" | |
|
146 | msgstr "*** [alias] %s: 不明确的命令 %s" | |
|
147 | ||
|
148 | #, python-format | |
|
149 | msgid "*** [alias] %s: circular dependency on %s" | |
|
150 | msgstr "*** [alias] %s: 循环依赖于 %s" | |
|
151 | ||
|
152 | #, python-format | |
|
153 | msgid "*** [alias] %s: no definition\n" | |
|
154 | msgstr "*** [alias] %s: 无定义\n" | |
|
155 | ||
|
156 | msgid "" | |
|
157 | "mercurial bookmarks\n" | |
|
158 | "\n" | |
|
159 | "Mercurial bookmarks are local moveable pointers to changesets. Every\n" | |
|
160 | "bookmark points to a changeset identified by its hash. If you commit a\n" | |
|
161 | "changeset that is based on a changeset that has a bookmark on it, the\n" | |
|
162 | "bookmark is forwarded to the new changeset.\n" | |
|
163 | "\n" | |
|
164 | "It is possible to use bookmark names in every revision lookup (e.g. hg\n" | |
|
165 | "merge, hg update).\n" | |
|
166 | "\n" | |
|
167 | "The bookmark extension offers the possiblity to have a more git-like " | |
|
168 | "experience\n" | |
|
169 | "by adding the following configuration option to your .hgrc:\n" | |
|
170 | "\n" | |
|
171 | "[bookmarks]\n" | |
|
172 | "track.current = True\n" | |
|
173 | "\n" | |
|
174 | "This will cause bookmarks to track the bookmark that you are currently on, " | |
|
175 | "and\n" | |
|
176 | "just updates it. This is similar to git's approach of branching.\n" | |
|
177 | msgstr "" | |
|
178 | ||
|
179 | msgid "" | |
|
180 | "Parse .hg/bookmarks file and return a dictionary\n" | |
|
181 | "\n" | |
|
182 | " Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" | |
|
183 | " in the .hg/bookmarks file. They are read by the parse() method and\n" | |
|
184 | " returned as a dictionary with name => hash values.\n" | |
|
185 | "\n" | |
|
186 | " The parsed dictionary is cached until a write() operation is done.\n" | |
|
187 | " " | |
|
188 | msgstr "" | |
|
189 | ||
|
190 | msgid "" | |
|
191 | "Write bookmarks\n" | |
|
192 | "\n" | |
|
193 | " Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" | |
|
194 | " in a format equal to those of localtags.\n" | |
|
195 | "\n" | |
|
196 | " We also store a backup of the previous state in undo.bookmarks that\n" | |
|
197 | " can be copied back on rollback.\n" | |
|
198 | " " | |
|
199 | msgstr "" | |
|
200 | ||
|
201 | msgid "" | |
|
202 | "Get the current bookmark\n" | |
|
203 | "\n" | |
|
204 | " If we use gittishsh branches we have a current bookmark that\n" | |
|
205 | " we are on. This function returns the name of the bookmark. It\n" | |
|
206 | " is stored in .hg/bookmarks.current\n" | |
|
207 | " " | |
|
208 | msgstr "" | |
|
209 | ||
|
210 | msgid "" | |
|
211 | "Set the name of the bookmark that we are currently on\n" | |
|
212 | "\n" | |
|
213 | " Set the name of the bookmark that we are on (hg update <bookmark>).\n" | |
|
214 | " The name is recoreded in .hg/bookmarks.current\n" | |
|
215 | " " | |
|
216 | msgstr "" | |
|
217 | ||
|
218 | msgid "" | |
|
219 | "mercurial bookmarks\n" | |
|
166 | "track a line of development with movable markers\n" | |
|
167 | "\n" | |
|
168 | "Bookmarks are local movable markers to changesets. Every bookmark\n" | |
|
169 | "points to a changeset identified by its hash. If you commit a\n" | |
|
170 | "changeset that is based on a changeset that has a bookmark on it,\n" | |
|
171 | "the bookmark shifts to the new changeset.\n" | |
|
172 | "\n" | |
|
173 | "It is possible to use bookmark names in every revision lookup\n" | |
|
174 | "(e.g. hg merge, hg update).\n" | |
|
175 | "\n" | |
|
176 | "By default, when several bookmarks point to the same changeset, they\n" | |
|
177 | "will all move forward together. It is possible to obtain a more\n" | |
|
178 | "git-like experience by adding the following configuration option to\n" | |
|
179 | "your .hgrc:\n" | |
|
180 | "\n" | |
|
181 | " [bookmarks]\n" | |
|
182 | " track.current = True\n" | |
|
183 | "\n" | |
|
184 | "This will cause Mercurial to track the bookmark that you are currently\n" | |
|
185 | "using, and only update it. This is similar to git's approach to\n" | |
|
186 | "branching.\n" | |
|
187 | msgstr "" | |
|
188 | ||
|
189 | msgid "" | |
|
190 | "track a line of development with movable markers\n" | |
|
220 | 191 | "\n" |
|
221 | 192 | " Bookmarks are pointers to certain commits that move when\n" |
|
222 | " commiting. Bookmarks are local. They can be renamed, copied and\n" | |
|
223 |
" deleted. It is possible to use bookmark names in 'hg merge' and |
|
|
224 | " update' to update to a given bookmark.\n" | |
|
225 | "\n" | |
|
226 |
" You can use 'hg bookmark NAME' to set a bookmark on the |
|
|
227 |
" |
|
|
228 |
" (where REV may be an existing bookmark), |
|
|
229 | " that revision.\n" | |
|
193 | " committing. Bookmarks are local. They can be renamed, copied and\n" | |
|
194 | " deleted. It is possible to use bookmark names in 'hg merge' and\n" | |
|
195 | " 'hg update' to merge and update respectively to a given bookmark.\n" | |
|
196 | "\n" | |
|
197 | " You can use 'hg bookmark NAME' to set a bookmark on the working\n" | |
|
198 | " directory's parent revision with the given name. If you specify\n" | |
|
199 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |
|
200 | " the bookmark is assigned to that revision.\n" | |
|
230 | 201 | " " |
|
231 | 202 | msgstr "" |
|
232 | 203 | |
@@ -248,28 +219,6 b' msgstr ""' | |||
|
248 | 219 | msgid "a bookmark cannot have the name of an existing branch" |
|
249 | 220 | msgstr "" |
|
250 | 221 | |
|
251 | msgid "" | |
|
252 | "Strip bookmarks if revisions are stripped using\n" | |
|
253 | " the mercurial.strip method. This usually happens during\n" | |
|
254 | " qpush and qpop" | |
|
255 | msgstr "" | |
|
256 | ||
|
257 | msgid "" | |
|
258 | "Add a revision to the repository and\n" | |
|
259 | " move the bookmark" | |
|
260 | msgstr "" | |
|
261 | ||
|
262 | msgid "Merge bookmarks with normal tags" | |
|
263 | msgstr "" | |
|
264 | ||
|
265 | msgid "" | |
|
266 | "Set the current bookmark\n" | |
|
267 | "\n" | |
|
268 | " If the user updates to a bookmark we update the .hg/bookmarks.current\n" | |
|
269 | " file.\n" | |
|
270 | " " | |
|
271 | msgstr "" | |
|
272 | ||
|
273 | 222 | msgid "force" |
|
274 | 223 | msgstr "强制" |
|
275 | 224 | |
@@ -286,79 +235,79 b' msgid "hg bookmarks [-f] [-d] [-m NAME] ' | |||
|
286 | 235 | msgstr "" |
|
287 | 236 | |
|
288 | 237 | msgid "" |
|
289 | "Bugzilla integration\n" | |
|
238 | "integrate Mercurial with a Bugzilla bug tracker\n" | |
|
290 | 239 | "\n" |
|
291 | 240 | "This hook extension adds comments on bugs in Bugzilla when changesets\n" |
|
292 |
"that refer to bugs by Bugzilla ID are seen. The hook does not change |
|
|
293 | "status.\n" | |
|
294 | "\n" | |
|
295 |
"The hook updates the Bugzilla database directly. Only Bugzilla |
|
|
296 | "using MySQL are supported.\n" | |
|
297 | "\n" | |
|
298 |
"The hook relies on a Bugzilla script to send bug change notification |
|
|
299 |
"That script changes between Bugzilla versions; the |
|
|
300 |
"prior to 2.18 is replaced in 2.18 and |
|
|
301 |
"'config/sendbugmail.pl'. Note that these will |
|
|
302 | "user\n" | |
|
303 | "pushing the change; you will need to ensure the Bugzilla install file\n" | |
|
304 | "permissions are set appropriately.\n" | |
|
241 | "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" | |
|
242 | "bug status.\n" | |
|
243 | "\n" | |
|
244 | "The hook updates the Bugzilla database directly. Only Bugzilla\n" | |
|
245 | "installations using MySQL are supported.\n" | |
|
246 | "\n" | |
|
247 | "The hook relies on a Bugzilla script to send bug change notification\n" | |
|
248 | "emails. That script changes between Bugzilla versions; the\n" | |
|
249 | "'processmail' script used prior to 2.18 is replaced in 2.18 and\n" | |
|
250 | "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" | |
|
251 | "be run by Mercurial as the user pushing the change; you will need to\n" | |
|
252 | "ensure the Bugzilla install file permissions are set appropriately.\n" | |
|
305 | 253 | "\n" |
|
306 | 254 | "Configuring the extension:\n" |
|
307 | 255 | "\n" |
|
308 | 256 | " [bugzilla]\n" |
|
309 | " host Hostname of the MySQL server holding the Bugzilla database.\n" | |
|
257 | "\n" | |
|
258 | " host Hostname of the MySQL server holding the Bugzilla\n" | |
|
259 | " database.\n" | |
|
310 | 260 | " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" |
|
311 | 261 | " user Username to use to access MySQL server. Default 'bugs'.\n" |
|
312 | 262 | " password Password to use to access MySQL server.\n" |
|
313 | 263 | " timeout Database connection timeout (seconds). Default 5.\n" |
|
314 |
" version Bugzilla version. Specify '3.0' for Bugzilla versions |
|
|
315 |
" later, '2.18' for Bugzilla versions from 2.18 |
|
|
316 | " versions prior to 2.18.\n" | |
|
264 | " version Bugzilla version. Specify '3.0' for Bugzilla versions\n" | |
|
265 | " 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" | |
|
266 | " and '2.16' for versions prior to 2.18.\n" | |
|
317 | 267 | " bzuser Fallback Bugzilla user name to record comments with, if\n" |
|
318 | 268 | " changeset committer cannot be found as a Bugzilla user.\n" |
|
319 | 269 | " bzdir Bugzilla install directory. Used by default notify.\n" |
|
320 | 270 | " Default '/var/www/html/bugzilla'.\n" |
|
321 | 271 | " notify The command to run to get Bugzilla to send bug change\n" |
|
322 |
" notification emails. Substitutes from a map with 3 |
|
|
323 |
" 'bzdir', 'id' (bug id) and 'user' (committer |
|
|
324 |
" Default depends on version; from 2.18 |
|
|
325 |
" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl |
|
|
326 | "s\".\n" | |
|
327 |
" regexp Regular expression to match bug IDs in changeset commit |
|
|
328 | "message.\n" | |
|
329 | " Must contain one \"()\" group. The default expression matches\n" | |
|
330 | " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" | |
|
331 | " 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations thereof.\n" | |
|
332 | " Matching is case insensitive.\n" | |
|
272 | " notification emails. Substitutes from a map with 3\n" | |
|
273 | " keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" | |
|
274 | " bugzilla email). Default depends on version; from 2.18\n" | |
|
275 | " it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" | |
|
276 | " %(id)s %(user)s\".\n" | |
|
277 | " regexp Regular expression to match bug IDs in changeset commit\n" | |
|
278 | " message. Must contain one \"()\" group. The default\n" | |
|
279 | " expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" | |
|
280 | " number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" | |
|
281 | " variations thereof. Matching is case insensitive.\n" | |
|
333 | 282 | " style The style file to use when formatting comments.\n" |
|
334 | 283 | " template Template to use when formatting comments. Overrides\n" |
|
335 | 284 | " style if specified. In addition to the usual Mercurial\n" |
|
336 | 285 | " keywords, the extension specifies:\n" |
|
337 | 286 | " {bug} The Bugzilla bug ID.\n" |
|
338 |
" {root} The full pathname of the Mercurial |
|
|
339 | "repository.\n" | |
|
340 |
" {webroot} Stripped pathname of the Mercurial |
|
|
341 | "repository.\n" | |
|
342 |
" {hgweb} Base URL for browsing Mercurial |
|
|
287 | " {root} The full pathname of the Mercurial\n" | |
|
288 | " repository.\n" | |
|
289 | " {webroot} Stripped pathname of the Mercurial\n" | |
|
290 | " repository.\n" | |
|
291 | " {hgweb} Base URL for browsing Mercurial\n" | |
|
292 | " repositories.\n" | |
|
343 | 293 | " Default 'changeset {node|short} in repo {root} refers '\n" |
|
344 | 294 | " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" |
|
345 | 295 | " strip The number of slashes to strip from the front of {root}\n" |
|
346 | 296 | " to produce {webroot}. Default 0.\n" |
|
347 |
" usermap Path of file containing Mercurial committer ID to |
|
|
348 | "user\n" | |
|
349 | " ID mappings. If specified, the file should contain one " | |
|
350 | "mapping\n" | |
|
351 | " per line, \"committer\"=\"Bugzilla user\". See also the\n" | |
|
352 | " [usermap] section.\n" | |
|
297 | " usermap Path of file containing Mercurial committer ID to\n" | |
|
298 | " Bugzilla user ID mappings. If specified, the file\n" | |
|
299 | " should contain one mapping per line,\n" | |
|
300 | " \"committer\"=\"Bugzilla user\". See also the [usermap]\n" | |
|
301 | " section.\n" | |
|
353 | 302 | "\n" |
|
354 | 303 | " [usermap]\n" |
|
355 |
" Any entries in this section specify mappings of Mercurial |
|
|
356 | " to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
|
304 | " Any entries in this section specify mappings of Mercurial\n" | |
|
305 | " committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" | |
|
357 | 306 | " \"committer\"=\"Bugzilla user\"\n" |
|
358 | 307 | "\n" |
|
359 | 308 | " [web]\n" |
|
360 |
" baseurl Base URL for browsing Mercurial repositories. Reference |
|
|
361 | " templates as {hgweb}.\n" | |
|
309 | " baseurl Base URL for browsing Mercurial repositories. Reference\n" | |
|
310 | " from templates as {hgweb}.\n" | |
|
362 | 311 | "\n" |
|
363 | 312 | "Activating the extension:\n" |
|
364 | 313 | "\n" |
@@ -371,9 +320,9 b' msgid ""' | |||
|
371 | 320 | "\n" |
|
372 | 321 | "Example configuration:\n" |
|
373 | 322 | "\n" |
|
374 |
"This example configuration is for a collection of Mercurial |
|
|
375 |
"in /var/local/hg/repos/ used with a local Bugzilla 3.2 |
|
|
376 | "/opt/bugzilla-3.2.\n" | |
|
323 | "This example configuration is for a collection of Mercurial\n" | |
|
324 | "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" | |
|
325 | "installation in /opt/bugzilla-3.2.\n" | |
|
377 | 326 | "\n" |
|
378 | 327 | " [bugzilla]\n" |
|
379 | 328 | " host=localhost\n" |
@@ -399,16 +348,10 b' msgid ""' | |||
|
399 | 348 | " Changeset commit comment. Bug 1234.\n" |
|
400 | 349 | msgstr "" |
|
401 | 350 | |
|
402 | msgid "support for bugzilla version 2.16." | |
|
403 | msgstr "支持 bugzilla 2.16。" | |
|
404 | ||
|
405 | 351 | #, python-format |
|
406 | 352 | msgid "connecting to %s:%s as %s, password %s\n" |
|
407 | 353 | msgstr "连接到 %s:%s as %s,密码 %s\n" |
|
408 | 354 | |
|
409 | msgid "run a query." | |
|
410 | msgstr "运行查询。" | |
|
411 | ||
|
412 | 355 | #, python-format |
|
413 | 356 | msgid "query: %s %s\n" |
|
414 | 357 | msgstr "查询: %s %s\n" |
@@ -417,25 +360,13 b' msgstr "\xe6\x9f\xa5\xe8\xaf\xa2: %s %s\\n"' | |||
|
417 | 360 | msgid "failed query: %s %s\n" |
|
418 | 361 | msgstr "查询失败: %s %s\n" |
|
419 | 362 | |
|
420 | msgid "get identity of longdesc field" | |
|
421 | msgstr "" | |
|
422 | ||
|
423 | 363 | msgid "unknown database schema" |
|
424 | 364 | msgstr "未知的数据库方案" |
|
425 | 365 | |
|
426 | msgid "filter not-existing bug ids from list." | |
|
427 | msgstr "从列表中过滤不存在的问题标识。" | |
|
428 | ||
|
429 | msgid "filter bug ids from list that already refer to this changeset." | |
|
430 | msgstr "" | |
|
431 | ||
|
432 | 366 | #, python-format |
|
433 | 367 | msgid "bug %d already knows about changeset %s\n" |
|
434 | 368 | msgstr "" |
|
435 | 369 | |
|
436 | msgid "tell bugzilla to send mail." | |
|
437 | msgstr "" | |
|
438 | ||
|
439 | 370 | msgid "telling bugzilla to send mail:\n" |
|
440 | 371 | msgstr "" |
|
441 | 372 | |
@@ -454,22 +385,10 b' msgstr ""' | |||
|
454 | 385 | msgid "done\n" |
|
455 | 386 | msgstr "完成\n" |
|
456 | 387 | |
|
457 | msgid "look up numeric bugzilla user id." | |
|
458 | msgstr "" | |
|
459 | ||
|
460 | 388 | #, python-format |
|
461 | 389 | msgid "looking up user %s\n" |
|
462 | 390 | msgstr "" |
|
463 | 391 | |
|
464 | msgid "map name of committer to bugzilla user name." | |
|
465 | msgstr "" | |
|
466 | ||
|
467 | msgid "" | |
|
468 | "see if committer is a registered bugzilla user. Return\n" | |
|
469 | " bugzilla username and userid if so. If not, return default\n" | |
|
470 | " bugzilla username and userid." | |
|
471 | msgstr "" | |
|
472 | ||
|
473 | 392 | #, python-format |
|
474 | 393 | msgid "cannot find bugzilla user id for %s" |
|
475 | 394 | msgstr "" |
@@ -478,52 +397,16 b' msgstr ""' | |||
|
478 | 397 | msgid "cannot find bugzilla user id for %s or %s" |
|
479 | 398 | msgstr "" |
|
480 | 399 | |
|
481 | msgid "" | |
|
482 | "add comment to bug. try adding comment as committer of\n" | |
|
483 | " changeset, otherwise as default bugzilla user." | |
|
484 | msgstr "" | |
|
485 | ||
|
486 | msgid "support for bugzilla 2.18 series." | |
|
487 | msgstr "" | |
|
488 | ||
|
489 | msgid "support for bugzilla 3.0 series." | |
|
490 | msgstr "" | |
|
491 | ||
|
492 | msgid "" | |
|
493 | "return object that knows how to talk to bugzilla version in\n" | |
|
494 | " use." | |
|
495 | msgstr "" | |
|
496 | ||
|
497 | 400 | #, python-format |
|
498 | 401 | msgid "bugzilla version %s not supported" |
|
499 | 402 | msgstr "" |
|
500 | 403 | |
|
501 | 404 | msgid "" |
|
502 | "find valid bug ids that are referred to in changeset\n" | |
|
503 | " comments and that do not already have references to this\n" | |
|
504 | " changeset." | |
|
505 | msgstr "" | |
|
506 | ||
|
507 | msgid "update bugzilla bug with reference to changeset." | |
|
508 | msgstr "" | |
|
509 | ||
|
510 | msgid "" | |
|
511 | "strip leading prefix of repo root and turn into\n" | |
|
512 | " url-safe path." | |
|
513 | msgstr "" | |
|
514 | ||
|
515 | msgid "" | |
|
516 | 405 | "changeset {node|short} in repo {root} refers to bug {bug}.\n" |
|
517 | 406 | "details:\n" |
|
518 | 407 | "\t{desc|tabindent}" |
|
519 | 408 | msgstr "" |
|
520 | 409 | |
|
521 | msgid "" | |
|
522 | "add comment to bugzilla for each changeset that refers to a\n" | |
|
523 | " bugzilla bug id. only add a comment once per bug, so same change\n" | |
|
524 | " seen multiple times does not fill bug with duplicate data." | |
|
525 | msgstr "" | |
|
526 | ||
|
527 | 410 | #, python-format |
|
528 | 411 | msgid "python mysql support not available: %s" |
|
529 | 412 | msgstr "" |
@@ -536,27 +419,36 b' msgstr ""' | |||
|
536 | 419 | msgid "database error: %s" |
|
537 | 420 | msgstr "" |
|
538 | 421 | |
|
539 | msgid "" | |
|
540 | "show the children of the given or working dir revision\n" | |
|
541 | "\n" | |
|
542 | " Print the children of the working directory's revisions.\n" | |
|
543 | " If a revision is given via --rev, the children of that revision\n" | |
|
544 | " will be printed. If a file argument is given, revision in\n" | |
|
545 | " which the file was last changed (after the working directory\n" | |
|
546 | " revision or the argument to --rev if given) is printed.\n" | |
|
547 | " " | |
|
548 | msgstr "" | |
|
549 | ||
|
550 | msgid "show children of the specified rev" | |
|
551 | msgstr "" | |
|
422 | #, fuzzy | |
|
423 | msgid "display children changesets" | |
|
424 | msgstr "列出修改集" | |
|
425 | ||
|
426 | #, fuzzy | |
|
427 | msgid "" | |
|
428 | "show the children of the given or working directory revision\n" | |
|
429 | "\n" | |
|
430 | " Print the children of the working directory's revisions. If a\n" | |
|
431 | " revision is given via -r/--rev, the children of that revision will\n" | |
|
432 | " be printed. If a file argument is given, revision in which the\n" | |
|
433 | " file was last changed (after the working directory revision or the\n" | |
|
434 | " argument to --rev if given) is printed.\n" | |
|
435 | " " | |
|
436 | msgstr "" | |
|
437 | "显示工作目录或指定版本的父亲\n" | |
|
438 | "\n" | |
|
439 | " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n" | |
|
440 | " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n" | |
|
441 | " 版本,或 '--rev' 指定的版本)。\n" | |
|
442 | " " | |
|
443 | ||
|
444 | #, fuzzy | |
|
445 | msgid "show children of the specified revision" | |
|
446 | msgstr "从指定的版本显示父亲" | |
|
552 | 447 | |
|
553 | 448 | msgid "hg children [-r REV] [FILE]" |
|
554 | 449 | msgstr "" |
|
555 | 450 | |
|
556 |
msgid " |
|
|
557 | msgstr "" | |
|
558 | ||
|
559 | msgid "Calculate stats" | |
|
451 | msgid "display statistics about repository history" | |
|
560 | 452 | msgstr "" |
|
561 | 453 | |
|
562 | 454 | #, python-format |
@@ -564,18 +456,21 b' msgid "Revision %d is a merge, ignoring.' | |||
|
564 | 456 | msgstr "" |
|
565 | 457 | |
|
566 | 458 | #, python-format |
|
567 |
msgid " |
|
|
568 | msgstr "" | |
|
569 | ||
|
570 | msgid "" | |
|
571 | "graph count of revisions grouped by template\n" | |
|
572 | "\n" | |
|
573 | " Will graph count of changed lines or revisions grouped by template or\n" | |
|
574 | " alternatively by date, if dateformat is used. In this case it will " | |
|
575 | "override\n" | |
|
576 | " template.\n" | |
|
577 | "\n" | |
|
578 | " By default statistics are counted for number of changed lines.\n" | |
|
459 | msgid "generating stats: %d%%" | |
|
460 | msgstr "" | |
|
461 | ||
|
462 | msgid "" | |
|
463 | "histogram of changes to the repository\n" | |
|
464 | "\n" | |
|
465 | " This command will display a histogram representing the number\n" | |
|
466 | " of changed lines or revisions, grouped according to the given\n" | |
|
467 | " template. The default template will group changes by author.\n" | |
|
468 | " The --dateformat option may be used to group the results by\n" | |
|
469 | " date instead.\n" | |
|
470 | "\n" | |
|
471 | " Statistics are based on the number of changed lines, or\n" | |
|
472 | " alternatively the number of matching revisions if the\n" | |
|
473 | " --changesets option is specified.\n" | |
|
579 | 474 | "\n" |
|
580 | 475 | " Examples:\n" |
|
581 | 476 | "\n" |
@@ -591,9 +486,14 b' msgid ""' | |||
|
591 | 486 | " # display count of lines changed in every year\n" |
|
592 | 487 | " hg churn -f '%Y' -s\n" |
|
593 | 488 | "\n" |
|
594 | " The map file format used to specify aliases is fairly simple:\n" | |
|
595 | "\n" | |
|
596 | " <alias email> <actual email>" | |
|
489 | " It is possible to map alternate email addresses to a main address\n" | |
|
490 | " by providing a file using the following format:\n" | |
|
491 | "\n" | |
|
492 | " <alias email> <actual email>\n" | |
|
493 | "\n" | |
|
494 | " Such a file may be specified with the --aliases option, otherwise a\n" | |
|
495 | " .hgchurn file will be looked for in the working directory root.\n" | |
|
496 | " " | |
|
597 | 497 | msgstr "" |
|
598 | 498 | |
|
599 | 499 | #, python-format |
@@ -603,8 +503,9 b' msgstr ""' | |||
|
603 | 503 | msgid "count rate for the specified revision or range" |
|
604 | 504 | msgstr "" |
|
605 | 505 | |
|
606 | msgid "count rate for revs matching date spec" | |
|
607 | msgstr "" | |
|
506 | #, fuzzy | |
|
507 | msgid "count rate for revisions matching date spec" | |
|
508 | msgstr "显示匹配日期的版本" | |
|
608 | 509 | |
|
609 | 510 | msgid "template to group changesets" |
|
610 | 511 | msgstr "" |
@@ -628,24 +529,20 b' msgid "hg churn [-d DATE] [-r REV] [--al' | |||
|
628 | 529 | msgstr "" |
|
629 | 530 | |
|
630 | 531 | msgid "" |
|
631 | "add color output to status, qseries, and diff-related commands\n" | |
|
632 | "\n" | |
|
633 |
"This extension modifies the status command to add color to its output |
|
|
634 |
"reflect file status, the qseries command to add color to reflect |
|
|
635 | "status\n" | |
|
636 | "(applied, unapplied, missing), and to diff-related commands to highlight\n" | |
|
637 | "additions, removals, diff headers, and trailing whitespace.\n" | |
|
638 | "\n" | |
|
639 |
"Other effects in addition to color, like bold and underlined text, are |
|
|
640 |
"available. |
|
|
641 |
"ANSI escape codes). |
|
|
642 | "which can be used to add effects to any text.\n" | |
|
643 | "\n" | |
|
644 | "To enable this extension, add this to your .hgrc file:\n" | |
|
645 | "[extensions]\n" | |
|
646 | "color =\n" | |
|
647 | "\n" | |
|
648 | "Default effects my be overriden from the .hgrc file:\n" | |
|
532 | "colorize output from some commands\n" | |
|
533 | "\n" | |
|
534 | "This extension modifies the status command to add color to its output\n" | |
|
535 | "to reflect file status, the qseries command to add color to reflect\n" | |
|
536 | "patch status (applied, unapplied, missing), and to diff-related\n" | |
|
537 | "commands to highlight additions, removals, diff headers, and trailing\n" | |
|
538 | "whitespace.\n" | |
|
539 | "\n" | |
|
540 | "Other effects in addition to color, like bold and underlined text, are\n" | |
|
541 | "also available. Effects are rendered with the ECMA-48 SGR control\n" | |
|
542 | "function (aka ANSI escape codes). This module also provides the\n" | |
|
543 | "render_text function, which can be used to add effects to any text.\n" | |
|
544 | "\n" | |
|
545 | "Default effects may be overridden from the .hgrc file:\n" | |
|
649 | 546 | "\n" |
|
650 | 547 | "[color]\n" |
|
651 | 548 | "status.modified = blue bold underline red_background\n" |
@@ -674,37 +571,13 b' msgid ""' | |||
|
674 | 571 | "diff.trailingwhitespace = bold red_background\n" |
|
675 | 572 | msgstr "" |
|
676 | 573 | |
|
677 | msgid "Wrap text in commands to turn on each effect." | |
|
678 | msgstr "" | |
|
679 | ||
|
680 | msgid "run the status command with colored output" | |
|
681 | msgstr "" | |
|
682 | ||
|
683 | msgid "run the qseries command with colored output" | |
|
684 | msgstr "" | |
|
685 | ||
|
686 | msgid "wrap ui.write for colored diff output" | |
|
687 | msgstr "" | |
|
688 | ||
|
689 | msgid "wrap cmdutil.changeset_printer.showpatch with colored output" | |
|
690 | msgstr "" | |
|
691 | ||
|
692 | msgid "run the diff command with colored output" | |
|
693 | msgstr "" | |
|
694 | ||
|
695 | msgid "Initialize the extension." | |
|
696 | msgstr "" | |
|
697 | ||
|
698 | msgid "patch in command to command table and load effect map" | |
|
699 | msgstr "" | |
|
700 | ||
|
701 | 574 | msgid "when to colorize (always, auto, or never)" |
|
702 | 575 | msgstr "" |
|
703 | 576 | |
|
704 | 577 | msgid "don't colorize output" |
|
705 | 578 | msgstr "" |
|
706 | 579 | |
|
707 |
msgid " |
|
|
580 | msgid "import from foreign VCS repositories into Mercurial" | |
|
708 | 581 | msgstr "" |
|
709 | 582 | |
|
710 | 583 | msgid "" |
@@ -725,33 +598,44 b' msgid ""' | |||
|
725 | 598 | " - Mercurial [hg]\n" |
|
726 | 599 | " - Subversion [svn] (history on branches is not preserved)\n" |
|
727 | 600 | "\n" |
|
728 |
" If no revision is given, all revisions will be converted. |
|
|
729 |
" convert will only import up to the named revision |
|
|
730 | " understood by the source).\n" | |
|
601 | " If no revision is given, all revisions will be converted.\n" | |
|
602 | " Otherwise, convert will only import up to the named revision\n" | |
|
603 | " (given in a format understood by the source).\n" | |
|
731 | 604 | "\n" |
|
732 | 605 | " If no destination directory name is specified, it defaults to the\n" |
|
733 |
" basename of the source with '-hg' appended. |
|
|
606 | " basename of the source with '-hg' appended. If the destination\n" | |
|
734 | 607 | " repository doesn't exist, it will be created.\n" |
|
735 | 608 | "\n" |
|
609 | " By default, all sources except Mercurial will use\n" | |
|
610 | " --branchsort. Mercurial uses --sourcesort to preserve original\n" | |
|
611 | " revision numbers order. Sort modes have the following effects:\n" | |
|
612 | " --branchsort: convert from parent to child revision when\n" | |
|
613 | " possible, which means branches are usually converted one after\n" | |
|
614 | " the other. It generates more compact repositories.\n" | |
|
615 | " --datesort: sort revisions by date. Converted repositories have\n" | |
|
616 | " good-looking changelogs but are often an order of magnitude\n" | |
|
617 | " larger than the same ones generated by --branchsort.\n" | |
|
618 | " --sourcesort: try to preserve source revisions order, only\n" | |
|
619 | " supported by Mercurial sources.\n" | |
|
620 | "\n" | |
|
736 | 621 | " If <REVMAP> isn't given, it will be put in a default location\n" |
|
737 |
" (<dest>/.hg/shamap by default). |
|
|
738 |
" |
|
|
739 |
" |
|
|
622 | " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" | |
|
623 | " that maps each source commit ID to the destination ID for that\n" | |
|
624 | " revision, like so:\n" | |
|
740 | 625 | " <source ID> <destination ID>\n" |
|
741 | 626 | "\n" |
|
742 |
" If the file doesn't exist, it's automatically created. |
|
|
743 |
" on each commit copied, so convert-repo can be interrupted |
|
|
744 | " be run repeatedly to copy new commits.\n" | |
|
745 | "\n" | |
|
746 |
" The [username mapping] file is a simple text file that maps each |
|
|
747 |
" commit author to a destination commit author. It is handy |
|
|
748 | "SCMs\n" | |
|
749 | " that use unix logins to identify authors (eg: CVS). One line per author\n" | |
|
750 | " mapping and the line format is:\n" | |
|
627 | " If the file doesn't exist, it's automatically created. It's\n" | |
|
628 | " updated on each commit copied, so convert-repo can be interrupted\n" | |
|
629 | " and can be run repeatedly to copy new commits.\n" | |
|
630 | "\n" | |
|
631 | " The [username mapping] file is a simple text file that maps each\n" | |
|
632 | " source commit author to a destination commit author. It is handy\n" | |
|
633 | " for source SCMs that use unix logins to identify authors (eg:\n" | |
|
634 | " CVS). One line per author mapping and the line format is:\n" | |
|
751 | 635 | " srcauthor=whatever string you want\n" |
|
752 | 636 | "\n" |
|
753 | 637 | " The filemap is a file that allows filtering and remapping of files\n" |
|
754 |
" and directories. |
|
|
638 | " and directories. Comment lines start with '#'. Each line can\n" | |
|
755 | 639 | " contain one of the following directives:\n" |
|
756 | 640 | "\n" |
|
757 | 641 | " include path/to/file\n" |
@@ -762,33 +646,44 b' msgid ""' | |||
|
762 | 646 | "\n" |
|
763 | 647 | " The 'include' directive causes a file, or all files under a\n" |
|
764 | 648 | " directory, to be included in the destination repository, and the\n" |
|
765 |
" exclusion of all other files and dirs not explicit |
|
|
649 | " exclusion of all other files and directories not explicitly included.\n" | |
|
766 | 650 | " The 'exclude' directive causes files or directories to be omitted.\n" |
|
767 |
" The 'rename' directive renames a file or directory. |
|
|
768 |
" subdirectory into the root of the repository, use '.' as the |
|
|
769 | " rename to.\n" | |
|
651 | " The 'rename' directive renames a file or directory. To rename from\n" | |
|
652 | " a subdirectory into the root of the repository, use '.' as the\n" | |
|
653 | " path to rename to.\n" | |
|
770 | 654 | "\n" |
|
771 | 655 | " The splicemap is a file that allows insertion of synthetic\n" |
|
772 |
" history, letting you specify the parents of a revision. |
|
|
656 | " history, letting you specify the parents of a revision. This is\n" | |
|
773 | 657 | " useful if you want to e.g. give a Subversion merge two parents, or\n" |
|
774 |
" graft two disconnected series of history together. |
|
|
658 | " graft two disconnected series of history together. Each entry\n" | |
|
775 | 659 | " contains a key, followed by a space, followed by one or two\n" |
|
776 |
" |
|
|
777 |
" |
|
|
778 |
" |
|
|
779 |
" |
|
|
780 |
" |
|
|
660 | " comma-separated values. The key is the revision ID in the source\n" | |
|
661 | " revision control system whose parents should be modified (same\n" | |
|
662 | " format as a key in .hg/shamap). The values are the revision IDs\n" | |
|
663 | " (in either the source or destination revision control system) that\n" | |
|
664 | " should be used as the new parents for that node.\n" | |
|
665 | "\n" | |
|
666 | " The branchmap is a file that allows you to rename a branch when it is\n" | |
|
667 | " being brought in from whatever external repository. When used in\n" | |
|
668 | " conjunction with a splicemap, it allows for a powerful combination\n" | |
|
669 | " to help fix even the most badly mismanaged repositories and turn them\n" | |
|
670 | " into nicely structured Mercurial repositories. The branchmap contains\n" | |
|
671 | " lines of the form \"original_branch_name new_branch_name\".\n" | |
|
672 | " \"original_branch_name\" is the name of the branch in the source\n" | |
|
673 | " repository, and \"new_branch_name\" is the name of the branch is the\n" | |
|
674 | " destination repository. This can be used to (for instance) move code\n" | |
|
675 | " in one repository from \"default\" to a named branch.\n" | |
|
781 | 676 | "\n" |
|
782 | 677 | " Mercurial Source\n" |
|
783 | 678 | " -----------------\n" |
|
784 | 679 | "\n" |
|
785 | " --config convert.hg.ignoreerrors=False (boolean)\n" | |
|
680 | " --config convert.hg.ignoreerrors=False (boolean)\n" | |
|
786 | 681 | " ignore integrity errors when reading. Use it to fix Mercurial\n" |
|
787 | 682 | " repositories with missing revlogs, by converting from and to\n" |
|
788 | 683 | " Mercurial.\n" |
|
789 |
" --config convert.hg.saverev=False |
|
|
790 |
" store original revision ID in changeset (forces target IDs to |
|
|
791 | "change)\n" | |
|
684 | " --config convert.hg.saverev=False (boolean)\n" | |
|
685 | " store original revision ID in changeset (forces target IDs to\n" | |
|
686 | " change)\n" | |
|
792 | 687 | " --config convert.hg.startrev=0 (hg revision identifier)\n" |
|
793 | 688 | " convert start revision and its descendants\n" |
|
794 | 689 | "\n" |
@@ -797,12 +692,12 b' msgid ""' | |||
|
797 | 692 | "\n" |
|
798 | 693 | " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" |
|
799 | 694 | " to indicate the starting point of what will be converted. Direct\n" |
|
800 | " access to the repository files is not needed, unless of course\n" | |
|
801 |
" |
|
|
802 |
" |
|
|
803 |
" |
|
|
804 |
" |
|
|
805 |
" converted, and that any directory reorgani |
|
|
695 | " access to the repository files is not needed, unless of course the\n" | |
|
696 | " repository is :local:. The conversion uses the top level directory\n" | |
|
697 | " in the sandbox to find the CVS repository, and then uses CVS rlog\n" | |
|
698 | " commands to find files to convert. This means that unless a\n" | |
|
699 | " filemap is given, all files under the starting directory will be\n" | |
|
700 | " converted, and that any directory reorganization in the CVS\n" | |
|
806 | 701 | " sandbox is ignored.\n" |
|
807 | 702 | "\n" |
|
808 | 703 | " Because CVS does not have changesets, it is necessary to collect\n" |
@@ -810,46 +705,52 b' msgid ""' | |||
|
810 | 705 | " source uses its internal changeset merging code by default but can\n" |
|
811 | 706 | " be configured to call the external 'cvsps' program by setting:\n" |
|
812 | 707 | " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" |
|
813 |
" This |
|
|
708 | " This option is deprecated and will be removed in Mercurial 1.4.\n" | |
|
814 | 709 | "\n" |
|
815 | 710 | " The options shown are the defaults.\n" |
|
816 | 711 | "\n" |
|
817 | 712 | " Internal cvsps is selected by setting\n" |
|
818 | 713 | " --config convert.cvsps=builtin\n" |
|
819 | 714 | " and has a few more configurable options:\n" |
|
820 |
" --config convert.cvsps. |
|
|
821 | " Specify the maximum time (in seconds) that is allowed between\n" | |
|
822 | " commits with identical user and log message in a single\n" | |
|
823 | " changeset. When very large files were checked in as part\n" | |
|
824 | " of a changeset then the default may not be long enough.\n" | |
|
715 | " --config convert.cvsps.cache=True (boolean)\n" | |
|
716 | " Set to False to disable remote log caching, for testing and\n" | |
|
717 | " debugging purposes.\n" | |
|
718 | " --config convert.cvsps.fuzz=60 (integer)\n" | |
|
719 | " Specify the maximum time (in seconds) that is allowed\n" | |
|
720 | " between commits with identical user and log message in a\n" | |
|
721 | " single changeset. When very large files were checked in as\n" | |
|
722 | " part of a changeset then the default may not be long\n" | |
|
723 | " enough.\n" | |
|
825 | 724 | " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" |
|
826 |
" Specify a regular expression to which commit log messages |
|
|
827 |
" matched. If a match occurs, then the conversion |
|
|
828 |
" insert a dummy revision merging the branch on |
|
|
829 |
" message occurs to the branch indicated in |
|
|
725 | " Specify a regular expression to which commit log messages\n" | |
|
726 | " are matched. If a match occurs, then the conversion\n" | |
|
727 | " process will insert a dummy revision merging the branch on\n" | |
|
728 | " which this log message occurs to the branch indicated in\n" | |
|
729 | " the regex.\n" | |
|
830 | 730 | " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" |
|
831 |
" Specify a regular expression to which commit log messages |
|
|
832 |
" matched. If a match occurs, then the conversion |
|
|
833 |
" add the most recent revision on the branch |
|
|
834 |
" regex as the second parent of the |
|
|
835 | "\n" | |
|
836 | " The hgext/convert/cvsps wrapper script allows the builtin changeset\n" | |
|
837 | " merging code to be run without doing a conversion. Its parameters and\n" | |
|
838 | " output are similar to that of cvsps 2.1.\n" | |
|
731 | " Specify a regular expression to which commit log messages\n" | |
|
732 | " are matched. If a match occurs, then the conversion\n" | |
|
733 | " process will add the most recent revision on the branch\n" | |
|
734 | " indicated in the regex as the second parent of the\n" | |
|
735 | " changeset.\n" | |
|
736 | "\n" | |
|
737 | " The hgext/convert/cvsps wrapper script allows the builtin\n" | |
|
738 | " changeset merging code to be run without doing a conversion. Its\n" | |
|
739 | " parameters and output are similar to that of cvsps 2.1.\n" | |
|
839 | 740 | "\n" |
|
840 | 741 | " Subversion Source\n" |
|
841 | 742 | " -----------------\n" |
|
842 | 743 | "\n" |
|
843 | 744 | " Subversion source detects classical trunk/branches/tags layouts.\n" |
|
844 | 745 | " By default, the supplied \"svn://repo/path/\" source URL is\n" |
|
845 | " converted as a single branch. If \"svn://repo/path/trunk\" exists\n" | |
|
846 |
" |
|
|
847 |
" |
|
|
746 | " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" | |
|
747 | " replaces the default branch. If \"svn://repo/path/branches\" exists,\n" | |
|
748 | " its subdirectories are listed as possible branches. If\n" | |
|
848 | 749 | " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" |
|
849 | 750 | " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" |
|
850 | " can be overriden with following options. Set them to paths\n" | |
|
851 | " relative to the source URL, or leave them blank to disable\n" | |
|
852 |
" |
|
|
751 | " can be overridden with following options. Set them to paths\n" | |
|
752 | " relative to the source URL, or leave them blank to disable auto\n" | |
|
753 | " detection.\n" | |
|
853 | 754 | "\n" |
|
854 | 755 | " --config convert.svn.branches=branches (directory name)\n" |
|
855 | 756 | " specify the directory containing branches\n" |
@@ -868,16 +769,17 b' msgid ""' | |||
|
868 | 769 | " Perforce Source\n" |
|
869 | 770 | " ---------------\n" |
|
870 | 771 | "\n" |
|
871 |
" The Perforce (P4) importer can be given a p4 depot path or a |
|
|
872 |
" specification as source. It will convert all files in the |
|
|
873 |
" a flat Mercurial repository, ignoring labels, branches |
|
|
874 |
" Note that when a depot path is given you then |
|
|
875 |
" target directory, because otherwise the |
|
|
876 | "\n" | |
|
877 | " It is possible to limit the amount of source history to be converted\n" | |
|
878 | " by specifying an initial Perforce revision.\n" | |
|
879 | "\n" | |
|
880 | " --config convert.p4.startrev=0 (perforce changelist number)\n" | |
|
772 | " The Perforce (P4) importer can be given a p4 depot path or a\n" | |
|
773 | " client specification as source. It will convert all files in the\n" | |
|
774 | " source to a flat Mercurial repository, ignoring labels, branches\n" | |
|
775 | " and integrations. Note that when a depot path is given you then\n" | |
|
776 | " usually should specify a target directory, because otherwise the\n" | |
|
777 | " target may be named ...-hg.\n" | |
|
778 | "\n" | |
|
779 | " It is possible to limit the amount of source history to be\n" | |
|
780 | " converted by specifying an initial Perforce revision.\n" | |
|
781 | "\n" | |
|
782 | " --config convert.p4.startrev=0 (perforce changelist number)\n" | |
|
881 | 783 | " specify initial Perforce revision.\n" |
|
882 | 784 | "\n" |
|
883 | 785 | "\n" |
@@ -897,12 +799,14 b' msgstr ""' | |||
|
897 | 799 | msgid "" |
|
898 | 800 | "create changeset information from CVS\n" |
|
899 | 801 | "\n" |
|
900 |
" This command is intended as a debugging tool for the CVS to |
|
|
901 |
" converter, and can be used as a direct replacement for |
|
|
902 | "\n" | |
|
903 | " Hg debugcvsps reads the CVS rlog for current directory (or any named\n" | |
|
904 | " directory) in the CVS repository, and converts the log to a series of\n" | |
|
905 | " changesets based on matching commit log entries and dates." | |
|
802 | " This command is intended as a debugging tool for the CVS to\n" | |
|
803 | " Mercurial converter, and can be used as a direct replacement for\n" | |
|
804 | " cvsps.\n" | |
|
805 | "\n" | |
|
806 | " Hg debugcvsps reads the CVS rlog for current directory (or any\n" | |
|
807 | " named directory) in the CVS repository, and converts the log to a\n" | |
|
808 | " series of changesets based on matching commit log entries and\n" | |
|
809 | " dates." | |
|
906 | 810 | msgstr "" |
|
907 | 811 | |
|
908 | 812 | msgid "username mapping filename" |
@@ -923,9 +827,18 b' msgstr ""' | |||
|
923 | 827 | msgid "splice synthesized history into place" |
|
924 | 828 | msgstr "" |
|
925 | 829 | |
|
830 | msgid "change branch names while converting" | |
|
831 | msgstr "" | |
|
832 | ||
|
833 | msgid "try to sort changesets by branches" | |
|
834 | msgstr "" | |
|
835 | ||
|
926 | 836 | msgid "try to sort changesets by date" |
|
927 | 837 | msgstr "" |
|
928 | 838 | |
|
839 | msgid "preserve source changesets order" | |
|
840 | msgstr "" | |
|
841 | ||
|
929 | 842 | msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" |
|
930 | 843 | msgstr "" |
|
931 | 844 | |
@@ -962,6 +875,14 b' msgstr ""' | |||
|
962 | 875 | msgid "hg debugcvsps [OPTION]... [PATH]..." |
|
963 | 876 | msgstr "" |
|
964 | 877 | |
|
878 | msgid "" | |
|
879 | "warning: lightweight checkouts may cause conversion failures, try with a " | |
|
880 | "regular branch instead.\n" | |
|
881 | msgstr "" | |
|
882 | ||
|
883 | msgid "bzr source type could not be determined\n" | |
|
884 | msgstr "" | |
|
885 | ||
|
965 | 886 | #, python-format |
|
966 | 887 | msgid "%s is not a valid revision in current branch" |
|
967 | 888 | msgstr "" |
@@ -971,6 +892,10 b' msgid "%s is not available in %s anymore' | |||
|
971 | 892 | msgstr "" |
|
972 | 893 | |
|
973 | 894 | #, python-format |
|
895 | msgid "%s.%s symlink has no target" | |
|
896 | msgstr "" | |
|
897 | ||
|
898 | #, python-format | |
|
974 | 899 | msgid "cannot find required \"%s\" tool" |
|
975 | 900 | msgstr "" |
|
976 | 901 | |
@@ -987,6 +912,10 b' msgid "%s %s"' | |||
|
987 | 912 | msgstr "" |
|
988 | 913 | |
|
989 | 914 | #, python-format |
|
915 | msgid "syntax error in %s(%d): key/value pair expected" | |
|
916 | msgstr "" | |
|
917 | ||
|
918 | #, python-format | |
|
990 | 919 | msgid "could not open map file %r: %s" |
|
991 | 920 | msgstr "" |
|
992 | 921 | |
@@ -1002,6 +931,10 b' msgstr ""' | |||
|
1002 | 931 | msgid "%s: unknown repository type" |
|
1003 | 932 | msgstr "" |
|
1004 | 933 | |
|
934 | #, fuzzy, python-format | |
|
935 | msgid "unknown sort mode: %s" | |
|
936 | msgstr "hg: 未知命令 '%s'\n" | |
|
937 | ||
|
1005 | 938 | #, python-format |
|
1006 | 939 | msgid "cycle detected between %s and %s" |
|
1007 | 940 | msgstr "" |
@@ -1014,7 +947,7 b' msgid "Writing author map file %s\\n"' | |||
|
1014 | 947 | msgstr "" |
|
1015 | 948 | |
|
1016 | 949 | #, python-format |
|
1017 | msgid "Overriding mapping for author %s, was %s, will be %s\n" | |
|
950 | msgid "Ignoring bad line in author map file %s: %s\n" | |
|
1018 | 951 | msgstr "" |
|
1019 | 952 | |
|
1020 | 953 | #, python-format |
@@ -1022,7 +955,7 b' msgid "mapping author %s to %s\\n"' | |||
|
1022 | 955 | msgstr "" |
|
1023 | 956 | |
|
1024 | 957 | #, python-format |
|
1025 |
msgid " |
|
|
958 | msgid "overriding mapping for author %s, was %s, will be %s\n" | |
|
1026 | 959 | msgstr "" |
|
1027 | 960 | |
|
1028 | 961 | #, python-format |
@@ -1046,6 +979,17 b' msgstr ""' | |||
|
1046 | 979 | msgid "assuming destination %s\n" |
|
1047 | 980 | msgstr "" |
|
1048 | 981 | |
|
982 | msgid "more than one sort mode specified" | |
|
983 | msgstr "" | |
|
984 | ||
|
985 | msgid "--sourcesort is not supported by this data source" | |
|
986 | msgstr "" | |
|
987 | ||
|
988 | msgid "" | |
|
989 | "warning: support for external cvsps is deprecated and will be removed in " | |
|
990 | "Mercurial 1.4\n" | |
|
991 | msgstr "" | |
|
992 | ||
|
1049 | 993 | #, python-format |
|
1050 | 994 | msgid "revision %s is not a patchset number or date" |
|
1051 | 995 | msgstr "" |
@@ -1110,6 +1054,10 b' msgstr ""' | |||
|
1110 | 1054 | msgid "revision must be followed by date line" |
|
1111 | 1055 | msgstr "" |
|
1112 | 1056 | |
|
1057 | #, fuzzy, python-format | |
|
1058 | msgid "found synthetic revision in %s: %r\n" | |
|
1059 | msgstr "版本 %d 有未知路径: %s\n" | |
|
1060 | ||
|
1113 | 1061 | #, python-format |
|
1114 | 1062 | msgid "writing cvs log cache %s\n" |
|
1115 | 1063 | msgstr "" |
@@ -1121,6 +1069,15 b' msgstr ""' | |||
|
1121 | 1069 | msgid "creating changesets\n" |
|
1122 | 1070 | msgstr "" |
|
1123 | 1071 | |
|
1072 | msgid "synthetic changeset cannot have multiple parents" | |
|
1073 | msgstr "" | |
|
1074 | ||
|
1075 | #, python-format | |
|
1076 | msgid "" | |
|
1077 | "warning: CVS commit message references non-existent branch %r:\n" | |
|
1078 | "%s\n" | |
|
1079 | msgstr "" | |
|
1080 | ||
|
1124 | 1081 | #, python-format |
|
1125 | 1082 | msgid "%d changeset entries\n" |
|
1126 | 1083 | msgstr "" |
@@ -1178,7 +1135,7 b' msgid "obtaining revision %s...\\n"' | |||
|
1178 | 1135 | msgstr "" |
|
1179 | 1136 | |
|
1180 | 1137 | #, python-format |
|
1181 |
msgid "analy |
|
|
1138 | msgid "analyzing revision %s...\n" | |
|
1182 | 1139 | msgstr "" |
|
1183 | 1140 | |
|
1184 | 1141 | #, python-format |
@@ -1203,6 +1160,9 b' msgstr "\xe6\x89\xa7\xe8\xa1\x8c\xe5\x8a\xa8\xe4\xbd\x9c hg sink post-conversion action\\n"' | |||
|
1203 | 1160 | msgid "pulling from %s into %s\n" |
|
1204 | 1161 | msgstr "自 %s 拉到 %s\n" |
|
1205 | 1162 | |
|
1163 | msgid "filtering out empty revision\n" | |
|
1164 | msgstr "" | |
|
1165 | ||
|
1206 | 1166 | msgid "updating tags\n" |
|
1207 | 1167 | msgstr "正在更新标签\n" |
|
1208 | 1168 | |
@@ -1224,8 +1184,8 b' msgstr "\xe6\x89\xa7\xe8\xa1\x8c\xe5\x8a\xa8\xe4\xbd\x9c hg source post-conversion\\n"' | |||
|
1224 | 1184 | msgid "%s does not look like a monotone repo" |
|
1225 | 1185 | msgstr "%s 不像是单纯的 monotone 版本库" |
|
1226 | 1186 | |
|
1227 | #, python-format | |
|
1228 | msgid "copying file in renamed dir from '%s' to '%s'" | |
|
1187 | #, fuzzy, python-format | |
|
1188 | msgid "copying file in renamed directory from '%s' to '%s'" | |
|
1229 | 1189 | msgstr "从已改名的目录 '%s' 复制文件到 '%s'" |
|
1230 | 1190 | |
|
1231 | 1191 | msgid "reading p4 views\n" |
@@ -1272,7 +1232,8 b' msgstr "\xe5\xbf\xbd\xe7\x95\xa5\xe7\xa9\xba\xe7\x9a\x84\xe5\x88\x86\xe6\x94\xaf %s\\n"' | |||
|
1272 | 1232 | msgid "found branch %s at %d\n" |
|
1273 | 1233 | msgstr "发现分支 %s 位于 %d\n" |
|
1274 | 1234 | |
|
1275 | msgid "svn: start revision is not supported with with more than one branch" | |
|
1235 | #, fuzzy | |
|
1236 | msgid "svn: start revision is not supported with more than one branch" | |
|
1276 | 1237 | msgstr "svn: 在给出多于一个分支时不支持开始版本" |
|
1277 | 1238 | |
|
1278 | 1239 | #, python-format |
@@ -1307,21 +1268,10 b' msgstr "\xe5\xa4\x8d\xe5\x88\xb6\xe5\x88\xb0 %s\xef\xbc\x8c\xe8\x87\xaa %s@%s\\n"' | |||
|
1307 | 1268 | msgid "gone from %s\n" |
|
1308 | 1269 | msgstr "离开 %s\n" |
|
1309 | 1270 | |
|
1310 | #, python-format | |
|
1311 |
msgid " |
|
|
1312 | msgstr "发现父目录 %s\n" | |
|
1313 | ||
|
1314 | #, python-format | |
|
1315 | msgid "base, entry %s %s\n" | |
|
1271 | #, fuzzy, python-format | |
|
1272 | msgid "entry %s\n" | |
|
1316 | 1273 | msgstr "基本,入口 %s %s\n" |
|
1317 | 1274 | |
|
1318 | msgid "munge-o-matic\n" | |
|
1319 | msgstr "" | |
|
1320 | ||
|
1321 | #, python-format | |
|
1322 | msgid "info: %s %s %s %s\n" | |
|
1323 | msgstr "信息: %s %s %s %s\n" | |
|
1324 | ||
|
1325 | 1275 | #, python-format |
|
1326 | 1276 | msgid "unknown path in revision %d: %s\n" |
|
1327 | 1277 | msgstr "版本 %d 有未知路径: %s\n" |
@@ -1346,10 +1296,6 b' msgid "fetching revision log for \\"%s\\" ' | |||
|
1346 | 1296 | msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n" |
|
1347 | 1297 | |
|
1348 | 1298 | #, python-format |
|
1349 | msgid "skipping blacklisted revision %d\n" | |
|
1350 | msgstr "忽略黑名单版本 %d\n" | |
|
1351 | ||
|
1352 | #, python-format | |
|
1353 | 1299 | msgid "revision %d has no entries\n" |
|
1354 | 1300 | msgstr "版本 %d 没有入口\n" |
|
1355 | 1301 | |
@@ -1379,18 +1325,14 b' msgid "XXX TAGS NOT IMPLEMENTED YET\\n"' | |||
|
1379 | 1325 | msgstr "" |
|
1380 | 1326 | |
|
1381 | 1327 | msgid "" |
|
1328 | "allow external programs to compare revisions\n" | |
|
1382 | 1329 | "\n" |
|
1383 | 1330 | "The `extdiff' Mercurial extension allows you to use external programs\n" |
|
1384 |
"to compare revisions, or revision with working dir. |
|
|
1331 | "to compare revisions, or revision with working directory. The external diff\n" | |
|
1385 | 1332 | "programs are called with a configurable set of options and two\n" |
|
1386 | 1333 | "non-option arguments: paths to directories containing snapshots of\n" |
|
1387 | 1334 | "files to compare.\n" |
|
1388 | 1335 | "\n" |
|
1389 | "To enable this extension:\n" | |
|
1390 | "\n" | |
|
1391 | " [extensions]\n" | |
|
1392 | " hgext.extdiff =\n" | |
|
1393 | "\n" | |
|
1394 | 1336 | "The `extdiff' extension also allows to configure new diff commands, so\n" |
|
1395 | 1337 | "you do not need to type \"hg extdiff -p kdiff3\" always.\n" |
|
1396 | 1338 | "\n" |
@@ -1408,42 +1350,23 b' msgid ""' | |||
|
1408 | 1350 | " meld =\n" |
|
1409 | 1351 | "\n" |
|
1410 | 1352 | " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" |
|
1411 | " #(see http://www.vim.org/scripts/script.php?script_id=102)\n" | |
|
1412 |
" # Non |
|
|
1353 | " # (see http://www.vim.org/scripts/script.php?script_id=102)\n" | |
|
1354 | " # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" | |
|
1413 | 1355 | " # your .vimrc\n" |
|
1414 | 1356 | " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" |
|
1415 | 1357 | "\n" |
|
1416 | "You can use -I/-X and list of file or directory names like normal\n" | |
|
1417 |
" |
|
|
1418 |
" |
|
|
1419 |
" |
|
|
1420 | msgstr "" | |
|
1421 | ||
|
1422 | msgid "snapshot files as of some revision" | |
|
1358 | "You can use -I/-X and list of file or directory names like normal \"hg\n" | |
|
1359 | "diff\" command. The `extdiff' extension makes snapshots of only needed\n" | |
|
1360 | "files, so running the external diff program will actually be pretty\n" | |
|
1361 | "fast (at least faster than having to compare the entire tree).\n" | |
|
1423 | 1362 | msgstr "" |
|
1424 | 1363 | |
|
1425 | 1364 | #, python-format |
|
1426 | 1365 | msgid "making snapshot of %d files from rev %s\n" |
|
1427 | 1366 | msgstr "" |
|
1428 | 1367 | |
|
1429 | msgid "" | |
|
1430 |
"snapshot files from working directory |
|
|
1431 | " if not using snapshot, -I/-X does not work and recursive diff\n" | |
|
1432 | " in tools like kdiff3 and meld displays too many files." | |
|
1433 | msgstr "" | |
|
1434 | ||
|
1435 | #, python-format | |
|
1436 | msgid "making snapshot of %d files from working dir\n" | |
|
1437 | msgstr "" | |
|
1438 | ||
|
1439 | msgid "" | |
|
1440 | "Do the actuall diff:\n" | |
|
1441 | "\n" | |
|
1442 | " - copy to a temp structure if diffing 2 internal revisions\n" | |
|
1443 | " - copy to a temp structure if diffing working revision with\n" | |
|
1444 | " another one and more than 1 file is changed\n" | |
|
1445 | " - just invoke the diff for a single file in the working dir\n" | |
|
1446 | " " | |
|
1368 | #, python-format | |
|
1369 | msgid "making snapshot of %d files from working directory\n" | |
|
1447 | 1370 | msgstr "" |
|
1448 | 1371 | |
|
1449 | 1372 | msgid "cannot specify --rev and --change at the same time" |
@@ -1464,19 +1387,19 b' msgid ""' | |||
|
1464 | 1387 | "use external program to diff repository (or selected files)\n" |
|
1465 | 1388 | "\n" |
|
1466 | 1389 | " Show differences between revisions for the specified files, using\n" |
|
1467 |
" an external program. |
|
|
1390 | " an external program. The default program used is diff, with\n" | |
|
1468 | 1391 | " default options \"-Npru\".\n" |
|
1469 | 1392 | "\n" |
|
1470 |
" To select a different program, use the -p option. |
|
|
1471 |
" will be passed the names of two directories to compare. |
|
|
1472 |
" additional options to the program, use |
|
|
1473 | " be passed before the names of the directories to compare.\n" | |
|
1474 | "\n" | |
|
1475 | " When two revision arguments are given, then changes are\n" | |
|
1476 |
" |
|
|
1477 |
" |
|
|
1478 | " directory, and, when no revisions are specified, the\n" | |
|
1479 | " working directory files are compared to its parent." | |
|
1393 | " To select a different program, use the -p/--program option. The\n" | |
|
1394 | " program will be passed the names of two directories to compare. To\n" | |
|
1395 | " pass additional options to the program, use -o/--option. These\n" | |
|
1396 | " will be passed before the names of the directories to compare.\n" | |
|
1397 | "\n" | |
|
1398 | " When two revision arguments are given, then changes are shown\n" | |
|
1399 | " between those revisions. If only one revision is specified then\n" | |
|
1400 | " that revision is compared to the working directory, and, when no\n" | |
|
1401 | " revisions are specified, the working directory files are compared\n" | |
|
1402 | " to its parent." | |
|
1480 | 1403 | msgstr "" |
|
1481 | 1404 | |
|
1482 | 1405 | msgid "comparison program to run" |
@@ -1491,14 +1414,11 b' msgstr "\xe6\xad\xa4\xe7\x89\x88\xe6\x9c\xac\xe7\x9a\x84\xe4\xbf\xae\xe6\x94\xb9"' | |||
|
1491 | 1414 | msgid "hg extdiff [OPT]... [FILE]..." |
|
1492 | 1415 | msgstr "" |
|
1493 | 1416 | |
|
1494 | msgid "use closure to save diff command to use" | |
|
1495 | msgstr "" | |
|
1496 | ||
|
1497 | 1417 | #, python-format |
|
1498 | 1418 | msgid "hg %s [OPTION]... [FILE]..." |
|
1499 | 1419 | msgstr "" |
|
1500 | 1420 | |
|
1501 |
msgid "pull |
|
|
1421 | msgid "pull, update and merge in one command" | |
|
1502 | 1422 | msgstr "" |
|
1503 | 1423 | |
|
1504 | 1424 | msgid "" |
@@ -1507,13 +1427,14 b' msgid ""' | |||
|
1507 | 1427 | " This finds all changes from the repository at the specified path\n" |
|
1508 | 1428 | " or URL and adds them to the local repository.\n" |
|
1509 | 1429 | "\n" |
|
1510 |
" If the pulled changes add a new branch head, the head is |
|
|
1511 |
" merged, and the result of the merge is committed. |
|
|
1512 |
" working directory is updated to include the new |
|
|
1430 | " If the pulled changes add a new branch head, the head is\n" | |
|
1431 | " automatically merged, and the result of the merge is committed.\n" | |
|
1432 | " Otherwise, the working directory is updated to include the new\n" | |
|
1433 | " changes.\n" | |
|
1513 | 1434 | "\n" |
|
1514 | 1435 | " When a merge occurs, the newly pulled changes are assumed to be\n" |
|
1515 |
" \"authoritative\". |
|
|
1516 |
" parent, with local changes as the second. |
|
|
1436 | " \"authoritative\". The head of the new changes is used as the first\n" | |
|
1437 | " parent, with local changes as the second. To switch the merge\n" | |
|
1517 | 1438 | " order, use --switch-parent.\n" |
|
1518 | 1439 | "\n" |
|
1519 | 1440 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
@@ -1541,7 +1462,9 b' msgstr ""' | |||
|
1541 | 1462 | msgid "pulling from %s\n" |
|
1542 | 1463 | msgstr "正在拉自 %s\n" |
|
1543 | 1464 | |
|
1544 | msgid "fetch -r doesn't work for remote repositories yet" | |
|
1465 | msgid "" | |
|
1466 | "Other repository doesn't support revision lookup, so a rev cannot be " | |
|
1467 | "specified." | |
|
1545 | 1468 | msgstr "" |
|
1546 | 1469 | |
|
1547 | 1470 | #, python-format |
@@ -1581,25 +1504,13 b' msgstr "\xe5\xbd\x93\xe5\x90\x88\xe5\xb9\xb6\xe6\x97\xb6\xe5\x88\x87\xe6\x8d\xa2\xe7\x88\xb6\xe4\xba\xb2"' | |||
|
1581 | 1504 | msgid "hg fetch [SOURCE]" |
|
1582 | 1505 | msgstr "" |
|
1583 | 1506 | |
|
1584 | msgid " returns of the good and bad signatures" | |
|
1585 | msgstr "" | |
|
1507 | #, fuzzy | |
|
1508 | msgid "sign and verify changesets" | |
|
1509 | msgstr "正在增加修改集\n" | |
|
1586 | 1510 | |
|
1587 | 1511 | msgid "error while verifying signature" |
|
1588 | 1512 | msgstr "" |
|
1589 | 1513 | |
|
1590 | msgid "create a new gpg instance" | |
|
1591 | msgstr "" | |
|
1592 | ||
|
1593 | msgid "" | |
|
1594 | "\n" | |
|
1595 | " walk over every sigs, yields a couple\n" | |
|
1596 | " ((node, version, sig), (filename, linenumber))\n" | |
|
1597 | " " | |
|
1598 | msgstr "" | |
|
1599 | ||
|
1600 | msgid "get the keys who signed a data" | |
|
1601 | msgstr "" | |
|
1602 | ||
|
1603 | 1514 | #, python-format |
|
1604 | 1515 | msgid "%s Bad signature from \"%s\"\n" |
|
1605 | 1516 | msgstr "" |
@@ -1626,9 +1537,6 b' msgstr ""' | |||
|
1626 | 1537 | msgid "No valid signature for %s\n" |
|
1627 | 1538 | msgstr "" |
|
1628 | 1539 | |
|
1629 | msgid "associate a string to a key (username, comment)" | |
|
1630 | msgstr "" | |
|
1631 | ||
|
1632 | 1540 | msgid "" |
|
1633 | 1541 | "add a signature for the current or given revision\n" |
|
1634 | 1542 | "\n" |
@@ -1654,9 +1562,6 b' msgstr ""' | |||
|
1654 | 1562 | msgid "Added signature for changeset %s" |
|
1655 | 1563 | msgstr "" |
|
1656 | 1564 | |
|
1657 | msgid "map a manifest into some text" | |
|
1658 | msgstr "" | |
|
1659 | ||
|
1660 | 1565 | msgid "unknown signature version" |
|
1661 | 1566 | msgstr "" |
|
1662 | 1567 | |
@@ -1685,59 +1590,13 b' msgid "hg sigs"' | |||
|
1685 | 1590 | msgstr "" |
|
1686 | 1591 | |
|
1687 | 1592 | msgid "" |
|
1688 |
"show revision graphs in terminal |
|
|
1593 | "show revision graphs in terminals\n" | |
|
1689 | 1594 | "\n" |
|
1690 | 1595 | "This extension adds a --graph option to the incoming, outgoing and log\n" |
|
1691 |
"commands. When this options is given, an |
|
|
1596 | "commands. When this options is given, an ASCII representation of the\n" | |
|
1692 | 1597 | "revision graph is also shown.\n" |
|
1693 | 1598 | msgstr "" |
|
1694 | 1599 | |
|
1695 | msgid "" | |
|
1696 | "cset DAG generator yielding (rev, node, [parents]) tuples\n" | |
|
1697 | "\n" | |
|
1698 | " This generator function walks through the revision history from revision\n" | |
|
1699 | " start to revision stop (which must be less than or equal to start).\n" | |
|
1700 | " " | |
|
1701 | msgstr "" | |
|
1702 | ||
|
1703 | msgid "" | |
|
1704 | "file cset DAG generator yielding (rev, node, [parents]) tuples\n" | |
|
1705 | "\n" | |
|
1706 | " This generator function walks through the revision history of a single\n" | |
|
1707 | " file from revision start to revision stop (which must be less than or\n" | |
|
1708 | " equal to start).\n" | |
|
1709 | " " | |
|
1710 | msgstr "" | |
|
1711 | ||
|
1712 | msgid "" | |
|
1713 | "grapher for asciigraph on a list of nodes and their parents\n" | |
|
1714 | "\n" | |
|
1715 | " nodes must generate tuples (node, parents, char, lines) where\n" | |
|
1716 | " - parents must generate the parents of node, in sorted order,\n" | |
|
1717 | " and max length 2,\n" | |
|
1718 | " - char is the char to print as the node symbol, and\n" | |
|
1719 | " - lines are the lines to display next to the node.\n" | |
|
1720 | " " | |
|
1721 | msgstr "" | |
|
1722 | ||
|
1723 | msgid "" | |
|
1724 | "prints an ASCII graph of the DAG returned by the grapher\n" | |
|
1725 | "\n" | |
|
1726 | " grapher is a generator that emits tuples with the following elements:\n" | |
|
1727 | "\n" | |
|
1728 | " - Character to use as node's symbol.\n" | |
|
1729 | " - List of lines to display as the node's text.\n" | |
|
1730 | " - Column of the current node in the set of ongoing edges.\n" | |
|
1731 | " - Edges; a list of (col, next_col) indicating the edges between\n" | |
|
1732 | " the current node and its parents.\n" | |
|
1733 | " - Number of columns (ongoing edges) in the current revision.\n" | |
|
1734 | " - The difference between the number of columns (ongoing edges)\n" | |
|
1735 | " in the next revision and the number of columns (ongoing edges)\n" | |
|
1736 | " in the current revision. That is: -1 means one column removed;\n" | |
|
1737 | " 0 means no columns added or removed; 1 means one column added.\n" | |
|
1738 | " " | |
|
1739 | msgstr "" | |
|
1740 | ||
|
1741 | 1600 | #, python-format |
|
1742 | 1601 | msgid "--graph option is incompatible with --%s" |
|
1743 | 1602 | msgstr "" |
@@ -1753,17 +1612,6 b' msgid ""' | |||
|
1753 | 1612 | " " |
|
1754 | 1613 | msgstr "" |
|
1755 | 1614 | |
|
1756 | msgid "" | |
|
1757 | "show the outgoing changesets alongside an ASCII revision graph\n" | |
|
1758 | "\n" | |
|
1759 | " Print the outgoing changesets alongside a revision graph drawn with\n" | |
|
1760 | " ASCII characters.\n" | |
|
1761 | "\n" | |
|
1762 | " Nodes printed as an @ character are parents of the working\n" | |
|
1763 | " directory.\n" | |
|
1764 | " " | |
|
1765 | msgstr "" | |
|
1766 | ||
|
1767 | 1615 | #, python-format |
|
1768 | 1616 | msgid "comparing with %s\n" |
|
1769 | 1617 | msgstr "" |
@@ -1771,20 +1619,6 b' msgstr ""' | |||
|
1771 | 1619 | msgid "no changes found\n" |
|
1772 | 1620 | msgstr "没有发现修改\n" |
|
1773 | 1621 | |
|
1774 | msgid "" | |
|
1775 | "show the incoming changesets alongside an ASCII revision graph\n" | |
|
1776 | "\n" | |
|
1777 | " Print the incoming changesets alongside a revision graph drawn with\n" | |
|
1778 | " ASCII characters.\n" | |
|
1779 | "\n" | |
|
1780 | " Nodes printed as an @ character are parents of the working\n" | |
|
1781 | " directory.\n" | |
|
1782 | " " | |
|
1783 | msgstr "" | |
|
1784 | ||
|
1785 | msgid "wrap the command" | |
|
1786 | msgstr "" | |
|
1787 | ||
|
1788 | 1622 | msgid "show the revision DAG" |
|
1789 | 1623 | msgstr "显示版本分支图" |
|
1790 | 1624 | |
@@ -1801,7 +1635,7 b' msgid "hg glog [OPTION]... [FILE]"' | |||
|
1801 | 1635 | msgstr "" |
|
1802 | 1636 | |
|
1803 | 1637 | msgid "" |
|
1804 | "CIA notification\n" | |
|
1638 | "integrate Mercurial with a CIA notification service\n" | |
|
1805 | 1639 | "\n" |
|
1806 | 1640 | "This is meant to be run as a changegroup or incoming hook.\n" |
|
1807 | 1641 | "To configure it, set the following options in your hgrc:\n" |
@@ -1816,8 +1650,7 b' msgid ""' | |||
|
1816 | 1650 | "# Append a diffstat to the log message (optional)\n" |
|
1817 | 1651 | "#diffstat = False\n" |
|
1818 | 1652 | "# Template to use for log messages (optional)\n" |
|
1819 | "#template = {desc}\n" | |
|
1820 | "{baseurl}/rev/{node}-- {diffstat}\n" | |
|
1653 | "#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" | |
|
1821 | 1654 | "# Style to use (optional)\n" |
|
1822 | 1655 | "#style = foo\n" |
|
1823 | 1656 | "# The URL of the CIA notification service (optional)\n" |
@@ -1838,19 +1671,10 b' msgid ""' | |||
|
1838 | 1671 | "baseurl = http://server/path/to/repo\n" |
|
1839 | 1672 | msgstr "" |
|
1840 | 1673 | |
|
1841 | msgid " A CIA message " | |
|
1842 | msgstr "" | |
|
1843 | ||
|
1844 | msgid " CIA notification class " | |
|
1845 | msgstr "" | |
|
1846 | ||
|
1847 | 1674 | #, python-format |
|
1848 | 1675 | msgid "hgcia: sending update to %s\n" |
|
1849 | 1676 | msgstr "" |
|
1850 | 1677 | |
|
1851 | msgid " send CIA notification " | |
|
1852 | msgstr "" | |
|
1853 | ||
|
1854 | 1678 | msgid "email.from must be defined when sending by email" |
|
1855 | 1679 | msgstr "" |
|
1856 | 1680 | |
@@ -1861,33 +1685,21 b' msgid "cia: no project specified"' | |||
|
1861 | 1685 | msgstr "" |
|
1862 | 1686 | |
|
1863 | 1687 | msgid "" |
|
1864 |
"brows |
|
|
1688 | "browse the repository in a graphical way\n" | |
|
1865 | 1689 | "\n" |
|
1866 | 1690 | "The hgk extension allows browsing the history of a repository in a\n" |
|
1867 | "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" | |
|
1868 |
" |
|
|
1691 | "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" | |
|
1692 | "distributed with Mercurial.)\n" | |
|
1869 | 1693 | "\n" |
|
1870 | 1694 | "hgk consists of two parts: a Tcl script that does the displaying and\n" |
|
1871 |
"querying of information, and an extension to |
|
|
1695 | "querying of information, and an extension to Mercurial named hgk.py,\n" | |
|
1872 | 1696 | "which provides hooks for hgk to get information. hgk can be found in\n" |
|
1873 |
"the contrib directory, and |
|
|
1874 | "\n" | |
|
1875 | "To load the hgext.py extension, add it to your .hgrc file (you have\n" | |
|
1876 | "to use your global $HOME/.hgrc file, not one in a repository). You\n" | |
|
1877 | "can specify an absolute path:\n" | |
|
1878 | "\n" | |
|
1879 | " [extensions]\n" | |
|
1880 | " hgk=/usr/local/lib/hgk.py\n" | |
|
1881 | "\n" | |
|
1882 | "Mercurial can also scan the default python library path for a file\n" | |
|
1883 | "named 'hgk.py' if you set hgk empty:\n" | |
|
1884 | "\n" | |
|
1885 | " [extensions]\n" | |
|
1886 | " hgk=\n" | |
|
1697 | "the contrib directory, and the extension is shipped in the hgext\n" | |
|
1698 | "repository, and needs to be enabled.\n" | |
|
1887 | 1699 | "\n" |
|
1888 | 1700 | "The hg view command will launch the hgk Tcl script. For this command\n" |
|
1889 | "to work, hgk must be in your search path. Alternately, you can\n" | |
|
1890 |
" |
|
|
1701 | "to work, hgk must be in your search path. Alternately, you can specify\n" | |
|
1702 | "the path to hgk in your .hgrc file:\n" | |
|
1891 | 1703 | "\n" |
|
1892 | 1704 | " [hgk]\n" |
|
1893 | 1705 | " path=/location/of/hgk\n" |
@@ -1984,16 +1796,11 b' msgid "hg debug-rev-list [options] revs"' | |||
|
1984 | 1796 | msgstr "" |
|
1985 | 1797 | |
|
1986 | 1798 | msgid "" |
|
1987 |
"syntax highlighting |
|
|
1988 | "\n" | |
|
1989 |
"It depends on the |
|
|
1799 | "syntax highlighting for hgweb\n" | |
|
1800 | "\n" | |
|
1801 | "It depends on the Pygments syntax highlighting library:\n" | |
|
1990 | 1802 | "http://pygments.org/\n" |
|
1991 | 1803 | "\n" |
|
1992 | "To enable the extension add this to hgrc:\n" | |
|
1993 | "\n" | |
|
1994 | "[extensions]\n" | |
|
1995 | "hgext.highlight =\n" | |
|
1996 | "\n" | |
|
1997 | 1804 | "There is a single configuration option:\n" |
|
1998 | 1805 | "\n" |
|
1999 | 1806 | "[web]\n" |
@@ -2004,12 +1811,37 b' msgid ""' | |||
|
2004 | 1811 | "-- Adam Hupp <adam@hupp.org>\n" |
|
2005 | 1812 | msgstr "" |
|
2006 | 1813 | |
|
2007 | msgid "inotify-based status acceleration for Linux systems\n" | |
|
1814 | msgid "accelerate status report using system level services" | |
|
2008 | 1815 | msgstr "" |
|
2009 | 1816 | |
|
2010 | 1817 | msgid "start an inotify server for this repository" |
|
2011 | 1818 | msgstr "为此版本库启动服务 'inotify'" |
|
2012 | 1819 | |
|
1820 | msgid "" | |
|
1821 | "debugging information for inotify extension\n" | |
|
1822 | "\n" | |
|
1823 | " Prints the list of directories being watched by the inotify server.\n" | |
|
1824 | " " | |
|
1825 | msgstr "" | |
|
1826 | ||
|
1827 | msgid "directories being watched:\n" | |
|
1828 | msgstr "" | |
|
1829 | ||
|
1830 | msgid "run server in background" | |
|
1831 | msgstr "在后台运行服务" | |
|
1832 | ||
|
1833 | msgid "used internally by daemon mode" | |
|
1834 | msgstr "在后台服务模式内部使用" | |
|
1835 | ||
|
1836 | msgid "minutes to sit idle before exiting" | |
|
1837 | msgstr "空闲几分钟后退出" | |
|
1838 | ||
|
1839 | msgid "name of file to write process ID to" | |
|
1840 | msgstr "写入进程标识符的文件名称" | |
|
1841 | ||
|
1842 | msgid "hg inserve [OPT]..." | |
|
1843 | msgstr "" | |
|
1844 | ||
|
2013 | 1845 | msgid "(found dead inotify server socket; removing it)\n" |
|
2014 | 1846 | msgstr "" |
|
2015 | 1847 | |
@@ -2031,25 +1863,17 b' msgstr ""' | |||
|
2031 | 1863 | msgid "failed to contact inotify server: %s\n" |
|
2032 | 1864 | msgstr "" |
|
2033 | 1865 | |
|
2034 | msgid "run server in background" | |
|
2035 | msgstr "在后台运行服务" | |
|
2036 | ||
|
2037 | msgid "used internally by daemon mode" | |
|
2038 | msgstr "在后台服务模式内部使用" | |
|
2039 | ||
|
2040 | msgid "minutes to sit idle before exiting" | |
|
2041 | msgstr "空闲几分钟后退出" | |
|
2042 | ||
|
2043 | msgid "name of file to write process ID to" | |
|
2044 | msgstr "写入进程标识符的文件名称" | |
|
2045 | ||
|
2046 | msgid "hg inserve [OPT]..." | |
|
1866 | msgid "received empty answer from inotify server" | |
|
2047 | 1867 | msgstr "" |
|
2048 | 1868 | |
|
2049 | 1869 | #, python-format |
|
2050 | 1870 | msgid "(inotify: received response from incompatible server version %d)\n" |
|
2051 | 1871 | msgstr "" |
|
2052 | 1872 | |
|
1873 | #, python-format | |
|
1874 | msgid "(inotify: received '%s' response when expecting '%s')\n" | |
|
1875 | msgstr "" | |
|
1876 | ||
|
2053 | 1877 | msgid "this system does not seem to support inotify" |
|
2054 | 1878 | msgstr "" |
|
2055 | 1879 | |
@@ -2143,29 +1967,39 b' msgid "%s hooking back up with %d bytes ' | |||
|
2143 | 1967 | msgstr "" |
|
2144 | 1968 | |
|
2145 | 1969 | #, python-format |
|
2146 | msgid "%s processing %d deferred events as %d\n" | |
|
2147 | msgstr "" | |
|
2148 | ||
|
2149 | #, python-format | |
|
2150 | 1970 | msgid "could not start server: %s" |
|
2151 | 1971 | msgstr "" |
|
2152 | 1972 | |
|
2153 | 1973 | #, python-format |
|
1974 | msgid "answering query for %r\n" | |
|
1975 | msgstr "" | |
|
1976 | ||
|
1977 | #, python-format | |
|
2154 | 1978 | msgid "received query from incompatible client version %d\n" |
|
2155 | 1979 | msgstr "" |
|
2156 | 1980 | |
|
2157 | 1981 | #, python-format |
|
2158 |
msgid " |
|
|
1982 | msgid "unrecognized query type: %s\n" | |
|
2159 | 1983 | msgstr "" |
|
2160 | 1984 | |
|
2161 | 1985 | msgid "finished setup\n" |
|
2162 | 1986 | msgstr "" |
|
2163 | 1987 | |
|
2164 | msgid "polling: no timeout\n" | |
|
2165 | msgstr "" | |
|
2166 | ||
|
2167 | #, python-format | |
|
2168 | msgid "polling: %sms timeout\n" | |
|
1988 | msgid "" | |
|
1989 | "expand expressions into changelog and summaries\n" | |
|
1990 | "\n" | |
|
1991 | "This extension allows the use of a special syntax in summaries,\n" | |
|
1992 | "which will be automatically expanded into links or any other\n" | |
|
1993 | "arbitrary expression, much like InterWiki does.\n" | |
|
1994 | "\n" | |
|
1995 | "A few example patterns (link to bug tracking, etc.) that may\n" | |
|
1996 | "be used in your hgrc:\n" | |
|
1997 | "\n" | |
|
1998 | " [interhg]\n" | |
|
1999 | " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" | |
|
2000 | " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" | |
|
2001 | "i\n" | |
|
2002 | " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" | |
|
2169 | 2003 | msgstr "" |
|
2170 | 2004 | |
|
2171 | 2005 | #, python-format |
@@ -2177,17 +2011,17 b' msgid "interhg: invalid regexp for %s: %' | |||
|
2177 | 2011 | msgstr "" |
|
2178 | 2012 | |
|
2179 | 2013 | msgid "" |
|
2180 | "keyword expansion in local repositories\n" | |
|
2181 | "\n" | |
|
2182 | "This extension expands RCS/CVS-like or self-customized $Keywords$\n" | |
|
2183 |
" |
|
|
2184 | "\n" | |
|
2185 | "Keywords are only expanded in local repositories and not stored in\n" | |
|
2186 |
" |
|
|
2187 |
" |
|
|
2188 | "\n" | |
|
2189 | "Configuration is done in the [keyword] and [keywordmaps] sections\n" | |
|
2190 |
" |
|
|
2014 | "expand keywords in tracked files\n" | |
|
2015 | "\n" | |
|
2016 | "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" | |
|
2017 | "tracked text files selected by your configuration.\n" | |
|
2018 | "\n" | |
|
2019 | "Keywords are only expanded in local repositories and not stored in the\n" | |
|
2020 | "change history. The mechanism can be regarded as a convenience for the\n" | |
|
2021 | "current user or for archive distribution.\n" | |
|
2022 | "\n" | |
|
2023 | "Configuration is done in the [keyword] and [keywordmaps] sections of\n" | |
|
2024 | "hgrc files.\n" | |
|
2191 | 2025 | "\n" |
|
2192 | 2026 | "Example:\n" |
|
2193 | 2027 | "\n" |
@@ -2197,96 +2031,40 b' msgid ""' | |||
|
2197 | 2031 | " x* = ignore\n" |
|
2198 | 2032 | "\n" |
|
2199 | 2033 | "Note: the more specific you are in your filename patterns\n" |
|
2200 | " the less you lose speed in huge repos.\n" | |
|
2034 | " the less you lose speed in huge repositories.\n" | |
|
2201 | 2035 | "\n" |
|
2202 | 2036 | "For [keywordmaps] template mapping and expansion demonstration and\n" |
|
2203 | 2037 | "control run \"hg kwdemo\".\n" |
|
2204 | 2038 | "\n" |
|
2205 | 2039 | "An additional date template filter {date|utcdate} is provided.\n" |
|
2206 | 2040 | "\n" |
|
2207 |
"The default template mappings (view with \"hg kwdemo -d\") can be |
|
|
2208 | "with customized keywords and templates.\n" | |
|
2209 |
" |
|
|
2041 | "The default template mappings (view with \"hg kwdemo -d\") can be\n" | |
|
2042 | "replaced with customized keywords and templates. Again, run \"hg\n" | |
|
2043 | "kwdemo\" to control the results of your config changes.\n" | |
|
2210 | 2044 | "\n" |
|
2211 | 2045 | "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" |
|
2212 |
"the risk of inadverte |
|
|
2046 | "the risk of inadvertently storing expanded keywords in the change\n" | |
|
2047 | "history.\n" | |
|
2213 | 2048 | "\n" |
|
2214 | 2049 | "To force expansion after enabling it, or a configuration change, run\n" |
|
2215 | 2050 | "\"hg kwexpand\".\n" |
|
2216 | 2051 | "\n" |
|
2217 |
"Also, when committing with the record extension or using mq's qrecord, |
|
|
2218 | "aware\n" | |
|
2219 | "that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" | |
|
2220 | "question to update keyword expansions after all changes have been checked " | |
|
2221 | "in.\n" | |
|
2052 | "Also, when committing with the record extension or using mq's qrecord,\n" | |
|
2053 | "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" | |
|
2054 | "the files in question to update keyword expansions after all changes\n" | |
|
2055 | "have been checked in.\n" | |
|
2222 | 2056 | "\n" |
|
2223 | 2057 | "Expansions spanning more than one line and incremental expansions,\n" |
|
2224 | 2058 | "like CVS' $Log$, are not supported. A keyword template map\n" |
|
2225 | 2059 | "\"Log = {desc}\" expands to the first line of the changeset description.\n" |
|
2226 | 2060 | msgstr "" |
|
2227 | 2061 | |
|
2228 | msgid "Returns hgdate in cvs-like UTC format." | |
|
2229 | msgstr "" | |
|
2230 | ||
|
2231 | msgid "" | |
|
2232 | "\n" | |
|
2233 | " Sets up keyword templates, corresponding keyword regex, and\n" | |
|
2234 | " provides keyword substitution functions.\n" | |
|
2235 | " " | |
|
2236 | msgstr "" | |
|
2237 | ||
|
2238 | msgid "Replaces keywords in data with expanded template." | |
|
2239 | msgstr "" | |
|
2240 | ||
|
2241 | msgid "Returns data with keywords expanded." | |
|
2242 | msgstr "" | |
|
2243 | ||
|
2244 | msgid "" | |
|
2245 | "Returns true if path matches [keyword] pattern\n" | |
|
2246 | " and is not a symbolic link.\n" | |
|
2247 | " Caveat: localrepository._link fails on Windows." | |
|
2248 | msgstr "" | |
|
2249 | ||
|
2250 | msgid "Overwrites selected files expanding/shrinking keywords." | |
|
2251 | msgstr "" | |
|
2252 | ||
|
2253 | #, python-format | |
|
2254 | msgid "overwriting %s %s keywords\n" | |
|
2255 | msgstr "" | |
|
2256 | ||
|
2257 | msgid "Unconditionally removes all keyword substitutions from text." | |
|
2258 | msgstr "" | |
|
2259 | ||
|
2260 | msgid "Returns text with all keyword substitutions removed." | |
|
2261 | msgstr "" | |
|
2262 | ||
|
2263 | msgid "Returns lines with keyword substitutions removed." | |
|
2264 | msgstr "" | |
|
2265 | ||
|
2266 | msgid "" | |
|
2267 | "If in restricted mode returns data read from wdir with\n" | |
|
2268 | " keyword substitutions removed." | |
|
2269 | msgstr "" | |
|
2270 | ||
|
2271 | msgid "" | |
|
2272 | "\n" | |
|
2273 | " Subclass of filelog to hook into its read, add, cmp methods.\n" | |
|
2274 | " Keywords are \"stored\" unexpanded, and processed on reading.\n" | |
|
2275 | " " | |
|
2276 | msgstr "" | |
|
2277 | ||
|
2278 | msgid "Expands keywords when reading filelog." | |
|
2279 | msgstr "" | |
|
2280 | ||
|
2281 | msgid "Removes keyword substitutions when adding to filelog." | |
|
2282 | msgstr "" | |
|
2283 | ||
|
2284 | msgid "Removes keyword substitutions for comparison." | |
|
2285 | msgstr "" | |
|
2286 | ||
|
2287 | msgid "" | |
|
2288 | "Bails out if [keyword] configuration is not active.\n" | |
|
2289 | " Returns status of working directory." | |
|
2062 | #, python-format | |
|
2063 | msgid "overwriting %s expanding keywords\n" | |
|
2064 | msgstr "" | |
|
2065 | ||
|
2066 | #, python-format | |
|
2067 | msgid "overwriting %s shrinking keywords\n" | |
|
2290 | 2068 | msgstr "" |
|
2291 | 2069 | |
|
2292 | 2070 | msgid "[keyword] patterns cannot match" |
@@ -2295,17 +2073,14 b' msgstr ""' | |||
|
2295 | 2073 | msgid "no [keyword] patterns configured" |
|
2296 | 2074 | msgstr "" |
|
2297 | 2075 | |
|
2298 | msgid "Selects files and passes them to kwtemplater.overwrite." | |
|
2299 | msgstr "" | |
|
2300 | ||
|
2301 | 2076 | msgid "" |
|
2302 | 2077 | "print [keywordmaps] configuration and an expansion example\n" |
|
2303 | 2078 | "\n" |
|
2304 | " Show current, custom, or default keyword template maps\n" | |
|
2305 |
" |
|
|
2306 | "\n" | |
|
2307 | " Extend current configuration by specifying maps as arguments\n" | |
|
2308 |
" |
|
|
2079 | " Show current, custom, or default keyword template maps and their\n" | |
|
2080 | " expansions.\n" | |
|
2081 | "\n" | |
|
2082 | " Extend current configuration by specifying maps as arguments and\n" | |
|
2083 | " optionally by reading from an additional hgrc file.\n" | |
|
2309 | 2084 | "\n" |
|
2310 | 2085 | " Override current keyword template maps with \"default\" option.\n" |
|
2311 | 2086 | " " |
@@ -2317,9 +2092,11 b' msgid ""' | |||
|
2317 | 2092 | "\t%s\n" |
|
2318 | 2093 | msgstr "" |
|
2319 | 2094 | |
|
2320 | #, python-format | |
|
2321 | msgid "creating temporary repo at %s\n" | |
|
2322 | msgstr "" | |
|
2095 | #, fuzzy, python-format | |
|
2096 | msgid "creating temporary repository at %s\n" | |
|
2097 | msgstr "" | |
|
2098 | "\n" | |
|
2099 | "正在删除临时版本库 %s\n" | |
|
2323 | 2100 | |
|
2324 | 2101 | #, python-format |
|
2325 | 2102 | msgid "" |
@@ -2330,16 +2107,16 b' msgstr ""' | |||
|
2330 | 2107 | msgid "unhooked all commit hooks\n" |
|
2331 | 2108 | msgstr "" |
|
2332 | 2109 | |
|
2333 | #, python-format | |
|
2334 | msgid "" | |
|
2335 | "\n" | |
|
2336 | "removing temporary repo %s\n" | |
|
2110 | #, fuzzy, python-format | |
|
2111 | msgid "" | |
|
2112 | "\n" | |
|
2113 | "removing temporary repository %s\n" | |
|
2337 | 2114 | msgstr "" |
|
2338 | 2115 | "\n" |
|
2339 | 2116 | "正在删除临时版本库 %s\n" |
|
2340 | 2117 | |
|
2341 | 2118 | msgid "" |
|
2342 | "expand keywords in working directory\n" | |
|
2119 | "expand keywords in the working directory\n" | |
|
2343 | 2120 | "\n" |
|
2344 | 2121 | " Run after (re)enabling keyword expansion.\n" |
|
2345 | 2122 | "\n" |
@@ -2350,52 +2127,22 b' msgstr ""' | |||
|
2350 | 2127 | msgid "" |
|
2351 | 2128 | "print files currently configured for keyword expansion\n" |
|
2352 | 2129 | "\n" |
|
2353 |
" Crosscheck which files in working directory are potential targets |
|
|
2354 | " keyword expansion.\n" | |
|
2355 |
" |
|
|
2356 | " " | |
|
2357 | msgstr "" | |
|
2358 | ||
|
2359 | msgid "" | |
|
2360 | "revert expanded keywords in working directory\n" | |
|
2361 | "\n" | |
|
2362 | " Run before changing/disabling active keywords\n" | |
|
2363 |
" |
|
|
2130 | " Crosscheck which files in working directory are potential targets\n" | |
|
2131 | " for keyword expansion. That is, files matched by [keyword] config\n" | |
|
2132 | " patterns but not symlinks.\n" | |
|
2133 | " " | |
|
2134 | msgstr "" | |
|
2135 | ||
|
2136 | msgid "" | |
|
2137 | "revert expanded keywords in the working directory\n" | |
|
2138 | "\n" | |
|
2139 | " Run before changing/disabling active keywords or if you experience\n" | |
|
2140 | " problems with \"hg import\" or \"hg merge\".\n" | |
|
2364 | 2141 | "\n" |
|
2365 | 2142 | " kwshrink refuses to run if given files contain local changes.\n" |
|
2366 | 2143 | " " |
|
2367 | 2144 | msgstr "" |
|
2368 | 2145 | |
|
2369 | msgid "" | |
|
2370 | "Collects [keyword] config in kwtools.\n" | |
|
2371 | " Monkeypatches dispatch._parse if needed." | |
|
2372 | msgstr "" | |
|
2373 | ||
|
2374 | msgid "Monkeypatch dispatch._parse to obtain running hg command." | |
|
2375 | msgstr "" | |
|
2376 | ||
|
2377 | msgid "" | |
|
2378 | "Sets up repo as kwrepo for keyword substitution.\n" | |
|
2379 | " Overrides file method to return kwfilelog instead of filelog\n" | |
|
2380 | " if file matches user configuration.\n" | |
|
2381 | " Wraps commit to overwrite configured files with updated\n" | |
|
2382 | " keyword substitutions.\n" | |
|
2383 | " Monkeypatches patch and webcommands." | |
|
2384 | msgstr "" | |
|
2385 | ||
|
2386 | msgid "" | |
|
2387 | "Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" | |
|
2388 | " rejects or conflicts due to expanded keywords in working dir." | |
|
2389 | msgstr "" | |
|
2390 | ||
|
2391 | msgid "" | |
|
2392 | "Monkeypatch patch.diff to avoid expansion except when\n" | |
|
2393 | " comparing against working dir." | |
|
2394 | msgstr "" | |
|
2395 | ||
|
2396 | msgid "Wraps webcommands.x turning off keyword expansion." | |
|
2397 | msgstr "" | |
|
2398 | ||
|
2399 | 2146 | msgid "show default keyword template maps" |
|
2400 | 2147 | msgstr "" |
|
2401 | 2148 | |
@@ -2424,14 +2171,14 b' msgid "hg kwshrink [OPTION]... [FILE]...' | |||
|
2424 | 2171 | msgstr "" |
|
2425 | 2172 | |
|
2426 | 2173 | msgid "" |
|
2427 | "patch management and development\n" | |
|
2174 | "work with a stack of patches\n" | |
|
2428 | 2175 | "\n" |
|
2429 | 2176 | "This extension lets you work with a stack of patches in a Mercurial\n" |
|
2430 |
"repository. |
|
|
2177 | "repository. It manages two stacks of patches - all known patches, and\n" | |
|
2431 | 2178 | "applied patches (subset of known patches).\n" |
|
2432 | 2179 | "\n" |
|
2433 | 2180 | "Known patches are represented as patch files in the .hg/patches\n" |
|
2434 |
"directory. |
|
|
2181 | "directory. Applied patches are both patch files and changesets.\n" | |
|
2435 | 2182 | "\n" |
|
2436 | 2183 | "Common tasks (use \"hg help command\" for more details):\n" |
|
2437 | 2184 | "\n" |
@@ -2448,17 +2195,6 b' msgid ""' | |||
|
2448 | 2195 | "refresh contents of top applied patch qrefresh\n" |
|
2449 | 2196 | msgstr "" |
|
2450 | 2197 | |
|
2451 | msgid "" | |
|
2452 | "Update all references to a field in the patch header.\n" | |
|
2453 | " If none found, add it email style." | |
|
2454 | msgstr "" | |
|
2455 | ||
|
2456 | msgid "" | |
|
2457 | "Remove existing message, keeping the rest of the comments fields.\n" | |
|
2458 | " If comments contains 'subject: ', message will prepend\n" | |
|
2459 | " the field and a blank line." | |
|
2460 | msgstr "" | |
|
2461 | ||
|
2462 | 2198 | #, python-format |
|
2463 | 2199 | msgid "%s appears more than once in %s" |
|
2464 | 2200 | msgstr "" |
@@ -2537,11 +2273,6 b' msgstr ""' | |||
|
2537 | 2273 | msgid "patch %s is not applied\n" |
|
2538 | 2274 | msgstr "" |
|
2539 | 2275 | |
|
2540 | msgid "" | |
|
2541 | "Apply patchfile to the working directory.\n" | |
|
2542 | " patchfile: file name of patch" | |
|
2543 | msgstr "" | |
|
2544 | ||
|
2545 | 2276 | msgid "patch failed, unable to continue (try -v)\n" |
|
2546 | 2277 | msgstr "" |
|
2547 | 2278 | |
@@ -2549,9 +2280,11 b' msgstr ""' | |||
|
2549 | 2280 | msgid "applying %s\n" |
|
2550 | 2281 | msgstr "" |
|
2551 | 2282 | |
|
2552 | #, python-format | |
|
2553 |
msgid " |
|
|
2554 | msgstr "" | |
|
2283 | #, fuzzy, python-format | |
|
2284 | msgid "unable to read %s\n" | |
|
2285 | msgstr "" | |
|
2286 | "解析 '%s' 失败\n" | |
|
2287 | "%s" | |
|
2555 | 2288 | |
|
2556 | 2289 | #, python-format |
|
2557 | 2290 | msgid "imported patch %s\n" |
@@ -2581,6 +2314,10 b' msgstr ""' | |||
|
2581 | 2314 | msgid "cannot delete revision %d above applied patches" |
|
2582 | 2315 | msgstr "" |
|
2583 | 2316 | |
|
2317 | #, fuzzy, python-format | |
|
2318 | msgid "patch %s finalized without changeset message\n" | |
|
2319 | msgstr "只显示无改动文件的状态" | |
|
2320 | ||
|
2584 | 2321 | msgid "qdelete requires at least one revision or patch name" |
|
2585 | 2322 | msgstr "" |
|
2586 | 2323 | |
@@ -2608,12 +2345,6 b' msgstr ""' | |||
|
2608 | 2345 | msgid "\"%s\" cannot be used as the name of a patch" |
|
2609 | 2346 | msgstr "" |
|
2610 | 2347 | |
|
2611 | msgid "" | |
|
2612 | "options:\n" | |
|
2613 | " msg: a string or a no-argument function returning a string\n" | |
|
2614 | " " | |
|
2615 | msgstr "" | |
|
2616 | ||
|
2617 | 2348 | #, python-format |
|
2618 | 2349 | msgid "patch \"%s\" already exists" |
|
2619 | 2350 | msgstr "" |
@@ -2622,9 +2353,6 b' msgstr ""' | |||
|
2622 | 2353 | msgid "error unlinking %s\n" |
|
2623 | 2354 | msgstr "" |
|
2624 | 2355 | |
|
2625 | msgid "returns (index, rev, patch)" | |
|
2626 | msgstr "" | |
|
2627 | ||
|
2628 | 2356 | #, python-format |
|
2629 | 2357 | msgid "patch name \"%s\" is ambiguous:\n" |
|
2630 | 2358 | msgstr "" |
@@ -2633,7 +2361,7 b' msgstr ""' | |||
|
2633 | 2361 | msgid "patch %s not in series" |
|
2634 | 2362 | msgstr "" |
|
2635 | 2363 | |
|
2636 |
msgid "(working directory not at |
|
|
2364 | msgid "(working directory not at a head)\n" | |
|
2637 | 2365 | msgstr "" |
|
2638 | 2366 | |
|
2639 | 2367 | msgid "no patches in series\n" |
@@ -2752,14 +2480,6 b' msgstr ""' | |||
|
2752 | 2480 | msgid "repo commit failed\n" |
|
2753 | 2481 | msgstr "" |
|
2754 | 2482 | |
|
2755 | msgid "" | |
|
2756 | "If all_patches is False, return the index of the next pushable patch\n" | |
|
2757 | " in the series, or the series length. If all_patches is True, return " | |
|
2758 | "the\n" | |
|
2759 | " index of the first patch past the last applied one.\n" | |
|
2760 | " " | |
|
2761 | msgstr "" | |
|
2762 | ||
|
2763 | 2483 | #, python-format |
|
2764 | 2484 | msgid "patch %s is already in the series file" |
|
2765 | 2485 | msgstr "" |
@@ -2811,14 +2531,14 b' msgstr ""' | |||
|
2811 | 2531 | msgid "" |
|
2812 | 2532 | "remove patches from queue\n" |
|
2813 | 2533 | "\n" |
|
2814 |
" The patches must not be applied, |
|
|
2815 | " the --rev parameter. At least one patch or revision is required.\n" | |
|
2816 | "\n" | |
|
2817 | " With --rev, mq will stop managing the named revisions (converting\n" | |
|
2818 | " them to regular mercurial changesets). The qfinish command should be\n" | |
|
2819 | " used as an alternative for qdel -r, as the latter option is deprecated.\n" | |
|
2820 | "\n" | |
|
2821 | " With --keep, the patch files are preserved in the patch directory." | |
|
2534 | " The patches must not be applied, and at least one patch is\n" | |
|
2535 | " required.\n" | |
|
2536 | "\n" | |
|
2537 | " With -k/--keep, the patch files are preserved in the patch\n" | |
|
2538 | " directory.\n" | |
|
2539 | "\n" | |
|
2540 | " To stop managing a patch and move it into permanent history,\n" | |
|
2541 | " use the qfinish command." | |
|
2822 | 2542 | msgstr "" |
|
2823 | 2543 | |
|
2824 | 2544 | msgid "print the patches already applied" |
@@ -2827,26 +2547,33 b' msgstr ""' | |||
|
2827 | 2547 | msgid "print the patches not yet applied" |
|
2828 | 2548 | msgstr "" |
|
2829 | 2549 | |
|
2550 | #, fuzzy | |
|
2830 | 2551 | msgid "" |
|
2831 | 2552 | "import a patch\n" |
|
2832 | 2553 | "\n" |
|
2833 |
" The patch is inserted into the series after the last applied |
|
|
2834 | " If no patches have been applied, qimport prepends the patch\n" | |
|
2554 | " The patch is inserted into the series after the last applied\n" | |
|
2555 | " patch. If no patches have been applied, qimport prepends the patch\n" | |
|
2835 | 2556 | " to the series.\n" |
|
2836 | 2557 | "\n" |
|
2837 | 2558 | " The patch will have the same name as its source file unless you\n" |
|
2838 | " give it a new one with --name.\n" | |
|
2839 | "\n" | |
|
2840 | " You can register an existing patch inside the patch directory\n" | |
|
2841 |
" |
|
|
2842 | "\n" | |
|
2843 |
" With --force, an existing patch of the same name will be |
|
|
2844 | "\n" | |
|
2845 | " An existing changeset may be placed under mq control with --rev\n" | |
|
2559 | " give it a new one with -n/--name.\n" | |
|
2560 | "\n" | |
|
2561 | " You can register an existing patch inside the patch directory with\n" | |
|
2562 | " the -e/--existing flag.\n" | |
|
2563 | "\n" | |
|
2564 | " With -f/--force, an existing patch of the same name will be\n" | |
|
2565 | " overwritten.\n" | |
|
2566 | "\n" | |
|
2567 | " An existing changeset may be placed under mq control with -r/--rev\n" | |
|
2846 | 2568 | " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" |
|
2847 | " With --git, patches imported with --rev will use the git diff\n" | |
|
2569 | " With -g/--git, patches imported with --rev will use the git diff\n" | |
|
2848 | 2570 | " format. See the diffs help topic for information on why this is\n" |
|
2849 |
" important for preserving rename/copy information and permission |
|
|
2571 | " important for preserving rename/copy information and permission\n" | |
|
2572 | " changes.\n" | |
|
2573 | "\n" | |
|
2574 | " To import a patch from standard input, pass - as the patch file.\n" | |
|
2575 | " When importing from standard input, a patch name must be specified\n" | |
|
2576 | " using the --name flag.\n" | |
|
2850 | 2577 | " " |
|
2851 | 2578 | msgstr "" |
|
2852 | 2579 | "导入补丁\n" |
@@ -2866,14 +2593,15 b' msgstr ""' | |||
|
2866 | 2593 | " 为什么这对于保留改名/复制信息和权限修改很重要。\n" |
|
2867 | 2594 | " " |
|
2868 | 2595 | |
|
2596 | #, fuzzy | |
|
2869 | 2597 | msgid "" |
|
2870 | 2598 | "init a new queue repository\n" |
|
2871 | 2599 | "\n" |
|
2872 |
" The queue repository is unversioned by default. If |
|
|
2873 |
" specified, qinit will create a separate nested |
|
|
2874 | " for patches (qinit -c may also be run later to convert\n" | |
|
2875 | " an unversioned patch repository into a versioned one).\n" | |
|
2876 |
" |
|
|
2600 | " The queue repository is unversioned by default. If\n" | |
|
2601 | " -c/--create-repo is specified, qinit will create a separate nested\n" | |
|
2602 | " repository for patches (qinit -c may also be run later to convert\n" | |
|
2603 | " an unversioned patch repository into a versioned one). You can use\n" | |
|
2604 | " qcommit to commit changes to this queue repository." | |
|
2877 | 2605 | msgstr "" |
|
2878 | 2606 | "初始化队列仓库\n" |
|
2879 | 2607 | "\n" |
@@ -2884,16 +2612,16 b' msgstr ""' | |||
|
2884 | 2612 | msgid "" |
|
2885 | 2613 | "clone main and patch repository at same time\n" |
|
2886 | 2614 | "\n" |
|
2887 |
" If source is local, destination will have no patches applied. |
|
|
2615 | " If source is local, destination will have no patches applied. If\n" | |
|
2888 | 2616 | " source is remote, this command can not check if patches are\n" |
|
2889 | 2617 | " applied in source, so cannot guarantee that patches are not\n" |
|
2890 |
" applied in destination. |
|
|
2618 | " applied in destination. If you clone remote repository, be sure\n" | |
|
2891 | 2619 | " before that it has no patches applied.\n" |
|
2892 | 2620 | "\n" |
|
2893 | 2621 | " Source patch repository is looked for in <src>/.hg/patches by\n" |
|
2894 |
" default. |
|
|
2895 | "\n" | |
|
2896 |
" The patch directory must be a nested |
|
|
2622 | " default. Use -p <url> to change.\n" | |
|
2623 | "\n" | |
|
2624 | " The patch directory must be a nested Mercurial repository, as\n" | |
|
2897 | 2625 | " would be created by qinit -c.\n" |
|
2898 | 2626 | " " |
|
2899 | 2627 | msgstr "" |
@@ -2901,17 +2629,20 b' msgstr ""' | |||
|
2901 | 2629 | msgid "versioned patch repository not found (see qinit -c)" |
|
2902 | 2630 | msgstr "" |
|
2903 | 2631 | |
|
2904 | msgid "cloning main repo\n" | |
|
2905 | msgstr "" | |
|
2906 | ||
|
2907 | msgid "cloning patch repo\n" | |
|
2908 | msgstr "" | |
|
2909 | ||
|
2910 | msgid "stripping applied patches from destination repo\n" | |
|
2911 | msgstr "" | |
|
2912 | ||
|
2913 | msgid "updating destination repo\n" | |
|
2914 | msgstr "" | |
|
2632 | #, fuzzy | |
|
2633 | msgid "cloning main repository\n" | |
|
2634 | msgstr "初始化目标版本库 %s\n" | |
|
2635 | ||
|
2636 | msgid "cloning patch repository\n" | |
|
2637 | msgstr "" | |
|
2638 | ||
|
2639 | #, fuzzy | |
|
2640 | msgid "stripping applied patches from destination repository\n" | |
|
2641 | msgstr "初始化目标版本库 %s\n" | |
|
2642 | ||
|
2643 | #, fuzzy | |
|
2644 | msgid "updating destination repository\n" | |
|
2645 | msgstr "初始化目标版本库 %s\n" | |
|
2915 | 2646 | |
|
2916 | 2647 | msgid "commit changes in the queue repository" |
|
2917 | 2648 | msgstr "" |
@@ -2937,40 +2668,44 b' msgstr ""' | |||
|
2937 | 2668 | msgid "" |
|
2938 | 2669 | "create a new patch\n" |
|
2939 | 2670 | "\n" |
|
2940 |
" qnew creates a new patch on top of the currently-applied patch (if |
|
|
2941 |
" It will refuse to run if there are any outstanding change |
|
|
2942 |
" specified, in which case the patch will be |
|
|
2943 | " may also use -I, -X, and/or a list of files after the patch name to add\n" | |
|
2944 | " only changes to matching files to the new patch, leaving the rest as\n" | |
|
2945 | " uncommitted modifications.\n" | |
|
2946 | "\n" | |
|
2947 | " -u and -d can be used to set the (given) user and date, respectively.\n" | |
|
2948 | " -U and -D set user to current user and date to current date.\n" | |
|
2949 | "\n" | |
|
2950 | " -e, -m or -l set the patch header as well as the commit message. If none\n" | |
|
2951 | " is specified, the header is empty and the commit message is '[mq]: " | |
|
2952 | "PATCH'.\n" | |
|
2953 | "\n" | |
|
2954 | " Use the --git option to keep the patch in the git extended diff\n" | |
|
2671 | " qnew creates a new patch on top of the currently-applied patch (if\n" | |
|
2672 | " any). It will refuse to run if there are any outstanding changes\n" | |
|
2673 | " unless -f/--force is specified, in which case the patch will be\n" | |
|
2674 | " initialized with them. You may also use -I/--include,\n" | |
|
2675 | " -X/--exclude, and/or a list of files after the patch name to add\n" | |
|
2676 | " only changes to matching files to the new patch, leaving the rest\n" | |
|
2677 | " as uncommitted modifications.\n" | |
|
2678 | "\n" | |
|
2679 | " -u/--user and -d/--date can be used to set the (given) user and\n" | |
|
2680 | " date, respectively. -U/--currentuser and -D/--currentdate set user\n" | |
|
2681 | " to current user and date to current date.\n" | |
|
2682 | "\n" | |
|
2683 | " -e/--edit, -m/--message or -l/--logfile set the patch header as\n" | |
|
2684 | " well as the commit message. If none is specified, the header is\n" | |
|
2685 | " empty and the commit message is '[mq]: PATCH'.\n" | |
|
2686 | "\n" | |
|
2687 | " Use the -g/--git option to keep the patch in the git extended diff\n" | |
|
2955 | 2688 | " format. Read the diffs help topic for more information on why this\n" |
|
2956 | 2689 | " is important for preserving permission changes and copy/rename\n" |
|
2957 | 2690 | " information.\n" |
|
2958 | 2691 | " " |
|
2959 | 2692 | msgstr "" |
|
2960 | 2693 | |
|
2694 | #, fuzzy | |
|
2961 | 2695 | msgid "" |
|
2962 | 2696 | "update the current patch\n" |
|
2963 | 2697 | "\n" |
|
2964 |
" If any file patterns are provided, the refreshed patch will |
|
|
2965 |
" the modifications that match those patterns; the |
|
|
2966 | " will remain in the working directory.\n" | |
|
2967 | "\n" | |
|
2968 |
" If --short is specified, files currently included in the patch |
|
|
2969 | " be refreshed just like matched files and remain in the patch.\n" | |
|
2970 | "\n" | |
|
2971 |
" hg add/remove/copy/rename work as usual, though you might want to |
|
|
2972 |
" git-style patches (--git or [diff] git=1) to track copies |
|
|
2973 |
" See the diffs help topic for more information on the |
|
|
2698 | " If any file patterns are provided, the refreshed patch will\n" | |
|
2699 | " contain only the modifications that match those patterns; the\n" | |
|
2700 | " remaining modifications will remain in the working directory.\n" | |
|
2701 | "\n" | |
|
2702 | " If -s/--short is specified, files currently included in the patch\n" | |
|
2703 | " will be refreshed just like matched files and remain in the patch.\n" | |
|
2704 | "\n" | |
|
2705 | " hg add/remove/copy/rename work as usual, though you might want to\n" | |
|
2706 | " use git-style patches (-g/--git or [diff] git=1) to track copies\n" | |
|
2707 | " and renames. See the diffs help topic for more information on the\n" | |
|
2708 | " git diff format.\n" | |
|
2974 | 2709 | " " |
|
2975 | 2710 | msgstr "" |
|
2976 | 2711 | "更新当前补丁\n" |
@@ -2988,17 +2723,19 b' msgstr ""' | |||
|
2988 | 2723 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" |
|
2989 | 2724 | msgstr "" |
|
2990 | 2725 | |
|
2726 | #, fuzzy | |
|
2991 | 2727 | msgid "" |
|
2992 | 2728 | "diff of the current patch and subsequent modifications\n" |
|
2993 | 2729 | "\n" |
|
2994 |
" Shows a diff which includes the current patch as well as any |
|
|
2995 | "which\n" | |
|
2996 | " have been made in the working directory since the last refresh (thus\n" | |
|
2997 | " showing what the current patch would become after a qrefresh).\n" | |
|
2998 | "\n" | |
|
2999 |
" Use 'hg diff' if you only want to see the changes made since the |
|
|
3000 |
" qrefresh, or 'hg export qtip' if you want to see changes mad |
|
|
3001 |
" current patch without including changes made since the |
|
|
2730 | " Shows a diff which includes the current patch as well as any\n" | |
|
2731 | " changes which have been made in the working directory since the\n" | |
|
2732 | " last refresh (thus showing what the current patch would become\n" | |
|
2733 | " after a qrefresh).\n" | |
|
2734 | "\n" | |
|
2735 | " Use 'hg diff' if you only want to see the changes made since the\n" | |
|
2736 | " last qrefresh, or 'hg export qtip' if you want to see changes made\n" | |
|
2737 | " by the current patch without including changes made since the\n" | |
|
2738 | " qrefresh.\n" | |
|
3002 | 2739 | " " |
|
3003 | 2740 | msgstr "" |
|
3004 | 2741 | "显式当前的补丁和后续的修改\n" |
@@ -3016,12 +2753,12 b' msgid ""' | |||
|
3016 | 2753 | " Patches must not yet be applied. Each patch will be successively\n" |
|
3017 | 2754 | " applied to the current patch in the order given. If all the\n" |
|
3018 | 2755 | " patches apply successfully, the current patch will be refreshed\n" |
|
3019 | " with the new cumulative patch, and the folded patches will\n" | |
|
3020 |
" |
|
|
3021 |
" |
|
|
3022 | "\n" | |
|
3023 | " The header for each folded patch will be concatenated with\n" | |
|
3024 |
" |
|
|
2756 | " with the new cumulative patch, and the folded patches will be\n" | |
|
2757 | " deleted. With -k/--keep, the folded patch files will not be\n" | |
|
2758 | " removed afterwards.\n" | |
|
2759 | "\n" | |
|
2760 | " The header for each folded patch will be concatenated with the\n" | |
|
2761 | " current patch header, separated by a line of '* * *'." | |
|
3025 | 2762 | msgstr "" |
|
3026 | 2763 | |
|
3027 | 2764 | msgid "qfold requires at least one patch name" |
@@ -3076,11 +2813,12 b' msgstr ""' | |||
|
3076 | 2813 | msgid "print the header of the topmost or specified patch" |
|
3077 | 2814 | msgstr "" |
|
3078 | 2815 | |
|
2816 | #, fuzzy | |
|
3079 | 2817 | msgid "" |
|
3080 | 2818 | "push the next patch onto the stack\n" |
|
3081 | 2819 | "\n" |
|
3082 |
" When --force is applied, all local changes in patched files |
|
|
3083 | "lost.\n" | |
|
2820 | " When -f/--force is applied, all local changes in patched files\n" | |
|
2821 | " will be lost.\n" | |
|
3084 | 2822 | " " |
|
3085 | 2823 | msgstr "" |
|
3086 | 2824 | "将下个补丁压入堆栈\n" |
@@ -3095,12 +2833,13 b' msgstr ""' | |||
|
3095 | 2833 | msgid "merging with queue at: %s\n" |
|
3096 | 2834 | msgstr "" |
|
3097 | 2835 | |
|
2836 | #, fuzzy | |
|
3098 | 2837 | msgid "" |
|
3099 | 2838 | "pop the current patch off the stack\n" |
|
3100 | 2839 | "\n" |
|
3101 |
" By default, pops off the top of the patch stack. If given a patch |
|
|
3102 |
" keeps popping off patches until the named patch is at the |
|
|
3103 | "stack.\n" | |
|
2840 | " By default, pops off the top of the patch stack. If given a patch\n" | |
|
2841 | " name, keeps popping off patches until the named patch is at the\n" | |
|
2842 | " top of the stack.\n" | |
|
3104 | 2843 | " " |
|
3105 | 2844 | msgstr "" |
|
3106 | 2845 | "将当前补丁弹出堆栈\n" |
@@ -3128,7 +2867,7 b' msgstr ""' | |||
|
3128 | 2867 | msgid "A patch named %s already exists in the series file" |
|
3129 | 2868 | msgstr "" |
|
3130 | 2869 | |
|
3131 | msgid "restore the queue state saved by a rev" | |
|
2870 | msgid "restore the queue state saved by a revision" | |
|
3132 | 2871 | msgstr "" |
|
3133 | 2872 | |
|
3134 | 2873 | msgid "save current queue state" |
@@ -3146,11 +2885,13 b' msgstr ""' | |||
|
3146 | 2885 | msgid "copy %s to %s\n" |
|
3147 | 2886 | msgstr "" |
|
3148 | 2887 | |
|
2888 | #, fuzzy | |
|
3149 | 2889 | msgid "" |
|
3150 | 2890 | "strip a revision and all its descendants from the repository\n" |
|
3151 | 2891 | "\n" |
|
3152 |
" If one of the working dir's parent revisions is stripped, the |
|
|
3153 |
" directory will be updated to the parent of the stripped |
|
|
2892 | " If one of the working directory's parent revisions is stripped, the\n" | |
|
2893 | " working directory will be updated to the parent of the stripped\n" | |
|
2894 | " revision.\n" | |
|
3154 | 2895 | " " |
|
3155 | 2896 | msgstr "" |
|
3156 | 2897 | "从版本库删除一个版本以及它的子孙\n" |
@@ -3162,33 +2903,34 b' msgid ""' | |||
|
3162 | 2903 | "set or print guarded patches to push\n" |
|
3163 | 2904 | "\n" |
|
3164 | 2905 | " Use the qguard command to set or print guards on patch, then use\n" |
|
3165 |
" qselect to tell mq which guards to use. A patch will be pushed if |
|
|
3166 |
" has no guards or any positive guards match the currently |
|
|
3167 |
" but will not be pushed if any negative guards |
|
|
3168 | " For example:\n" | |
|
2906 | " qselect to tell mq which guards to use. A patch will be pushed if\n" | |
|
2907 | " it has no guards or any positive guards match the currently\n" | |
|
2908 | " selected guard, but will not be pushed if any negative guards\n" | |
|
2909 | " match the current guard. For example:\n" | |
|
3169 | 2910 | "\n" |
|
3170 | 2911 | " qguard foo.patch -stable (negative guard)\n" |
|
3171 | 2912 | " qguard bar.patch +stable (positive guard)\n" |
|
3172 | 2913 | " qselect stable\n" |
|
3173 | 2914 | "\n" |
|
3174 | 2915 | " This activates the \"stable\" guard. mq will skip foo.patch (because\n" |
|
3175 | " it has a negative match) but push bar.patch (because it\n" | |
|
3176 |
" |
|
|
2916 | " it has a negative match) but push bar.patch (because it has a\n" | |
|
2917 | " positive match).\n" | |
|
3177 | 2918 | "\n" |
|
3178 | 2919 | " With no arguments, prints the currently active guards.\n" |
|
3179 | 2920 | " With one argument, sets the active guard.\n" |
|
3180 | 2921 | "\n" |
|
3181 | 2922 | " Use -n/--none to deactivate guards (no other arguments needed).\n" |
|
3182 |
" When no guards are active, patches with positive guards are |
|
|
3183 | " and patches with negative guards are pushed.\n" | |
|
2923 | " When no guards are active, patches with positive guards are\n" | |
|
2924 | " skipped and patches with negative guards are pushed.\n" | |
|
3184 | 2925 | "\n" |
|
3185 | 2926 | " qselect can change the guards on applied patches. It does not pop\n" |
|
3186 |
" guarded patches by default. Use --pop to pop back to the last |
|
|
3187 |
" patch that is not guarded. Use --reapply (which implies |
|
|
3188 |
" back to the current patch afterwards, but skip |
|
|
3189 | "\n" | |
|
3190 | " Use -s/--series to print a list of all guards in the series file (no\n" | |
|
3191 | " other arguments needed). Use -v for more information." | |
|
2927 | " guarded patches by default. Use --pop to pop back to the last\n" | |
|
2928 | " applied patch that is not guarded. Use --reapply (which implies\n" | |
|
2929 | " --pop) to push back to the current patch afterwards, but skip\n" | |
|
2930 | " guarded patches.\n" | |
|
2931 | "\n" | |
|
2932 | " Use -s/--series to print a list of all guards in the series file\n" | |
|
2933 | " (no other arguments needed). Use -v for more information." | |
|
3192 | 2934 | msgstr "" |
|
3193 | 2935 | |
|
3194 | 2936 | msgid "guards deactivated\n" |
@@ -3223,17 +2965,18 b' msgstr ""' | |||
|
3223 | 2965 | msgid "" |
|
3224 | 2966 | "move applied patches into repository history\n" |
|
3225 | 2967 | "\n" |
|
3226 |
" Finishes the specified revisions (corresponding to applied |
|
|
3227 |
" moving them out of mq control into regular repository |
|
|
3228 | "\n" | |
|
3229 | " Accepts a revision range or the --applied option. If --applied is\n" | |
|
3230 | " specified, all applied mq revisions are removed from mq control.\n" | |
|
3231 | " Otherwise, the given revisions must be at the base of the stack of\n" | |
|
3232 | " applied patches.\n" | |
|
3233 | "\n" | |
|
3234 | " This can be especially useful if your changes have been applied to an\n" | |
|
3235 | " upstream repository, or if you are about to push your changes to " | |
|
3236 | "upstream.\n" | |
|
2968 | " Finishes the specified revisions (corresponding to applied\n" | |
|
2969 | " patches) by moving them out of mq control into regular repository\n" | |
|
2970 | " history.\n" | |
|
2971 | "\n" | |
|
2972 | " Accepts a revision range or the -a/--applied option. If --applied\n" | |
|
2973 | " is specified, all applied mq revisions are removed from mq\n" | |
|
2974 | " control. Otherwise, the given revisions must be at the base of the\n" | |
|
2975 | " stack of applied patches.\n" | |
|
2976 | "\n" | |
|
2977 | " This can be especially useful if your changes have been applied to\n" | |
|
2978 | " an upstream repository, or if you are about to push your changes\n" | |
|
2979 | " to upstream.\n" | |
|
3237 | 2980 | " " |
|
3238 | 2981 | msgstr "" |
|
3239 | 2982 | |
@@ -3272,8 +3015,9 b' msgstr ""' | |||
|
3272 | 3015 | msgid "use uncompressed transfer (fast over LAN)" |
|
3273 | 3016 | msgstr "使用不压缩的传输(在局域网更快)" |
|
3274 | 3017 | |
|
3275 | msgid "location of source patch repo" | |
|
3276 | msgstr "" | |
|
3018 | #, fuzzy | |
|
3019 | msgid "location of source patch repository" | |
|
3020 | msgstr "为此版本库启动服务 'inotify'" | |
|
3277 | 3021 | |
|
3278 | 3022 | msgid "hg qclone [OPTION]... SOURCE [DEST]" |
|
3279 | 3023 | msgstr "" |
@@ -3287,7 +3031,7 b' msgstr ""' | |||
|
3287 | 3031 | msgid "keep patch file" |
|
3288 | 3032 | msgstr "" |
|
3289 | 3033 | |
|
3290 | msgid "stop managing a revision" | |
|
3034 | msgid "stop managing a revision (DEPRECATED)" | |
|
3291 | 3035 | msgstr "" |
|
3292 | 3036 | |
|
3293 | 3037 | msgid "hg qdelete [-k] [-r REV]... [PATCH]..." |
@@ -3320,10 +3064,12 b' msgstr ""' | |||
|
3320 | 3064 | msgid "hg qheader [PATCH]" |
|
3321 | 3065 | msgstr "" |
|
3322 | 3066 | |
|
3323 | msgid "import file in patch dir" | |
|
3067 | #, fuzzy | |
|
3068 | msgid "import file in patch directory" | |
|
3324 | 3069 | msgstr "从补丁目录导入文件" |
|
3325 | 3070 | |
|
3326 | msgid "patch file name" | |
|
3071 | #, fuzzy | |
|
3072 | msgid "name of patch file" | |
|
3327 | 3073 | msgstr "补丁文件名称" |
|
3328 | 3074 | |
|
3329 | 3075 | msgid "overwrite existing files" |
@@ -3335,7 +3081,10 b' msgstr "\xe5\xb0\x86\xe7\x8e\xb0\xe6\x9c\x89\xe7\x9a\x84\xe7\x89\x88\xe6\x9c\xac\xe7\xbd\xae\xe4\xba\x8e mq \xe6\x8e\xa7\xe5\x88\xb6\xe4\xb8\x8b"' | |||
|
3335 | 3081 | msgid "use git extended diff format" |
|
3336 | 3082 | msgstr "使用 git 扩展差异格式" |
|
3337 | 3083 | |
|
3338 | msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." | |
|
3084 | msgid "qpush after importing" | |
|
3085 | msgstr "" | |
|
3086 | ||
|
3087 | msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." | |
|
3339 | 3088 | msgstr "" |
|
3340 | 3089 | |
|
3341 | 3090 | msgid "create queue repository" |
@@ -3422,8 +3171,9 b' msgstr ""' | |||
|
3422 | 3171 | msgid "delete save entry" |
|
3423 | 3172 | msgstr "" |
|
3424 | 3173 | |
|
3425 | msgid "update queue working dir" | |
|
3426 | msgstr "" | |
|
3174 | #, fuzzy | |
|
3175 | msgid "update queue working directory" | |
|
3176 | msgstr "正在更新工作目录\n" | |
|
3427 | 3177 | |
|
3428 | 3178 | msgid "hg qrestore [-d] [-u] REV" |
|
3429 | 3179 | msgstr "" |
@@ -3489,7 +3239,7 b' msgid "hg qfinish [-a] [REV...]"' | |||
|
3489 | 3239 | msgstr "" |
|
3490 | 3240 | |
|
3491 | 3241 | msgid "" |
|
3492 |
" |
|
|
3242 | "send e-mail notifications for commits/pushes\n" | |
|
3493 | 3243 | "\n" |
|
3494 | 3244 | "Subscriptions can be managed through hgrc. Default mode is to print\n" |
|
3495 | 3245 | "messages to stdout, for testing and configuring.\n" |
@@ -3544,31 +3294,10 b' msgid ""' | |||
|
3544 | 3294 | " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" |
|
3545 | 3295 | " pattern = user@host\n" |
|
3546 | 3296 | "\n" |
|
3547 | " glob patterns are matched against path to repo root.\n" | |
|
3548 | "\n" | |
|
3549 |
" if you like, you can put notify config file in repo that users |
|
|
3550 | " push changes to, they can manage their own subscriptions." | |
|
3551 | msgstr "" | |
|
3552 | ||
|
3553 | msgid "email notification class." | |
|
3554 | msgstr "" | |
|
3555 | ||
|
3556 | msgid "strip leading slashes from local path, turn into web-safe path." | |
|
3557 | msgstr "" | |
|
3558 | ||
|
3559 | msgid "try to clean up email addresses." | |
|
3560 | msgstr "" | |
|
3561 | ||
|
3562 | msgid "return list of email addresses of subscribers to this repo." | |
|
3563 | msgstr "" | |
|
3564 | ||
|
3565 | msgid "format one changeset." | |
|
3566 | msgstr "" | |
|
3567 | ||
|
3568 | msgid "true if incoming changes from this source should be skipped." | |
|
3569 | msgstr "" | |
|
3570 | ||
|
3571 | msgid "send message." | |
|
3297 | " glob patterns are matched against path to repository root.\n" | |
|
3298 | "\n" | |
|
3299 | " if you like, you can put notify config file in repository that users\n" | |
|
3300 | " can push changes to, they can manage their own subscriptions." | |
|
3572 | 3301 | msgstr "" |
|
3573 | 3302 | |
|
3574 | 3303 | #, python-format |
@@ -3593,15 +3322,8 b' msgid ""' | |||
|
3593 | 3322 | "\n" |
|
3594 | 3323 | msgstr "" |
|
3595 | 3324 | |
|
3596 | msgid "" | |
|
3597 | "send email notifications to interested subscribers.\n" | |
|
3598 | "\n" | |
|
3599 | " if used as changegroup hook, send one email for all changesets in\n" | |
|
3600 | " changegroup. else send one email per changeset." | |
|
3601 | msgstr "" | |
|
3602 | ||
|
3603 | #, python-format | |
|
3604 | msgid "notify: no subscribers to repo %s\n" | |
|
3325 | #, python-format | |
|
3326 | msgid "notify: no subscribers to repository %s\n" | |
|
3605 | 3327 | msgstr "" |
|
3606 | 3328 | |
|
3607 | 3329 | #, python-format |
@@ -3609,19 +3331,18 b' msgid "notify: changes have source \\"%s\\' | |||
|
3609 | 3331 | msgstr "" |
|
3610 | 3332 | |
|
3611 | 3333 | msgid "" |
|
3612 | "browse command output with external pager\n" | |
|
3334 | "browse command output with an external pager\n" | |
|
3613 | 3335 | "\n" |
|
3614 | 3336 | "To set the pager that should be used, set the application variable:\n" |
|
3615 | 3337 | "\n" |
|
3616 | 3338 | " [pager]\n" |
|
3617 | 3339 | " pager = LESS='FSRX' less\n" |
|
3618 | 3340 | "\n" |
|
3619 | "If no pager is set, the pager extensions uses the environment\n" | |
|
3620 |
" |
|
|
3621 | "is used.\n" | |
|
3622 | "\n" | |
|
3623 | "If you notice \"BROKEN PIPE\" error messages, you can disable them\n" | |
|
3624 | "by setting:\n" | |
|
3341 | "If no pager is set, the pager extensions uses the environment variable\n" | |
|
3342 | "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" | |
|
3343 | "\n" | |
|
3344 | "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" | |
|
3345 | "setting:\n" | |
|
3625 | 3346 | "\n" |
|
3626 | 3347 | " [pager]\n" |
|
3627 | 3348 | " quiet = True\n" |
@@ -3632,27 +3353,27 b' msgid ""' | |||
|
3632 | 3353 | " [pager]\n" |
|
3633 | 3354 | " ignore = version, help, update\n" |
|
3634 | 3355 | "\n" |
|
3635 |
"You can also enable the pager only for certain commands using |
|
|
3356 | "You can also enable the pager only for certain commands using\n" | |
|
3357 | "pager.attend:\n" | |
|
3636 | 3358 | "\n" |
|
3637 | 3359 | " [pager]\n" |
|
3638 | 3360 | " attend = log\n" |
|
3639 | 3361 | "\n" |
|
3640 | 3362 | "If pager.attend is present, pager.ignore will be ignored.\n" |
|
3641 | 3363 | "\n" |
|
3642 |
"To ignore global commands like \"hg version\" or \"hg help\", you have to |
|
|
3643 | "specify\n" | |
|
3644 | "them in the global .hgrc\n" | |
|
3645 | msgstr "" | |
|
3646 | ||
|
3647 | msgid "" | |
|
3648 | "use suffixes to refer to ancestor revisions\n" | |
|
3649 | "\n" | |
|
3650 | "This extension allows you to use git-style suffixes to refer to\n" | |
|
3651 | "the ancestors of a specific revision.\n" | |
|
3364 | "To ignore global commands like \"hg version\" or \"hg help\", you have to\n" | |
|
3365 | "specify them in the global .hgrc\n" | |
|
3366 | msgstr "" | |
|
3367 | ||
|
3368 | msgid "" | |
|
3369 | "interpret suffixes to refer to ancestor revisions\n" | |
|
3370 | "\n" | |
|
3371 | "This extension allows you to use git-style suffixes to refer to the\n" | |
|
3372 | "ancestors of a specific revision.\n" | |
|
3652 | 3373 | "\n" |
|
3653 | 3374 | "For example, if you can refer to a revision as \"foo\", then:\n" |
|
3654 | 3375 | "\n" |
|
3655 |
"- foo^N = Nth parent of foo |
|
|
3376 | "- foo^N = Nth parent of foo\n" | |
|
3656 | 3377 | " foo^0 = foo\n" |
|
3657 | 3378 | " foo^1 = first parent of foo\n" |
|
3658 | 3379 | " foo^2 = second parent of foo\n" |
@@ -3665,34 +3386,31 b' msgid ""' | |||
|
3665 | 3386 | msgstr "" |
|
3666 | 3387 | |
|
3667 | 3388 | msgid "" |
|
3668 |
"send |
|
|
3669 | "\n" | |
|
3670 | "The series is started off with a \"[PATCH 0 of N]\" introduction,\n" | |
|
3671 |
" |
|
|
3672 | "\n" | |
|
3673 | "Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" | |
|
3674 |
" |
|
|
3675 |
" |
|
|
3676 | "\n" | |
|
3677 |
" The |
|
|
3389 | "send Mercurial changesets as a series of patch e-mails\n" | |
|
3390 | "\n" | |
|
3391 | "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" | |
|
3392 | "describes the series as a whole.\n" | |
|
3393 | "\n" | |
|
3394 | "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" | |
|
3395 | "first line of the changeset description as the subject text. The\n" | |
|
3396 | "message contains two or three body parts:\n" | |
|
3397 | "\n" | |
|
3398 | " The changeset description.\n" | |
|
3678 | 3399 | "\n" |
|
3679 | 3400 | " [Optional] The result of running diffstat on the patch.\n" |
|
3680 | 3401 | "\n" |
|
3681 | 3402 | " The patch itself, as generated by \"hg export\".\n" |
|
3682 | 3403 | "\n" |
|
3683 |
"Each message refers to |
|
|
3684 | "and References headers, so they will show up as a sequence in\n" | |
|
3685 |
" |
|
|
3686 | "\n" | |
|
3687 | "For each changeset, you will be prompted with a diffstat summary and\n" | |
|
3688 | "the changeset summary, so you can be sure you are sending the right changes.\n" | |
|
3689 | "\n" | |
|
3690 | "To enable this extension:\n" | |
|
3691 | "\n" | |
|
3692 | " [extensions]\n" | |
|
3693 | " hgext.patchbomb =\n" | |
|
3694 | "\n" | |
|
3695 | "To configure other defaults, add a section like this to your hgrc file:\n" | |
|
3404 | "Each message refers to the first in the series using the In-Reply-To\n" | |
|
3405 | "and References headers, so they will show up as a sequence in threaded\n" | |
|
3406 | "mail and news readers, and in mail archives.\n" | |
|
3407 | "\n" | |
|
3408 | "With the -d/--diffstat option, you will be prompted for each changeset\n" | |
|
3409 | "with a diffstat summary and the changeset summary, so you can be sure\n" | |
|
3410 | "you are sending the right changes.\n" | |
|
3411 | "\n" | |
|
3412 | "To configure other defaults, add a section like this to your hgrc\n" | |
|
3413 | "file:\n" | |
|
3696 | 3414 | "\n" |
|
3697 | 3415 | " [email]\n" |
|
3698 | 3416 | " from = My Name <my@email>\n" |
@@ -3704,34 +3422,34 b' msgid ""' | |||
|
3704 | 3422 | "as a patchbomb.\n" |
|
3705 | 3423 | "\n" |
|
3706 | 3424 | "To avoid sending patches prematurely, it is a good idea to first run\n" |
|
3707 |
"the \"email\" command with the \"-n\" option (test only). |
|
|
3708 | "prompted for an email recipient address, a subject an an introductory\n" | |
|
3709 |
"message describing the patches of your patchbomb. |
|
|
3710 |
"done, patchbomb messages are displayed. If PAGER environment |
|
|
3711 |
"is set, your pager will be fired up once for each patchbomb |
|
|
3712 | "you can verify everything is alright.\n" | |
|
3713 | "\n" | |
|
3714 |
"The |
|
|
3715 |
" |
|
|
3716 |
" |
|
|
3717 |
" |
|
|
3718 |
" |
|
|
3425 | "the \"email\" command with the \"-n\" option (test only). You will be\n" | |
|
3426 | "prompted for an email recipient address, a subject and an introductory\n" | |
|
3427 | "message describing the patches of your patchbomb. Then when all is\n" | |
|
3428 | "done, patchbomb messages are displayed. If the PAGER environment\n" | |
|
3429 | "variable is set, your pager will be fired up once for each patchbomb\n" | |
|
3430 | "message, so you can verify everything is alright.\n" | |
|
3431 | "\n" | |
|
3432 | "The -m/--mbox option is also very useful. Instead of previewing each\n" | |
|
3433 | "patchbomb message in a pager or sending the messages directly, it will\n" | |
|
3434 | "create a UNIX mailbox file with the patch emails. This mailbox file\n" | |
|
3435 | "can be previewed with any mail user agent which supports UNIX mbox\n" | |
|
3436 | "files, e.g. with mutt:\n" | |
|
3719 | 3437 | "\n" |
|
3720 | 3438 | " % mutt -R -f mbox\n" |
|
3721 | 3439 | "\n" |
|
3722 | 3440 | "When you are previewing the patchbomb messages, you can use `formail'\n" |
|
3723 |
"(a utility that is commonly installed as part of the procmail |
|
|
3724 | "to send each message out:\n" | |
|
3441 | "(a utility that is commonly installed as part of the procmail\n" | |
|
3442 | "package), to send each message out:\n" | |
|
3725 | 3443 | "\n" |
|
3726 | 3444 | " % formail -s sendmail -bm -t < mbox\n" |
|
3727 | 3445 | "\n" |
|
3728 | 3446 | "That should be all. Now your patchbomb is on its way out.\n" |
|
3729 | 3447 | "\n" |
|
3730 | 3448 | "You can also either configure the method option in the email section\n" |
|
3731 |
"to be a sendmail compat |
|
|
3732 |
"that the patchbomb extension can automatically send patchbombs |
|
|
3733 |
"from the commandline. See the [email] and [smtp] sections in |
|
|
3734 | "for details." | |
|
3449 | "to be a sendmail compatible mailer or fill out the [smtp] section so\n" | |
|
3450 | "that the patchbomb extension can automatically send patchbombs\n" | |
|
3451 | "directly from the commandline. See the [email] and [smtp] sections in\n" | |
|
3452 | "hgrc(5) for details." | |
|
3735 | 3453 | msgstr "" |
|
3736 | 3454 | |
|
3737 | 3455 | msgid "Please enter a valid value.\n" |
@@ -3747,23 +3465,29 b' msgid ""' | |||
|
3747 | 3465 | "send changesets by email\n" |
|
3748 | 3466 | "\n" |
|
3749 | 3467 | " By default, diffs are sent in the format generated by hg export,\n" |
|
3750 |
" one per message. |
|
|
3468 | " one per message. The series starts with a \"[PATCH 0 of N]\"\n" | |
|
3751 | 3469 | " introduction, which describes the series as a whole.\n" |
|
3752 | 3470 | "\n" |
|
3753 | 3471 | " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" |
|
3754 | 3472 | " the first line of the changeset description as the subject text.\n" |
|
3755 |
" The message contains two or three |
|
|
3756 |
" |
|
|
3757 | " program is installed, the result of running diffstat on the patch.\n" | |
|
3758 |
" Finally, the patch itself, as generated by |
|
|
3759 | "\n" | |
|
3760 | " With --outgoing, emails will be generated for patches not\n" | |
|
3761 | " found in the destination repository (or only those which are\n" | |
|
3762 | " ancestors of the specified revisions if any are provided)\n" | |
|
3763 | "\n" | |
|
3764 | " With --bundle, changesets are selected as for --outgoing,\n" | |
|
3765 | " but a single email containing a binary Mercurial bundle as an\n" | |
|
3766 | " attachment will be sent.\n" | |
|
3473 | " The message contains two or three parts. First, the changeset\n" | |
|
3474 | " description. Next, (optionally) if the diffstat program is\n" | |
|
3475 | " installed and -d/--diffstat is used, the result of running\n" | |
|
3476 | " diffstat on the patch. Finally, the patch itself, as generated by\n" | |
|
3477 | " \"hg export\".\n" | |
|
3478 | "\n" | |
|
3479 | " By default the patch is included as text in the email body for\n" | |
|
3480 | " easy reviewing. Using the -a/--attach option will instead create\n" | |
|
3481 | " an attachment for the patch. With -i/--inline an inline attachment\n" | |
|
3482 | " will be created.\n" | |
|
3483 | "\n" | |
|
3484 | " With -o/--outgoing, emails will be generated for patches not found\n" | |
|
3485 | " in the destination repository (or only those which are ancestors\n" | |
|
3486 | " of the specified revisions if any are provided)\n" | |
|
3487 | "\n" | |
|
3488 | " With -b/--bundle, changesets are selected as for --outgoing, but a\n" | |
|
3489 | " single email containing a binary Mercurial bundle as an attachment\n" | |
|
3490 | " will be sent.\n" | |
|
3767 | 3491 | "\n" |
|
3768 | 3492 | " Examples:\n" |
|
3769 | 3493 | "\n" |
@@ -3783,12 +3507,9 b' msgid ""' | |||
|
3783 | 3507 | "default\n" |
|
3784 | 3508 | " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" |
|
3785 | 3509 | "\n" |
|
3786 |
" Before using this command, you will need to enable email in your |
|
|
3787 | " See the [email] section in hgrc(5) for details.\n" | |
|
3788 | " " | |
|
3789 | msgstr "" | |
|
3790 | ||
|
3791 | msgid "Return the revisions present locally but not in dest" | |
|
3510 | " Before using this command, you will need to enable email in your\n" | |
|
3511 | " hgrc. See the [email] section in hgrc(5) for details.\n" | |
|
3512 | " " | |
|
3792 | 3513 | msgstr "" |
|
3793 | 3514 | |
|
3794 | 3515 | msgid "specify at least one changeset with -r or -o" |
@@ -3860,6 +3581,9 b' msgstr ""' | |||
|
3860 | 3581 | msgid "subject of first message (intro or single patch)" |
|
3861 | 3582 | msgstr "" |
|
3862 | 3583 | |
|
3584 | msgid "message identifier to reply to" | |
|
3585 | msgstr "" | |
|
3586 | ||
|
3863 | 3587 | msgid "email addresses of recipients" |
|
3864 | 3588 | msgstr "" |
|
3865 | 3589 | |
@@ -3872,13 +3596,17 b' msgstr ""' | |||
|
3872 | 3596 | msgid "send changes not in target as a binary bundle" |
|
3873 | 3597 | msgstr "" |
|
3874 | 3598 | |
|
3599 | msgid "name of the bundle attachment file" | |
|
3600 | msgstr "" | |
|
3601 | ||
|
3875 | 3602 | msgid "a revision to send" |
|
3876 | 3603 | msgstr "" |
|
3877 | 3604 | |
|
3878 | msgid "run even when remote repository is unrelated (with -b)" | |
|
3879 | msgstr "" | |
|
3880 | ||
|
3881 | msgid "a base changeset to specify instead of a destination (with -b)" | |
|
3605 | #, fuzzy | |
|
3606 | msgid "run even when remote repository is unrelated (with -b/--bundle)" | |
|
3607 | msgstr "纵然远程版本库是无关的也要执行" | |
|
3608 | ||
|
3609 | msgid "a base changeset to specify instead of a destination (with -b/--bundle)" | |
|
3882 | 3610 | msgstr "" |
|
3883 | 3611 | |
|
3884 | 3612 | msgid "send an introduction email for a single patch" |
@@ -3887,16 +3615,19 b' msgstr ""' | |||
|
3887 | 3615 | msgid "hg email [OPTION]... [DEST]..." |
|
3888 | 3616 | msgstr "" |
|
3889 | 3617 | |
|
3618 | msgid "delete files not tracked from the working directory" | |
|
3619 | msgstr "" | |
|
3620 | ||
|
3890 | 3621 | msgid "" |
|
3891 | 3622 | "removes files not tracked by Mercurial\n" |
|
3892 | 3623 | "\n" |
|
3893 |
" Delete files not known to Mercurial. This is useful to test local |
|
|
3894 | " uncommitted changes in an otherwise-clean source tree.\n" | |
|
3624 | " Delete files not known to Mercurial. This is useful to test local\n" | |
|
3625 | " and uncommitted changes in an otherwise-clean source tree.\n" | |
|
3895 | 3626 | "\n" |
|
3896 | 3627 | " This means that purge will delete:\n" |
|
3897 | 3628 | " - Unknown files: files marked with \"?\" by \"hg status\"\n" |
|
3898 |
" - Empty directories: in fact Mercurial ignores directories unless |
|
|
3899 | " contain files under source control managment\n" | |
|
3629 | " - Empty directories: in fact Mercurial ignores directories unless\n" | |
|
3630 | " they contain files under source control management\n" | |
|
3900 | 3631 | " But it will leave untouched:\n" |
|
3901 | 3632 | " - Modified and unmodified tracked files\n" |
|
3902 | 3633 | " - Ignored files (unless --all is specified)\n" |
@@ -3905,9 +3636,10 b' msgid ""' | |||
|
3905 | 3636 | " If directories are given on the command line, only files in these\n" |
|
3906 | 3637 | " directories are considered.\n" |
|
3907 | 3638 | "\n" |
|
3908 |
" Be careful with purge, as you could irreversibly delete some files |
|
|
3909 |
" forgot to add to the repository. If you only want to print the |
|
|
3910 |
" files that this program would delete, use the --print |
|
|
3639 | " Be careful with purge, as you could irreversibly delete some files\n" | |
|
3640 | " you forgot to add to the repository. If you only want to print the\n" | |
|
3641 | " list of files that this program would delete, use the --print\n" | |
|
3642 | " option.\n" | |
|
3911 | 3643 | " " |
|
3912 | 3644 | msgstr "" |
|
3913 | 3645 | |
@@ -3933,11 +3665,12 b' msgstr ""' | |||
|
3933 | 3665 | msgid "purge ignored files too" |
|
3934 | 3666 | msgstr "" |
|
3935 | 3667 | |
|
3936 |
msgid "print |
|
|
3937 | msgstr "" | |
|
3938 | ||
|
3939 | msgid "end filenames with NUL, for use with xargs (implies -p)" | |
|
3940 | msgstr "" | |
|
3668 | msgid "print filenames instead of deleting them" | |
|
3669 | msgstr "" | |
|
3670 | ||
|
3671 | #, fuzzy | |
|
3672 | msgid "end filenames with NUL, for use with xargs (implies -p/--print)" | |
|
3673 | msgstr "在文件名称结尾增加 NUL,用于 xargs" | |
|
3941 | 3674 | |
|
3942 | 3675 | msgid "hg purge [OPTION]... [DIR]..." |
|
3943 | 3676 | msgstr "" |
@@ -3945,35 +3678,26 b' msgstr ""' | |||
|
3945 | 3678 | msgid "" |
|
3946 | 3679 | "move sets of revisions to a different ancestor\n" |
|
3947 | 3680 | "\n" |
|
3948 |
"This extension lets you rebase changesets in an existing Mercurial |
|
|
3681 | "This extension lets you rebase changesets in an existing Mercurial\n" | |
|
3949 | 3682 | "repository.\n" |
|
3950 | 3683 | "\n" |
|
3951 | 3684 | "For more information:\n" |
|
3952 | 3685 | "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" |
|
3953 | 3686 | msgstr "" |
|
3954 | 3687 | |
|
3955 | msgid "return the correct ancestor" | |
|
3956 | msgstr "" | |
|
3957 | ||
|
3958 | 3688 | msgid "first revision, do not change ancestor\n" |
|
3959 | 3689 | msgstr "" |
|
3960 | 3690 | |
|
3961 | 3691 | msgid "" |
|
3962 | 3692 | "move changeset (and descendants) to a different branch\n" |
|
3963 | 3693 | "\n" |
|
3964 |
" Rebase uses repeated merging to graft changesets from one part of |
|
|
3965 | "history\n" | |
|
3966 | " onto another. This can be useful for linearizing local changes relative " | |
|
3967 |
" |
|
|
3968 | " a master development tree.\n" | |
|
3969 | "\n" | |
|
3970 | " If a rebase is interrupted to manually resolve a merge, it can be " | |
|
3971 | "continued\n" | |
|
3972 | " with --continue or aborted with --abort.\n" | |
|
3973 | " " | |
|
3974 | msgstr "" | |
|
3975 | ||
|
3976 | msgid "cannot use both keepbranches and extrafn" | |
|
3694 | " Rebase uses repeated merging to graft changesets from one part of\n" | |
|
3695 | " history onto another. This can be useful for linearizing local\n" | |
|
3696 | " changes relative to a master development tree.\n" | |
|
3697 | "\n" | |
|
3698 | " If a rebase is interrupted to manually resolve a merge, it can be\n" | |
|
3699 | " continued with --continue/-c or aborted with --abort/-a.\n" | |
|
3700 | " " | |
|
3977 | 3701 | msgstr "" |
|
3978 | 3702 | |
|
3979 | 3703 | msgid "cannot use both abort and continue" |
@@ -3991,6 +3715,9 b' msgstr ""' | |||
|
3991 | 3715 | msgid "nothing to rebase\n" |
|
3992 | 3716 | msgstr "" |
|
3993 | 3717 | |
|
3718 | msgid "cannot use both keepbranches and extrafn" | |
|
3719 | msgstr "" | |
|
3720 | ||
|
3994 | 3721 | msgid "rebase merging completed\n" |
|
3995 | 3722 | msgstr "" |
|
3996 | 3723 | |
@@ -4004,18 +3731,9 b' msgstr ""' | |||
|
4004 | 3731 | msgid "%d revisions have been skipped\n" |
|
4005 | 3732 | msgstr "" |
|
4006 | 3733 | |
|
4007 | msgid "" | |
|
4008 | "Skip commit if collapsing has been required and rev is not the last\n" | |
|
4009 | " revision, commit otherwise\n" | |
|
4010 | " " | |
|
4011 | msgstr "" | |
|
4012 | ||
|
4013 | 3734 | msgid " set parents\n" |
|
4014 | 3735 | msgstr "" |
|
4015 | 3736 | |
|
4016 | msgid "Rebase a single revision" | |
|
4017 | msgstr "" | |
|
4018 | ||
|
4019 | 3737 | #, python-format |
|
4020 | 3738 | msgid "rebasing %d:%s\n" |
|
4021 | 3739 | msgstr "" |
@@ -4049,16 +3767,10 b' msgstr ""' | |||
|
4049 | 3767 | msgid "next revision set to %s\n" |
|
4050 | 3768 | msgstr "" |
|
4051 | 3769 | |
|
4052 | msgid "Return the new parent relationship of the revision that will be rebased" | |
|
4053 | msgstr "" | |
|
4054 | ||
|
4055 | 3770 | #, python-format |
|
4056 | 3771 | msgid "cannot use revision %d as base, result would have 3 parents" |
|
4057 | 3772 | msgstr "" |
|
4058 | 3773 | |
|
4059 | msgid "Update rebased mq patches - finalize and then import them" | |
|
4060 | msgstr "" | |
|
4061 | ||
|
4062 | 3774 | #, python-format |
|
4063 | 3775 | msgid "revision %d is an mq patch (%s), finalize it.\n" |
|
4064 | 3776 | msgstr "" |
@@ -4067,36 +3779,21 b' msgstr ""' | |||
|
4067 | 3779 | msgid "import mq patch %d (%s)\n" |
|
4068 | 3780 | msgstr "" |
|
4069 | 3781 | |
|
4070 | msgid "Store the current status to allow recovery" | |
|
4071 | msgstr "" | |
|
4072 | ||
|
4073 | 3782 | msgid "rebase status stored\n" |
|
4074 | 3783 | msgstr "" |
|
4075 | 3784 | |
|
4076 | msgid "Remove the status files" | |
|
4077 | msgstr "" | |
|
4078 | ||
|
4079 | msgid "Restore a previously stored status" | |
|
4080 | msgstr "" | |
|
4081 | ||
|
4082 | 3785 | msgid "rebase status resumed\n" |
|
4083 | 3786 | msgstr "" |
|
4084 | 3787 | |
|
4085 | 3788 | msgid "no rebase in progress" |
|
4086 | 3789 | msgstr "" |
|
4087 | 3790 | |
|
4088 | msgid "Restore the repository to its original state" | |
|
4089 | msgstr "" | |
|
4090 | ||
|
4091 | 3791 | msgid "warning: new changesets detected on target branch, not stripping\n" |
|
4092 | 3792 | msgstr "" |
|
4093 | 3793 | |
|
4094 | 3794 | msgid "rebase aborted\n" |
|
4095 | 3795 | msgstr "" |
|
4096 | 3796 | |
|
4097 | msgid "Define which revisions are going to be rebased and where" | |
|
4098 | msgstr "" | |
|
4099 | ||
|
4100 | 3797 | msgid "cannot rebase onto an applied mq patch" |
|
4101 | 3798 | msgstr "" |
|
4102 | 3799 | |
@@ -4119,24 +3816,12 b' msgstr ""' | |||
|
4119 | 3816 | msgid "unable to collapse, there is more than one external parent" |
|
4120 | 3817 | msgstr "" |
|
4121 | 3818 | |
|
4122 | msgid "Call rebase after pull if the latter has been invoked with --rebase" | |
|
4123 | msgstr "" | |
|
4124 | ||
|
4125 | 3819 | msgid "--update and --rebase are not compatible, ignoring the update flag\n" |
|
4126 | 3820 | msgstr "" |
|
4127 | 3821 | |
|
4128 | msgid "Replace pull with a decorator to provide --rebase option" | |
|
4129 | msgstr "" | |
|
4130 | ||
|
4131 | 3822 | msgid "rebase working directory to branch head" |
|
4132 | 3823 | msgstr "" |
|
4133 | 3824 | |
|
4134 | msgid "keep original revisions" | |
|
4135 | msgstr "" | |
|
4136 | ||
|
4137 | msgid "keep original branches" | |
|
4138 | msgstr "" | |
|
4139 | ||
|
4140 | 3825 | msgid "rebase from a given revision" |
|
4141 | 3826 | msgstr "" |
|
4142 | 3827 | |
@@ -4149,6 +3834,12 b' msgstr ""' | |||
|
4149 | 3834 | msgid "collapse the rebased revisions" |
|
4150 | 3835 | msgstr "" |
|
4151 | 3836 | |
|
3837 | msgid "keep original revisions" | |
|
3838 | msgstr "" | |
|
3839 | ||
|
3840 | msgid "keep original branches" | |
|
3841 | msgstr "" | |
|
3842 | ||
|
4152 | 3843 | msgid "continue an interrupted rebase" |
|
4153 | 3844 | msgstr "" |
|
4154 | 3845 | |
@@ -4156,30 +3847,11 b' msgid "abort an interrupted rebase"' | |||
|
4156 | 3847 | msgstr "" |
|
4157 | 3848 | |
|
4158 | 3849 | msgid "" |
|
4159 |
"hg rebase [-s |
|
|
4160 | msgstr "" | |
|
4161 | ||
|
4162 | msgid "interactive change selection during commit or qrefresh" | |
|
4163 | msgstr "" | |
|
4164 | ||
|
4165 | msgid "" | |
|
4166 | "like patch.iterhunks, but yield different events\n" | |
|
4167 | "\n" | |
|
4168 | " - ('file', [header_lines + fromfile + tofile])\n" | |
|
4169 | " - ('context', [context_lines])\n" | |
|
4170 | " - ('hunk', [hunk_lines])\n" | |
|
4171 | " - ('range', (-start,len, +start,len, diffp))\n" | |
|
4172 | " " | |
|
4173 | msgstr "" | |
|
4174 | ||
|
4175 | msgid "scan lr while predicate holds" | |
|
4176 | msgstr "" | |
|
4177 | ||
|
4178 | msgid "" | |
|
4179 | "patch header\n" | |
|
4180 | "\n" | |
|
4181 | " XXX shoudn't we move this to mercurial/patch.py ?\n" | |
|
4182 | " " | |
|
3850 | "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | " | |
|
3851 | "[-c] | [-a]" | |
|
3852 | msgstr "" | |
|
3853 | ||
|
3854 | msgid "interactively select which sets of changes to commit/qrefresh" | |
|
4183 | 3855 | msgstr "" |
|
4184 | 3856 | |
|
4185 | 3857 | msgid "this modifies a binary file (all or nothing)\n" |
@@ -4192,46 +3864,35 b' msgstr ""' | |||
|
4192 | 3864 | msgid "%d hunks, %d lines changed\n" |
|
4193 | 3865 | msgstr "" |
|
4194 | 3866 | |
|
4195 | msgid "hunk -> (n+,n-)" | |
|
4196 | msgstr "" | |
|
4197 | ||
|
4198 | msgid "" | |
|
4199 | "patch hunk\n" | |
|
4200 | "\n" | |
|
4201 | " XXX shouldn't we merge this with patch.hunk ?\n" | |
|
4202 | " " | |
|
4203 | msgstr "" | |
|
4204 | ||
|
4205 | msgid "patch -> [] of hunks " | |
|
4206 | msgstr "" | |
|
4207 | ||
|
4208 | msgid "patch parsing state machine" | |
|
4209 | msgstr "" | |
|
4210 | ||
|
4211 | msgid "Interactively filter patch chunks into applied-only chunks" | |
|
4212 | msgstr "" | |
|
4213 | ||
|
4214 | msgid "" | |
|
4215 | "fetch next portion from chunks until a 'header' is seen\n" | |
|
4216 | " NB: header == new-file mark\n" | |
|
4217 | " " | |
|
4218 | msgstr "" | |
|
4219 | ||
|
4220 | msgid "" | |
|
4221 | "prompt query, and process base inputs\n" | |
|
4222 | "\n" | |
|
4223 | " - y/n for the rest of file\n" | |
|
4224 | " - y/n for the rest\n" | |
|
4225 | " - ? (help)\n" | |
|
4226 | " - q (quit)\n" | |
|
4227 | "\n" | |
|
4228 | " else, input is returned to the caller.\n" | |
|
4229 | " " | |
|
4230 | msgstr "" | |
|
4231 | ||
|
4232 | 3867 | msgid "[Ynsfdaq?]" |
|
4233 | 3868 | msgstr "" |
|
4234 | 3869 | |
|
3870 | msgid "&Yes, record this change" | |
|
3871 | msgstr "" | |
|
3872 | ||
|
3873 | msgid "&No, skip this change" | |
|
3874 | msgstr "" | |
|
3875 | ||
|
3876 | msgid "&Skip remaining changes to this file" | |
|
3877 | msgstr "" | |
|
3878 | ||
|
3879 | msgid "Record remaining changes to this &file" | |
|
3880 | msgstr "" | |
|
3881 | ||
|
3882 | msgid "&Done, skip remaining changes and files" | |
|
3883 | msgstr "" | |
|
3884 | ||
|
3885 | #, fuzzy | |
|
3886 | msgid "Record &all changes to all remaining files" | |
|
3887 | msgstr "将丢失的文件视为删除" | |
|
3888 | ||
|
3889 | #, fuzzy | |
|
3890 | msgid "&Quit, recording no changes" | |
|
3891 | msgstr "正在搜索修改\n" | |
|
3892 | ||
|
3893 | msgid "&?" | |
|
3894 | msgstr "" | |
|
3895 | ||
|
4235 | 3896 | msgid "y" |
|
4236 | 3897 | msgstr "" |
|
4237 | 3898 | |
@@ -4270,6 +3931,10 b' msgstr ""' | |||
|
4270 | 3931 | msgid "record this change to %r?" |
|
4271 | 3932 | msgstr "" |
|
4272 | 3933 | |
|
3934 | #, fuzzy, python-format | |
|
3935 | msgid "record change %d/%d to %r?" | |
|
3936 | msgstr "不需要改变 %s\n" | |
|
3937 | ||
|
4273 | 3938 | msgid "" |
|
4274 | 3939 | "interactively select changes to commit\n" |
|
4275 | 3940 | "\n" |
@@ -4280,7 +3945,7 b' msgid ""' | |||
|
4280 | 3945 | "\n" |
|
4281 | 3946 | " You will be prompted for whether to record changes to each\n" |
|
4282 | 3947 | " modified file, and for files with multiple changes, for each\n" |
|
4283 |
" change to use. |
|
|
3948 | " change to use. For each query, the following responses are\n" | |
|
4284 | 3949 | " possible:\n" |
|
4285 | 3950 | "\n" |
|
4286 | 3951 | " y - record this change\n" |
@@ -4296,35 +3961,12 b' msgid ""' | |||
|
4296 | 3961 | " ? - display help" |
|
4297 | 3962 | msgstr "" |
|
4298 | 3963 | |
|
4299 | msgid "" | |
|
4300 | "interactively record a new patch\n" | |
|
4301 | "\n" | |
|
4302 | " see 'hg help qnew' & 'hg help record' for more information and usage\n" | |
|
4303 | " " | |
|
4304 | msgstr "" | |
|
4305 | ||
|
4306 | 3964 | msgid "'mq' extension not loaded" |
|
4307 | 3965 | msgstr "" |
|
4308 | 3966 | |
|
4309 | 3967 | msgid "running non-interactively, use commit instead" |
|
4310 | 3968 | msgstr "" |
|
4311 | 3969 | |
|
4312 | msgid "" | |
|
4313 | "This is generic record driver.\n" | |
|
4314 | "\n" | |
|
4315 | " It's job is to interactively filter local changes, and accordingly\n" | |
|
4316 | " prepare working dir into a state, where the job can be delegated to\n" | |
|
4317 | " non-interactive commit command such as 'commit' or 'qrefresh'.\n" | |
|
4318 | "\n" | |
|
4319 | " After the actual job is done by non-interactive command, working dir\n" | |
|
4320 | " state is restored to original.\n" | |
|
4321 | "\n" | |
|
4322 | " In the end we'll record intresting changes, and everything else will " | |
|
4323 | "be\n" | |
|
4324 | " left in place, so the user can continue his work.\n" | |
|
4325 | " " | |
|
4326 | msgstr "" | |
|
4327 | ||
|
4328 | 3970 | msgid "no changes to record\n" |
|
4329 | 3971 | msgstr "" |
|
4330 | 3972 | |
@@ -4348,21 +3990,33 b' msgstr ""' | |||
|
4348 | 3990 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
4349 | 3991 | msgstr "" |
|
4350 | 3992 | |
|
4351 | msgid "" | |
|
4352 | "patch transplanting tool\n" | |
|
3993 | msgid "share a common history between several working directories" | |
|
3994 | msgstr "" | |
|
3995 | ||
|
3996 | msgid "" | |
|
3997 | "create a new shared repository (experimental)\n" | |
|
3998 | "\n" | |
|
3999 | " Initialize a new repository and working directory that shares its\n" | |
|
4000 | " history with another repository.\n" | |
|
4001 | "\n" | |
|
4002 | " NOTE: actions that change history such as rollback or moving the\n" | |
|
4003 | " source may confuse sharers.\n" | |
|
4004 | " " | |
|
4005 | msgstr "" | |
|
4006 | ||
|
4007 | msgid "do not create a working copy" | |
|
4008 | msgstr "" | |
|
4009 | ||
|
4010 | msgid "[-U] SOURCE [DEST]" | |
|
4011 | msgstr "" | |
|
4012 | ||
|
4013 | msgid "" | |
|
4014 | "transplant changesets from another branch\n" | |
|
4353 | 4015 | "\n" |
|
4354 | 4016 | "This extension allows you to transplant patches from another branch.\n" |
|
4355 | 4017 | "\n" |
|
4356 |
"Transplanted patches are recorded in .hg/transplant/transplants, as a |
|
|
4357 | "from a changeset hash to its hash in the source repository.\n" | |
|
4358 | msgstr "" | |
|
4359 | ||
|
4360 | msgid "" | |
|
4361 | "returns True if a node is already an ancestor of parent\n" | |
|
4362 | " or has already been transplanted" | |
|
4363 | msgstr "" | |
|
4364 | ||
|
4365 | msgid "apply the revisions in revmap one by one in revision order" | |
|
4018 | "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" | |
|
4019 | "map from a changeset hash to its hash in the source repository.\n" | |
|
4366 | 4020 | msgstr "" |
|
4367 | 4021 | |
|
4368 | 4022 | #, python-format |
@@ -4381,9 +4035,6 b' msgstr ""' | |||
|
4381 | 4035 | msgid "%s transplanted to %s\n" |
|
4382 | 4036 | msgstr "" |
|
4383 | 4037 | |
|
4384 | msgid "arbitrarily rewrite changeset before applying it" | |
|
4385 | msgstr "" | |
|
4386 | ||
|
4387 | 4038 | #, python-format |
|
4388 | 4039 | msgid "filtering %s\n" |
|
4389 | 4040 | msgstr "" |
@@ -4391,9 +4042,6 b' msgstr ""' | |||
|
4391 | 4042 | msgid "filter failed" |
|
4392 | 4043 | msgstr "" |
|
4393 | 4044 | |
|
4394 | msgid "apply the patch in patchfile to the repository as a transplant" | |
|
4395 | msgstr "" | |
|
4396 | ||
|
4397 | 4045 | msgid "can only omit patchfile if merging" |
|
4398 | 4046 | msgstr "" |
|
4399 | 4047 | |
@@ -4404,16 +4052,10 b' msgstr ""' | |||
|
4404 | 4052 | msgid "Fix up the merge and run hg transplant --continue" |
|
4405 | 4053 | msgstr "" |
|
4406 | 4054 | |
|
4407 | msgid "recover last transaction and apply remaining changesets" | |
|
4408 | msgstr "" | |
|
4409 | ||
|
4410 | 4055 | #, python-format |
|
4411 | 4056 | msgid "%s transplanted as %s\n" |
|
4412 | 4057 | msgstr "" |
|
4413 | 4058 | |
|
4414 | msgid "commit working directory using journal metadata" | |
|
4415 | msgstr "" | |
|
4416 | ||
|
4417 | 4059 | msgid "transplant log file is corrupt" |
|
4418 | 4060 | msgstr "" |
|
4419 | 4061 | |
@@ -4424,15 +4066,6 b' msgstr ""' | |||
|
4424 | 4066 | msgid "commit failed" |
|
4425 | 4067 | msgstr "" |
|
4426 | 4068 | |
|
4427 | msgid "journal changelog metadata for later recover" | |
|
4428 | msgstr "" | |
|
4429 | ||
|
4430 | msgid "remove changelog journal" | |
|
4431 | msgstr "" | |
|
4432 | ||
|
4433 | msgid "interactively transplant changesets" | |
|
4434 | msgstr "" | |
|
4435 | ||
|
4436 | 4069 | msgid "apply changeset? [ynmpcq?]:" |
|
4437 | 4070 | msgstr "" |
|
4438 | 4071 | |
@@ -4446,28 +4079,31 b' msgid ""' | |||
|
4446 | 4079 | " (transplanted from CHANGESETHASH)\n" |
|
4447 | 4080 | "\n" |
|
4448 | 4081 | " You can rewrite the changelog message with the --filter option.\n" |
|
4449 | " Its argument will be invoked with the current changelog message\n" | |
|
4450 |
" |
|
|
4451 | "\n" | |
|
4452 | " If --source is specified, selects changesets from the named\n" | |
|
4453 |
" repository. If --branch is specified, selects changesets from |
|
|
4454 |
" branch holding the named revision, up to that revision. If |
|
|
4455 |
" is specified, all changesets on the branch will be |
|
|
4456 |
" otherwise you will be prompted to select the |
|
|
4457 | "\n" | |
|
4458 | " hg transplant --branch REVISION --all will rebase the selected branch\n" | |
|
4459 | " (up to the named revision) onto your current working directory.\n" | |
|
4460 | "\n" | |
|
4461 | " You can optionally mark selected transplanted changesets as\n" | |
|
4462 | " merge changesets. You will not be prompted to transplant any\n" | |
|
4463 | " ancestors of a merged transplant, and you can merge descendants\n" | |
|
4464 | " of them normally instead of transplanting them.\n" | |
|
4082 | " Its argument will be invoked with the current changelog message as\n" | |
|
4083 | " $1 and the patch as $2.\n" | |
|
4084 | "\n" | |
|
4085 | " If --source/-s is specified, selects changesets from the named\n" | |
|
4086 | " repository. If --branch/-b is specified, selects changesets from\n" | |
|
4087 | " the branch holding the named revision, up to that revision. If\n" | |
|
4088 | " --all/-a is specified, all changesets on the branch will be\n" | |
|
4089 | " transplanted, otherwise you will be prompted to select the\n" | |
|
4090 | " changesets you want.\n" | |
|
4091 | "\n" | |
|
4092 | " hg transplant --branch REVISION --all will rebase the selected\n" | |
|
4093 | " branch (up to the named revision) onto your current working\n" | |
|
4094 | " directory.\n" | |
|
4095 | "\n" | |
|
4096 | " You can optionally mark selected transplanted changesets as merge\n" | |
|
4097 | " changesets. You will not be prompted to transplant any ancestors\n" | |
|
4098 | " of a merged transplant, and you can merge descendants of them\n" | |
|
4099 | " normally instead of transplanting them.\n" | |
|
4465 | 4100 | "\n" |
|
4466 | 4101 | " If no merges or revisions are provided, hg transplant will start\n" |
|
4467 | 4102 | " an interactive changeset browser.\n" |
|
4468 | 4103 | "\n" |
|
4469 |
" If a changeset application fails, you can fix the merge by hand |
|
|
4470 |
" then resume where you left off by calling hg transplant |
|
|
4104 | " If a changeset application fails, you can fix the merge by hand\n" | |
|
4105 | " and then resume where you left off by calling hg transplant\n" | |
|
4106 | " --continue/-c.\n" | |
|
4471 | 4107 | " " |
|
4472 | 4108 | msgstr "" |
|
4473 | 4109 | |
@@ -4521,37 +4157,33 b' msgid ""' | |||
|
4521 | 4157 | msgstr "" |
|
4522 | 4158 | |
|
4523 | 4159 | msgid "" |
|
4524 |
"allow t |
|
|
4525 | "\n" | |
|
4526 | "Some MBCS encodings are not good for some path operations\n" | |
|
4527 |
" |
|
|
4528 |
" |
|
|
4529 |
" |
|
|
4530 |
" |
|
|
4531 |
" |
|
|
4532 | "\n" | |
|
4533 |
"This extension is useful |
|
|
4160 | "allow the use of MBCS paths with problematic encoding\n" | |
|
4161 | "\n" | |
|
4162 | "Some MBCS encodings are not good for some path operations (i.e.\n" | |
|
4163 | "splitting path, case conversion, etc.) with its encoded bytes. We call\n" | |
|
4164 | "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" | |
|
4165 | "This extension can be used to fix the issue with those encodings by\n" | |
|
4166 | "wrapping some functions to convert to Unicode string before path\n" | |
|
4167 | "operation.\n" | |
|
4168 | "\n" | |
|
4169 | "This extension is useful for:\n" | |
|
4534 | 4170 | " * Japanese Windows users using shift_jis encoding.\n" |
|
4535 | 4171 | " * Chinese Windows users using big5 encoding.\n" |
|
4536 | " * All users who use a repository with one of problematic encodings\n" | |
|
4537 |
" |
|
|
4172 | " * All users who use a repository with one of problematic encodings on\n" | |
|
4173 | " case-insensitive file system.\n" | |
|
4538 | 4174 | "\n" |
|
4539 | 4175 | "This extension is not needed for:\n" |
|
4540 |
" * Any user who use only |
|
|
4176 | " * Any user who use only ASCII chars in path.\n" | |
|
4541 | 4177 | " * Any user who do not use any of problematic encodings.\n" |
|
4542 | 4178 | "\n" |
|
4543 | 4179 | "Note that there are some limitations on using this extension:\n" |
|
4544 | 4180 | " * You should use single encoding in one repository.\n" |
|
4545 |
" * You should set same encoding for the repository by locale or |
|
|
4546 | "\n" | |
|
4547 | "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" | |
|
4548 | "\n" | |
|
4549 | " [extensions]\n" | |
|
4550 | " hgext.win32mbcs =\n" | |
|
4551 | "\n" | |
|
4552 | "Path encoding conversion are done between unicode and util._encoding\n" | |
|
4553 | "which is decided by mercurial from current locale setting or HGENCODING.\n" | |
|
4554 | "\n" | |
|
4181 | " * You should set same encoding for the repository by locale or\n" | |
|
4182 | " HGENCODING.\n" | |
|
4183 | "\n" | |
|
4184 | "Path encoding conversion are done between Unicode and\n" | |
|
4185 | "encoding.encoding which is decided by Mercurial from current locale\n" | |
|
4186 | "setting or HGENCODING.\n" | |
|
4555 | 4187 | msgstr "" |
|
4556 | 4188 | |
|
4557 | 4189 | #, python-format |
@@ -4565,6 +4197,35 b' msgstr ""' | |||
|
4565 | 4197 | msgid "[win32mbcs] activated with encoding: %s\n" |
|
4566 | 4198 | msgstr "" |
|
4567 | 4199 | |
|
4200 | msgid "" | |
|
4201 | "perform automatic newline conversion\n" | |
|
4202 | "\n" | |
|
4203 | "To perform automatic newline conversion, use:\n" | |
|
4204 | "\n" | |
|
4205 | "[extensions]\n" | |
|
4206 | "hgext.win32text =\n" | |
|
4207 | "[encode]\n" | |
|
4208 | "** = cleverencode:\n" | |
|
4209 | "# or ** = macencode:\n" | |
|
4210 | "\n" | |
|
4211 | "[decode]\n" | |
|
4212 | "** = cleverdecode:\n" | |
|
4213 | "# or ** = macdecode:\n" | |
|
4214 | "\n" | |
|
4215 | "If not doing conversion, to make sure you do not commit CRLF/CR by accident:\n" | |
|
4216 | "\n" | |
|
4217 | "[hooks]\n" | |
|
4218 | "pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" | |
|
4219 | "# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" | |
|
4220 | "\n" | |
|
4221 | "To do the same check on a server to prevent CRLF/CR from being\n" | |
|
4222 | "pushed or pulled:\n" | |
|
4223 | "\n" | |
|
4224 | "[hooks]\n" | |
|
4225 | "pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" | |
|
4226 | "# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" | |
|
4227 | msgstr "" | |
|
4228 | ||
|
4568 | 4229 | #, python-format |
|
4569 | 4230 | msgid "" |
|
4570 | 4231 | "WARNING: %s already has %s line endings\n" |
@@ -4601,21 +4262,14 b' msgid ""' | |||
|
4601 | 4262 | msgstr "" |
|
4602 | 4263 | |
|
4603 | 4264 | msgid "" |
|
4604 | "zeroconf support for mercurial repositories\n" | |
|
4605 | "\n" | |
|
4606 |
"Zeroconf enabled repositories will be announced in a network without |
|
|
4607 | "need\n" | |
|
4608 | "to configure a server or a service. They can be discovered without knowing\n" | |
|
4609 | "their actual IP address.\n" | |
|
4610 | "\n" | |
|
4611 | "To use the zeroconf extension add the following entry to your hgrc file:\n" | |
|
4612 | "\n" | |
|
4613 | "[extensions]\n" | |
|
4614 | "hgext.zeroconf =\n" | |
|
4615 | "\n" | |
|
4616 | "To allow other people to discover your repository using run \"hg serve\" in " | |
|
4617 | "your\n" | |
|
4618 | "repository.\n" | |
|
4265 | "discover and advertise repositories on the local network\n" | |
|
4266 | "\n" | |
|
4267 | "Zeroconf enabled repositories will be announced in a network without\n" | |
|
4268 | "the need to configure a server or a service. They can be discovered\n" | |
|
4269 | "without knowing their actual IP address.\n" | |
|
4270 | "\n" | |
|
4271 | "To allow other people to discover your repository using run \"hg serve\"\n" | |
|
4272 | "in your repository.\n" | |
|
4619 | 4273 | "\n" |
|
4620 | 4274 | " $ cd test\n" |
|
4621 | 4275 | " $ hg serve\n" |
@@ -4665,6 +4319,9 b' msgstr ""' | |||
|
4665 | 4319 | msgid "premature EOF reading chunk (got %d bytes, expected %d)" |
|
4666 | 4320 | msgstr "" |
|
4667 | 4321 | |
|
4322 | msgid "empty username" | |
|
4323 | msgstr "" | |
|
4324 | ||
|
4668 | 4325 | #, python-format |
|
4669 | 4326 | msgid "username %s contains a newline" |
|
4670 | 4327 | msgstr "" |
@@ -4686,7 +4343,7 b' msgid "too many revisions specified"' | |||
|
4686 | 4343 | msgstr "" |
|
4687 | 4344 | |
|
4688 | 4345 | #, python-format |
|
4689 |
msgid "invalid format spec '%%%s' in output file |
|
|
4346 | msgid "invalid format spec '%%%s' in output filename" | |
|
4690 | 4347 | msgstr "" |
|
4691 | 4348 | |
|
4692 | 4349 | #, python-format |
@@ -4726,8 +4383,12 b' msgid "%s: cannot copy - %s\\n"' | |||
|
4726 | 4383 | msgstr "" |
|
4727 | 4384 | |
|
4728 | 4385 | #, python-format |
|
4729 |
msgid " |
|
|
4730 | msgstr "" | |
|
4386 | msgid "moving %s to %s\n" | |
|
4387 | msgstr "" | |
|
4388 | ||
|
4389 | #, fuzzy, python-format | |
|
4390 | msgid "copying %s to %s\n" | |
|
4391 | msgstr "正在推到 %s\n" | |
|
4731 | 4392 | |
|
4732 | 4393 | #, python-format |
|
4733 | 4394 | msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" |
@@ -4831,32 +4492,54 b' msgstr ""' | |||
|
4831 | 4492 | msgid "%s:%s copy source revision cannot be found!\n" |
|
4832 | 4493 | msgstr "" |
|
4833 | 4494 | |
|
4834 |
msgid "can only follow copies/renames for explicit file |
|
|
4835 | msgstr "" | |
|
4836 | ||
|
4837 | #, python-format | |
|
4838 | msgid "file %s not found!" | |
|
4839 | msgstr "" | |
|
4840 | ||
|
4841 | #, python-format | |
|
4842 | msgid "no match under directory %s!" | |
|
4843 | msgstr "" | |
|
4844 | ||
|
4845 | #, python-format | |
|
4846 | msgid "can't commit %s: unsupported file type!" | |
|
4847 | msgstr "" | |
|
4848 | ||
|
4849 | #, python-format | |
|
4850 | msgid "file %s not tracked!" | |
|
4851 | msgstr "" | |
|
4852 | ||
|
4495 | msgid "can only follow copies/renames for explicit filenames" | |
|
4496 | msgstr "" | |
|
4497 | ||
|
4498 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." | |
|
4499 | msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" | |
|
4500 | ||
|
4501 | msgid "HG: Leave message empty to abort commit." | |
|
4502 | msgstr "" | |
|
4503 | ||
|
4504 | #, fuzzy, python-format | |
|
4505 | msgid "HG: user: %s" | |
|
4506 | msgstr "用户: %s\n" | |
|
4507 | ||
|
4508 | msgid "HG: branch merge" | |
|
4509 | msgstr "" | |
|
4510 | ||
|
4511 | #, python-format | |
|
4512 | msgid "HG: branch '%s'" | |
|
4513 | msgstr "" | |
|
4514 | ||
|
4515 | #, python-format | |
|
4516 | msgid "HG: added %s" | |
|
4517 | msgstr "" | |
|
4518 | ||
|
4519 | #, python-format | |
|
4520 | msgid "HG: changed %s" | |
|
4521 | msgstr "" | |
|
4522 | ||
|
4523 | #, fuzzy, python-format | |
|
4524 | msgid "HG: removed %s" | |
|
4525 | msgstr "已删除" | |
|
4526 | ||
|
4527 | #, fuzzy | |
|
4528 | msgid "HG: no files changed" | |
|
4529 | msgstr "正在增加文件改变\n" | |
|
4530 | ||
|
4531 | msgid "empty commit message" | |
|
4532 | msgstr "空的提交日志" | |
|
4533 | ||
|
4534 | #, fuzzy | |
|
4853 | 4535 | msgid "" |
|
4854 | 4536 | "add the specified files on the next commit\n" |
|
4855 | 4537 | "\n" |
|
4856 |
" Schedule files to be version controlled and added to the |
|
|
4538 | " Schedule files to be version controlled and added to the\n" | |
|
4539 | " repository.\n" | |
|
4857 | 4540 | "\n" |
|
4858 | 4541 | " The files will be added to the repository at the next commit. To\n" |
|
4859 |
" undo an add before that, see hg |
|
|
4542 | " undo an add before that, see hg forget.\n" | |
|
4860 | 4543 | "\n" |
|
4861 | 4544 | " If no names are given, add all files to the repository.\n" |
|
4862 | 4545 | " " |
@@ -4874,16 +4557,19 b' msgstr ""' | |||
|
4874 | 4557 | msgid "" |
|
4875 | 4558 | "add all new files, delete all missing files\n" |
|
4876 | 4559 | "\n" |
|
4877 |
" Add all new files and remove all missing files from the |
|
|
4878 | "\n" | |
|
4879 | " New files are ignored if they match any of the patterns in .hgignore. As\n" | |
|
4880 | " with add, these changes take effect at the next commit.\n" | |
|
4881 | "\n" | |
|
4882 | " Use the -s option to detect renamed files. With a parameter > 0,\n" | |
|
4883 | " this compares every removed file with every added file and records\n" | |
|
4884 | " those similar enough as renames. This option takes a percentage\n" | |
|
4885 | " between 0 (disabled) and 100 (files must be identical) as its\n" | |
|
4886 | " parameter. Detecting renamed files this way can be expensive.\n" | |
|
4560 | " Add all new files and remove all missing files from the\n" | |
|
4561 | " repository.\n" | |
|
4562 | "\n" | |
|
4563 | " New files are ignored if they match any of the patterns in\n" | |
|
4564 | " .hgignore. As with add, these changes take effect at the next\n" | |
|
4565 | " commit.\n" | |
|
4566 | "\n" | |
|
4567 | " Use the -s/--similarity option to detect renamed files. With a\n" | |
|
4568 | " parameter > 0, this compares every removed file with every added\n" | |
|
4569 | " file and records those similar enough as renames. This option\n" | |
|
4570 | " takes a percentage between 0 (disabled) and 100 (files must be\n" | |
|
4571 | " identical) as its parameter. Detecting renamed files this way can\n" | |
|
4572 | " be expensive.\n" | |
|
4887 | 4573 | " " |
|
4888 | 4574 | msgstr "" |
|
4889 | 4575 | |
@@ -4893,18 +4579,20 b' msgstr ""' | |||
|
4893 | 4579 | msgid "similarity must be between 0 and 100" |
|
4894 | 4580 | msgstr "" |
|
4895 | 4581 | |
|
4896 | msgid "" | |
|
4897 | "show changeset information per file line\n" | |
|
4898 | "\n" | |
|
4899 | " List changes in files, showing the revision id responsible for each line\n" | |
|
4900 | "\n" | |
|
4901 | " This command is useful to discover who did a change or when a change " | |
|
4902 |
" |
|
|
4903 | " place.\n" | |
|
4904 | "\n" | |
|
4905 | " Without the -a option, annotate will avoid processing files it\n" | |
|
4906 | " detects as binary. With -a, annotate will generate an annotation\n" | |
|
4907 | " anyway, probably with undesirable results.\n" | |
|
4582 | #, fuzzy | |
|
4583 | msgid "" | |
|
4584 | "show changeset information by line for each file\n" | |
|
4585 | "\n" | |
|
4586 | " List changes in files, showing the revision id responsible for\n" | |
|
4587 | " each line\n" | |
|
4588 | "\n" | |
|
4589 | " This command is useful for discovering when a change was made and\n" | |
|
4590 | " by whom.\n" | |
|
4591 | "\n" | |
|
4592 | " Without the -a/--text option, annotate will avoid processing files\n" | |
|
4593 | " it detects as binary. With -a, annotate will annotate the file\n" | |
|
4594 | " anyway, although the results will probably be neither useful\n" | |
|
4595 | " nor desirable.\n" | |
|
4908 | 4596 | " " |
|
4909 | 4597 | msgstr "" |
|
4910 | 4598 | "显示指定文件每行的修改集信息\n" |
@@ -4917,7 +4605,7 b' msgstr ""' | |||
|
4917 | 4605 | " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n" |
|
4918 | 4606 | " " |
|
4919 | 4607 | |
|
4920 |
msgid "at least one file |
|
|
4608 | msgid "at least one filename or pattern is required" | |
|
4921 | 4609 | msgstr "" |
|
4922 | 4610 | |
|
4923 | 4611 | msgid "at least one of -n/-c is required for -l" |
@@ -4928,12 +4616,12 b' msgid "%s: binary file\\n"' | |||
|
4928 | 4616 | msgstr "" |
|
4929 | 4617 | |
|
4930 | 4618 | msgid "" |
|
4931 | "create unversioned archive of a repository revision\n" | |
|
4619 | "create an unversioned archive of a repository revision\n" | |
|
4932 | 4620 | "\n" |
|
4933 | 4621 | " By default, the revision used is the parent of the working\n" |
|
4934 |
" directory; use |
|
|
4935 | "\n" | |
|
4936 |
" To specify the type of archive to create, use |
|
|
4622 | " directory; use -r/--rev to specify a different revision.\n" | |
|
4623 | "\n" | |
|
4624 | " To specify the type of archive to create, use -t/--type. Valid\n" | |
|
4937 | 4625 | " types are:\n" |
|
4938 | 4626 | "\n" |
|
4939 | 4627 | " \"files\" (default): a directory full of files\n" |
@@ -4944,11 +4632,12 b' msgid ""' | |||
|
4944 | 4632 | " \"zip\": zip archive, compressed using deflate\n" |
|
4945 | 4633 | "\n" |
|
4946 | 4634 | " The exact name of the destination archive or directory is given\n" |
|
4947 |
" using a format string; see |
|
|
4635 | " using a format string; see 'hg help export' for details.\n" | |
|
4948 | 4636 | "\n" |
|
4949 | 4637 | " Each member added to an archive file has a directory prefix\n" |
|
4950 |
" prepended. Use |
|
|
4951 |
" The default is the basename of the archive, with suffixes |
|
|
4638 | " prepended. Use -p/--prefix to specify a format string for the\n" | |
|
4639 | " prefix. The default is the basename of the archive, with suffixes\n" | |
|
4640 | " removed.\n" | |
|
4952 | 4641 | " " |
|
4953 | 4642 | msgstr "" |
|
4954 | 4643 | |
@@ -4967,15 +4656,14 b' msgid ""' | |||
|
4967 | 4656 | " Commit the backed out changes as a new changeset. The new\n" |
|
4968 | 4657 | " changeset is a child of the backed out changeset.\n" |
|
4969 | 4658 | "\n" |
|
4970 |
" If you back |
|
|
4659 | " If you backout a changeset other than the tip, a new head is\n" | |
|
4971 | 4660 | " created. This head will be the new tip and you should merge this\n" |
|
4972 |
" backout changeset with another head |
|
|
4661 | " backout changeset with another head.\n" | |
|
4973 | 4662 | "\n" |
|
4974 | 4663 | " The --merge option remembers the parent of the working directory\n" |
|
4975 | 4664 | " before starting the backout, then merges the new head with that\n" |
|
4976 | " changeset afterwards. This saves you from doing the merge by\n" | |
|
4977 |
" |
|
|
4978 | " merge.\n" | |
|
4665 | " changeset afterwards. This saves you from doing the merge by hand.\n" | |
|
4666 | " The result of this merge is not committed, as with a normal merge.\n" | |
|
4979 | 4667 | "\n" |
|
4980 | 4668 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
4981 | 4669 | " " |
@@ -4987,13 +4675,13 b' msgstr ""' | |||
|
4987 | 4675 | msgid "please specify a revision to backout" |
|
4988 | 4676 | msgstr "" |
|
4989 | 4677 | |
|
4990 |
msgid "cannot back |
|
|
4991 | msgstr "" | |
|
4992 | ||
|
4993 |
msgid "cannot back |
|
|
4994 | msgstr "" | |
|
4995 | ||
|
4996 |
msgid "cannot back |
|
|
4678 | msgid "cannot backout change on a different branch" | |
|
4679 | msgstr "" | |
|
4680 | ||
|
4681 | msgid "cannot backout a change with no parents" | |
|
4682 | msgstr "" | |
|
4683 | ||
|
4684 | msgid "cannot backout a merge changeset without --parent" | |
|
4997 | 4685 | msgstr "" |
|
4998 | 4686 | |
|
4999 | 4687 | #, python-format |
@@ -5024,35 +4712,36 b' msgstr ""' | |||
|
5024 | 4712 | msgid "" |
|
5025 | 4713 | "subdivision search of changesets\n" |
|
5026 | 4714 | "\n" |
|
5027 | " This command helps to find changesets which introduce problems.\n" | |
|
5028 |
" |
|
|
5029 |
" |
|
|
5030 |
" |
|
|
5031 |
" |
|
|
5032 |
" |
|
|
5033 |
" |
|
|
4715 | " This command helps to find changesets which introduce problems. To\n" | |
|
4716 | " use, mark the earliest changeset you know exhibits the problem as\n" | |
|
4717 | " bad, then mark the latest changeset which is free from the problem\n" | |
|
4718 | " as good. Bisect will update your working directory to a revision\n" | |
|
4719 | " for testing (unless the -U/--noupdate option is specified). Once\n" | |
|
4720 | " you have performed tests, mark the working directory as good or\n" | |
|
4721 | " bad, and bisect will either update to another candidate changeset\n" | |
|
5034 | 4722 | " or announce that it has found the bad revision.\n" |
|
5035 | 4723 | "\n" |
|
5036 | 4724 | " As a shortcut, you can also use the revision argument to mark a\n" |
|
5037 | 4725 | " revision as good or bad without checking it out first.\n" |
|
5038 | 4726 | "\n" |
|
5039 |
" If you supply a command it will be used for automatic bisection. |
|
|
5040 | "exit\n" | |
|
5041 | " status will be used as flag to mark revision as bad or good. In case " | |
|
5042 | "exit\n" | |
|
5043 | " status is 0 the revision is marked as good, 125 - skipped, 127 (command " | |
|
5044 | "not\n" | |
|
5045 | " found) - bisection will be aborted; any other status bigger than 0 will\n" | |
|
5046 | " mark revision as bad.\n" | |
|
5047 | " " | |
|
5048 | msgstr "" | |
|
5049 | ||
|
5050 | #, python-format | |
|
5051 | msgid "The first %s revision is:\n" | |
|
5052 | msgstr "" | |
|
5053 | ||
|
5054 | #, python-format | |
|
5055 | msgid "Due to skipped revisions, the first %s revision could be any of:\n" | |
|
4727 | " If you supply a command, it will be used for automatic bisection.\n" | |
|
4728 | " Its exit status will be used to mark revisions as good or bad:\n" | |
|
4729 | " status 0 means good, 125 means to skip the revision, 127\n" | |
|
4730 | " (command not found) will abort the bisection, and any other\n" | |
|
4731 | " non-zero exit status means the revision is bad.\n" | |
|
4732 | " " | |
|
4733 | msgstr "" | |
|
4734 | ||
|
4735 | msgid "The first good revision is:\n" | |
|
4736 | msgstr "" | |
|
4737 | ||
|
4738 | msgid "The first bad revision is:\n" | |
|
4739 | msgstr "" | |
|
4740 | ||
|
4741 | msgid "Due to skipped revisions, the first good revision could be any of:\n" | |
|
4742 | msgstr "" | |
|
4743 | ||
|
4744 | msgid "Due to skipped revisions, the first bad revision could be any of:\n" | |
|
5056 | 4745 | msgstr "" |
|
5057 | 4746 | |
|
5058 | 4747 | msgid "cannot bisect (no known good revisions)" |
@@ -5068,6 +4757,10 b' msgid "incompatible arguments"' | |||
|
5068 | 4757 | msgstr "" |
|
5069 | 4758 | |
|
5070 | 4759 | #, python-format |
|
4760 | msgid "cannot find executable: %s" | |
|
4761 | msgstr "" | |
|
4762 | ||
|
4763 | #, python-format | |
|
5071 | 4764 | msgid "failed to execute %s" |
|
5072 | 4765 | msgstr "" |
|
5073 | 4766 | |
@@ -5075,9 +4768,9 b' msgstr ""' | |||
|
5075 | 4768 | msgid "%s killed" |
|
5076 | 4769 | msgstr "" |
|
5077 | 4770 | |
|
5078 | #, python-format | |
|
5079 | msgid "Changeset %s: %s\n" | |
|
5080 | msgstr "" | |
|
4771 | #, fuzzy, python-format | |
|
4772 | msgid "Changeset %d:%s: %s\n" | |
|
4773 | msgstr "修改集: %d:%s\n" | |
|
5081 | 4774 | |
|
5082 | 4775 | #, python-format |
|
5083 | 4776 | msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" |
@@ -5087,14 +4780,17 b' msgid ""' | |||
|
5087 | 4780 | "set or show the current branch name\n" |
|
5088 | 4781 | "\n" |
|
5089 | 4782 | " With no argument, show the current branch name. With one argument,\n" |
|
5090 |
" set the working directory branch name (the branch |
|
|
5091 | " the repository until the next commit).\n" | |
|
5092 | "\n" | |
|
5093 | " Unless --force is specified, branch will not let you set a\n" | |
|
5094 | " branch name that shadows an existing branch.\n" | |
|
5095 | "\n" | |
|
5096 | " Use --clean to reset the working directory branch to that of the\n" | |
|
5097 | " parent of the working directory, negating a previous branch change.\n" | |
|
4783 | " set the working directory branch name (the branch will not exist\n" | |
|
4784 | " in the repository until the next commit). Standard practice\n" | |
|
4785 | " recommends that primary development take place on the 'default'\n" | |
|
4786 | " branch.\n" | |
|
4787 | "\n" | |
|
4788 | " Unless -f/--force is specified, branch will not let you set a\n" | |
|
4789 | " branch name that already exists, even if it's inactive.\n" | |
|
4790 | "\n" | |
|
4791 | " Use -C/--clean to reset the working directory branch to that of\n" | |
|
4792 | " the parent of the working directory, negating a previous branch\n" | |
|
4793 | " change.\n" | |
|
5098 | 4794 | "\n" |
|
5099 | 4795 | " Use the command 'hg update' to switch to an existing branch.\n" |
|
5100 | 4796 | " " |
@@ -5132,20 +4828,23 b' msgid ""' | |||
|
5132 | 4828 | " If no destination repository is specified the destination is\n" |
|
5133 | 4829 | " assumed to have all the nodes specified by one or more --base\n" |
|
5134 | 4830 | " parameters. To create a bundle containing all changesets, use\n" |
|
5135 | " --all (or --base null). To change the compression method applied,\n" | |
|
5136 | " use the -t option (by default, bundles are compressed using bz2).\n" | |
|
5137 | "\n" | |
|
5138 | " The bundle file can then be transferred using conventional means and\n" | |
|
5139 | " applied to another repository with the unbundle or pull command.\n" | |
|
5140 | " This is useful when direct push and pull are not available or when\n" | |
|
5141 | " exporting an entire repository is undesirable.\n" | |
|
4831 | " -a/--all (or --base null).\n" | |
|
4832 | "\n" | |
|
4833 | " To change the compression method applied, use the -t/--type\n" | |
|
4834 | " option. The available compression methods are: none, bzip2, and\n" | |
|
4835 | " gzip (by default, bundles are compressed using bzip2).\n" | |
|
4836 | "\n" | |
|
4837 | " The bundle file can then be transferred using conventional means\n" | |
|
4838 | " and applied to another repository with the unbundle or pull\n" | |
|
4839 | " command. This is useful when direct push and pull are not\n" | |
|
4840 | " available or when exporting an entire repository is undesirable.\n" | |
|
5142 | 4841 | "\n" |
|
5143 | 4842 | " Applying bundles preserves all changeset contents including\n" |
|
5144 | 4843 | " permissions, copy/rename information, and revision history.\n" |
|
5145 | 4844 | " " |
|
5146 | 4845 | msgstr "" |
|
5147 | 4846 | |
|
5148 |
msgid "--base is incompatible with specif |
|
|
4847 | msgid "--base is incompatible with specifying a destination" | |
|
5149 | 4848 | msgstr "" |
|
5150 | 4849 | |
|
5151 | 4850 | msgid "unknown bundle type specified with --type" |
@@ -5154,8 +4853,8 b' msgstr ""' | |||
|
5154 | 4853 | msgid "" |
|
5155 | 4854 | "output the current or given revision of files\n" |
|
5156 | 4855 | "\n" |
|
5157 | " Print the specified files as they were at the given revision.\n" | |
|
5158 |
" |
|
|
4856 | " Print the specified files as they were at the given revision. If\n" | |
|
4857 | " no revision is given, the parent of the working directory is used,\n" | |
|
5159 | 4858 | " or tip if no revision is checked out.\n" |
|
5160 | 4859 | "\n" |
|
5161 | 4860 | " Output may be to a file, in which case the name of the file is\n" |
@@ -5163,7 +4862,7 b' msgid ""' | |||
|
5163 | 4862 | " for the export command, with the following additions:\n" |
|
5164 | 4863 | "\n" |
|
5165 | 4864 | " %s basename of file being printed\n" |
|
5166 | " %d dirname of file being printed, or '.' if in repo root\n" | |
|
4865 | " %d dirname of file being printed, or '.' if in repository root\n" | |
|
5167 | 4866 | " %p root-relative path name of file being printed\n" |
|
5168 | 4867 | " " |
|
5169 | 4868 | msgstr "" |
@@ -5179,6 +4878,22 b' msgid ""' | |||
|
5179 | 4878 | " The location of the source is added to the new repository's\n" |
|
5180 | 4879 | " .hg/hgrc file, as the default to be used for future pulls.\n" |
|
5181 | 4880 | "\n" |
|
4881 | " If you use the -r/--rev option to clone up to a specific revision,\n" | |
|
4882 | " no subsequent revisions (including subsequent tags) will be\n" | |
|
4883 | " present in the cloned repository. This option implies --pull, even\n" | |
|
4884 | " on local repositories.\n" | |
|
4885 | "\n" | |
|
4886 | " By default, clone will check out the head of the 'default' branch.\n" | |
|
4887 | " If the -U/--noupdate option is used, the new clone will contain\n" | |
|
4888 | " only a repository (.hg) and no working copy (the working copy\n" | |
|
4889 | " parent is the null revision).\n" | |
|
4890 | "\n" | |
|
4891 | " See 'hg help urls' for valid source format details.\n" | |
|
4892 | "\n" | |
|
4893 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
4894 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
4895 | " Please see 'hg help urls' for important details about ssh:// URLs.\n" | |
|
4896 | "\n" | |
|
5182 | 4897 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
5183 | 4898 | " and destination are on the same filesystem (note this applies only\n" |
|
5184 | 4899 | " to the repository data, not to the checked out files). Some\n" |
@@ -5191,75 +4906,32 b' msgid ""' | |||
|
5191 | 4906 | "\n" |
|
5192 | 4907 | " $ cp -al REPO REPOCLONE\n" |
|
5193 | 4908 | "\n" |
|
5194 |
" This is the fastest way to clone, but it is not always safe. |
|
|
4909 | " This is the fastest way to clone, but it is not always safe. The\n" | |
|
5195 | 4910 | " operation is not atomic (making sure REPO is not modified during\n" |
|
5196 | 4911 | " the operation is up to you) and you have to make sure your editor\n" |
|
5197 |
" breaks hardlinks (Emacs and most Linux Kernel tools do so). |
|
|
4912 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
|
5198 | 4913 | " this is not compatible with certain extensions that place their\n" |
|
5199 | 4914 | " metadata under the .hg directory, such as mq.\n" |
|
5200 | 4915 | "\n" |
|
5201 | " If you use the -r option to clone up to a specific revision, no\n" | |
|
5202 | " subsequent revisions will be present in the cloned repository.\n" | |
|
5203 | " This option implies --pull, even on local repositories.\n" | |
|
5204 | "\n" | |
|
5205 | " If the -U option is used, the new clone will contain only a repository\n" | |
|
5206 | " (.hg) and no working copy (the working copy parent is the null " | |
|
5207 | "revision).\n" | |
|
5208 | "\n" | |
|
5209 | " See 'hg help urls' for valid source format details.\n" | |
|
5210 | "\n" | |
|
5211 | " It is possible to specify an ssh:// URL as the destination, but no\n" | |
|
5212 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
|
5213 | " Look at the help text for urls for important details about ssh:// URLs.\n" | |
|
5214 | " " | |
|
5215 | msgstr "" | |
|
5216 | "复制现有版本库\n" | |
|
5217 | "\n" | |
|
5218 | " 在新目录创建现有版本库的副本。\n" | |
|
5219 | "\n" | |
|
5220 | " 如果没有指定目标目录,默认使用源版本库的基本名称。\n" | |
|
5221 | "\n" | |
|
5222 | " 源版本库的位置增加到新版本库的文件 .hg/hgrc 中,作为未来更新时的默认\n" | |
|
5223 | " 位置。\n" | |
|
5224 | "\n" | |
|
5225 | " 为了效率,在复制时,只要源版本库和目标版本库位于同一文件系统,就会使\n" | |
|
5226 | " 用硬链接(注意这只适用于版本库中的数据,不适用于检出的文件)。某些文件\n" | |
|
5227 | " 系统,例如 AFS,没有正确实现硬链接,还不报告错误。在这些情况下,请使\n" | |
|
5228 | " 用选项 '--pull'来避免硬链接。\n" | |
|
5229 | "\n" | |
|
5230 | " 在某些情况下,你可以通过下述命令用硬链接复制且检出文件:\n" | |
|
5231 | "\n" | |
|
5232 | " $ cp -al REPO REPOCLONE\n" | |
|
5233 | "\n" | |
|
5234 | " 这是最快速的复制方法,但是不见得总是安全。此操作不是原子的(请确认在你\n" | |
|
5235 | " 操作期间版本库未修改),还要确认你的编辑器会破坏硬链接。还有,它与将元\n" | |
|
5236 | " 数据放到目录 .hg 中的某些扩展不兼容,例如 mq。\n" | |
|
5237 | "\n" | |
|
5238 | " 如果你使用选项 '-r' 复制指定版本,那么后来的版本不会在新版本库中出现。\n" | |
|
5239 | " 此选项暗示 '--pull',纵然是操作本地版本库。\n" | |
|
5240 | "\n" | |
|
5241 | " 如果你使用了选项 '-U',那么新仓库只包含版本库(.hg),没有工作副本。\n" | |
|
5242 | "\n" | |
|
5243 | " 参见 'hg help urls' 以了解有效源格式的详情。\n" | |
|
5244 | "\n" | |
|
5245 | " 也可以指定位置 'ssh://' 作为目标,但是不会创建文件 .hg/hgrc,并且工作\n" | |
|
5246 | " 副本将会创建在远程。参见主题 'urls' 的帮助信息,以了解位置 'ssh://'\n" | |
|
5247 | " 的重要详情。\n" | |
|
5248 | " " | |
|
5249 | ||
|
4916 | " " | |
|
4917 | msgstr "" | |
|
4918 | ||
|
4919 | #, fuzzy | |
|
5250 | 4920 | msgid "" |
|
5251 | 4921 | "commit the specified files or all outstanding changes\n" |
|
5252 | 4922 | "\n" |
|
5253 | " Commit changes to the given files into the repository.\n" | |
|
4923 | " Commit changes to the given files into the repository. Unlike a\n" | |
|
4924 | " centralized RCS, this operation is a local operation. See hg push\n" | |
|
4925 | " for a way to actively distribute your changes.\n" | |
|
5254 | 4926 | "\n" |
|
5255 | 4927 | " If a list of files is omitted, all changes reported by \"hg status\"\n" |
|
5256 | 4928 | " will be committed.\n" |
|
5257 | 4929 | "\n" |
|
5258 | 4930 | " If you are committing the result of a merge, do not provide any\n" |
|
5259 |
" file |
|
|
5260 | "\n" | |
|
5261 |
" If no commit message is specified, the configured editor is |
|
|
5262 | " prompt you for a message.\n" | |
|
4931 | " filenames or -I/-X filters.\n" | |
|
4932 | "\n" | |
|
4933 | " If no commit message is specified, the configured editor is\n" | |
|
4934 | " started to prompt you for a message.\n" | |
|
5263 | 4935 | "\n" |
|
5264 | 4936 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5265 | 4937 | " " |
@@ -5292,7 +4964,7 b' msgid ""' | |||
|
5292 | 4964 | " the source must be a single file.\n" |
|
5293 | 4965 | "\n" |
|
5294 | 4966 | " By default, this command copies the contents of files as they\n" |
|
5295 |
" st |
|
|
4967 | " exist in the working directory. If invoked with -A/--after, the\n" | |
|
5296 | 4968 | " operation is recorded, but no copying is performed.\n" |
|
5297 | 4969 | "\n" |
|
5298 | 4970 | " This command takes effect with the next commit. To undo a copy\n" |
@@ -5340,13 +5012,17 b' msgstr ""' | |||
|
5340 | 5012 | msgid "" |
|
5341 | 5013 | "show combined config settings from all hgrc files\n" |
|
5342 | 5014 | "\n" |
|
5343 | " With no args, print names and values of all config items.\n" | |
|
5344 | "\n" | |
|
5345 |
" With one arg of the form section.name, print just the value |
|
|
5346 | " that config item.\n" | |
|
5347 | "\n" | |
|
5348 |
" With multiple args, print names and values of all config |
|
|
5349 | " with matching section names." | |
|
5015 | " With no arguments, print names and values of all config items.\n" | |
|
5016 | "\n" | |
|
5017 | " With one argument of the form section.name, print just the value\n" | |
|
5018 | " of that config item.\n" | |
|
5019 | "\n" | |
|
5020 | " With multiple arguments, print names and values of all config\n" | |
|
5021 | " items with matching section names.\n" | |
|
5022 | "\n" | |
|
5023 | " With --debug, the source (filename and line number) is printed\n" | |
|
5024 | " for each config item.\n" | |
|
5025 | " " | |
|
5350 | 5026 | msgstr "" |
|
5351 | 5027 | |
|
5352 | 5028 | msgid "only one config item permitted" |
@@ -5380,7 +5056,7 b' msgstr ""' | |||
|
5380 | 5056 | msgid "dump the contents of an index file" |
|
5381 | 5057 | msgstr "" |
|
5382 | 5058 | |
|
5383 |
msgid "dump an index DAG as a |
|
|
5059 | msgid "dump an index DAG as a graphviz dot file" | |
|
5384 | 5060 | msgstr "" |
|
5385 | 5061 | |
|
5386 | 5062 | msgid "test Mercurial installation" |
@@ -5470,6 +5146,7 b' msgstr ""' | |||
|
5470 | 5146 | msgid "show how files match on given patterns" |
|
5471 | 5147 | msgstr "" |
|
5472 | 5148 | |
|
5149 | #, fuzzy | |
|
5473 | 5150 | msgid "" |
|
5474 | 5151 | "diff repository (or selected files)\n" |
|
5475 | 5152 | "\n" |
@@ -5487,12 +5164,12 b' msgid ""' | |||
|
5487 | 5164 | " revisions are specified, the working directory files are compared\n" |
|
5488 | 5165 | " to its parent.\n" |
|
5489 | 5166 | "\n" |
|
5490 |
" Without the -a option, diff will avoid generating diffs of |
|
|
5491 |
" it detects as binary. With -a, diff will generate a diff |
|
|
5492 | " probably with undesirable results.\n" | |
|
5493 | "\n" | |
|
5494 | " Use the --git option to generate diffs in the git extended diff\n" | |
|
5495 | " format. For more information, read hg help diffs.\n" | |
|
5167 | " Without the -a/--text option, diff will avoid generating diffs of\n" | |
|
5168 | " files it detects as binary. With -a, diff will generate a diff\n" | |
|
5169 | " anyway, probably with undesirable results.\n" | |
|
5170 | "\n" | |
|
5171 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
|
5172 | " format. For more information, read 'hg help diffs'.\n" | |
|
5496 | 5173 | " " |
|
5497 | 5174 | msgstr "" |
|
5498 | 5175 | "在版本库中比较(指定的文件)\n" |
@@ -5515,6 +5192,7 b' msgstr ""' | |||
|
5515 | 5192 | " 了解更多信息。\n" |
|
5516 | 5193 | " " |
|
5517 | 5194 | |
|
5195 | #, fuzzy | |
|
5518 | 5196 | msgid "" |
|
5519 | 5197 | "dump the header and diffs for one or more changesets\n" |
|
5520 | 5198 | "\n" |
@@ -5523,8 +5201,9 b' msgid ""' | |||
|
5523 | 5201 | " The information shown in the changeset header is: author,\n" |
|
5524 | 5202 | " changeset hash, parent(s) and commit comment.\n" |
|
5525 | 5203 | "\n" |
|
5526 |
" NOTE: export may generate unexpected diff output for merge |
|
|
5527 |
" as it will compare the merge changeset against its |
|
|
5204 | " NOTE: export may generate unexpected diff output for merge\n" | |
|
5205 | " changesets, as it will compare the merge changeset against its\n" | |
|
5206 | " first parent only.\n" | |
|
5528 | 5207 | "\n" |
|
5529 | 5208 | " Output may be to a file, in which case the name of the file is\n" |
|
5530 | 5209 | " given using a format string. The formatting rules are as follows:\n" |
@@ -5538,15 +5217,15 b' msgid ""' | |||
|
5538 | 5217 | " %n zero-padded sequence number, starting at 1\n" |
|
5539 | 5218 | " %r zero-padded changeset revision number\n" |
|
5540 | 5219 | "\n" |
|
5541 |
" Without the -a option, export will avoid generating diff |
|
|
5542 |
" it detects as binary. With -a, export will generate a |
|
|
5543 | " probably with undesirable results.\n" | |
|
5544 | "\n" | |
|
5545 | " Use the --git option to generate diffs in the git extended diff\n" | |
|
5546 |
" format. |
|
|
5547 | "\n" | |
|
5548 |
" With the --switch-parent option, the diff will be against the |
|
|
5549 | " parent. It can be useful to review a merge.\n" | |
|
5220 | " Without the -a/--text option, export will avoid generating diffs\n" | |
|
5221 | " of files it detects as binary. With -a, export will generate a\n" | |
|
5222 | " diff anyway, probably with undesirable results.\n" | |
|
5223 | "\n" | |
|
5224 | " Use the -g/--git option to generate diffs in the git extended diff\n" | |
|
5225 | " format. See 'hg help diffs' for more information.\n" | |
|
5226 | "\n" | |
|
5227 | " With the --switch-parent option, the diff will be against the\n" | |
|
5228 | " second parent. It can be useful to review a merge.\n" | |
|
5550 | 5229 | " " |
|
5551 | 5230 | msgstr "" |
|
5552 | 5231 | "为一个或多个修改集输出标题和差异\n" |
@@ -5589,14 +5268,35 b' msgid "exporting patch:\\n"' | |||
|
5589 | 5268 | msgstr "" |
|
5590 | 5269 | |
|
5591 | 5270 | msgid "" |
|
5271 | "forget the specified files on the next commit\n" | |
|
5272 | "\n" | |
|
5273 | " Mark the specified files so they will no longer be tracked\n" | |
|
5274 | " after the next commit.\n" | |
|
5275 | "\n" | |
|
5276 | " This only removes files from the current branch, not from the\n" | |
|
5277 | " entire project history, and it does not delete them from the\n" | |
|
5278 | " working directory.\n" | |
|
5279 | "\n" | |
|
5280 | " To undo a forget before the next commit, see hg add.\n" | |
|
5281 | " " | |
|
5282 | msgstr "" | |
|
5283 | ||
|
5284 | msgid "no files specified" | |
|
5285 | msgstr "" | |
|
5286 | ||
|
5287 | #, python-format | |
|
5288 | msgid "not removing %s: file is already untracked\n" | |
|
5289 | msgstr "" | |
|
5290 | ||
|
5291 | msgid "" | |
|
5592 | 5292 | "search for a pattern in specified files and revisions\n" |
|
5593 | 5293 | "\n" |
|
5594 | 5294 | " Search revisions of files for a regular expression.\n" |
|
5595 | 5295 | "\n" |
|
5596 | 5296 | " This command behaves differently than Unix grep. It only accepts\n" |
|
5597 | 5297 | " Python/Perl regexps. It searches repository history, not the\n" |
|
5598 | " working directory. It always prints the revision number in which\n" | |
|
5599 |
" |
|
|
5298 | " working directory. It always prints the revision number in which a\n" | |
|
5299 | " match appears.\n" | |
|
5600 | 5300 | "\n" |
|
5601 | 5301 | " By default, grep only prints output for the first revision of a\n" |
|
5602 | 5302 | " file in which it finds a match. To get it to print every revision\n" |
@@ -5615,19 +5315,28 b' msgid ""' | |||
|
5615 | 5315 | "\n" |
|
5616 | 5316 | " With no arguments, show all repository head changesets.\n" |
|
5617 | 5317 | "\n" |
|
5618 | " If branch or revisions names are given this will show the heads of\n" | |
|
5619 | " the specified branches or the branches those revisions are tagged\n" | |
|
5620 | " with.\n" | |
|
5621 | "\n" | |
|
5622 | 5318 | " Repository \"heads\" are changesets that don't have child\n" |
|
5623 | 5319 | " changesets. They are where development generally takes place and\n" |
|
5624 | 5320 | " are the usual targets for update and merge operations.\n" |
|
5625 | 5321 | "\n" |
|
5626 | " Branch heads are changesets that have a given branch tag, but have\n" | |
|
5627 | " no child changesets with that tag. They are usually where\n" | |
|
5628 | " development on the given branch takes place.\n" | |
|
5629 | " " | |
|
5630 | msgstr "" | |
|
5322 | " If one or more REV is given, the \"branch heads\" will be shown for\n" | |
|
5323 | " the named branch associated with that revision. The name of the\n" | |
|
5324 | " branch is called the revision's branch tag.\n" | |
|
5325 | "\n" | |
|
5326 | " Branch heads are revisions on a given named branch that do not have\n" | |
|
5327 | " any children on the same branch. A branch head could be a true head\n" | |
|
5328 | " or it could be the last changeset on a branch before a new branch\n" | |
|
5329 | " was created. If none of the branch heads are true heads, the branch\n" | |
|
5330 | " is considered inactive.\n" | |
|
5331 | "\n" | |
|
5332 | " If STARTREV is specified only those heads (or branch heads) that\n" | |
|
5333 | " are descendants of STARTREV will be displayed.\n" | |
|
5334 | " " | |
|
5335 | msgstr "" | |
|
5336 | ||
|
5337 | #, fuzzy, python-format | |
|
5338 | msgid "no open branch heads on branch %s\n" | |
|
5339 | msgstr "svn: 分支没有版本 %s" | |
|
5631 | 5340 | |
|
5632 | 5341 | #, python-format |
|
5633 | 5342 | msgid "no changes on branch %s containing %s are reachable from %s\n" |
@@ -5640,9 +5349,10 b' msgstr ""' | |||
|
5640 | 5349 | msgid "" |
|
5641 | 5350 | "show help for a given topic or a help overview\n" |
|
5642 | 5351 | "\n" |
|
5643 |
" With no arguments, print a list of commands |
|
|
5644 | "\n" | |
|
5645 |
" Given a topic, extension, or command name, print help for that |
|
|
5352 | " With no arguments, print a list of commands with short help messages.\n" | |
|
5353 | "\n" | |
|
5354 | " Given a topic, extension, or command name, print help for that\n" | |
|
5355 | " topic." | |
|
5646 | 5356 | msgstr "" |
|
5647 | 5357 | |
|
5648 | 5358 | msgid "global options:" |
@@ -5686,19 +5396,13 b' msgstr "\xe9\x80\x89\xe9\xa1\xb9:\\n"' | |||
|
5686 | 5396 | msgid "no commands defined\n" |
|
5687 | 5397 | msgstr "" |
|
5688 | 5398 | |
|
5689 | msgid "" | |
|
5690 | "\n" | |
|
5691 | "enabled extensions:\n" | |
|
5692 | "\n" | |
|
5399 | #, fuzzy | |
|
5400 | msgid "enabled extensions:" | |
|
5693 | 5401 | msgstr "" |
|
5694 | 5402 | "\n" |
|
5695 | 5403 | "启用的扩展:\n" |
|
5696 | 5404 | "\n" |
|
5697 | 5405 | |
|
5698 | #, python-format | |
|
5699 | msgid " %s %s\n" | |
|
5700 | msgstr "" | |
|
5701 | ||
|
5702 | 5406 | msgid "no help text available" |
|
5703 | 5407 | msgstr "没有可用的帮助信息" |
|
5704 | 5408 | |
@@ -5728,14 +5432,16 b' msgstr ""' | |||
|
5728 | 5432 | msgid "" |
|
5729 | 5433 | "identify the working copy or specified revision\n" |
|
5730 | 5434 | "\n" |
|
5731 |
" With no revision, print a summary of the current state of the |
|
|
5732 | "\n" | |
|
5733 | " With a path, do a lookup in another repository.\n" | |
|
5734 | "\n" | |
|
5735 | " This summary identifies the repository state using one or two parent\n" | |
|
5736 | " hash identifiers, followed by a \"+\" if there are uncommitted changes\n" | |
|
5737 | " in the working directory, a list of tags for this revision and a branch\n" | |
|
5738 | " name for non-default branches.\n" | |
|
5435 | " With no revision, print a summary of the current state of the\n" | |
|
5436 | " repository.\n" | |
|
5437 | "\n" | |
|
5438 | " Specifying a path to a repository root or Mercurial bundle will\n" | |
|
5439 | " cause lookup to operate on that repository/bundle.\n" | |
|
5440 | "\n" | |
|
5441 | " This summary identifies the repository state using one or two\n" | |
|
5442 | " parent hash identifiers, followed by a \"+\" if there are\n" | |
|
5443 | " uncommitted changes in the working directory, a list of tags for\n" | |
|
5444 | " this revision and a branch name for non-default branches.\n" | |
|
5739 | 5445 | " " |
|
5740 | 5446 | msgstr "" |
|
5741 | 5447 | |
@@ -5745,29 +5451,30 b' msgid ""' | |||
|
5745 | 5451 | " Import a list of patches and commit them individually.\n" |
|
5746 | 5452 | "\n" |
|
5747 | 5453 | " If there are outstanding changes in the working directory, import\n" |
|
5748 | " will abort unless given the -f flag.\n" | |
|
5454 | " will abort unless given the -f/--force flag.\n" | |
|
5749 | 5455 | "\n" |
|
5750 | 5456 | " You can import a patch straight from a mail message. Even patches\n" |
|
5751 |
" as attachments work (body part must |
|
|
5752 |
" text/x-patch |
|
|
5457 | " as attachments work (to use the body part, it must have type\n" | |
|
5458 | " text/plain or text/x-patch). From and Subject headers of email\n" | |
|
5753 | 5459 | " message are used as default committer and commit message. All\n" |
|
5754 | 5460 | " text/plain body parts before first diff are added to commit\n" |
|
5755 | 5461 | " message.\n" |
|
5756 | 5462 | "\n" |
|
5757 |
" If the imported patch was generated by hg export, user and |
|
|
5758 |
" from patch override values from message headers and |
|
|
5759 |
" given on command line with -m and -u |
|
|
5760 | "\n" | |
|
5761 | " If --exact is specified, import will set the working directory\n" | |
|
5762 | " to the parent of each patch before applying it, and will abort\n" | |
|
5763 | " if the resulting changeset has a different ID than the one\n" | |
|
5764 | " recorded in the patch. This may happen due to character set\n" | |
|
5765 | " problems or other deficiencies in the text patch format.\n" | |
|
5766 | "\n" | |
|
5767 | " With --similarity, hg will attempt to discover renames and copies\n" | |
|
5768 | " in the patch in the same way as 'addremove'.\n" | |
|
5769 | "\n" | |
|
5770 | " To read a patch from standard input, use patch name \"-\".\n" | |
|
5463 | " If the imported patch was generated by hg export, user and\n" | |
|
5464 | " description from patch override values from message headers and\n" | |
|
5465 | " body. Values given on command line with -m/--message and -u/--user\n" | |
|
5466 | " override these.\n" | |
|
5467 | "\n" | |
|
5468 | " If --exact is specified, import will set the working directory to\n" | |
|
5469 | " the parent of each patch before applying it, and will abort if the\n" | |
|
5470 | " resulting changeset has a different ID than the one recorded in\n" | |
|
5471 | " the patch. This may happen due to character set problems or other\n" | |
|
5472 | " deficiencies in the text patch format.\n" | |
|
5473 | "\n" | |
|
5474 | " With -s/--similarity, hg will attempt to discover renames and\n" | |
|
5475 | " copies in the patch in the same way as 'addremove'.\n" | |
|
5476 | "\n" | |
|
5477 | " To read a patch from standard input, use \"-\" as the patch name.\n" | |
|
5771 | 5478 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5772 | 5479 | " " |
|
5773 | 5480 | msgstr "" |
@@ -5784,8 +5491,9 b' msgid ""' | |||
|
5784 | 5491 | "%s\n" |
|
5785 | 5492 | msgstr "" |
|
5786 | 5493 | |
|
5787 | msgid "not a mercurial patch" | |
|
5788 | msgstr "" | |
|
5494 | #, fuzzy | |
|
5495 | msgid "not a Mercurial patch" | |
|
5496 | msgstr "%s 不是本地的水银版本库" | |
|
5789 | 5497 | |
|
5790 | 5498 | msgid "patch is damaged or loses information" |
|
5791 | 5499 | msgstr "" |
@@ -5794,21 +5502,22 b' msgid ""' | |||
|
5794 | 5502 | "show new changesets found in source\n" |
|
5795 | 5503 | "\n" |
|
5796 | 5504 | " Show new changesets found in the specified path/URL or the default\n" |
|
5797 |
" pull location. These are the changesets that would be pulled |
|
|
5798 | " was requested.\n" | |
|
5799 | "\n" | |
|
5800 |
" For remote repository, using --bundle avoids downloading the |
|
|
5801 | " twice if the incoming is followed by a pull.\n" | |
|
5505 | " pull location. These are the changesets that would have been pulled\n" | |
|
5506 | " if a pull at the time you issued this command.\n" | |
|
5507 | "\n" | |
|
5508 | " For remote repository, using --bundle avoids downloading the\n" | |
|
5509 | " changesets twice if the incoming is followed by a pull.\n" | |
|
5802 | 5510 | "\n" |
|
5803 | 5511 | " See pull for valid source format details.\n" |
|
5804 | 5512 | " " |
|
5805 | 5513 | msgstr "" |
|
5806 | 5514 | |
|
5515 | #, fuzzy | |
|
5807 | 5516 | msgid "" |
|
5808 | 5517 | "create a new repository in the given directory\n" |
|
5809 | 5518 | "\n" |
|
5810 | 5519 | " Initialize a new repository in the given directory. If the given\n" |
|
5811 |
" directory does not exist, it |
|
|
5520 | " directory does not exist, it will be created.\n" | |
|
5812 | 5521 | "\n" |
|
5813 | 5522 | " If no directory is given, the current directory is used.\n" |
|
5814 | 5523 | "\n" |
@@ -5829,23 +5538,24 b' msgstr ""' | |||
|
5829 | 5538 | msgid "" |
|
5830 | 5539 | "locate files matching specific patterns\n" |
|
5831 | 5540 | "\n" |
|
5832 |
" Print |
|
|
5833 | " given patterns.\n" | |
|
5834 | "\n" | |
|
5835 | " This command searches the entire repository by default. To search\n" | |
|
5836 |
" just the current directory and its |
|
|
5837 | " \"--include .\".\n" | |
|
5838 | "\n" | |
|
5839 |
" If no patterns are given to match, this command prints |
|
|
5840 | " names.\n" | |
|
5541 | " Print files under Mercurial control in the working directory whose\n" | |
|
5542 | " names match the given patterns.\n" | |
|
5543 | "\n" | |
|
5544 | " By default, this command searches all directories in the working\n" | |
|
5545 | " directory. To search just the current directory and its\n" | |
|
5546 | " subdirectories, use \"--include .\".\n" | |
|
5547 | "\n" | |
|
5548 | " If no patterns are given to match, this command prints the names\n" | |
|
5549 | " of all files under Mercurial control in the working directory.\n" | |
|
5841 | 5550 | "\n" |
|
5842 | 5551 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
5843 |
" command, use the |
|
|
5844 |
" |
|
|
5845 |
" |
|
|
5846 | " " | |
|
5847 | msgstr "" | |
|
5848 | ||
|
5552 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
|
5553 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
|
5554 | " contain whitespace as multiple filenames.\n" | |
|
5555 | " " | |
|
5556 | msgstr "" | |
|
5557 | ||
|
5558 | #, fuzzy | |
|
5849 | 5559 | msgid "" |
|
5850 | 5560 | "show revision history of entire repository or files\n" |
|
5851 | 5561 | "\n" |
@@ -5853,8 +5563,8 b' msgid ""' | |||
|
5853 | 5563 | " project.\n" |
|
5854 | 5564 | "\n" |
|
5855 | 5565 | " File history is shown without following rename or copy history of\n" |
|
5856 |
" files. Use -f/--follow with a file |
|
|
5857 |
" renames and copies. --follow without a file |
|
|
5566 | " files. Use -f/--follow with a filename to follow history across\n" | |
|
5567 | " renames and copies. --follow without a filename will only show\n" | |
|
5858 | 5568 | " ancestors or descendants of the starting revision. --follow-first\n" |
|
5859 | 5569 | " only follows the first parent of merge revisions.\n" |
|
5860 | 5570 | "\n" |
@@ -5864,16 +5574,15 b' msgid ""' | |||
|
5864 | 5574 | "\n" |
|
5865 | 5575 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
|
5866 | 5576 | "\n" |
|
5867 |
" By default this command |
|
|
5868 |
" non-trivial parents, user, date and time, and a summary for |
|
|
5869 |
" commit. When the -v/--verbose switch is used, the list of |
|
|
5870 |
" files and full commit message |
|
|
5871 | "\n" | |
|
5872 | " NOTE: log -p may generate unexpected diff output for merge\n" | |
|
5577 | " By default this command prints revision number and changeset id,\n" | |
|
5578 | " tags, non-trivial parents, user, date and time, and a summary for\n" | |
|
5579 | " each commit. When the -v/--verbose switch is used, the list of\n" | |
|
5580 | " changed files and full commit message are shown.\n" | |
|
5581 | "\n" | |
|
5582 | " NOTE: log -p/--patch may generate unexpected diff output for merge\n" | |
|
5873 | 5583 | " changesets, as it will only compare the merge changeset against\n" |
|
5874 |
" its first parent. Also, |
|
|
5875 | " that are different from BOTH parents.\n" | |
|
5876 | "\n" | |
|
5584 | " its first parent. Also, only files different from BOTH parents\n" | |
|
5585 | " will appear in files:.\n" | |
|
5877 | 5586 | " " |
|
5878 | 5587 | msgstr "" |
|
5879 | 5588 | "显示全部版本库或指定文件的版本历史\n" |
@@ -5901,40 +5610,33 b' msgstr ""' | |||
|
5901 | 5610 | " " |
|
5902 | 5611 | |
|
5903 | 5612 | msgid "" |
|
5904 | "looks up all renames for a file (up to endrev) the first\n" | |
|
5905 | " time the file is given. It indexes on the changerev and only\n" | |
|
5906 | " parses the manifest if linkrev != changerev.\n" | |
|
5907 | " Returns rename info for fn at changerev rev." | |
|
5908 | msgstr "" | |
|
5909 | ||
|
5910 | msgid "" | |
|
5911 | 5613 | "output the current or given revision of the project manifest\n" |
|
5912 | 5614 | "\n" |
|
5913 | 5615 | " Print a list of version controlled files for the given revision.\n" |
|
5914 |
" If no revision is given, the parent of the working directory |
|
|
5915 |
" |
|
|
5916 | "\n" | |
|
5917 | " The manifest is the list of files being version controlled. If no " | |
|
5918 | "revision\n" | |
|
5919 | " is given then the first parent of the working directory is used.\n" | |
|
5920 | "\n" | |
|
5921 | " With -v flag, print file permissions, symlink and executable bits. With\n" | |
|
5922 | " --debug flag, print file revision hashes.\n" | |
|
5923 | " " | |
|
5924 | msgstr "" | |
|
5925 | ||
|
5616 | " If no revision is given, the first parent of the working directory\n" | |
|
5617 | " is used, or the null revision if no revision is checked out.\n" | |
|
5618 | "\n" | |
|
5619 | " With -v, print file permissions, symlink and executable bits.\n" | |
|
5620 | " With --debug, print file revision hashes.\n" | |
|
5621 | " " | |
|
5622 | msgstr "" | |
|
5623 | ||
|
5624 | #, fuzzy | |
|
5926 | 5625 | msgid "" |
|
5927 | 5626 | "merge working directory with another revision\n" |
|
5928 | 5627 | "\n" |
|
5929 | " Merge the contents of the current working directory and the\n" | |
|
5930 |
" requested revision |
|
|
5931 | " marked as changed for the next commit and a commit must be\n" | |
|
5932 | " performed before any further updates are allowed.\n" | |
|
5628 | " The current working directory is updated with all changes made in\n" | |
|
5629 | " the requested revision since the last common predecessor revision.\n" | |
|
5630 | "\n" | |
|
5631 | " Files that changed between either parent are marked as changed for\n" | |
|
5632 | " the next commit and a commit must be performed before any further\n" | |
|
5633 | " updates to the repository are allowed. The next commit will have\n" | |
|
5634 | " two parents.\n" | |
|
5933 | 5635 | "\n" |
|
5934 | 5636 | " If no revision is specified, the working directory's parent is a\n" |
|
5935 |
" head revision, and the current branch contains exactly one other |
|
|
5936 |
" the other head is merged with by default. Otherwise, an |
|
|
5937 | " revision to merge with must be provided.\n" | |
|
5637 | " head revision, and the current branch contains exactly one other\n" | |
|
5638 | " head, the other head is merged with by default. Otherwise, an\n" | |
|
5639 | " explicit revision with which to merge with must be provided.\n" | |
|
5938 | 5640 | " " |
|
5939 | 5641 | msgstr "" |
|
5940 | 5642 | "将工作目录与其它版本合并\n" |
@@ -5969,22 +5671,23 b' msgstr ""' | |||
|
5969 | 5671 | msgid "" |
|
5970 | 5672 | "show changesets not found in destination\n" |
|
5971 | 5673 | "\n" |
|
5972 |
" Show changesets not found in the specified destination repository |
|
|
5973 |
" the default push location. These are the changesets that woul |
|
|
5974 | " if a push was requested.\n" | |
|
5674 | " Show changesets not found in the specified destination repository\n" | |
|
5675 | " or the default push location. These are the changesets that would\n" | |
|
5676 | " be pushed if a push was requested.\n" | |
|
5975 | 5677 | "\n" |
|
5976 | 5678 | " See pull for valid destination format details.\n" |
|
5977 | 5679 | " " |
|
5978 | 5680 | msgstr "" |
|
5979 | 5681 | |
|
5980 | msgid "" | |
|
5981 | "show the parents of the working dir or revision\n" | |
|
5982 | "\n" | |
|
5983 | " Print the working directory's parent revisions. If a\n" | |
|
5984 | " revision is given via --rev, the parent of that revision\n" | |
|
5985 | " will be printed. If a file argument is given, revision in\n" | |
|
5986 | " which the file was last changed (before the working directory\n" | |
|
5987 | " revision or the argument to --rev if given) is printed.\n" | |
|
5682 | #, fuzzy | |
|
5683 | msgid "" | |
|
5684 | "show the parents of the working directory or revision\n" | |
|
5685 | "\n" | |
|
5686 | " Print the working directory's parent revisions. If a revision is\n" | |
|
5687 | " given via -r/--rev, the parent of that revision will be printed.\n" | |
|
5688 | " If a file argument is given, the revision in which the file was\n" | |
|
5689 | " last changed (before the working directory revision or the\n" | |
|
5690 | " argument to --rev if given) is printed.\n" | |
|
5988 | 5691 | " " |
|
5989 | 5692 | msgstr "" |
|
5990 | 5693 | "显示工作目录或指定版本的父亲\n" |
@@ -5994,7 +5697,7 b' msgstr ""' | |||
|
5994 | 5697 | " 版本,或 '--rev' 指定的版本)。\n" |
|
5995 | 5698 | " " |
|
5996 | 5699 | |
|
5997 |
msgid "can only specify an explicit file |
|
|
5700 | msgid "can only specify an explicit filename" | |
|
5998 | 5701 | msgstr "" |
|
5999 | 5702 | |
|
6000 | 5703 | #, python-format |
@@ -6004,8 +5707,8 b' msgstr ""' | |||
|
6004 | 5707 | msgid "" |
|
6005 | 5708 | "show aliases for remote repositories\n" |
|
6006 | 5709 | "\n" |
|
6007 |
" Show definition of symbolic path name NAME. If no name is given, |
|
|
6008 | " definition of available names.\n" | |
|
5710 | " Show definition of symbolic path name NAME. If no name is given,\n" | |
|
5711 | " show definition of all available names.\n" | |
|
6009 | 5712 | "\n" |
|
6010 | 5713 | " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" |
|
6011 | 5714 | " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" |
@@ -6026,14 +5729,21 b' msgstr ""' | |||
|
6026 | 5729 | msgid "(run 'hg update' to get a working copy)\n" |
|
6027 | 5730 | msgstr "" |
|
6028 | 5731 | |
|
5732 | #, fuzzy | |
|
6029 | 5733 | msgid "" |
|
6030 | 5734 | "pull changes from the specified source\n" |
|
6031 | 5735 | "\n" |
|
6032 | 5736 | " Pull changes from a remote repository to a local one.\n" |
|
6033 | 5737 | "\n" |
|
6034 | 5738 | " This finds all changes from the repository at the specified path\n" |
|
6035 |
" or URL and adds them to |
|
|
6036 | " does not update the copy of the project in the working directory.\n" | |
|
5739 | " or URL and adds them to a local repository (the current one unless\n" | |
|
5740 | " -R is specified). By default, this does not update the copy of the\n" | |
|
5741 | " project in the working directory.\n" | |
|
5742 | "\n" | |
|
5743 | " Use hg incoming if you want to see what would have been added by a\n" | |
|
5744 | " pull at the time you issued this command. If you then decide to\n" | |
|
5745 | " added those changes to the repository, you should use pull -r X\n" | |
|
5746 | " where X is the last changeset listed by hg incoming.\n" | |
|
6037 | 5747 | "\n" |
|
6038 | 5748 | " If SOURCE is omitted, the 'default' path will be used.\n" |
|
6039 | 5749 | " See 'hg help urls' for more information.\n" |
@@ -6050,31 +5760,26 b' msgstr ""' | |||
|
6050 | 5760 | " 更多信息。\n" |
|
6051 | 5761 | " " |
|
6052 | 5762 | |
|
6053 | msgid "" | |
|
6054 | "Other repository doesn't support revision lookup, so a rev cannot be " | |
|
6055 | "specified." | |
|
6056 | msgstr "" | |
|
6057 | ||
|
5763 | #, fuzzy | |
|
6058 | 5764 | msgid "" |
|
6059 | 5765 | "push changes to the specified destination\n" |
|
6060 | 5766 | "\n" |
|
6061 | 5767 | " Push changes from the local repository to the given destination.\n" |
|
6062 | 5768 | "\n" |
|
6063 |
" This is the symmetrical operation for pull. It |
|
|
6064 |
" |
|
|
6065 |
" |
|
|
6066 |
" |
|
|
5769 | " This is the symmetrical operation for pull. It moves changes from\n" | |
|
5770 | " the current repository to a different one. If the destination is\n" | |
|
5771 | " local this is identical to a pull in that directory from the\n" | |
|
5772 | " current one.\n" | |
|
6067 | 5773 | "\n" |
|
6068 | 5774 | " By default, push will refuse to run if it detects the result would\n" |
|
6069 | 5775 | " increase the number of remote heads. This generally indicates the\n" |
|
6070 |
" |
|
|
6071 | "\n" | |
|
6072 |
" If -r is used, the named |
|
|
6073 | " to the remote repository.\n" | |
|
6074 | "\n" | |
|
6075 |
" |
|
|
6076 | " If DESTINATION is omitted, a default path will be used.\n" | |
|
6077 | " See 'hg help urls' for more information.\n" | |
|
5776 | " user forgot to pull and merge before pushing.\n" | |
|
5777 | "\n" | |
|
5778 | " If -r/--rev is used, the named revision and all its ancestors will\n" | |
|
5779 | " be pushed to the remote repository.\n" | |
|
5780 | "\n" | |
|
5781 | " Please see 'hg help urls' for important details about ssh://\n" | |
|
5782 | " URLs. If DESTINATION is omitted, a default path will be used.\n" | |
|
6078 | 5783 | " " |
|
6079 | 5784 | msgstr "" |
|
6080 | 5785 | "推送改变到指定位置\n" |
@@ -6100,46 +5805,33 b' msgid "pushing to %s\\n"' | |||
|
6100 | 5805 | msgstr "正在推到 %s\n" |
|
6101 | 5806 | |
|
6102 | 5807 | msgid "" |
|
6103 | "raw commit interface (DEPRECATED)\n" | |
|
6104 | "\n" | |
|
6105 | " (DEPRECATED)\n" | |
|
6106 | " Lowlevel commit, for use in helper scripts.\n" | |
|
6107 | "\n" | |
|
6108 | " This command is not intended to be used by normal users, as it is\n" | |
|
6109 | " primarily useful for importing from other SCMs.\n" | |
|
6110 | "\n" | |
|
6111 | " This command is now deprecated and will be removed in a future\n" | |
|
6112 | " release, please use debugsetparents and commit instead.\n" | |
|
6113 | " " | |
|
6114 | msgstr "" | |
|
6115 | ||
|
6116 | msgid "(the rawcommit command is deprecated)\n" | |
|
6117 | msgstr "" | |
|
6118 | ||
|
6119 | msgid "" | |
|
6120 | 5808 | "roll back an interrupted transaction\n" |
|
6121 | 5809 | "\n" |
|
6122 | 5810 | " Recover from an interrupted commit or pull.\n" |
|
6123 | 5811 | "\n" |
|
6124 |
" This command tries to fix the repository status after an |
|
|
6125 |
" operation. It should only be necessary when Mercurial |
|
|
6126 | " " | |
|
6127 | msgstr "" | |
|
6128 | ||
|
5812 | " This command tries to fix the repository status after an\n" | |
|
5813 | " interrupted operation. It should only be necessary when Mercurial\n" | |
|
5814 | " suggests it.\n" | |
|
5815 | " " | |
|
5816 | msgstr "" | |
|
5817 | ||
|
5818 | #, fuzzy | |
|
6129 | 5819 | msgid "" |
|
6130 | 5820 | "remove the specified files on the next commit\n" |
|
6131 | 5821 | "\n" |
|
6132 | 5822 | " Schedule the indicated files for removal from the repository.\n" |
|
6133 | 5823 | "\n" |
|
6134 |
" This only removes files from the current branch, not from the |
|
|
6135 |
" project history. -A can be used to remove onl |
|
|
6136 | " been deleted, -f can be used to force deletion, and -Af can be used\n" | |
|
6137 | " to remove files from the next revision without deleting them.\n" | |
|
6138 | "\n" | |
|
6139 | " The following table details the behavior of remove for different file\n" | |
|
6140 | " states (columns) and option combinations (rows). The file states are\n" | |
|
6141 | " Added, Clean, Modified and Missing (as reported by hg status). The\n" | |
|
6142 | " actions are Warn, Remove (from branch) and Delete (from disk).\n" | |
|
5824 | " This only removes files from the current branch, not from the\n" | |
|
5825 | " entire project history. -A/--after can be used to remove only\n" | |
|
5826 | " files that have already been deleted, -f/--force can be used to\n" | |
|
5827 | " force deletion, and -Af can be used to remove files from the next\n" | |
|
5828 | " revision without deleting them from the working directory.\n" | |
|
5829 | "\n" | |
|
5830 | " The following table details the behavior of remove for different\n" | |
|
5831 | " file states (columns) and option combinations (rows). The file\n" | |
|
5832 | " states are Added [A], Clean [C], Modified [M] and Missing [!]\n" | |
|
5833 | " (as reported by hg status). The actions are Warn, Remove (from\n" | |
|
5834 | " branch) and Delete (from disk).\n" | |
|
6143 | 5835 | "\n" |
|
6144 | 5836 | " A C M !\n" |
|
6145 | 5837 | " none W RD W R\n" |
@@ -6173,7 +5865,8 b' msgstr ""' | |||
|
6173 | 5865 | " 要在此之前撤销删除,请参见 'hg revert'。\n" |
|
6174 | 5866 | " " |
|
6175 | 5867 | |
|
6176 | msgid "no files specified" | |
|
5868 | #, python-format | |
|
5869 | msgid "not removing %s: file is untracked\n" | |
|
6177 | 5870 | msgstr "" |
|
6178 | 5871 | |
|
6179 | 5872 | #, python-format |
@@ -6192,12 +5885,12 b' msgstr ""' | |||
|
6192 | 5885 | msgid "" |
|
6193 | 5886 | "rename files; equivalent of copy + remove\n" |
|
6194 | 5887 | "\n" |
|
6195 | " Mark dest as copies of sources; mark sources for deletion. If\n" | |
|
6196 |
" |
|
|
6197 |
" |
|
|
5888 | " Mark dest as copies of sources; mark sources for deletion. If dest\n" | |
|
5889 | " is a directory, copies are put in that directory. If dest is a\n" | |
|
5890 | " file, there can only be one source.\n" | |
|
6198 | 5891 | "\n" |
|
6199 | 5892 | " By default, this command copies the contents of files as they\n" |
|
6200 | " exist in the working directory. If invoked with --after, the\n" | |
|
5893 | " exist in the working directory. If invoked with -A/--after, the\n" | |
|
6201 | 5894 | " operation is recorded, but no copying is performed.\n" |
|
6202 | 5895 | "\n" |
|
6203 | 5896 | " This command takes effect at the next commit. To undo a rename\n" |
@@ -6210,10 +5903,15 b' msgid ""' | |||
|
6210 | 5903 | "\n" |
|
6211 | 5904 | " This command will cleanly retry unresolved file merges using file\n" |
|
6212 | 5905 | " revisions preserved from the last update or merge. To attempt to\n" |
|
6213 | " resolve all unresolved files, use the -a switch.\n" | |
|
6214 | "\n" | |
|
6215 | " This command will also allow listing resolved files and manually\n" | |
|
6216 | " marking and unmarking files as resolved.\n" | |
|
5906 | " resolve all unresolved files, use the -a/--all switch.\n" | |
|
5907 | "\n" | |
|
5908 | " If a conflict is resolved manually, please note that the changes\n" | |
|
5909 | " will be overwritten if the merge is retried with resolve. The\n" | |
|
5910 | " -m/--mark switch should be used to mark the file as resolved.\n" | |
|
5911 | "\n" | |
|
5912 | " This command also allows listing resolved files and manually\n" | |
|
5913 | " indicating whether or not files are resolved. All files must be\n" | |
|
5914 | " marked as resolved before a commit is permitted.\n" | |
|
6217 | 5915 | "\n" |
|
6218 | 5916 | " The codes used to show the status of files are:\n" |
|
6219 | 5917 | " U = unresolved\n" |
@@ -6231,10 +5929,10 b' msgid "no files or directories specified' | |||
|
6231 | 5929 | msgstr "" |
|
6232 | 5930 | |
|
6233 | 5931 | msgid "" |
|
6234 | "restore individual files or dirs to an earlier state\n" | |
|
6235 | "\n" | |
|
6236 |
" ( |
|
|
6237 | " change the working dir parents)\n" | |
|
5932 | "restore individual files or directories to an earlier state\n" | |
|
5933 | "\n" | |
|
5934 | " (Use update -r to check out earlier revisions, revert does not\n" | |
|
5935 | " change the working directory parents.)\n" | |
|
6238 | 5936 | "\n" |
|
6239 | 5937 | " With no revision specified, revert the named files or directories\n" |
|
6240 | 5938 | " to the contents they had in the parent of the working directory.\n" |
@@ -6243,10 +5941,10 b' msgid ""' | |||
|
6243 | 5941 | " working directory has two parents, you must explicitly specify the\n" |
|
6244 | 5942 | " revision to revert to.\n" |
|
6245 | 5943 | "\n" |
|
6246 |
" Using the -r option, revert the given files or directories |
|
|
6247 |
" contents as of a specific revision. This can be helpfu |
|
|
6248 | " back\" some or all of an earlier change.\n" | |
|
6249 |
" |
|
|
5944 | " Using the -r/--rev option, revert the given files or directories\n" | |
|
5945 | " to their contents as of a specific revision. This can be helpful\n" | |
|
5946 | " to \"roll back\" some or all of an earlier change. See 'hg help\n" | |
|
5947 | " dates' for a list of formats valid for -d/--date.\n" | |
|
6250 | 5948 | "\n" |
|
6251 | 5949 | " Revert modifies the working directory. It does not commit any\n" |
|
6252 | 5950 | " changes, or change the parent of the working directory. If you\n" |
@@ -6254,8 +5952,8 b' msgid ""' | |||
|
6254 | 5952 | " directory, the reverted files will thus appear modified\n" |
|
6255 | 5953 | " afterwards.\n" |
|
6256 | 5954 | "\n" |
|
6257 | " If a file has been deleted, it is restored. If the executable\n" | |
|
6258 |
" |
|
|
5955 | " If a file has been deleted, it is restored. If the executable mode\n" | |
|
5956 | " of a file was changed, it is reset.\n" | |
|
6259 | 5957 | "\n" |
|
6260 | 5958 | " If names are given, all files matching the names are reverted.\n" |
|
6261 | 5959 | " If no arguments are given, no files are reverted.\n" |
@@ -6301,7 +5999,8 b' msgid ""' | |||
|
6301 | 5999 | " This command should be used with care. There is only one level of\n" |
|
6302 | 6000 | " rollback, and there is no way to undo a rollback. It will also\n" |
|
6303 | 6001 | " restore the dirstate at the time of the last transaction, losing\n" |
|
6304 | " any dirstate changes since that time.\n" | |
|
6002 | " any dirstate changes since that time. This command does not alter\n" | |
|
6003 | " the working directory.\n" | |
|
6305 | 6004 | "\n" |
|
6306 | 6005 | " Transactions are used to encapsulate the effects of all commands\n" |
|
6307 | 6006 | " that create new changesets or propagate existing changesets into a\n" |
@@ -6324,19 +6023,21 b' msgid ""' | |||
|
6324 | 6023 | msgstr "" |
|
6325 | 6024 | |
|
6326 | 6025 | msgid "" |
|
6327 | "print the root (top) of the current working dir\n" | |
|
6026 | "print the root (top) of the current working directory\n" | |
|
6328 | 6027 | "\n" |
|
6329 | 6028 | " Print the root directory of the current repository.\n" |
|
6330 | 6029 | " " |
|
6331 | 6030 | msgstr "" |
|
6332 | 6031 | |
|
6032 | #, fuzzy | |
|
6333 | 6033 | msgid "" |
|
6334 | 6034 | "export the repository via HTTP\n" |
|
6335 | 6035 | "\n" |
|
6336 | 6036 | " Start a local HTTP repository browser and pull server.\n" |
|
6337 | 6037 | "\n" |
|
6338 | 6038 | " By default, the server logs accesses to stdout and errors to\n" |
|
6339 |
" stderr. Use the |
|
|
6039 | " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" | |
|
6040 | " files.\n" | |
|
6340 | 6041 | " " |
|
6341 | 6042 | msgstr "" |
|
6342 | 6043 | "通过 HTTP 发布版本库\n" |
@@ -6351,17 +6052,19 b' msgstr ""' | |||
|
6351 | 6052 | msgid "listening at http://%s%s/%s (bound to %s:%d)\n" |
|
6352 | 6053 | msgstr "" |
|
6353 | 6054 | |
|
6055 | #, fuzzy | |
|
6354 | 6056 | msgid "" |
|
6355 | 6057 | "show changed files in the working directory\n" |
|
6356 | 6058 | "\n" |
|
6357 | 6059 | " Show status of files in the repository. If names are given, only\n" |
|
6358 | 6060 | " files that match are shown. Files that are clean or ignored or\n" |
|
6359 |
" source of a copy/move operation, are not listed unless |
|
|
6360 | " -i (ignored), -C (copies) or -A is given. Unless options described\n" | |
|
6361 |
" with \"show only ...\" are given, the |
|
|
6061 | " the source of a copy/move operation, are not listed unless\n" | |
|
6062 | " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" | |
|
6063 | " Unless options described with \"show only ...\" are given, the\n" | |
|
6064 | " options -mardu are used.\n" | |
|
6362 | 6065 | "\n" |
|
6363 | 6066 | " Option -q/--quiet hides untracked (unknown and ignored) files\n" |
|
6364 | " unless explicitly requested with -u/--unknown or -i/-ignored.\n" | |
|
6067 | " unless explicitly requested with -u/--unknown or -i/--ignored.\n" | |
|
6365 | 6068 | "\n" |
|
6366 | 6069 | " NOTE: status may appear to disagree with diff if permissions have\n" |
|
6367 | 6070 | " changed or a merge has occurred. The standard diff format does not\n" |
@@ -6369,17 +6072,18 b' msgid ""' | |||
|
6369 | 6072 | " to one merge parent.\n" |
|
6370 | 6073 | "\n" |
|
6371 | 6074 | " If one revision is given, it is used as the base revision.\n" |
|
6372 |
" If two revisions are given, the difference between them |
|
|
6075 | " If two revisions are given, the differences between them are\n" | |
|
6076 | " shown.\n" | |
|
6373 | 6077 | "\n" |
|
6374 | 6078 | " The codes used to show the status of files are:\n" |
|
6375 | 6079 | " M = modified\n" |
|
6376 | 6080 | " A = added\n" |
|
6377 | 6081 | " R = removed\n" |
|
6378 | 6082 | " C = clean\n" |
|
6379 | " ! = deleted, but still tracked\n" | |
|
6083 | " ! = missing (deleted by non-hg command, but still tracked)\n" | |
|
6380 | 6084 | " ? = not tracked\n" |
|
6381 | 6085 | " I = ignored\n" |
|
6382 | " = the previous added file was copied from here\n" | |
|
6086 | " = origin of the previous file listed as A (added)\n" | |
|
6383 | 6087 | " " |
|
6384 | 6088 | msgstr "" |
|
6385 | 6089 | "显示工作目录中已改变的文件\n" |
@@ -6418,8 +6122,8 b' msgid ""' | |||
|
6418 | 6122 | " very useful to compare different revisions, to go back to significant\n" |
|
6419 | 6123 | " earlier versions or to mark branch points as releases, etc.\n" |
|
6420 | 6124 | "\n" |
|
6421 |
" If no revision is given, the parent of the working directory is |
|
|
6422 | " or tip if no revision is checked out.\n" | |
|
6125 | " If no revision is given, the parent of the working directory is\n" | |
|
6126 | " used, or tip if no revision is checked out.\n" | |
|
6423 | 6127 | "\n" |
|
6424 | 6128 | " To facilitate version control, distribution, and merging of tags,\n" |
|
6425 | 6129 | " they are stored as a file named \".hgtags\" which is managed\n" |
@@ -6445,9 +6149,13 b' msgstr ""' | |||
|
6445 | 6149 | msgid "tag '%s' does not exist" |
|
6446 | 6150 | msgstr "" |
|
6447 | 6151 | |
|
6448 | #, python-format | |
|
6449 |
msgid "tag '%s' is not a |
|
|
6450 | msgstr "" | |
|
6152 | #, fuzzy, python-format | |
|
6153 | msgid "tag '%s' is not a global tag" | |
|
6154 | msgstr "非本地版本库 '%s'" | |
|
6155 | ||
|
6156 | #, fuzzy, python-format | |
|
6157 | msgid "tag '%s' is not a local tag" | |
|
6158 | msgstr "非本地版本库 '%s'" | |
|
6451 | 6159 | |
|
6452 | 6160 | #, python-format |
|
6453 | 6161 | msgid "Removed tag %s" |
@@ -6464,17 +6172,17 b' msgstr ""' | |||
|
6464 | 6172 | msgid "" |
|
6465 | 6173 | "list repository tags\n" |
|
6466 | 6174 | "\n" |
|
6467 |
" This lists both regular and local tags. When the -v/--verbose |
|
|
6468 | " is used, a third column \"local\" is printed for local tags.\n" | |
|
6175 | " This lists both regular and local tags. When the -v/--verbose\n" | |
|
6176 | " switch is used, a third column \"local\" is printed for local tags.\n" | |
|
6469 | 6177 | " " |
|
6470 | 6178 | msgstr "" |
|
6471 | 6179 | |
|
6472 | 6180 | msgid "" |
|
6473 | 6181 | "show the tip revision\n" |
|
6474 | 6182 | "\n" |
|
6475 |
" The tip revision (usually just called the tip) is the |
|
|
6476 |
" recently added |
|
|
6477 | " changed head.\n" | |
|
6183 | " The tip revision (usually just called the tip) is the changeset\n" | |
|
6184 | " most recently added to the repository (and therefore the most\n" | |
|
6185 | " recently changed head).\n" | |
|
6478 | 6186 | "\n" |
|
6479 | 6187 | " If you have just made a commit, that commit will be the tip. If\n" |
|
6480 | 6188 | " you have just pulled changes from another repository, the tip of\n" |
@@ -6491,32 +6199,37 b' msgid ""' | |||
|
6491 | 6199 | " " |
|
6492 | 6200 | msgstr "" |
|
6493 | 6201 | |
|
6202 | #, fuzzy | |
|
6494 | 6203 | msgid "" |
|
6495 | 6204 | "update working directory\n" |
|
6496 | 6205 | "\n" |
|
6497 |
" Update the repository's working directory to the specified |
|
|
6498 |
" or the tip of the current branch if none is specified. |
|
|
6499 |
" the revision to remove the working copy (like 'hg |
|
|
6500 | "\n" | |
|
6501 | " When the working dir contains no uncommitted changes, it will be\n" | |
|
6502 | " replaced by the state of the requested revision from the repo. When\n" | |
|
6503 | " the requested revision is on a different branch, the working dir\n" | |
|
6504 | " will additionally be switched to that branch.\n" | |
|
6505 | "\n" | |
|
6506 | " When there are uncommitted changes, use option -C to discard them,\n" | |
|
6507 | " forcibly replacing the state of the working dir with the requested\n" | |
|
6508 | " revision.\n" | |
|
6509 | "\n" | |
|
6510 | " When there are uncommitted changes and option -C is not used, and\n" | |
|
6511 | " the parent revision and requested revision are on the same branch,\n" | |
|
6512 | " and one of them is an ancestor of the other, then the new working\n" | |
|
6513 | " directory will contain the requested revision merged with the\n" | |
|
6514 | " uncommitted changes. Otherwise, the update will fail with a\n" | |
|
6515 | " suggestion to use 'merge' or 'update -C' instead.\n" | |
|
6516 | "\n" | |
|
6517 | " If you want to update just one file to an older revision, use revert.\n" | |
|
6518 | "\n" | |
|
6519 | " See 'hg help dates' for a list of formats valid for --date.\n" | |
|
6206 | " Update the repository's working directory to the specified\n" | |
|
6207 | " revision, or the tip of the current branch if none is specified.\n" | |
|
6208 | " Use null as the revision to remove the working copy (like 'hg\n" | |
|
6209 | " clone -U').\n" | |
|
6210 | "\n" | |
|
6211 | " When the working directory contains no uncommitted changes, it\n" | |
|
6212 | " will be replaced by the state of the requested revision from the\n" | |
|
6213 | " repository. When the requested revision is on a different branch,\n" | |
|
6214 | " the working directory will additionally be switched to that\n" | |
|
6215 | " branch.\n" | |
|
6216 | "\n" | |
|
6217 | " When there are uncommitted changes, use option -C/--clean to\n" | |
|
6218 | " discard them, forcibly replacing the state of the working\n" | |
|
6219 | " directory with the requested revision. Alternately, use -c/--check\n" | |
|
6220 | " to abort.\n" | |
|
6221 | "\n" | |
|
6222 | " When there are uncommitted changes and option -C/--clean is not\n" | |
|
6223 | " used, and the parent revision and requested revision are on the\n" | |
|
6224 | " same branch, and one of them is an ancestor of the other, then the\n" | |
|
6225 | " new working directory will contain the requested revision merged\n" | |
|
6226 | " with the uncommitted changes. Otherwise, the update will fail with\n" | |
|
6227 | " a suggestion to use 'merge' or 'update -C' instead.\n" | |
|
6228 | "\n" | |
|
6229 | " If you want to update just one file to an older revision, use\n" | |
|
6230 | " revert.\n" | |
|
6231 | "\n" | |
|
6232 | " See 'hg help dates' for a list of formats valid for -d/--date.\n" | |
|
6520 | 6233 | " " |
|
6521 | 6234 | msgstr "" |
|
6522 | 6235 | "更新工作目录\n" |
@@ -6539,6 +6252,10 b' msgstr ""' | |||
|
6539 | 6252 | " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" |
|
6540 | 6253 | " " |
|
6541 | 6254 | |
|
6255 | #, fuzzy | |
|
6256 | msgid "uncommitted local changes" | |
|
6257 | msgstr "提交修改集 %d:%s\n" | |
|
6258 | ||
|
6542 | 6259 | msgid "" |
|
6543 | 6260 | "verify the integrity of the repository\n" |
|
6544 | 6261 | "\n" |
@@ -6599,9 +6316,6 b' msgstr "\xe8\xae\xbe\xe7\xbd\xae\xe5\xad\x97\xe7\xac\xa6\xe9\x9b\x86\xe7\xbc\x96\xe7\xa0\x81"' | |||
|
6599 | 6316 | msgid "set the charset encoding mode" |
|
6600 | 6317 | msgstr "设置字符集编码模式" |
|
6601 | 6318 | |
|
6602 | msgid "print improved command execution profile" | |
|
6603 | msgstr "显示改良的命令执行剖析" | |
|
6604 | ||
|
6605 | 6319 | msgid "print traceback on exception" |
|
6606 | 6320 | msgstr "显示异常的跟踪" |
|
6607 | 6321 | |
@@ -6641,7 +6355,8 b' msgstr "\xe4\xbb\x8e <file> \xe8\xaf\xbb\xe5\x8f\x96\xe6\x8f\x90\xe4\xba\xa4\xe6\x97\xa5\xe5\xbf\x97"' | |||
|
6641 | 6355 | msgid "record datecode as commit date" |
|
6642 | 6356 | msgstr "将提供的日期作为提交日期" |
|
6643 | 6357 | |
|
6644 | msgid "record user as committer" | |
|
6358 | #, fuzzy | |
|
6359 | msgid "record the specified user as committer" | |
|
6645 | 6360 | msgstr "将提供的用户作为提交者" |
|
6646 | 6361 | |
|
6647 | 6362 | msgid "display using template map file" |
@@ -6824,6 +6539,10 b' msgstr ""' | |||
|
6824 | 6539 | msgid "[INDEX] REV1 REV2" |
|
6825 | 6540 | msgstr "" |
|
6826 | 6541 | |
|
6542 | #, fuzzy | |
|
6543 | msgid "[COMMAND]" | |
|
6544 | msgstr "命令" | |
|
6545 | ||
|
6827 | 6546 | msgid "show the command options" |
|
6828 | 6547 | msgstr "" |
|
6829 | 6548 | |
@@ -6845,12 +6564,6 b' msgstr ""' | |||
|
6845 | 6564 | msgid "FILE" |
|
6846 | 6565 | msgstr "" |
|
6847 | 6566 | |
|
6848 | msgid "parent" | |
|
6849 | msgstr "" | |
|
6850 | ||
|
6851 | msgid "file list" | |
|
6852 | msgstr "" | |
|
6853 | ||
|
6854 | 6567 | msgid "revision to rebuild to" |
|
6855 | 6568 | msgstr "" |
|
6856 | 6569 | |
@@ -6872,6 +6585,10 b' msgstr ""' | |||
|
6872 | 6585 | msgid "[OPTION]..." |
|
6873 | 6586 | msgstr "" |
|
6874 | 6587 | |
|
6588 | #, fuzzy | |
|
6589 | msgid "revision to check" | |
|
6590 | msgstr "要合并的版本" | |
|
6591 | ||
|
6875 | 6592 | msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." |
|
6876 | 6593 | msgstr "" |
|
6877 | 6594 | |
@@ -6893,7 +6610,7 b' msgstr "\xe8\xb7\x9f\xe8\xb8\xaa\xe4\xbf\xae\xe6\x94\xb9\xe9\x9b\x86\xe5\x8e\x86\xe5\x8f\xb2\xef\xbc\x8c\xe6\x88\x96\xe8\x80\x85\xe8\xb7\x9f\xe8\xb8\xaa\xe6\x96\x87\xe4\xbb\xb6\xe7\x9a\x84\xe5\xa4\x8d\xe5\x88\xb6\xe4\xb8\x8e\xe6\x94\xb9\xe5\x90\x8d\xe6\x93\x8d\xe4\xbd\x9c"' | |||
|
6893 | 6610 | msgid "ignore case when matching" |
|
6894 | 6611 | msgstr "" |
|
6895 | 6612 | |
|
6896 | msgid "print only filenames and revs that match" | |
|
6613 | msgid "print only filenames and revisions that match" | |
|
6897 | 6614 | msgstr "" |
|
6898 | 6615 | |
|
6899 | 6616 | msgid "print matching line numbers" |
@@ -6905,20 +6622,25 b' msgstr ""' | |||
|
6905 | 6622 | msgid "[OPTION]... PATTERN [FILE]..." |
|
6906 | 6623 | msgstr "" |
|
6907 | 6624 | |
|
6908 |
msgid "show only heads which are descendants of |
|
|
6625 | msgid "show only heads which are descendants of REV" | |
|
6909 | 6626 | msgstr "" |
|
6910 | 6627 | |
|
6911 | 6628 | msgid "show only the active heads from open branches" |
|
6912 | 6629 | msgstr "" |
|
6913 | 6630 | |
|
6914 | msgid "[-r REV] [REV]..." | |
|
6631 | #, fuzzy | |
|
6632 | msgid "show normal and closed heads" | |
|
6633 | msgstr "只显示已增加文件的状态" | |
|
6634 | ||
|
6635 | msgid "[-r STARTREV] [REV]..." | |
|
6915 | 6636 | msgstr "" |
|
6916 | 6637 | |
|
6917 | 6638 | msgid "[TOPIC]" |
|
6918 | 6639 | msgstr "" |
|
6919 | 6640 | |
|
6920 | msgid "identify the specified rev" | |
|
6921 | msgstr "" | |
|
6641 | #, fuzzy | |
|
6642 | msgid "identify the specified revision" | |
|
6643 | msgstr "追溯指定版本" | |
|
6922 | 6644 | |
|
6923 | 6645 | msgid "show local revision number" |
|
6924 | 6646 | msgstr "" |
@@ -6936,8 +6658,8 b' msgid "[-nibt] [-r REV] [SOURCE]"' | |||
|
6936 | 6658 | msgstr "" |
|
6937 | 6659 | |
|
6938 | 6660 | msgid "" |
|
6939 |
"directory strip option for patch. This has the same |
|
|
6940 |
" |
|
|
6661 | "directory strip option for patch. This has the same meaning as the " | |
|
6662 | "corresponding patch option" | |
|
6941 | 6663 | msgstr "" |
|
6942 | 6664 | |
|
6943 | 6665 | msgid "base path" |
@@ -6952,7 +6674,7 b' msgstr ""' | |||
|
6952 | 6674 | msgid "apply patch to the nodes from which it was generated" |
|
6953 | 6675 | msgstr "" |
|
6954 | 6676 | |
|
6955 |
msgid " |
|
|
6677 | msgid "use any branch information in patch (implied by --exact)" | |
|
6956 | 6678 | msgstr "" |
|
6957 | 6679 | |
|
6958 | 6680 | msgid "[OPTION]... PATCH..." |
@@ -6973,7 +6695,7 b' msgstr ""' | |||
|
6973 | 6695 | msgid "[-e CMD] [--remotecmd CMD] [DEST]" |
|
6974 | 6696 | msgstr "" |
|
6975 | 6697 | |
|
6976 |
msgid "search the repository as it stood at |
|
|
6698 | msgid "search the repository as it stood at REV" | |
|
6977 | 6699 | msgstr "" |
|
6978 | 6700 | |
|
6979 | 6701 | msgid "end filenames with NUL, for use with xargs" |
@@ -6988,7 +6710,8 b' msgstr ""' | |||
|
6988 | 6710 | msgid "only follow the first parent of merge changesets" |
|
6989 | 6711 | msgstr "只跟踪修改集的第一个父亲" |
|
6990 | 6712 | |
|
6991 | msgid "show revs matching date spec" | |
|
6713 | #, fuzzy | |
|
6714 | msgid "show revisions matching date spec" | |
|
6992 | 6715 | msgstr "显示匹配日期的版本" |
|
6993 | 6716 | |
|
6994 | 6717 | msgid "show copied files" |
@@ -6997,13 +6720,15 b' msgstr "\xe6\x98\xbe\xe7\xa4\xba\xe5\xa4\x8d\xe5\x88\xb6\xe7\x9a\x84\xe6\x96\x87\xe4\xbb\xb6"' | |||
|
6997 | 6720 | msgid "do case-insensitive search for a keyword" |
|
6998 | 6721 | msgstr "对关键字执行不区分大小写的搜索" |
|
6999 | 6722 | |
|
7000 | msgid "include revs where files were removed" | |
|
6723 | #, fuzzy | |
|
6724 | msgid "include revisions where files were removed" | |
|
7001 | 6725 | msgstr "包含删除文件的版本" |
|
7002 | 6726 | |
|
7003 | 6727 | msgid "show only merges" |
|
7004 | 6728 | msgstr "只显示合并" |
|
7005 | 6729 | |
|
7006 | msgid "revs committed by user" | |
|
6730 | #, fuzzy | |
|
6731 | msgid "revisions committed by user" | |
|
7007 | 6732 | msgstr "指定用户提交的版本" |
|
7008 | 6733 | |
|
7009 | 6734 | msgid "show only changesets within the given named branch" |
@@ -7027,6 +6752,9 b' msgstr "\xe5\xbc\xba\xe5\x88\xb6\xe4\xb8\x8e\xe5\xb7\xb2\xe6\x9c\x89\xe4\xbf\xae\xe6\x94\xb9\xe5\x90\x88\xe5\xb9\xb6"' | |||
|
7027 | 6752 | msgid "revision to merge" |
|
7028 | 6753 | msgstr "要合并的版本" |
|
7029 | 6754 | |
|
6755 | msgid "review revisions to merge (no merge is performed)" | |
|
6756 | msgstr "" | |
|
6757 | ||
|
7030 | 6758 | msgid "[-f] [[-r] REV]" |
|
7031 | 6759 | msgstr "" |
|
7032 | 6760 | |
@@ -7036,10 +6764,11 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe4\xbd\xa0\xe8\xa6\x81\xe6\x8e\xa8\xe9\x80\x81\xe7\x9a\x84\xe6\x9c\x80\xe9\xab\x98\xe7\x89\x88\xe6\x9c\xac"' | |||
|
7036 | 6764 | msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" |
|
7037 | 6765 | msgstr "" |
|
7038 | 6766 | |
|
7039 | msgid "show parents from the specified rev" | |
|
6767 | #, fuzzy | |
|
6768 | msgid "show parents from the specified revision" | |
|
7040 | 6769 | msgstr "从指定的版本显示父亲" |
|
7041 | 6770 | |
|
7042 |
msgid " |
|
|
6771 | msgid "[-r REV] [FILE]" | |
|
7043 | 6772 | msgstr "" |
|
7044 | 6773 | |
|
7045 | 6774 | msgid "[NAME]" |
@@ -7111,10 +6840,12 b' msgstr "\xe7\x9b\x91\xe5\x90\xac\xe5\x9c\xb0\xe5\x9d\x80(\xe9\xbb\x98\xe8\xae\xa4: \xe6\x89\x80\xe6\x9c\x89\xe5\x9c\xb0\xe5\x9d\x80)"' | |||
|
7111 | 6840 | msgid "prefix path to serve from (default: server root)" |
|
7112 | 6841 | msgstr "服务路径前缀(默认: 服务器根)" |
|
7113 | 6842 | |
|
7114 | msgid "name to show in web pages (default: working dir)" | |
|
6843 | #, fuzzy | |
|
6844 | msgid "name to show in web pages (default: working directory)" | |
|
7115 | 6845 | msgstr "在 WEB 页面中显示的名称(默认: 工作目录)" |
|
7116 | 6846 | |
|
7117 | msgid "name of the webdir config file (serve more than one repo)" | |
|
6847 | #, fuzzy | |
|
6848 | msgid "name of the webdir config file (serve more than one repository)" | |
|
7118 | 6849 | msgstr "webdir 配置文件的名称(发布多个版本库)" |
|
7119 | 6850 | |
|
7120 | 6851 | msgid "for remote clients" |
@@ -7198,9 +6929,17 b' msgstr ""' | |||
|
7198 | 6929 | msgid "overwrite locally modified files (no backup)" |
|
7199 | 6930 | msgstr "覆盖本地修改的文件(不备份)" |
|
7200 | 6931 | |
|
6932 | #, fuzzy | |
|
6933 | msgid "check for uncommitted changes" | |
|
6934 | msgstr "提交修改集 %d:%s\n" | |
|
6935 | ||
|
7201 | 6936 | msgid "[-C] [-d DATE] [[-r] REV]" |
|
7202 | 6937 | msgstr "" |
|
7203 | 6938 | |
|
6939 | #, python-format | |
|
6940 | msgid "config error at %s:%d: '%s'" | |
|
6941 | msgstr "" | |
|
6942 | ||
|
7204 | 6943 | msgid "not found in manifest" |
|
7205 | 6944 | msgstr "" |
|
7206 | 6945 | |
@@ -7226,10 +6965,6 b' msgstr ""' | |||
|
7226 | 6965 | msgid " all copies found (* = to merge, ! = divergent):\n" |
|
7227 | 6966 | msgstr "" |
|
7228 | 6967 | |
|
7229 | #, python-format | |
|
7230 | msgid " %s -> %s %s\n" | |
|
7231 | msgstr "" | |
|
7232 | ||
|
7233 | 6968 | msgid " checking for directory renames\n" |
|
7234 | 6969 | msgstr "" |
|
7235 | 6970 | |
@@ -7241,6 +6976,9 b' msgstr ""' | |||
|
7241 | 6976 | msgid " file %s -> %s\n" |
|
7242 | 6977 | msgstr "" |
|
7243 | 6978 | |
|
6979 | msgid "working directory state appears damaged!" | |
|
6980 | msgstr "" | |
|
6981 | ||
|
7244 | 6982 | #, python-format |
|
7245 | 6983 | msgid "'\\n' and '\\r' disallowed in filenames: %r" |
|
7246 | 6984 | msgstr "" |
@@ -7257,6 +6995,9 b' msgstr ""' | |||
|
7257 | 6995 | msgid "not in dirstate: %s\n" |
|
7258 | 6996 | msgstr "" |
|
7259 | 6997 | |
|
6998 | msgid "unknown" | |
|
6999 | msgstr "" | |
|
7000 | ||
|
7260 | 7001 | msgid "character device" |
|
7261 | 7002 | msgstr "" |
|
7262 | 7003 | |
@@ -7273,7 +7014,7 b' msgid "directory"' | |||
|
7273 | 7014 | msgstr "" |
|
7274 | 7015 | |
|
7275 | 7016 | #, python-format |
|
7276 |
msgid " |
|
|
7017 | msgid "unsupported file type (type is %s)" | |
|
7277 | 7018 | msgstr "" |
|
7278 | 7019 | |
|
7279 | 7020 | #, python-format |
@@ -7287,6 +7028,10 b' msgid ""' | |||
|
7287 | 7028 | msgstr "" |
|
7288 | 7029 | |
|
7289 | 7030 | #, python-format |
|
7031 | msgid "hg: %s\n" | |
|
7032 | msgstr "" | |
|
7033 | ||
|
7034 | #, python-format | |
|
7290 | 7035 | msgid "timed out waiting for lock held by %s" |
|
7291 | 7036 | msgstr "" |
|
7292 | 7037 | |
@@ -7307,10 +7052,6 b' msgid "hg %s: %s\\n"' | |||
|
7307 | 7052 | msgstr "" |
|
7308 | 7053 | |
|
7309 | 7054 | #, python-format |
|
7310 | msgid "hg: %s\n" | |
|
7311 | msgstr "" | |
|
7312 | ||
|
7313 | #, python-format | |
|
7314 | 7055 | msgid "abort: %s!\n" |
|
7315 | 7056 | msgstr "中止: %s!\n" |
|
7316 | 7057 | |
@@ -7376,6 +7117,24 b' msgid "** Extensions loaded: %s\\n"' | |||
|
7376 | 7117 | msgstr "** 已加载的扩展: %s\n" |
|
7377 | 7118 | |
|
7378 | 7119 | #, python-format |
|
7120 | msgid "no definition for alias '%s'\n" | |
|
7121 | msgstr "" | |
|
7122 | ||
|
7123 | #, fuzzy, python-format | |
|
7124 | msgid "alias '%s' resolves to unknown command '%s'\n" | |
|
7125 | msgstr "hg: 未知命令 '%s'\n" | |
|
7126 | ||
|
7127 | #, python-format | |
|
7128 | msgid "alias '%s' resolves to ambiguous command '%s'\n" | |
|
7129 | msgstr "" | |
|
7130 | ||
|
7131 | #, fuzzy, python-format | |
|
7132 | msgid "alias '%s' shadows command\n" | |
|
7133 | msgstr "" | |
|
7134 | "命令列表:\n" | |
|
7135 | "\n" | |
|
7136 | ||
|
7137 | #, python-format | |
|
7379 | 7138 | msgid "malformed --config option: %s" |
|
7380 | 7139 | msgstr "非法 '--config' 选项: %s" |
|
7381 | 7140 | |
@@ -7389,8 +7148,9 b' msgstr "\xe9\x80\x89\xe9\xa1\xb9 \'--config\' \xe4\xb8\x8d\xe8\x83\xbd\xe7\xae\x80\xe7\x9f\xad!"' | |||
|
7389 | 7148 | msgid "Option --cwd may not be abbreviated!" |
|
7390 | 7149 | msgstr "选项 '--cwd' 不能简短!" |
|
7391 | 7150 | |
|
7392 | msgid "" | |
|
7393 | "Option -R has to be separated from other options (i.e. not -qR) and --" | |
|
7151 | #, fuzzy | |
|
7152 | msgid "" | |
|
7153 | "Option -R has to be separated from other options (e.g. not -qR) and --" | |
|
7394 | 7154 | "repository may only be abbreviated as --repo!" |
|
7395 | 7155 | msgstr "" |
|
7396 | 7156 | "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!" |
@@ -7406,7 +7166,8 b' msgstr "\xe9\x9d\x9e\xe6\x9c\xac\xe5\x9c\xb0\xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93 \'%s\'"' | |||
|
7406 | 7166 | msgid "invalid arguments" |
|
7407 | 7167 | msgstr "非法参数" |
|
7408 | 7168 | |
|
7409 | msgid "exception raised - generating profile anyway\n" | |
|
7169 | #, python-format | |
|
7170 | msgid "unrecognized profiling format '%s' - Ignored\n" | |
|
7410 | 7171 | msgstr "" |
|
7411 | 7172 | |
|
7412 | 7173 | msgid "" |
@@ -7451,7 +7212,10 b' msgstr ""' | |||
|
7451 | 7212 | " 没有找到工具合并 %s\n" |
|
7452 | 7213 | "使用本地(l)或者他人(o)的内容?" |
|
7453 | 7214 | |
|
7454 |
msgid " |
|
|
7215 | msgid "&Local" | |
|
7216 | msgstr "" | |
|
7217 | ||
|
7218 | msgid "&Other" | |
|
7455 | 7219 | msgstr "" |
|
7456 | 7220 | |
|
7457 | 7221 | msgid "l" |
@@ -7478,7 +7242,10 b' msgid ""' | |||
|
7478 | 7242 | "was merge successful (yn)?" |
|
7479 | 7243 | msgstr "" |
|
7480 | 7244 | |
|
7481 |
msgid " |
|
|
7245 | msgid "&No" | |
|
7246 | msgstr "" | |
|
7247 | ||
|
7248 | msgid "&Yes" | |
|
7482 | 7249 | msgstr "" |
|
7483 | 7250 | |
|
7484 | 7251 | msgid "n" |
@@ -7496,6 +7263,51 b' msgstr ""' | |||
|
7496 | 7263 | msgid "unknown bisect kind %s" |
|
7497 | 7264 | msgstr "" |
|
7498 | 7265 | |
|
7266 | msgid "" | |
|
7267 | "\n" | |
|
7268 | " Mercurial has the ability to add new features through the use of\n" | |
|
7269 | " extensions. Extensions may add new commands, add options to\n" | |
|
7270 | " existing commands, change the default behavior of commands, or\n" | |
|
7271 | " implement hooks.\n" | |
|
7272 | "\n" | |
|
7273 | " Extensions are not loaded by default for a variety of reasons:\n" | |
|
7274 | " they can increase startup overhead; they may be meant for\n" | |
|
7275 | " advanced usage only; they may provide potentially dangerous\n" | |
|
7276 | " abilities (such as letting you destroy or modify history); they\n" | |
|
7277 | " might not be ready for prime time; or they may alter some\n" | |
|
7278 | " usual behaviors of stock Mercurial. It is thus up to the user to\n" | |
|
7279 | " activate extensions as needed.\n" | |
|
7280 | "\n" | |
|
7281 | " To enable the \"foo\" extension, either shipped with Mercurial\n" | |
|
7282 | " or in the Python search path, create an entry for it in your\n" | |
|
7283 | " hgrc, like this:\n" | |
|
7284 | "\n" | |
|
7285 | " [extensions]\n" | |
|
7286 | " foo =\n" | |
|
7287 | "\n" | |
|
7288 | " You may also specify the full path to an extension:\n" | |
|
7289 | "\n" | |
|
7290 | " [extensions]\n" | |
|
7291 | " myfeature = ~/.hgext/myfeature.py\n" | |
|
7292 | "\n" | |
|
7293 | " To explicitly disable an extension enabled in an hgrc of broader\n" | |
|
7294 | " scope, prepend its path with !:\n" | |
|
7295 | "\n" | |
|
7296 | " [extensions]\n" | |
|
7297 | " # disabling extension bar residing in /path/to/extension/bar.py\n" | |
|
7298 | " hgext.bar = !/path/to/extension/bar.py\n" | |
|
7299 | " # ditto, but no path was supplied for extension baz\n" | |
|
7300 | " hgext.baz = !\n" | |
|
7301 | " " | |
|
7302 | msgstr "" | |
|
7303 | ||
|
7304 | #, fuzzy | |
|
7305 | msgid "disabled extensions:" | |
|
7306 | msgstr "" | |
|
7307 | "\n" | |
|
7308 | "启用的扩展:\n" | |
|
7309 | "\n" | |
|
7310 | ||
|
7499 | 7311 | msgid "Date Formats" |
|
7500 | 7312 | msgstr "" |
|
7501 | 7313 | |
@@ -7526,9 +7338,9 b' msgid ""' | |||
|
7526 | 7338 | " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" |
|
7527 | 7339 | "\n" |
|
7528 | 7340 | " This is the internal representation format for dates. unixtime is\n" |
|
7529 |
" the number of seconds since the epoch (1970-01-01 00:00 UTC). |
|
|
7530 |
" is the offset of the local timezone, in seconds west of UTC |
|
|
7531 | " if the timezone is east of UTC).\n" | |
|
7341 | " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" | |
|
7342 | " offset is the offset of the local timezone, in seconds west of UTC\n" | |
|
7343 | " (negative if the timezone is east of UTC).\n" | |
|
7532 | 7344 | "\n" |
|
7533 | 7345 | " The log command also accepts date ranges:\n" |
|
7534 | 7346 | "\n" |
@@ -7595,10 +7407,10 b' msgstr ""' | |||
|
7595 | 7407 | msgid "" |
|
7596 | 7408 | "\n" |
|
7597 | 7409 | "HG::\n" |
|
7598 |
" Path to the 'hg' executable, automatically passed when running |
|
|
7599 |
" extensions or external tools. If unset or empty, this is |
|
|
7600 |
" executable's name if it's frozen, or an executable named |
|
|
7601 | " (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
7410 | " Path to the 'hg' executable, automatically passed when running\n" | |
|
7411 | " hooks, extensions or external tools. If unset or empty, this is\n" | |
|
7412 | " the hg executable's name if it's frozen, or an executable named\n" | |
|
7413 | " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" | |
|
7602 | 7414 | " Windows) is searched.\n" |
|
7603 | 7415 | "\n" |
|
7604 | 7416 | "HGEDITOR::\n" |
@@ -7634,8 +7446,8 b' msgid ""' | |||
|
7634 | 7446 | " from the current repository is read.\n" |
|
7635 | 7447 | "\n" |
|
7636 | 7448 | " For each element in HGRCPATH:\n" |
|
7637 |
" * if it's a directory, all |
|
|
7638 |
" * otherwise, the |
|
|
7449 | " * if it's a directory, all files ending with .rc are added\n" | |
|
7450 | " * otherwise, the file itself will be added\n" | |
|
7639 | 7451 | "\n" |
|
7640 | 7452 | "HGUSER::\n" |
|
7641 | 7453 | " This is the string used as the author of a commit. If not set,\n" |
@@ -7659,16 +7471,16 b' msgid ""' | |||
|
7659 | 7471 | " This is the name of the editor to use when committing. See EDITOR.\n" |
|
7660 | 7472 | "\n" |
|
7661 | 7473 | "EDITOR::\n" |
|
7662 | " Sometimes Mercurial needs to open a text file in an editor\n" | |
|
7663 |
" |
|
|
7664 |
" |
|
|
7474 | " Sometimes Mercurial needs to open a text file in an editor for a\n" | |
|
7475 | " user to modify, for example when writing commit messages. The\n" | |
|
7476 | " editor it uses is determined by looking at the environment\n" | |
|
7665 | 7477 | " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" |
|
7666 | 7478 | " non-empty one is chosen. If all of them are empty, the editor\n" |
|
7667 | 7479 | " defaults to 'vi'.\n" |
|
7668 | 7480 | "\n" |
|
7669 | 7481 | "PYTHONPATH::\n" |
|
7670 |
" This is used by Python to find imported modules and may need to be |
|
|
7671 | " appropriately if this Mercurial is not installed system-wide.\n" | |
|
7482 | " This is used by Python to find imported modules and may need to be\n" | |
|
7483 | " set appropriately if this Mercurial is not installed system-wide.\n" | |
|
7672 | 7484 | " " |
|
7673 | 7485 | msgstr "" |
|
7674 | 7486 | |
@@ -7677,14 +7489,13 b' msgstr ""' | |||
|
7677 | 7489 | |
|
7678 | 7490 | msgid "" |
|
7679 | 7491 | "\n" |
|
7680 | " Mercurial supports several ways to specify individual\n" | |
|
7681 | " revisions.\n" | |
|
7682 | "\n" | |
|
7683 | " A plain integer is treated as a revision number. Negative\n" | |
|
7684 | " integers are treated as toplogical offsets from the tip, with\n" | |
|
7685 | " -1 denoting the tip. As such, negative numbers are only useful\n" | |
|
7686 | " if you've memorized your local tree numbers and want to save\n" | |
|
7687 | " typing a single digit. This editor suggests copy and paste.\n" | |
|
7492 | " Mercurial supports several ways to specify individual revisions.\n" | |
|
7493 | "\n" | |
|
7494 | " A plain integer is treated as a revision number. Negative integers\n" | |
|
7495 | " are treated as topological offsets from the tip, with -1 denoting\n" | |
|
7496 | " the tip. As such, negative numbers are only useful if you've\n" | |
|
7497 | " memorized your local tree numbers and want to save typing a single\n" | |
|
7498 | " digit. This editor suggests copy and paste.\n" | |
|
7688 | 7499 | "\n" |
|
7689 | 7500 | " A 40-digit hexadecimal string is treated as a unique revision\n" |
|
7690 | 7501 | " identifier.\n" |
@@ -7705,15 +7516,16 b' msgid ""' | |||
|
7705 | 7516 | " revision of an empty repository, and the parent of revision 0.\n" |
|
7706 | 7517 | "\n" |
|
7707 | 7518 | " The reserved name \".\" indicates the working directory parent. If\n" |
|
7708 | " no working directory is checked out, it is equivalent to null.\n" | |
|
7709 |
" |
|
|
7710 |
" |
|
|
7519 | " no working directory is checked out, it is equivalent to null. If\n" | |
|
7520 | " an uncommitted merge is in progress, \".\" is the revision of the\n" | |
|
7521 | " first parent.\n" | |
|
7711 | 7522 | " " |
|
7712 | 7523 | msgstr "" |
|
7713 | 7524 | |
|
7714 | 7525 | msgid "Specifying Multiple Revisions" |
|
7715 | 7526 | msgstr "指定多个版本" |
|
7716 | 7527 | |
|
7528 | #, fuzzy | |
|
7717 | 7529 | msgid "" |
|
7718 | 7530 | "\n" |
|
7719 | 7531 | " When Mercurial accepts more than one revision, they may be\n" |
@@ -7723,8 +7535,8 b' msgid ""' | |||
|
7723 | 7535 | " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" |
|
7724 | 7536 | " are revision identifiers. Both BEGIN and END are optional. If\n" |
|
7725 | 7537 | " BEGIN is not specified, it defaults to revision number 0. If END\n" |
|
7726 | " is not specified, it defaults to the tip. The range \":\" thus\n" | |
|
7727 |
" |
|
|
7538 | " is not specified, it defaults to the tip. The range \":\" thus means\n" | |
|
7539 | " \"all revisions\".\n" | |
|
7728 | 7540 | "\n" |
|
7729 | 7541 | " If BEGIN is greater than END, revisions are treated in reverse\n" |
|
7730 | 7542 | " order.\n" |
@@ -7751,11 +7563,13 b' msgstr ""' | |||
|
7751 | 7563 | msgid "Diff Formats" |
|
7752 | 7564 | msgstr "差异格式" |
|
7753 | 7565 | |
|
7754 | msgid "" | |
|
7755 | "\n" | |
|
7756 | " Mercurial's default format for showing changes between two versions\n" | |
|
7757 | " of a file is compatible with the unified format of GNU diff, which\n" | |
|
7758 | " can be used by GNU patch and many other standard tools.\n" | |
|
7566 | #, fuzzy | |
|
7567 | msgid "" | |
|
7568 | "\n" | |
|
7569 | " Mercurial's default format for showing changes between two\n" | |
|
7570 | " versions of a file is compatible with the unified format of GNU\n" | |
|
7571 | " diff, which can be used by GNU patch and many other standard\n" | |
|
7572 | " tools.\n" | |
|
7759 | 7573 | "\n" |
|
7760 | 7574 | " While this standard format is often enough, it does not encode the\n" |
|
7761 | 7575 | " following information:\n" |
@@ -7773,15 +7587,16 b' msgid ""' | |||
|
7773 | 7587 | " This means that when generating diffs from a Mercurial repository\n" |
|
7774 | 7588 | " (e.g. with \"hg export\"), you should be careful about things like\n" |
|
7775 | 7589 | " file copies and renames or other things mentioned above, because\n" |
|
7776 |
" when applying a standard diff to a different repository, this |
|
|
7777 |
" information is lost. Mercurial's internal operations (like |
|
|
7778 |
" pull) are not affected by this, because they use an |
|
|
7779 | " format for communicating changes.\n" | |
|
7590 | " when applying a standard diff to a different repository, this\n" | |
|
7591 | " extra information is lost. Mercurial's internal operations (like\n" | |
|
7592 | " push and pull) are not affected by this, because they use an\n" | |
|
7593 | " internal binary format for communicating changes.\n" | |
|
7780 | 7594 | "\n" |
|
7781 | 7595 | " To make Mercurial produce the git extended diff format, use the\n" |
|
7782 |
" --git option available for many commands, or set 'git = True' in |
|
|
7783 |
" [diff] section of your hgrc. You do not need to set this |
|
|
7784 |
" importing diffs in this format or using them in the mq |
|
|
7596 | " --git option available for many commands, or set 'git = True' in\n" | |
|
7597 | " the [diff] section of your hgrc. You do not need to set this\n" | |
|
7598 | " option when importing diffs in this format or using them in the mq\n" | |
|
7599 | " extension.\n" | |
|
7785 | 7600 | " " |
|
7786 | 7601 | msgstr "" |
|
7787 | 7602 | "\n" |
@@ -7811,50 +7626,56 b' msgstr ""' | |||
|
7811 | 7626 | msgid "Template Usage" |
|
7812 | 7627 | msgstr "模版用法" |
|
7813 | 7628 | |
|
7629 | #, fuzzy | |
|
7814 | 7630 | msgid "" |
|
7815 | 7631 | "\n" |
|
7816 | 7632 | " Mercurial allows you to customize output of commands through\n" |
|
7817 |
" templates. You can either pass in a template from the command |
|
|
7818 |
" via the --template option, or select an existing |
|
|
7819 | "style).\n" | |
|
7820 | "\n" | |
|
7821 |
" You can customize output for any \"log-like\" command: log, |
|
|
7822 | " incoming, tip, parents, heads and glog.\n" | |
|
7633 | " templates. You can either pass in a template from the command\n" | |
|
7634 | " line, via the --template option, or select an existing\n" | |
|
7635 | " template-style (--style).\n" | |
|
7636 | "\n" | |
|
7637 | " You can customize output for any \"log-like\" command: log,\n" | |
|
7638 | " outgoing, incoming, tip, parents, heads and glog.\n" | |
|
7823 | 7639 | "\n" |
|
7824 | 7640 | " Three styles are packaged with Mercurial: default (the style used\n" |
|
7825 |
" when no explicit preference is passed), compact and changelog. |
|
|
7641 | " when no explicit preference is passed), compact and changelog.\n" | |
|
7642 | " Usage:\n" | |
|
7826 | 7643 | "\n" |
|
7827 | 7644 | " $ hg log -r1 --style changelog\n" |
|
7828 | 7645 | "\n" |
|
7829 |
" A template is a piece of text, with markup to invoke variable |
|
|
7646 | " A template is a piece of text, with markup to invoke variable\n" | |
|
7647 | " expansion:\n" | |
|
7830 | 7648 | "\n" |
|
7831 | 7649 | " $ hg log -r1 --template \"{node}\\n\"\n" |
|
7832 | 7650 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" |
|
7833 | 7651 | "\n" |
|
7834 | 7652 | " Strings in curly braces are called keywords. The availability of\n" |
|
7835 |
" keywords depends on the exact context of the templater. These |
|
|
7836 | " are usually available for templating a log-like command:\n" | |
|
7653 | " keywords depends on the exact context of the templater. These\n" | |
|
7654 | " keywords are usually available for templating a log-like command:\n" | |
|
7837 | 7655 | "\n" |
|
7838 | 7656 | " - author: String. The unmodified author of the changeset.\n" |
|
7839 | 7657 | " - branches: String. The name of the branch on which the changeset\n" |
|
7840 | 7658 | " was committed. Will be empty if the branch name was default.\n" |
|
7841 | 7659 | " - date: Date information. The date when the changeset was committed.\n" |
|
7842 | 7660 | " - desc: String. The text of the changeset description.\n" |
|
7661 | " - diffstat: String. Statistics of changes with the following\n" | |
|
7662 | " format: \"modified files: +added/-removed lines\"\n" | |
|
7843 | 7663 | " - files: List of strings. All files modified, added, or removed by\n" |
|
7844 | 7664 | " this changeset.\n" |
|
7845 | 7665 | " - file_adds: List of strings. Files added by this changeset.\n" |
|
7846 | 7666 | " - file_mods: List of strings. Files modified by this changeset.\n" |
|
7847 | 7667 | " - file_dels: List of strings. Files removed by this changeset.\n" |
|
7848 |
" - node: String. The changeset identification hash, as a |
|
|
7849 | " hexadecimal string.\n" | |
|
7668 | " - node: String. The changeset identification hash, as a\n" | |
|
7669 | " 40-character hexadecimal string.\n" | |
|
7850 | 7670 | " - parents: List of strings. The parents of the changeset.\n" |
|
7851 | 7671 | " - rev: Integer. The repository-local changeset revision number.\n" |
|
7852 | 7672 | " - tags: List of strings. Any tags associated with the changeset.\n" |
|
7853 | 7673 | "\n" |
|
7854 | 7674 | " The \"date\" keyword does not produce human-readable output. If you\n" |
|
7855 |
" want to use a date in your output, you can use a filter to process |
|
|
7856 |
" Filters are functions which return a string based on the input |
|
|
7857 |
" You can also use a chain of filters to get the desired |
|
|
7675 | " want to use a date in your output, you can use a filter to process\n" | |
|
7676 | " it. Filters are functions which return a string based on the input\n" | |
|
7677 | " variable. You can also use a chain of filters to get the desired\n" | |
|
7678 | " output:\n" | |
|
7858 | 7679 | "\n" |
|
7859 | 7680 | " $ hg tip --template \"{date|isodate}\\n\"\n" |
|
7860 | 7681 | " 2008-08-21 18:22 +0000\n" |
@@ -7867,37 +7688,41 b' msgid ""' | |||
|
7867 | 7688 | " the given date/time and the current date/time.\n" |
|
7868 | 7689 | " - basename: Any text. Treats the text as a path, and returns the\n" |
|
7869 | 7690 | " last component of the path after splitting by the path\n" |
|
7870 | " separator (ignoring trailing seprators). For example,\n" | |
|
7691 | " separator (ignoring trailing separators). For example,\n" | |
|
7871 | 7692 | " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar\".\n" |
|
7693 | " - stripdir: Treat the text as path and strip a directory level, if\n" | |
|
7694 | " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n" | |
|
7872 | 7695 | " - date: Date. Returns a date in a Unix date format, including\n" |
|
7873 | 7696 | " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
|
7874 |
" - domain: Any text. Finds the first string that looks like an |
|
|
7875 | " address, and extracts just the domain component.\n" | |
|
7697 | " - domain: Any text. Finds the first string that looks like an\n" | |
|
7698 | " email address, and extracts just the domain component.\n" | |
|
7876 | 7699 | " Example: 'User <user@example.com>' becomes 'example.com'.\n" |
|
7877 |
" - email: Any text. Extracts the first string that looks like an |
|
|
7878 | " address. Example: 'User <user@example.com>' becomes\n" | |
|
7700 | " - email: Any text. Extracts the first string that looks like an\n" | |
|
7701 | " email address. Example: 'User <user@example.com>' becomes\n" | |
|
7879 | 7702 | " 'user@example.com'.\n" |
|
7880 | 7703 | " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n" |
|
7881 | 7704 | " \"<\" and \">\" with XML entities.\n" |
|
7882 | 7705 | " - fill68: Any text. Wraps the text to fit in 68 columns.\n" |
|
7883 | 7706 | " - fill76: Any text. Wraps the text to fit in 76 columns.\n" |
|
7884 | 7707 | " - firstline: Any text. Returns the first line of text.\n" |
|
7708 | " - nonempty: Any text. Returns '(none)' if the string is empty.\n" | |
|
7885 | 7709 | " - hgdate: Date. Returns the date as a pair of numbers:\n" |
|
7886 | 7710 | " \"1157407993 25200\" (Unix timestamp, timezone offset).\n" |
|
7887 | 7711 | " - isodate: Date. Returns the date in ISO 8601 format.\n" |
|
7888 | " - obfuscate: Any text. Returns the input text rendered as a sequence\n" | |
|
7889 | " of XML entities.\n" | |
|
7712 | " - localdate: Date. Converts a date to local date.\n" | |
|
7713 | " - obfuscate: Any text. Returns the input text rendered as a\n" | |
|
7714 | " sequence of XML entities.\n" | |
|
7890 | 7715 | " - person: Any text. Returns the text before an email address.\n" |
|
7891 | 7716 | " - rfc822date: Date. Returns a date using the same format used\n" |
|
7892 | 7717 | " in email headers.\n" |
|
7893 |
" - short: Changeset hash. Returns the short form of a changeset |
|
|
7894 | " i.e. a 12-byte hexadecimal string.\n" | |
|
7718 | " - short: Changeset hash. Returns the short form of a changeset\n" | |
|
7719 | " hash, i.e. a 12-byte hexadecimal string.\n" | |
|
7895 | 7720 | " - shortdate: Date. Returns a date like \"2006-09-18\".\n" |
|
7896 | 7721 | " - strip: Any text. Strips all leading and trailing whitespace.\n" |
|
7897 |
" - tabindent: Any text. Returns the text, with every line except |
|
|
7898 | " first starting with a tab character.\n" | |
|
7899 |
" - urlescape: Any text. Escapes all \"special\" characters. For |
|
|
7900 | " \"foo bar\" becomes \"foo%20bar\".\n" | |
|
7722 | " - tabindent: Any text. Returns the text, with every line except\n" | |
|
7723 | " the first starting with a tab character.\n" | |
|
7724 | " - urlescape: Any text. Escapes all \"special\" characters. For\n" | |
|
7725 | " example, \"foo bar\" becomes \"foo%20bar\".\n" | |
|
7901 | 7726 | " - user: Any text. Returns the user portion of an email address.\n" |
|
7902 | 7727 | " " |
|
7903 | 7728 | msgstr "" |
@@ -7976,9 +7801,11 b' msgstr ""' | |||
|
7976 | 7801 | " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" |
|
7977 | 7802 | " " |
|
7978 | 7803 | |
|
7979 | msgid "Url Paths" | |
|
7804 | #, fuzzy | |
|
7805 | msgid "URL Paths" | |
|
7980 | 7806 | msgstr "统一资源定位路径" |
|
7981 | 7807 | |
|
7808 | #, fuzzy | |
|
7982 | 7809 | msgid "" |
|
7983 | 7810 | "\n" |
|
7984 | 7811 | " Valid URLs are of the form:\n" |
@@ -7996,42 +7823,44 b' msgid ""' | |||
|
7996 | 7823 | " or changeset to use from the remote repository.\n" |
|
7997 | 7824 | "\n" |
|
7998 | 7825 | " Some features, such as pushing to http:// and https:// URLs are\n" |
|
7999 | " only possible if the feature is explicitly enabled on the\n" | |
|
8000 |
" |
|
|
7826 | " only possible if the feature is explicitly enabled on the remote\n" | |
|
7827 | " Mercurial server.\n" | |
|
8001 | 7828 | "\n" |
|
8002 | 7829 | " Some notes about using SSH with Mercurial:\n" |
|
8003 |
" - SSH requires an accessible shell account on the destination |
|
|
8004 |
" and a copy of hg in the remote path or specified with as |
|
|
7830 | " - SSH requires an accessible shell account on the destination\n" | |
|
7831 | " machine and a copy of hg in the remote path or specified with as\n" | |
|
7832 | " remotecmd.\n" | |
|
8005 | 7833 | " - path is relative to the remote user's home directory by default.\n" |
|
8006 | 7834 | " Use an extra slash at the start of a path to specify an absolute path:\n" |
|
8007 | 7835 | " ssh://example.com//tmp/repository\n" |
|
8008 |
" - Mercurial doesn't use its own compression via SSH; the right |
|
|
8009 | " to do is to configure it in your ~/.ssh/config, e.g.:\n" | |
|
7836 | " - Mercurial doesn't use its own compression via SSH; the right\n" | |
|
7837 | " thing to do is to configure it in your ~/.ssh/config, e.g.:\n" | |
|
8010 | 7838 | " Host *.mylocalnetwork.example.com\n" |
|
8011 | 7839 | " Compression no\n" |
|
8012 | 7840 | " Host *\n" |
|
8013 | 7841 | " Compression yes\n" |
|
8014 |
" Alternatively specify \"ssh -C\" as your ssh command in your hgrc |
|
|
8015 | " with the --ssh command line option.\n" | |
|
8016 | "\n" | |
|
8017 |
" These |
|
|
8018 | " [paths] section like so:\n" | |
|
7842 | " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" | |
|
7843 | " or with the --ssh command line option.\n" | |
|
7844 | "\n" | |
|
7845 | " These URLs can all be stored in your hgrc with path aliases under\n" | |
|
7846 | " the [paths] section like so:\n" | |
|
8019 | 7847 | " [paths]\n" |
|
8020 | 7848 | " alias1 = URL1\n" |
|
8021 | 7849 | " alias2 = URL2\n" |
|
8022 | 7850 | " ...\n" |
|
8023 | 7851 | "\n" |
|
8024 |
" You can then use the alias for any command that uses a |
|
|
8025 | " 'hg pull alias1' would pull from the 'alias1' path).\n" | |
|
7852 | " You can then use the alias for any command that uses a URL (for\n" | |
|
7853 | " example 'hg pull alias1' would pull from the 'alias1' path).\n" | |
|
8026 | 7854 | "\n" |
|
8027 | 7855 | " Two path aliases are special because they are used as defaults\n" |
|
8028 |
" when you do not provide the |
|
|
7856 | " when you do not provide the URL to a command:\n" | |
|
8029 | 7857 | "\n" |
|
8030 | 7858 | " default:\n" |
|
8031 |
" When you create a repository with hg clone, the clone command |
|
|
8032 |
" the location of the source repository as the new |
|
|
8033 |
" 'default' path. This is then used when you omit |
|
|
8034 |
" and pull-like commands (including in and |
|
|
7859 | " When you create a repository with hg clone, the clone command\n" | |
|
7860 | " saves the location of the source repository as the new\n" | |
|
7861 | " repository's 'default' path. This is then used when you omit\n" | |
|
7862 | " path from push- and pull-like commands (including incoming and\n" | |
|
7863 | " outgoing).\n" | |
|
8035 | 7864 | "\n" |
|
8036 | 7865 | " default-push:\n" |
|
8037 | 7866 | " The push command will look for a path named 'default-push', and\n" |
@@ -8089,6 +7918,21 b' msgstr ""' | |||
|
8089 | 7918 | " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n" |
|
8090 | 7919 | " " |
|
8091 | 7920 | |
|
7921 | #, fuzzy | |
|
7922 | msgid "Using additional features" | |
|
7923 | msgstr "启用额外的输出" | |
|
7924 | ||
|
7925 | #, fuzzy | |
|
7926 | msgid "can only share local repositories" | |
|
7927 | msgstr "为此版本库启动服务 'inotify'" | |
|
7928 | ||
|
7929 | #, fuzzy | |
|
7930 | msgid "destination already exists" | |
|
7931 | msgstr "版本库 %s 已存在" | |
|
7932 | ||
|
7933 | msgid "updating working directory\n" | |
|
7934 | msgstr "正在更新工作目录\n" | |
|
7935 | ||
|
8092 | 7936 | #, python-format |
|
8093 | 7937 | msgid "destination directory: %s\n" |
|
8094 | 7938 | msgstr "目标目录: %s\n" |
@@ -8097,6 +7941,10 b' msgstr "\xe7\x9b\xae\xe6\xa0\x87\xe7\x9b\xae\xe5\xbd\x95: %s\\n"' | |||
|
8097 | 7941 | msgid "destination '%s' already exists" |
|
8098 | 7942 | msgstr "" |
|
8099 | 7943 | |
|
7944 | #, fuzzy, python-format | |
|
7945 | msgid "destination '%s' is not empty" | |
|
7946 | msgstr "非本地版本库 '%s'" | |
|
7947 | ||
|
8100 | 7948 | msgid "" |
|
8101 | 7949 | "src repository does not support revision lookup and so doesn't support clone " |
|
8102 | 7950 | "by revision" |
@@ -8105,9 +7953,6 b' msgstr ""' | |||
|
8105 | 7953 | msgid "clone from remote to remote not supported" |
|
8106 | 7954 | msgstr "" |
|
8107 | 7955 | |
|
8108 | msgid "updating working directory\n" | |
|
8109 | msgstr "正在更新工作目录\n" | |
|
8110 | ||
|
8111 | 7956 | msgid "updated" |
|
8112 | 7957 | msgstr "已更新" |
|
8113 | 7958 | |
@@ -8142,7 +7987,7 b' msgstr ""' | |||
|
8142 | 7987 | msgid "SSL support is unavailable" |
|
8143 | 7988 | msgstr "" |
|
8144 | 7989 | |
|
8145 | msgid "IPv6 not available on this system" | |
|
7990 | msgid "IPv6 is not available on this system" | |
|
8146 | 7991 | msgstr "" |
|
8147 | 7992 | |
|
8148 | 7993 | #, python-format |
@@ -8237,8 +8082,8 b' msgstr ""' | |||
|
8237 | 8082 | msgid "real URL is %s\n" |
|
8238 | 8083 | msgstr "实际 URL 是 '%s'\n" |
|
8239 | 8084 | |
|
8240 | #, python-format | |
|
8241 |
msgid " |
|
|
8085 | #, fuzzy, python-format | |
|
8086 | msgid "requested URL: '%s'\n" | |
|
8242 | 8087 | msgstr "请求的 URL: '%s'\n" |
|
8243 | 8088 | |
|
8244 | 8089 | #, python-format |
@@ -8296,6 +8141,10 b' msgid "requirement \'%s\' not supported"' | |||
|
8296 | 8141 | msgstr "" |
|
8297 | 8142 | |
|
8298 | 8143 | #, python-format |
|
8144 | msgid ".hg/sharedpath points to nonexistent directory %s" | |
|
8145 | msgstr "" | |
|
8146 | ||
|
8147 | #, python-format | |
|
8299 | 8148 | msgid "%r cannot be used in a tag name" |
|
8300 | 8149 | msgstr "" |
|
8301 | 8150 | |
@@ -8314,7 +8163,7 b' msgid "node \'%s\' is not well formed"' | |||
|
8314 | 8163 | msgstr "" |
|
8315 | 8164 | |
|
8316 | 8165 | #, python-format |
|
8317 | msgid "tag '%s' refers to unknown node" | |
|
8166 | msgid "working directory has unknown parent '%s'!" | |
|
8318 | 8167 | msgstr "" |
|
8319 | 8168 | |
|
8320 | 8169 | #, python-format |
@@ -8367,26 +8216,32 b' msgstr ""' | |||
|
8367 | 8216 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
8368 | 8217 | msgstr "" |
|
8369 | 8218 | |
|
8370 | #, python-format | |
|
8371 |
msgid " |
|
|
8219 | #, fuzzy | |
|
8220 | msgid "file not found!" | |
|
8221 | msgstr "没有找到样式: %s" | |
|
8222 | ||
|
8223 | #, fuzzy | |
|
8224 | msgid "no match under directory!" | |
|
8225 | msgstr "改变工作目录" | |
|
8226 | ||
|
8227 | #, fuzzy | |
|
8228 | msgid "file not tracked!" | |
|
8372 | 8229 | msgstr "%s 没有被跟踪!\n" |
|
8373 | 8230 | |
|
8231 | msgid "nothing changed\n" | |
|
8232 | msgstr "没有改变\n" | |
|
8233 | ||
|
8374 | 8234 | msgid "unresolved merge conflicts (see hg resolve)" |
|
8375 | 8235 | msgstr "未解决的合并冲突(参见 'hg resolve')" |
|
8376 | 8236 | |
|
8377 | msgid "nothing changed\n" | |
|
8378 | msgstr "没有改变\n" | |
|
8237 | #, fuzzy, python-format | |
|
8238 | msgid "committing subrepository %s\n" | |
|
8239 | msgstr "初始化目标版本库 %s\n" | |
|
8379 | 8240 | |
|
8380 | 8241 | #, python-format |
|
8381 | 8242 | msgid "trouble committing %s!\n" |
|
8382 | 8243 | msgstr "提交 '%s' 出错!\n" |
|
8383 | 8244 | |
|
8384 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." | |
|
8385 | msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" | |
|
8386 | ||
|
8387 | msgid "empty commit message" | |
|
8388 | msgstr "空的提交日志" | |
|
8389 | ||
|
8390 | 8245 | #, python-format |
|
8391 | 8246 | msgid "%s does not exist!\n" |
|
8392 | 8247 | msgstr "%s 不存在!\n" |
@@ -8414,6 +8269,10 b' msgid "%s still exists!\\n"' | |||
|
8414 | 8269 | msgstr "" |
|
8415 | 8270 | |
|
8416 | 8271 | #, python-format |
|
8272 | msgid "%s not tracked!\n" | |
|
8273 | msgstr "%s 没有被跟踪!\n" | |
|
8274 | ||
|
8275 | #, python-format | |
|
8417 | 8276 | msgid "%s not removed!\n" |
|
8418 | 8277 | msgstr "" |
|
8419 | 8278 | |
@@ -8486,6 +8345,10 b' msgid ""' | |||
|
8486 | 8345 | "changegroupsubset." |
|
8487 | 8346 | msgstr "" |
|
8488 | 8347 | |
|
8348 | #, python-format | |
|
8349 | msgid "abort: push creates new remote branch '%s'!\n" | |
|
8350 | msgstr "" | |
|
8351 | ||
|
8489 | 8352 | msgid "abort: push creates new remote heads!\n" |
|
8490 | 8353 | msgstr "" |
|
8491 | 8354 | |
@@ -8607,9 +8470,6 b' msgstr ""' | |||
|
8607 | 8470 | msgid "invalid local address: %s" |
|
8608 | 8471 | msgstr "" |
|
8609 | 8472 | |
|
8610 | msgid "'\\n' and '\\r' disallowed in filenames" | |
|
8611 | msgstr "" | |
|
8612 | ||
|
8613 | 8473 | #, python-format |
|
8614 | 8474 | msgid "failed to remove %s from manifest" |
|
8615 | 8475 | msgstr "" |
@@ -8628,6 +8488,22 b' msgstr ""' | |||
|
8628 | 8488 | msgid "case-folding collision between %s and %s" |
|
8629 | 8489 | msgstr "" |
|
8630 | 8490 | |
|
8491 | #, python-format | |
|
8492 | msgid "" | |
|
8493 | " conflicting flags for %s\n" | |
|
8494 | "(n)one, e(x)ec or sym(l)ink?" | |
|
8495 | msgstr "" | |
|
8496 | ||
|
8497 | #, fuzzy | |
|
8498 | msgid "&None" | |
|
8499 | msgstr "完成\n" | |
|
8500 | ||
|
8501 | msgid "E&xec" | |
|
8502 | msgstr "" | |
|
8503 | ||
|
8504 | msgid "Sym&link" | |
|
8505 | msgstr "" | |
|
8506 | ||
|
8631 | 8507 | msgid "resolving manifests\n" |
|
8632 | 8508 | msgstr "正在解析清单\n" |
|
8633 | 8509 | |
@@ -8641,17 +8517,14 b' msgstr ""' | |||
|
8641 | 8517 | |
|
8642 | 8518 | #, python-format |
|
8643 | 8519 | msgid "" |
|
8644 | " conflicting flags for %s\n" | |
|
8645 | "(n)one, e(x)ec or sym(l)ink?" | |
|
8646 | msgstr "" | |
|
8647 | ||
|
8648 | #, python-format | |
|
8649 | msgid "" | |
|
8650 | 8520 | " local changed %s which remote deleted\n" |
|
8651 | 8521 | "use (c)hanged version or (d)elete?" |
|
8652 | 8522 | msgstr "" |
|
8653 | 8523 | |
|
8654 |
msgid " |
|
|
8524 | msgid "&Changed" | |
|
8525 | msgstr "" | |
|
8526 | ||
|
8527 | msgid "&Delete" | |
|
8655 | 8528 | msgstr "" |
|
8656 | 8529 | |
|
8657 | 8530 | msgid "c" |
@@ -8663,6 +8536,9 b' msgid ""' | |||
|
8663 | 8536 | "use (c)hanged version or leave (d)eleted?" |
|
8664 | 8537 | msgstr "" |
|
8665 | 8538 | |
|
8539 | msgid "&Deleted" | |
|
8540 | msgstr "" | |
|
8541 | ||
|
8666 | 8542 | #, python-format |
|
8667 | 8543 | msgid "preserving %s for resolve of %s\n" |
|
8668 | 8544 | msgstr "" |
@@ -8676,10 +8552,6 b' msgid "getting %s\\n"' | |||
|
8676 | 8552 | msgstr "正在检出 %s\n" |
|
8677 | 8553 | |
|
8678 | 8554 | #, python-format |
|
8679 | msgid "moving %s to %s\n" | |
|
8680 | msgstr "" | |
|
8681 | ||
|
8682 | #, python-format | |
|
8683 | 8555 | msgid "getting %s to %s\n" |
|
8684 | 8556 | msgstr "" |
|
8685 | 8557 | |
@@ -8697,6 +8569,9 b' msgstr ""' | |||
|
8697 | 8569 | msgid "nothing to merge (use 'hg update' or check 'hg heads')" |
|
8698 | 8570 | msgstr "" |
|
8699 | 8571 | |
|
8572 | msgid "outstanding uncommitted changes (use 'hg status' to list changes)" | |
|
8573 | msgstr "" | |
|
8574 | ||
|
8700 | 8575 | msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" |
|
8701 | 8576 | msgstr "" |
|
8702 | 8577 | |
@@ -8742,7 +8617,11 b' msgid "file %s already exists\\n"' | |||
|
8742 | 8617 | msgstr "" |
|
8743 | 8618 | |
|
8744 | 8619 | #, python-format |
|
8745 |
msgid "Hunk #%d succeeded at %d %s(offset %d |
|
|
8620 | msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" | |
|
8621 | msgstr "" | |
|
8622 | ||
|
8623 | #, python-format | |
|
8624 | msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" | |
|
8746 | 8625 | msgstr "" |
|
8747 | 8626 | |
|
8748 | 8627 | #, python-format |
@@ -8784,10 +8663,29 b' msgid "patch command failed: %s"' | |||
|
8784 | 8663 | msgstr "" |
|
8785 | 8664 | |
|
8786 | 8665 | #, python-format |
|
8666 | msgid "Unsupported line endings type: %s" | |
|
8667 | msgstr "" | |
|
8668 | ||
|
8669 | #, python-format | |
|
8787 | 8670 | msgid "no valid hunks found; trying with %r instead\n" |
|
8788 | 8671 | msgstr "" |
|
8789 | 8672 | |
|
8790 | 8673 | #, python-format |
|
8674 | msgid "exited with status %d" | |
|
8675 | msgstr "" | |
|
8676 | ||
|
8677 | #, python-format | |
|
8678 | msgid "killed by signal %d" | |
|
8679 | msgstr "" | |
|
8680 | ||
|
8681 | #, python-format | |
|
8682 | msgid "stopped by signal %d" | |
|
8683 | msgstr "" | |
|
8684 | ||
|
8685 | msgid "invalid exit code" | |
|
8686 | msgstr "" | |
|
8687 | ||
|
8688 | #, python-format | |
|
8791 | 8689 | msgid "saving bundle to %s\n" |
|
8792 | 8690 | msgstr "" |
|
8793 | 8691 | |
@@ -8814,6 +8712,10 b' msgstr ""' | |||
|
8814 | 8712 | msgid "index %s unknown format %d" |
|
8815 | 8713 | msgstr "" |
|
8816 | 8714 | |
|
8715 | #, python-format | |
|
8716 | msgid "index %s is corrupted" | |
|
8717 | msgstr "" | |
|
8718 | ||
|
8817 | 8719 | msgid "no node" |
|
8818 | 8720 | msgstr "" |
|
8819 | 8721 | |
@@ -8888,75 +8790,91 b' msgstr "\xe9\x9c\x80\xe8\xa6\x81\xe4\xbc\xa0\xe8\xbe\x93 %d \xe4\xb8\xaa\xe6\x96\x87\xe4\xbb\xb6\xef\xbc\x8c%d \xe5\xad\x97\xe8\x8a\x82\\n"' | |||
|
8888 | 8790 | msgid "sending %s (%d bytes)\n" |
|
8889 | 8791 | msgstr "正在发送 %s (%d 字节)\n" |
|
8890 | 8792 | |
|
8793 | #, python-format | |
|
8794 | msgid "" | |
|
8795 | " subrepository sources for %s differ\n" | |
|
8796 | "use (l)ocal source (%s) or (r)emote source (%s)?" | |
|
8797 | msgstr "" | |
|
8798 | ||
|
8799 | msgid "&Remote" | |
|
8800 | msgstr "" | |
|
8801 | ||
|
8802 | msgid "r" | |
|
8803 | msgstr "" | |
|
8804 | ||
|
8805 | #, python-format | |
|
8806 | msgid "" | |
|
8807 | " local changed subrepository %s which remote removed\n" | |
|
8808 | "use (c)hanged version or (d)elete?" | |
|
8809 | msgstr "" | |
|
8810 | ||
|
8811 | #, python-format | |
|
8812 | msgid "" | |
|
8813 | " remote changed subrepository %s which local removed\n" | |
|
8814 | "use (c)hanged version or (d)elete?" | |
|
8815 | msgstr "" | |
|
8816 | ||
|
8817 | #, fuzzy, python-format | |
|
8818 | msgid "removing subrepo %s\n" | |
|
8819 | msgstr "正在删除 %s\n" | |
|
8820 | ||
|
8821 | #, fuzzy, python-format | |
|
8822 | msgid "pulling subrepo %s\n" | |
|
8823 | msgstr "正在拉自 %s\n" | |
|
8824 | ||
|
8825 | #, fuzzy, python-format | |
|
8826 | msgid "pushing subrepo %s\n" | |
|
8827 | msgstr "正在推到 %s\n" | |
|
8828 | ||
|
8891 | 8829 | msgid "unmatched quotes" |
|
8892 | 8830 | msgstr "不匹配的引号" |
|
8893 | 8831 | |
|
8894 | 8832 | #, python-format |
|
8833 | msgid "error expanding '%s%%%s'" | |
|
8834 | msgstr "" | |
|
8835 | ||
|
8836 | #, python-format | |
|
8837 | msgid "unknown filter '%s'" | |
|
8838 | msgstr "" | |
|
8839 | ||
|
8840 | #, python-format | |
|
8895 | 8841 | msgid "style not found: %s" |
|
8896 | 8842 | msgstr "没有找到样式: %s" |
|
8897 | 8843 | |
|
8898 | 8844 | #, python-format |
|
8899 | msgid "%s:%s: parse error" | |
|
8900 | msgstr "%s:%s: 解析出错" | |
|
8901 | ||
|
8902 | #, python-format | |
|
8903 | 8845 | msgid "template file %s: %s" |
|
8904 | 8846 | msgstr "模版文件 %s: %s" |
|
8905 | 8847 | |
|
8906 | #, python-format | |
|
8907 | msgid "Error expanding '%s%%%s'" | |
|
8908 | msgstr "" | |
|
8909 | ||
|
8910 | msgid "transaction abort!\n" | |
|
8911 | msgstr "事务中止!\n" | |
|
8848 | msgid "cannot use transaction when it is already committed/aborted" | |
|
8849 | msgstr "" | |
|
8912 | 8850 | |
|
8913 | 8851 | #, python-format |
|
8914 | 8852 | msgid "failed to truncate %s\n" |
|
8915 | 8853 | msgstr "截断 '%s' 失败\n" |
|
8916 | 8854 | |
|
8855 | msgid "transaction abort!\n" | |
|
8856 | msgstr "事务中止!\n" | |
|
8857 | ||
|
8917 | 8858 | msgid "rollback completed\n" |
|
8918 | 8859 | msgstr "完成回滚\n" |
|
8919 | 8860 | |
|
8861 | msgid "rollback failed - please run hg recover\n" | |
|
8862 | msgstr "" | |
|
8863 | ||
|
8920 | 8864 | #, python-format |
|
8921 | 8865 | msgid "Not trusting file %s from untrusted user %s, group %s\n" |
|
8922 | 8866 | msgstr "" |
|
8923 | 8867 | |
|
8924 | 8868 | #, python-format |
|
8925 | msgid "" | |
|
8926 | "Failed to parse %s\n" | |
|
8927 | "%s" | |
|
8928 | msgstr "" | |
|
8929 | "解析 '%s' 失败\n" | |
|
8930 | "%s" | |
|
8931 | ||
|
8932 | #, python-format | |
|
8933 | 8869 | msgid "Ignored: %s\n" |
|
8934 | 8870 | msgstr "" |
|
8935 | 8871 | |
|
8936 | #, python-format | |
|
8937 | msgid "unable to open %s: %s" | |
|
8938 | msgstr "" | |
|
8939 | ||
|
8940 | #, python-format | |
|
8941 | msgid "" | |
|
8942 | "failed to parse %s\n" | |
|
8943 | "%s" | |
|
8944 | msgstr "" | |
|
8945 | ||
|
8946 | #, python-format | |
|
8947 | msgid "" | |
|
8948 | "Error in configuration section [%s] parameter '%s':\n" | |
|
8949 | "%s" | |
|
8950 | msgstr "" | |
|
8951 | ||
|
8952 | #, python-format | |
|
8953 | msgid "Ignoring untrusted configuration option %s.%s = %s\n" | |
|
8954 | msgstr "" | |
|
8955 | ||
|
8956 | #, python-format | |
|
8957 | msgid "" | |
|
8958 | "Error in configuration section [%s]:\n" | |
|
8959 | "%s" | |
|
8872 | #, fuzzy, python-format | |
|
8873 | msgid "ignoring untrusted configuration option %s.%s = %s\n" | |
|
8874 | msgstr "显示不能信赖的配置选项" | |
|
8875 | ||
|
8876 | #, python-format | |
|
8877 | msgid "%s.%s not a boolean ('%s')" | |
|
8960 | 8878 | msgstr "" |
|
8961 | 8879 | |
|
8962 | 8880 | msgid "enter a commit username:" |
@@ -9003,18 +8921,14 b' msgid "user:"' | |||
|
9003 | 8921 | msgstr "用户:" |
|
9004 | 8922 | |
|
9005 | 8923 | #, python-format |
|
8924 | msgid "http auth: user %s, password %s\n" | |
|
8925 | msgstr "" | |
|
8926 | ||
|
8927 | #, python-format | |
|
9006 | 8928 | msgid "proxying through http://%s:%s\n" |
|
9007 | 8929 | msgstr "" |
|
9008 | 8930 | |
|
9009 | 8931 | #, python-format |
|
9010 | msgid "http auth: user %s, password %s\n" | |
|
9011 | msgstr "" | |
|
9012 | ||
|
9013 | #, python-format | |
|
9014 | msgid "%s, please check your locale settings" | |
|
9015 | msgstr "" | |
|
9016 | ||
|
9017 | #, python-format | |
|
9018 | 8932 | msgid "command '%s' failed: %s" |
|
9019 | 8933 | msgstr "" |
|
9020 | 8934 | |
@@ -9033,24 +8947,6 b' msgstr ""' | |||
|
9033 | 8947 | msgid "Hardlinks not supported" |
|
9034 | 8948 | msgstr "" |
|
9035 | 8949 | |
|
9036 | msgid "user name not available - set USERNAME environment variable" | |
|
9037 | msgstr "" | |
|
9038 | ||
|
9039 | #, python-format | |
|
9040 | msgid "exited with status %d" | |
|
9041 | msgstr "" | |
|
9042 | ||
|
9043 | #, python-format | |
|
9044 | msgid "killed by signal %d" | |
|
9045 | msgstr "" | |
|
9046 | ||
|
9047 | #, python-format | |
|
9048 | msgid "stopped by signal %d" | |
|
9049 | msgstr "" | |
|
9050 | ||
|
9051 | msgid "invalid exit code" | |
|
9052 | msgstr "" | |
|
9053 | ||
|
9054 | 8950 | #, python-format |
|
9055 | 8951 | msgid "could not symlink to %r: %s" |
|
9056 | 8952 | msgstr "" |
@@ -9138,7 +9034,11 b' msgid "warning: `%s\' uses revlog format ' | |||
|
9138 | 9034 | msgstr "" |
|
9139 | 9035 | |
|
9140 | 9036 | #, python-format |
|
9141 |
msgid "rev %d point |
|
|
9037 | msgid "rev %d points to nonexistent changeset %d" | |
|
9038 | msgstr "" | |
|
9039 | ||
|
9040 | #, python-format | |
|
9041 | msgid "rev %d points to unexpected changeset %d" | |
|
9142 | 9042 | msgstr "" |
|
9143 | 9043 | |
|
9144 | 9044 | #, python-format |
@@ -9175,6 +9075,10 b' msgstr ""' | |||
|
9175 | 9075 | msgid "checking manifests\n" |
|
9176 | 9076 | msgstr "" |
|
9177 | 9077 | |
|
9078 | #, fuzzy, python-format | |
|
9079 | msgid "%s not in changesets" | |
|
9080 | msgstr "列出修改集" | |
|
9081 | ||
|
9178 | 9082 | msgid "file without name in manifest" |
|
9179 | 9083 | msgstr "" |
|
9180 | 9084 | |
@@ -9256,3 +9160,6 b' msgstr ""' | |||
|
9256 | 9160 | #, python-format |
|
9257 | 9161 | msgid "(first damaged changeset appears to be %d)\n" |
|
9258 | 9162 | msgstr "" |
|
9163 | ||
|
9164 | msgid "user name not available - set USERNAME environment variable" | |
|
9165 | msgstr "" |
General Comments 0
You need to be logged in to leave comments.
Login now