##// END OF EJS Templates
i18n-zh_CN: remove duplicate paragraphs...
timeless@mozdev.org -
r19341:863d4838 stable
parent child Browse files
Show More
@@ -1,10547 +1,10445
1 # Chinese (simplified) translation for Mercurial
1 # Chinese (simplified) translation for Mercurial
2 # This file is distributed under the same license as Mercurial
2 # This file is distributed under the same license as Mercurial
3 #
3 #
4 # Copyright (C) 2009 the Mercurial team
4 # Copyright (C) 2009 the Mercurial team
5 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
5 # Dongsheng Song <dongsheng.song@gmail.com>, 2009
6 #
6 #
7 # Update with pot file:
7 # Update with pot file:
8 # msgmerge --update zh_CN.po hg.pot
8 # msgmerge --update zh_CN.po hg.pot
9 # msgfmt --statistics -c zh_CN.po
9 # msgfmt --statistics -c zh_CN.po
10 #
10 #
11 # Please test your translation before commit:
11 # Please test your translation before commit:
12 # python setup.py build_py -c -d . build_ext -i build_mo
12 # python setup.py build_py -c -d . build_ext -i build_mo
13 # LC_ALL=zh_CN.UTF-8 ./hg
13 # LC_ALL=zh_CN.UTF-8 ./hg
14 #
14 #
15 # Please format your translation before commit:
15 # Please format your translation before commit:
16 # msgcat --width=80 --sort-by-file -o zh_CN_new.po zh_CN.po
16 # msgcat --width=80 --sort-by-file -o zh_CN_new.po zh_CN.po
17 # mv -f zh_CN_new.po zh_CN.po
17 # mv -f zh_CN_new.po zh_CN.po
18 #
18 #
19 # Please remove '#: filename:line' lines before submit to hg:
19 # Please remove '#: filename:line' lines before submit to hg:
20 # msgcat --width=80 --no-location -o zh_CN_new.po zh_CN.po
20 # msgcat --width=80 --no-location -o zh_CN_new.po zh_CN.po
21 # mv -f zh_CN_new.po zh_CN.po
21 # mv -f zh_CN_new.po zh_CN.po
22 #
22 #
23 # Dictionary:
23 # Dictionary:
24 # blame 追溯
24 # blame 追溯
25 # branch 分支
25 # branch 分支
26 # changes 修改
26 # changes 修改
27 # changeset 修改集
27 # changeset 修改集
28 # checkout 检出
28 # checkout 检出
29 # remove 移除(从版本库删除)
29 # remove 移除(从版本库删除)
30 # delete 删除(只从文件系统删除)
30 # delete 删除(只从文件系统删除)
31 # patchset 补丁集
31 # patchset 补丁集
32 # pushing to 推到
32 # pushing to 推到
33 # pulling from 拉自
33 # pulling from 拉自
34 # rename 改名
34 # rename 改名
35 # repository 版本库
35 # repository 版本库
36 # revert 恢复
36 # revert 恢复
37 # revision 版本
37 # revision 版本
38 # tag 标签
38 # tag 标签
39 # tip 顶点
39 # tip 顶点
40 # undo 撤销
40 # undo 撤销
41 # unversioned 未版本控制
41 # unversioned 未版本控制
42 # versioned 受版本控制
42 # versioned 受版本控制
43 # working copy 工作副本
43 # working copy 工作副本
44 # ...
44 # ...
45 #
45 #
46 msgid ""
46 msgid ""
47 msgstr ""
47 msgstr ""
48 "Project-Id-Version: Mercurial 1.3\n"
48 "Project-Id-Version: Mercurial 1.3\n"
49 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
49 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
50 "POT-Creation-Date: 2009-10-19 11:47+0800\n"
50 "POT-Creation-Date: 2009-10-19 11:47+0800\n"
51 "PO-Revision-Date: 2009-03-31 20:38+0200\n"
51 "PO-Revision-Date: 2009-03-31 20:38+0200\n"
52 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
52 "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
53 "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
53 "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
54 "MIME-Version: 1.0\n"
54 "MIME-Version: 1.0\n"
55 "Content-Type: text/plain; charset=UTF-8\n"
55 "Content-Type: text/plain; charset=UTF-8\n"
56 "Content-Transfer-Encoding: 8bit\n"
56 "Content-Transfer-Encoding: 8bit\n"
57 "X-Poedit-Language: Chinese\n"
57 "X-Poedit-Language: Chinese\n"
58 "Generated-By: pygettext.py 1.5\n"
58 "Generated-By: pygettext.py 1.5\n"
59 "X-Poedit-Country: CHINA\n"
59 "X-Poedit-Country: CHINA\n"
60
60
61 #, python-format
61 #, python-format
62 msgid " (default: %s)"
62 msgid " (default: %s)"
63 msgstr " (默认: %s)"
63 msgstr " (默认: %s)"
64
64
65 msgid "OPTIONS"
65 msgid "OPTIONS"
66 msgstr "选项"
66 msgstr "选项"
67
67
68 msgid "COMMANDS"
68 msgid "COMMANDS"
69 msgstr "命令"
69 msgstr "命令"
70
70
71 msgid " options:"
71 msgid " options:"
72 msgstr " 选项:"
72 msgstr " 选项:"
73
73
74 #, python-format
74 #, python-format
75 msgid " aliases: %s"
75 msgid " aliases: %s"
76 msgstr " 别名: %s"
76 msgstr " 别名: %s"
77
77
78 msgid "hooks for controlling repository access"
78 msgid "hooks for controlling repository access"
79 msgstr ""
79 msgstr ""
80
80
81 msgid ""
81 msgid ""
82 "This hook makes it possible to allow or deny write access to portions\n"
82 "This hook makes it possible to allow or deny write access to portions\n"
83 "of a repository when receiving incoming changesets."
83 "of a repository when receiving incoming changesets."
84 msgstr ""
84 msgstr ""
85
85
86 msgid ""
86 msgid ""
87 "The authorization is matched based on the local user name on the\n"
87 "The authorization is matched based on the local user name on the\n"
88 "system where the hook runs, and not the committer of the original\n"
88 "system where the hook runs, and not the committer of the original\n"
89 "changeset (since the latter is merely informative)."
89 "changeset (since the latter is merely informative)."
90 msgstr ""
90 msgstr ""
91
91
92 msgid ""
92 msgid ""
93 "The acl hook is best used along with a restricted shell like hgsh,\n"
93 "The acl hook is best used along with a restricted shell like hgsh,\n"
94 "preventing authenticating users from doing anything other than\n"
94 "preventing authenticating users from doing anything other than\n"
95 "pushing or pulling. The hook is not safe to use if users have\n"
95 "pushing or pulling. The hook is not safe to use if users have\n"
96 "interactive shell access, as they can then disable the hook.\n"
96 "interactive shell access, as they can then disable the hook.\n"
97 "Nor is it safe if remote users share an account, because then there\n"
97 "Nor is it safe if remote users share an account, because then there\n"
98 "is no way to distinguish them."
98 "is no way to distinguish them."
99 msgstr ""
99 msgstr ""
100
100
101 msgid "To use this hook, configure the acl extension in your hgrc like this::"
101 msgid "To use this hook, configure the acl extension in your hgrc like this::"
102 msgstr ""
102 msgstr ""
103
103
104 msgid ""
104 msgid ""
105 " [extensions]\n"
105 " [extensions]\n"
106 " acl ="
106 " acl ="
107 msgstr ""
107 msgstr ""
108
108
109 msgid ""
109 msgid ""
110 " [hooks]\n"
110 " [hooks]\n"
111 " pretxnchangegroup.acl = python:hgext.acl.hook"
111 " pretxnchangegroup.acl = python:hgext.acl.hook"
112 msgstr ""
112 msgstr ""
113
113
114 msgid ""
114 msgid ""
115 " [acl]\n"
115 " [acl]\n"
116 " # Check whether the source of incoming changes is in this list\n"
116 " # Check whether the source of incoming changes is in this list\n"
117 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
117 " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
118 " sources = serve"
118 " sources = serve"
119 msgstr ""
119 msgstr ""
120
120
121 msgid ""
121 msgid ""
122 "The allow and deny sections take a subtree pattern as key (with a glob\n"
122 "The allow and deny sections take a subtree pattern as key (with a glob\n"
123 "syntax by default), and a comma separated list of users as the\n"
123 "syntax by default), and a comma separated list of users as the\n"
124 "corresponding value. The deny list is checked before the allow list\n"
124 "corresponding value. The deny list is checked before the allow list\n"
125 "is. ::"
125 "is. ::"
126 msgstr ""
126 msgstr ""
127
127
128 msgid ""
128 msgid ""
129 " [acl.allow]\n"
129 " [acl.allow]\n"
130 " # If acl.allow is not present, all users are allowed by default.\n"
130 " # If acl.allow is not present, all users are allowed by default.\n"
131 " # An empty acl.allow section means no users allowed.\n"
131 " # An empty acl.allow section means no users allowed.\n"
132 " docs/** = doc_writer\n"
132 " docs/** = doc_writer\n"
133 " .hgtags = release_engineer"
133 " .hgtags = release_engineer"
134 msgstr ""
134 msgstr ""
135
135
136 msgid ""
136 msgid ""
137 " [acl.deny]\n"
137 " [acl.deny]\n"
138 " # If acl.deny is not present, no users are refused by default.\n"
138 " # If acl.deny is not present, no users are refused by default.\n"
139 " # An empty acl.deny section means all users allowed.\n"
139 " # An empty acl.deny section means all users allowed.\n"
140 " glob pattern = user4, user5\n"
140 " glob pattern = user4, user5\n"
141 " ** = user6\n"
141 " ** = user6\n"
142 msgstr ""
142 msgstr ""
143
143
144 #, python-format
144 #, python-format
145 msgid "acl: %s not enabled\n"
145 msgid "acl: %s not enabled\n"
146 msgstr "acl: 未启用 %s\n"
146 msgstr "acl: 未启用 %s\n"
147
147
148 #, python-format
148 #, python-format
149 msgid "acl: %s enabled, %d entries for user %s\n"
149 msgid "acl: %s enabled, %d entries for user %s\n"
150 msgstr "acl: 已启用 %s, %d 项,用户 %s\n"
150 msgstr "acl: 已启用 %s, %d 项,用户 %s\n"
151
151
152 #, python-format
152 #, python-format
153 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
153 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
154 msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
154 msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
155
155
156 #, python-format
156 #, python-format
157 msgid "acl: changes have source \"%s\" - skipping\n"
157 msgid "acl: changes have source \"%s\" - skipping\n"
158 msgstr "acl: 改变源 \"%s\" - 跳过\n"
158 msgstr "acl: 改变源 \"%s\" - 跳过\n"
159
159
160 #, python-format
160 #, python-format
161 msgid "acl: user %s denied on %s\n"
161 msgid "acl: user %s denied on %s\n"
162 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
162 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
163
163
164 #, python-format
164 #, python-format
165 msgid "acl: access denied for changeset %s"
165 msgid "acl: access denied for changeset %s"
166 msgstr "acl: 拒绝访问修改集 %s"
166 msgstr "acl: 拒绝访问修改集 %s"
167
167
168 #, python-format
168 #, python-format
169 msgid "acl: user %s not allowed on %s\n"
169 msgid "acl: user %s not allowed on %s\n"
170 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
170 msgstr "acl: 用户 %s 被拒绝访问 %s\n"
171
171
172 #, python-format
172 #, python-format
173 msgid "acl: allowing changeset %s\n"
173 msgid "acl: allowing changeset %s\n"
174 msgstr "acl: 允许修改集 %s\n"
174 msgstr "acl: 允许修改集 %s\n"
175
175
176 msgid "track a line of development with movable markers"
176 msgid "track a line of development with movable markers"
177 msgstr ""
177 msgstr ""
178
178
179 msgid ""
179 msgid ""
180 "Bookmarks are local movable markers to changesets. Every bookmark\n"
180 "Bookmarks are local movable markers to changesets. Every bookmark\n"
181 "points to a changeset identified by its hash. If you commit a\n"
181 "points to a changeset identified by its hash. If you commit a\n"
182 "changeset that is based on a changeset that has a bookmark on it, the\n"
182 "changeset that is based on a changeset that has a bookmark on it, the\n"
183 "bookmark shifts to the new changeset."
183 "bookmark shifts to the new changeset."
184 msgstr ""
184 msgstr ""
185
185
186 msgid ""
186 msgid ""
187 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
187 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
188 "merge, hg update)."
188 "merge, hg update)."
189 msgstr ""
189 msgstr ""
190
190
191 msgid ""
191 msgid ""
192 "By default, when several bookmarks point to the same changeset, they\n"
192 "By default, when several bookmarks point to the same changeset, they\n"
193 "will all move forward together. It is possible to obtain a more\n"
193 "will all move forward together. It is possible to obtain a more\n"
194 "git-like experience by adding the following configuration option to\n"
194 "git-like experience by adding the following configuration option to\n"
195 "your .hgrc::"
195 "your .hgrc::"
196 msgstr ""
196 msgstr ""
197
197
198 msgid ""
198 msgid ""
199 " [bookmarks]\n"
199 " [bookmarks]\n"
200 " track.current = True"
200 " track.current = True"
201 msgstr ""
201 msgstr ""
202
202
203 msgid ""
203 msgid ""
204 "This will cause Mercurial to track the bookmark that you are currently\n"
204 "This will cause Mercurial to track the bookmark that you are currently\n"
205 "using, and only update it. This is similar to git's approach to\n"
205 "using, and only update it. This is similar to git's approach to\n"
206 "branching.\n"
206 "branching.\n"
207 msgstr ""
207 msgstr ""
208
208
209 msgid ""
209 msgid ""
210 " Bookmarks are pointers to certain commits that move when\n"
210 " Bookmarks are pointers to certain commits that move when\n"
211 " committing. Bookmarks are local. They can be renamed, copied and\n"
211 " committing. Bookmarks are local. They can be renamed, copied and\n"
212 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
212 " deleted. It is possible to use bookmark names in 'hg merge' and\n"
213 " 'hg update' to merge and update respectively to a given bookmark."
213 " 'hg update' to merge and update respectively to a given bookmark."
214 msgstr ""
214 msgstr ""
215
215
216 msgid ""
216 msgid ""
217 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
217 " You can use 'hg bookmark NAME' to set a bookmark on the working\n"
218 " directory's parent revision with the given name. If you specify\n"
218 " directory's parent revision with the given name. If you specify\n"
219 " a revision using -r REV (where REV may be an existing bookmark),\n"
219 " a revision using -r REV (where REV may be an existing bookmark),\n"
220 " the bookmark is assigned to that revision.\n"
220 " the bookmark is assigned to that revision.\n"
221 " "
221 " "
222 msgstr ""
222 msgstr ""
223
223
224 msgid "a bookmark of this name does not exist"
224 msgid "a bookmark of this name does not exist"
225 msgstr ""
225 msgstr ""
226
226
227 msgid "a bookmark of the same name already exists"
227 msgid "a bookmark of the same name already exists"
228 msgstr ""
228 msgstr ""
229
229
230 msgid "new bookmark name required"
230 msgid "new bookmark name required"
231 msgstr ""
231 msgstr ""
232
232
233 msgid "bookmark name required"
233 msgid "bookmark name required"
234 msgstr ""
234 msgstr ""
235
235
236 msgid "bookmark name cannot contain newlines"
236 msgid "bookmark name cannot contain newlines"
237 msgstr ""
237 msgstr ""
238
238
239 msgid "a bookmark cannot have the name of an existing branch"
239 msgid "a bookmark cannot have the name of an existing branch"
240 msgstr ""
240 msgstr ""
241
241
242 msgid "force"
242 msgid "force"
243 msgstr "强制"
243 msgstr "强制"
244
244
245 msgid "revision"
245 msgid "revision"
246 msgstr "版本"
246 msgstr "版本"
247
247
248 msgid "delete a given bookmark"
248 msgid "delete a given bookmark"
249 msgstr "删除指定书签"
249 msgstr "删除指定书签"
250
250
251 msgid "rename a given bookmark"
251 msgid "rename a given bookmark"
252 msgstr "改名指定书签"
252 msgstr "改名指定书签"
253
253
254 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
254 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
255 msgstr ""
255 msgstr ""
256
256
257 msgid "hooks for integrating with the Bugzilla bug tracker"
257 msgid "hooks for integrating with the Bugzilla bug tracker"
258 msgstr ""
258 msgstr ""
259
259
260 msgid ""
260 msgid ""
261 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
261 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
262 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
262 "that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
263 "bug status."
263 "bug status."
264 msgstr ""
264 msgstr ""
265
265
266 msgid ""
266 msgid ""
267 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
267 "The hook updates the Bugzilla database directly. Only Bugzilla\n"
268 "installations using MySQL are supported."
268 "installations using MySQL are supported."
269 msgstr ""
269 msgstr ""
270
270
271 msgid ""
271 msgid ""
272 "The hook relies on a Bugzilla script to send bug change notification\n"
272 "The hook relies on a Bugzilla script to send bug change notification\n"
273 "emails. That script changes between Bugzilla versions; the\n"
273 "emails. That script changes between Bugzilla versions; the\n"
274 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
274 "'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
275 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
275 "subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
276 "be run by Mercurial as the user pushing the change; you will need to\n"
276 "be run by Mercurial as the user pushing the change; you will need to\n"
277 "ensure the Bugzilla install file permissions are set appropriately."
277 "ensure the Bugzilla install file permissions are set appropriately."
278 msgstr ""
278 msgstr ""
279
279
280 msgid ""
280 msgid ""
281 "The extension is configured through three different configuration\n"
281 "The extension is configured through three different configuration\n"
282 "sections. These keys are recognized in the [bugzilla] section:"
282 "sections. These keys are recognized in the [bugzilla] section:"
283 msgstr ""
283 msgstr ""
284
284
285 msgid ""
285 msgid ""
286 "host\n"
286 "host\n"
287 " Hostname of the MySQL server holding the Bugzilla database."
287 " Hostname of the MySQL server holding the Bugzilla database."
288 msgstr ""
288 msgstr ""
289
289
290 msgid ""
290 msgid ""
291 "db\n"
291 "db\n"
292 " Name of the Bugzilla database in MySQL. Default 'bugs'."
292 " Name of the Bugzilla database in MySQL. Default 'bugs'."
293 msgstr ""
293 msgstr ""
294
294
295 msgid ""
295 msgid ""
296 "user\n"
296 "user\n"
297 " Username to use to access MySQL server. Default 'bugs'."
297 " Username to use to access MySQL server. Default 'bugs'."
298 msgstr ""
298 msgstr ""
299
299
300 msgid ""
300 msgid ""
301 "password\n"
301 "password\n"
302 " Password to use to access MySQL server."
302 " Password to use to access MySQL server."
303 msgstr ""
303 msgstr ""
304
304
305 msgid ""
305 msgid ""
306 "timeout\n"
306 "timeout\n"
307 " Database connection timeout (seconds). Default 5."
307 " Database connection timeout (seconds). Default 5."
308 msgstr ""
308 msgstr ""
309
309
310 msgid ""
310 msgid ""
311 "version\n"
311 "version\n"
312 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
312 " Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
313 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
313 " '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
314 " to 2.18."
314 " to 2.18."
315 msgstr ""
315 msgstr ""
316
316
317 msgid ""
317 msgid ""
318 "bzuser\n"
318 "bzuser\n"
319 " Fallback Bugzilla user name to record comments with, if changeset\n"
319 " Fallback Bugzilla user name to record comments with, if changeset\n"
320 " committer cannot be found as a Bugzilla user."
320 " committer cannot be found as a Bugzilla user."
321 msgstr ""
321 msgstr ""
322
322
323 msgid ""
323 msgid ""
324 "bzdir\n"
324 "bzdir\n"
325 " Bugzilla install directory. Used by default notify. Default\n"
325 " Bugzilla install directory. Used by default notify. Default\n"
326 " '/var/www/html/bugzilla'."
326 " '/var/www/html/bugzilla'."
327 msgstr ""
327 msgstr ""
328
328
329 msgid ""
329 msgid ""
330 "notify\n"
330 "notify\n"
331 " The command to run to get Bugzilla to send bug change notification\n"
331 " The command to run to get Bugzilla to send bug change notification\n"
332 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
332 " emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
333 " and 'user' (committer bugzilla email). Default depends on version;\n"
333 " and 'user' (committer bugzilla email). Default depends on version;\n"
334 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
334 " from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
335 " %(id)s %(user)s\"."
335 " %(id)s %(user)s\"."
336 msgstr ""
336 msgstr ""
337
337
338 msgid ""
338 msgid ""
339 "regexp\n"
339 "regexp\n"
340 " Regular expression to match bug IDs in changeset commit message.\n"
340 " Regular expression to match bug IDs in changeset commit message.\n"
341 " Must contain one \"()\" group. The default expression matches 'Bug\n"
341 " Must contain one \"()\" group. The default expression matches 'Bug\n"
342 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
342 " 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
343 " 1234 and 5678' and variations thereof. Matching is case insensitive."
343 " 1234 and 5678' and variations thereof. Matching is case insensitive."
344 msgstr ""
344 msgstr ""
345
345
346 msgid ""
346 msgid ""
347 "style\n"
347 "style\n"
348 " The style file to use when formatting comments."
348 " The style file to use when formatting comments."
349 msgstr ""
349 msgstr ""
350
350
351 msgid ""
351 msgid ""
352 "template\n"
352 "template\n"
353 " Template to use when formatting comments. Overrides style if\n"
353 " Template to use when formatting comments. Overrides style if\n"
354 " specified. In addition to the usual Mercurial keywords, the\n"
354 " specified. In addition to the usual Mercurial keywords, the\n"
355 " extension specifies::"
355 " extension specifies::"
356 msgstr ""
356 msgstr ""
357
357
358 msgid ""
358 msgid ""
359 " {bug} The Bugzilla bug ID.\n"
359 " {bug} The Bugzilla bug ID.\n"
360 " {root} The full pathname of the Mercurial repository.\n"
360 " {root} The full pathname of the Mercurial repository.\n"
361 " {webroot} Stripped pathname of the Mercurial repository.\n"
361 " {webroot} Stripped pathname of the Mercurial repository.\n"
362 " {hgweb} Base URL for browsing Mercurial repositories."
362 " {hgweb} Base URL for browsing Mercurial repositories."
363 msgstr ""
363 msgstr ""
364
364
365 msgid ""
365 msgid ""
366 " Default 'changeset {node|short} in repo {root} refers '\n"
366 " Default 'changeset {node|short} in repo {root} refers '\n"
367 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
367 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
368 msgstr ""
368 msgstr ""
369
369
370 msgid ""
370 msgid ""
371 "strip\n"
371 "strip\n"
372 " The number of slashes to strip from the front of {root} to produce\n"
372 " The number of slashes to strip from the front of {root} to produce\n"
373 " {webroot}. Default 0."
373 " {webroot}. Default 0."
374 msgstr ""
374 msgstr ""
375
375
376 msgid ""
376 msgid ""
377 "usermap\n"
377 "usermap\n"
378 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
378 " Path of file containing Mercurial committer ID to Bugzilla user ID\n"
379 " mappings. If specified, the file should contain one mapping per\n"
379 " mappings. If specified, the file should contain one mapping per\n"
380 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
380 " line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
381 msgstr ""
381 msgstr ""
382
382
383 msgid ""
383 msgid ""
384 "The [usermap] section is used to specify mappings of Mercurial\n"
384 "The [usermap] section is used to specify mappings of Mercurial\n"
385 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
385 "committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
386 "\"committer\"=\"Bugzilla user\""
386 "\"committer\"=\"Bugzilla user\""
387 msgstr ""
387 msgstr ""
388
388
389 msgid "Finally, the [web] section supports one entry:"
389 msgid "Finally, the [web] section supports one entry:"
390 msgstr ""
390 msgstr ""
391
391
392 msgid ""
392 msgid ""
393 "baseurl\n"
393 "baseurl\n"
394 " Base URL for browsing Mercurial repositories. Reference from\n"
394 " Base URL for browsing Mercurial repositories. Reference from\n"
395 " templates as {hgweb}."
395 " templates as {hgweb}."
396 msgstr ""
396 msgstr ""
397
397
398 msgid "Activating the extension::"
398 msgid "Activating the extension::"
399 msgstr ""
399 msgstr ""
400
400
401 msgid ""
401 msgid ""
402 " [extensions]\n"
402 " [extensions]\n"
403 " bugzilla ="
403 " bugzilla ="
404 msgstr ""
404 msgstr ""
405
405
406 msgid ""
406 msgid ""
407 " [hooks]\n"
407 " [hooks]\n"
408 " # run bugzilla hook on every change pulled or pushed in here\n"
408 " # run bugzilla hook on every change pulled or pushed in here\n"
409 " incoming.bugzilla = python:hgext.bugzilla.hook"
409 " incoming.bugzilla = python:hgext.bugzilla.hook"
410 msgstr ""
410 msgstr ""
411
411
412 msgid "Example configuration:"
412 msgid "Example configuration:"
413 msgstr ""
413 msgstr ""
414
414
415 msgid ""
415 msgid ""
416 "This example configuration is for a collection of Mercurial\n"
416 "This example configuration is for a collection of Mercurial\n"
417 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
417 "repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
418 "installation in /opt/bugzilla-3.2. ::"
418 "installation in /opt/bugzilla-3.2. ::"
419 msgstr ""
419 msgstr ""
420
420
421 msgid ""
421 msgid ""
422 " [bugzilla]\n"
422 " [bugzilla]\n"
423 " host=localhost\n"
423 " host=localhost\n"
424 " password=XYZZY\n"
424 " password=XYZZY\n"
425 " version=3.0\n"
425 " version=3.0\n"
426 " bzuser=unknown@domain.com\n"
426 " bzuser=unknown@domain.com\n"
427 " bzdir=/opt/bugzilla-3.2\n"
427 " bzdir=/opt/bugzilla-3.2\n"
428 " template=Changeset {node|short} in {root|basename}.\n"
428 " template=Changeset {node|short} in {root|basename}.\n"
429 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
429 " {hgweb}/{webroot}/rev/{node|short}\\n\n"
430 " {desc}\\n\n"
430 " {desc}\\n\n"
431 " strip=5"
431 " strip=5"
432 msgstr ""
432 msgstr ""
433
433
434 msgid ""
434 msgid ""
435 " [web]\n"
435 " [web]\n"
436 " baseurl=http://dev.domain.com/hg"
436 " baseurl=http://dev.domain.com/hg"
437 msgstr ""
437 msgstr ""
438
438
439 msgid ""
439 msgid ""
440 " [usermap]\n"
440 " [usermap]\n"
441 " user@emaildomain.com=user.name@bugzilladomain.com"
441 " user@emaildomain.com=user.name@bugzilladomain.com"
442 msgstr ""
442 msgstr ""
443
443
444 msgid "Commits add a comment to the Bugzilla bug record of the form::"
444 msgid "Commits add a comment to the Bugzilla bug record of the form::"
445 msgstr ""
445 msgstr ""
446
446
447 msgid ""
447 msgid ""
448 " Changeset 3b16791d6642 in repository-name.\n"
448 " Changeset 3b16791d6642 in repository-name.\n"
449 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
449 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
450 msgstr ""
450 msgstr ""
451
451
452 msgid " Changeset commit comment. Bug 1234.\n"
452 msgid " Changeset commit comment. Bug 1234.\n"
453 msgstr ""
453 msgstr ""
454
454
455 #, python-format
455 #, python-format
456 msgid "connecting to %s:%s as %s, password %s\n"
456 msgid "connecting to %s:%s as %s, password %s\n"
457 msgstr "连接到 %s:%s as %s,密码 %s\n"
457 msgstr "连接到 %s:%s as %s,密码 %s\n"
458
458
459 #, python-format
459 #, python-format
460 msgid "query: %s %s\n"
460 msgid "query: %s %s\n"
461 msgstr "查询: %s %s\n"
461 msgstr "查询: %s %s\n"
462
462
463 #, python-format
463 #, python-format
464 msgid "failed query: %s %s\n"
464 msgid "failed query: %s %s\n"
465 msgstr "查询失败: %s %s\n"
465 msgstr "查询失败: %s %s\n"
466
466
467 msgid "unknown database schema"
467 msgid "unknown database schema"
468 msgstr "未知的数据库方案"
468 msgstr "未知的数据库方案"
469
469
470 #, python-format
470 #, python-format
471 msgid "bug %d already knows about changeset %s\n"
471 msgid "bug %d already knows about changeset %s\n"
472 msgstr ""
472 msgstr ""
473
473
474 msgid "telling bugzilla to send mail:\n"
474 msgid "telling bugzilla to send mail:\n"
475 msgstr ""
475 msgstr ""
476
476
477 #, python-format
477 #, python-format
478 msgid " bug %s\n"
478 msgid " bug %s\n"
479 msgstr ""
479 msgstr ""
480
480
481 #, python-format
481 #, python-format
482 msgid "running notify command %s\n"
482 msgid "running notify command %s\n"
483 msgstr ""
483 msgstr ""
484
484
485 #, python-format
485 #, python-format
486 msgid "bugzilla notify command %s"
486 msgid "bugzilla notify command %s"
487 msgstr ""
487 msgstr ""
488
488
489 msgid "done\n"
489 msgid "done\n"
490 msgstr "完成\n"
490 msgstr "完成\n"
491
491
492 #, python-format
492 #, python-format
493 msgid "looking up user %s\n"
493 msgid "looking up user %s\n"
494 msgstr ""
494 msgstr ""
495
495
496 #, python-format
496 #, python-format
497 msgid "cannot find bugzilla user id for %s"
497 msgid "cannot find bugzilla user id for %s"
498 msgstr ""
498 msgstr ""
499
499
500 #, python-format
500 #, python-format
501 msgid "cannot find bugzilla user id for %s or %s"
501 msgid "cannot find bugzilla user id for %s or %s"
502 msgstr ""
502 msgstr ""
503
503
504 #, python-format
504 #, python-format
505 msgid "bugzilla version %s not supported"
505 msgid "bugzilla version %s not supported"
506 msgstr ""
506 msgstr ""
507
507
508 msgid ""
508 msgid ""
509 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
509 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
510 "details:\n"
510 "details:\n"
511 "\t{desc|tabindent}"
511 "\t{desc|tabindent}"
512 msgstr ""
512 msgstr ""
513
513
514 #, python-format
514 #, python-format
515 msgid "python mysql support not available: %s"
515 msgid "python mysql support not available: %s"
516 msgstr ""
516 msgstr ""
517
517
518 #, python-format
518 #, python-format
519 msgid "hook type %s does not pass a changeset id"
519 msgid "hook type %s does not pass a changeset id"
520 msgstr ""
520 msgstr ""
521
521
522 #, python-format
522 #, python-format
523 msgid "database error: %s"
523 msgid "database error: %s"
524 msgstr ""
524 msgstr ""
525
525
526 msgid "command to display child changesets"
526 msgid "command to display child changesets"
527 msgstr "列出子修改集的命令"
527 msgstr "列出子修改集的命令"
528
528
529 #, fuzzy
529 #, fuzzy
530 msgid "show the children of the given or working directory revision"
530 msgid "show the children of the given or working directory revision"
531 msgstr "显示工作目录或指定版本的父亲"
531 msgstr "显示工作目录或指定版本的父亲"
532
532
533 #, fuzzy
533 #, fuzzy
534 msgid ""
534 msgid ""
535 " Print the children of the working directory's revisions. If a\n"
535 " Print the children of the working directory's revisions. If a\n"
536 " revision is given via -r/--rev, the children of that revision will\n"
536 " revision is given via -r/--rev, the children of that revision will\n"
537 " be printed. If a file argument is given, revision in which the\n"
537 " be printed. If a file argument is given, revision in which the\n"
538 " file was last changed (after the working directory revision or the\n"
538 " file was last changed (after the working directory revision or the\n"
539 " argument to --rev if given) is printed.\n"
539 " argument to --rev if given) is printed.\n"
540 " "
540 " "
541 msgstr ""
541 msgstr ""
542 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
542 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
543 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
543 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
544 " 版本,或 '--rev' 指定的版本)。\n"
544 " 版本,或 '--rev' 指定的版本)。\n"
545 " "
545 " "
546
546
547 msgid "show children of the specified revision"
547 msgid "show children of the specified revision"
548 msgstr "显示指定版本的子孙"
548 msgstr "显示指定版本的子孙"
549
549
550 msgid "hg children [-r REV] [FILE]"
550 msgid "hg children [-r REV] [FILE]"
551 msgstr ""
551 msgstr ""
552
552
553 msgid "command to display statistics about repository history"
553 msgid "command to display statistics about repository history"
554 msgstr ""
554 msgstr ""
555
555
556 #, python-format
556 #, python-format
557 msgid "Revision %d is a merge, ignoring...\n"
557 msgid "Revision %d is a merge, ignoring...\n"
558 msgstr ""
558 msgstr ""
559
559
560 #, python-format
560 #, python-format
561 msgid "generating stats: %d%%"
561 msgid "generating stats: %d%%"
562 msgstr ""
562 msgstr ""
563
563
564 msgid "histogram of changes to the repository"
564 msgid "histogram of changes to the repository"
565 msgstr ""
565 msgstr ""
566
566
567 msgid ""
567 msgid ""
568 " This command will display a histogram representing the number\n"
568 " This command will display a histogram representing the number\n"
569 " of changed lines or revisions, grouped according to the given\n"
569 " of changed lines or revisions, grouped according to the given\n"
570 " template. The default template will group changes by author.\n"
570 " template. The default template will group changes by author.\n"
571 " The --dateformat option may be used to group the results by\n"
571 " The --dateformat option may be used to group the results by\n"
572 " date instead."
572 " date instead."
573 msgstr ""
573 msgstr ""
574
574
575 msgid ""
575 msgid ""
576 " Statistics are based on the number of changed lines, or\n"
576 " Statistics are based on the number of changed lines, or\n"
577 " alternatively the number of matching revisions if the\n"
577 " alternatively the number of matching revisions if the\n"
578 " --changesets option is specified."
578 " --changesets option is specified."
579 msgstr ""
579 msgstr ""
580
580
581 msgid " Examples::"
581 msgid " Examples::"
582 msgstr ""
582 msgstr ""
583
583
584 msgid ""
584 msgid ""
585 " # display count of changed lines for every committer\n"
585 " # display count of changed lines for every committer\n"
586 " hg churn -t '{author|email}'"
586 " hg churn -t '{author|email}'"
587 msgstr ""
587 msgstr ""
588
588
589 msgid ""
589 msgid ""
590 " # display daily activity graph\n"
590 " # display daily activity graph\n"
591 " hg churn -f '%H' -s -c"
591 " hg churn -f '%H' -s -c"
592 msgstr ""
592 msgstr ""
593
593
594 msgid ""
594 msgid ""
595 " # display activity of developers by month\n"
595 " # display activity of developers by month\n"
596 " hg churn -f '%Y-%m' -s -c"
596 " hg churn -f '%Y-%m' -s -c"
597 msgstr ""
597 msgstr ""
598
598
599 msgid ""
599 msgid ""
600 " # display count of lines changed in every year\n"
600 " # display count of lines changed in every year\n"
601 " hg churn -f '%Y' -s"
601 " hg churn -f '%Y' -s"
602 msgstr ""
602 msgstr ""
603
603
604 msgid ""
604 msgid ""
605 " It is possible to map alternate email addresses to a main address\n"
605 " It is possible to map alternate email addresses to a main address\n"
606 " by providing a file using the following format::"
606 " by providing a file using the following format::"
607 msgstr ""
607 msgstr ""
608
608
609 msgid " <alias email> <actual email>"
609 msgid " <alias email> <actual email>"
610 msgstr ""
610 msgstr ""
611
611
612 msgid ""
612 msgid ""
613 " Such a file may be specified with the --aliases option, otherwise\n"
613 " Such a file may be specified with the --aliases option, otherwise\n"
614 " a .hgchurn file will be looked for in the working directory root.\n"
614 " a .hgchurn file will be looked for in the working directory root.\n"
615 " "
615 " "
616 msgstr ""
616 msgstr ""
617
617
618 #, python-format
618 #, python-format
619 msgid "assuming %i character terminal\n"
619 msgid "assuming %i character terminal\n"
620 msgstr ""
620 msgstr ""
621
621
622 msgid "count rate for the specified revision or range"
622 msgid "count rate for the specified revision or range"
623 msgstr ""
623 msgstr ""
624
624
625 #, fuzzy
625 #, fuzzy
626 msgid "count rate for revisions matching date spec"
626 msgid "count rate for revisions matching date spec"
627 msgstr "显示匹配日期的版本"
627 msgstr "显示匹配日期的版本"
628
628
629 msgid "template to group changesets"
629 msgid "template to group changesets"
630 msgstr ""
630 msgstr ""
631
631
632 msgid "strftime-compatible format for grouping by date"
632 msgid "strftime-compatible format for grouping by date"
633 msgstr ""
633 msgstr ""
634
634
635 msgid "count rate by number of changesets"
635 msgid "count rate by number of changesets"
636 msgstr ""
636 msgstr ""
637
637
638 msgid "sort by key (default: sort by count)"
638 msgid "sort by key (default: sort by count)"
639 msgstr ""
639 msgstr ""
640
640
641 msgid "file with email aliases"
641 msgid "file with email aliases"
642 msgstr ""
642 msgstr ""
643
643
644 msgid "show progress"
644 msgid "show progress"
645 msgstr ""
645 msgstr ""
646
646
647 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
647 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
648 msgstr ""
648 msgstr ""
649
649
650 msgid "colorize output from some commands"
650 msgid "colorize output from some commands"
651 msgstr ""
651 msgstr ""
652
652
653 msgid ""
653 msgid ""
654 "This extension modifies the status command to add color to its output\n"
654 "This extension modifies the status command to add color to its output\n"
655 "to reflect file status, the qseries command to add color to reflect\n"
655 "to reflect file status, the qseries command to add color to reflect\n"
656 "patch status (applied, unapplied, missing), and to diff-related\n"
656 "patch status (applied, unapplied, missing), and to diff-related\n"
657 "commands to highlight additions, removals, diff headers, and trailing\n"
657 "commands to highlight additions, removals, diff headers, and trailing\n"
658 "whitespace."
658 "whitespace."
659 msgstr ""
659 msgstr ""
660
660
661 msgid ""
661 msgid ""
662 "Other effects in addition to color, like bold and underlined text, are\n"
662 "Other effects in addition to color, like bold and underlined text, are\n"
663 "also available. Effects are rendered with the ECMA-48 SGR control\n"
663 "also available. Effects are rendered with the ECMA-48 SGR control\n"
664 "function (aka ANSI escape codes). This module also provides the\n"
664 "function (aka ANSI escape codes). This module also provides the\n"
665 "render_text function, which can be used to add effects to any text."
665 "render_text function, which can be used to add effects to any text."
666 msgstr ""
666 msgstr ""
667
667
668 msgid "Default effects may be overridden from the .hgrc file::"
668 msgid "Default effects may be overridden from the .hgrc file::"
669 msgstr ""
669 msgstr ""
670
670
671 msgid ""
671 msgid ""
672 " [color]\n"
672 " [color]\n"
673 " status.modified = blue bold underline red_background\n"
673 " status.modified = blue bold underline red_background\n"
674 " status.added = green bold\n"
674 " status.added = green bold\n"
675 " status.removed = red bold blue_background\n"
675 " status.removed = red bold blue_background\n"
676 " status.deleted = cyan bold underline\n"
676 " status.deleted = cyan bold underline\n"
677 " status.unknown = magenta bold underline\n"
677 " status.unknown = magenta bold underline\n"
678 " status.ignored = black bold"
678 " status.ignored = black bold"
679 msgstr ""
679 msgstr ""
680
680
681 msgid ""
681 msgid ""
682 " # 'none' turns off all effects\n"
682 " # 'none' turns off all effects\n"
683 " status.clean = none\n"
683 " status.clean = none\n"
684 " status.copied = none"
684 " status.copied = none"
685 msgstr ""
685 msgstr ""
686
686
687 msgid ""
687 msgid ""
688 " qseries.applied = blue bold underline\n"
688 " qseries.applied = blue bold underline\n"
689 " qseries.unapplied = black bold\n"
689 " qseries.unapplied = black bold\n"
690 " qseries.missing = red bold"
690 " qseries.missing = red bold"
691 msgstr ""
691 msgstr ""
692
692
693 msgid ""
693 msgid ""
694 " diff.diffline = bold\n"
694 " diff.diffline = bold\n"
695 " diff.extended = cyan bold\n"
695 " diff.extended = cyan bold\n"
696 " diff.file_a = red bold\n"
696 " diff.file_a = red bold\n"
697 " diff.file_b = green bold\n"
697 " diff.file_b = green bold\n"
698 " diff.hunk = magenta\n"
698 " diff.hunk = magenta\n"
699 " diff.deleted = red\n"
699 " diff.deleted = red\n"
700 " diff.inserted = green\n"
700 " diff.inserted = green\n"
701 " diff.changed = white\n"
701 " diff.changed = white\n"
702 " diff.trailingwhitespace = bold red_background\n"
702 " diff.trailingwhitespace = bold red_background\n"
703 msgstr ""
703 msgstr ""
704
704
705 msgid "when to colorize (always, auto, or never)"
705 msgid "when to colorize (always, auto, or never)"
706 msgstr ""
706 msgstr ""
707
707
708 msgid "don't colorize output"
708 msgid "don't colorize output"
709 msgstr ""
709 msgstr ""
710
710
711 #, python-format
711 #, python-format
712 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
712 msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
713 msgstr ""
713 msgstr ""
714
714
715 msgid "import revisions from foreign VCS repositories into Mercurial"
715 msgid "import revisions from foreign VCS repositories into Mercurial"
716 msgstr ""
716 msgstr ""
717
717
718 msgid "convert a foreign SCM repository to a Mercurial one."
718 msgid "convert a foreign SCM repository to a Mercurial one."
719 msgstr ""
719 msgstr ""
720
720
721 msgid " Accepted source formats [identifiers]:"
721 msgid " Accepted source formats [identifiers]:"
722 msgstr ""
722 msgstr ""
723
723
724 msgid ""
724 msgid ""
725 " - Mercurial [hg]\n"
725 " - Mercurial [hg]\n"
726 " - CVS [cvs]\n"
726 " - CVS [cvs]\n"
727 " - Darcs [darcs]\n"
727 " - Darcs [darcs]\n"
728 " - git [git]\n"
728 " - git [git]\n"
729 " - Subversion [svn]\n"
729 " - Subversion [svn]\n"
730 " - Monotone [mtn]\n"
730 " - Monotone [mtn]\n"
731 " - GNU Arch [gnuarch]\n"
731 " - GNU Arch [gnuarch]\n"
732 " - Bazaar [bzr]\n"
732 " - Bazaar [bzr]\n"
733 " - Perforce [p4]"
733 " - Perforce [p4]"
734 msgstr ""
734 msgstr ""
735
735
736 msgid " Accepted destination formats [identifiers]:"
736 msgid " Accepted destination formats [identifiers]:"
737 msgstr ""
737 msgstr ""
738
738
739 msgid ""
739 msgid ""
740 " - Mercurial [hg]\n"
740 " - Mercurial [hg]\n"
741 " - Subversion [svn] (history on branches is not preserved)"
741 " - Subversion [svn] (history on branches is not preserved)"
742 msgstr ""
742 msgstr ""
743
743
744 msgid ""
744 msgid ""
745 " If no revision is given, all revisions will be converted.\n"
745 " If no revision is given, all revisions will be converted.\n"
746 " Otherwise, convert will only import up to the named revision\n"
746 " Otherwise, convert will only import up to the named revision\n"
747 " (given in a format understood by the source)."
747 " (given in a format understood by the source)."
748 msgstr ""
748 msgstr ""
749
749
750 msgid ""
750 msgid ""
751 " If no destination directory name is specified, it defaults to the\n"
751 " If no destination directory name is specified, it defaults to the\n"
752 " basename of the source with '-hg' appended. If the destination\n"
752 " basename of the source with '-hg' appended. If the destination\n"
753 " repository doesn't exist, it will be created."
753 " repository doesn't exist, it will be created."
754 msgstr ""
754 msgstr ""
755
755
756 msgid ""
756 msgid ""
757 " By default, all sources except Mercurial will use --branchsort.\n"
757 " By default, all sources except Mercurial will use --branchsort.\n"
758 " Mercurial uses --sourcesort to preserve original revision numbers\n"
758 " Mercurial uses --sourcesort to preserve original revision numbers\n"
759 " order. Sort modes have the following effects:"
759 " order. Sort modes have the following effects:"
760 msgstr ""
760 msgstr ""
761
761
762 msgid ""
762 msgid ""
763 " --branchsort convert from parent to child revision when possible,\n"
763 " --branchsort convert from parent to child revision when possible,\n"
764 " which means branches are usually converted one after\n"
764 " which means branches are usually converted one after\n"
765 " the other. It generates more compact repositories."
765 " the other. It generates more compact repositories."
766 msgstr ""
766 msgstr ""
767
767
768 msgid ""
768 msgid ""
769 " --datesort sort revisions by date. Converted repositories have\n"
769 " --datesort sort revisions by date. Converted repositories have\n"
770 " good-looking changelogs but are often an order of\n"
770 " good-looking changelogs but are often an order of\n"
771 " magnitude larger than the same ones generated by\n"
771 " magnitude larger than the same ones generated by\n"
772 " --branchsort."
772 " --branchsort."
773 msgstr ""
773 msgstr ""
774
774
775 msgid ""
775 msgid ""
776 " --sourcesort try to preserve source revisions order, only\n"
776 " --sourcesort try to preserve source revisions order, only\n"
777 " supported by Mercurial sources."
777 " supported by Mercurial sources."
778 msgstr ""
778 msgstr ""
779
779
780 msgid ""
780 msgid ""
781 " If <REVMAP> isn't given, it will be put in a default location\n"
781 " If <REVMAP> isn't given, it will be put in a default location\n"
782 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
782 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
783 " that maps each source commit ID to the destination ID for that\n"
783 " that maps each source commit ID to the destination ID for that\n"
784 " revision, like so::"
784 " revision, like so::"
785 msgstr ""
785 msgstr ""
786
786
787 msgid " <source ID> <destination ID>"
787 msgid " <source ID> <destination ID>"
788 msgstr ""
788 msgstr ""
789
789
790 msgid ""
790 msgid ""
791 " If the file doesn't exist, it's automatically created. It's\n"
791 " If the file doesn't exist, it's automatically created. It's\n"
792 " updated on each commit copied, so convert-repo can be interrupted\n"
792 " updated on each commit copied, so convert-repo can be interrupted\n"
793 " and can be run repeatedly to copy new commits."
793 " and can be run repeatedly to copy new commits."
794 msgstr ""
794 msgstr ""
795
795
796 msgid ""
796 msgid ""
797 " The [username mapping] file is a simple text file that maps each\n"
797 " The [username mapping] file is a simple text file that maps each\n"
798 " source commit author to a destination commit author. It is handy\n"
798 " source commit author to a destination commit author. It is handy\n"
799 " for source SCMs that use unix logins to identify authors (eg:\n"
799 " for source SCMs that use unix logins to identify authors (eg:\n"
800 " CVS). One line per author mapping and the line format is:\n"
800 " CVS). One line per author mapping and the line format is:\n"
801 " srcauthor=whatever string you want"
801 " srcauthor=whatever string you want"
802 msgstr ""
802 msgstr ""
803
803
804 msgid ""
804 msgid ""
805 " The filemap is a file that allows filtering and remapping of files\n"
805 " The filemap is a file that allows filtering and remapping of files\n"
806 " and directories. Comment lines start with '#'. Each line can\n"
806 " and directories. Comment lines start with '#'. Each line can\n"
807 " contain one of the following directives::"
807 " contain one of the following directives::"
808 msgstr ""
808 msgstr ""
809
809
810 msgid " include path/to/file"
810 msgid " include path/to/file"
811 msgstr ""
811 msgstr ""
812
812
813 msgid " exclude path/to/file"
813 msgid " exclude path/to/file"
814 msgstr ""
814 msgstr ""
815
815
816 msgid " rename from/file to/file"
816 msgid " rename from/file to/file"
817 msgstr ""
817 msgstr ""
818
818
819 msgid ""
819 msgid ""
820 " The 'include' directive causes a file, or all files under a\n"
820 " The 'include' directive causes a file, or all files under a\n"
821 " directory, to be included in the destination repository, and the\n"
821 " directory, to be included in the destination repository, and the\n"
822 " exclusion of all other files and directories not explicitly\n"
822 " exclusion of all other files and directories not explicitly\n"
823 " included. The 'exclude' directive causes files or directories to\n"
823 " included. The 'exclude' directive causes files or directories to\n"
824 " be omitted. The 'rename' directive renames a file or directory. To\n"
824 " be omitted. The 'rename' directive renames a file or directory. To\n"
825 " rename from a subdirectory into the root of the repository, use\n"
825 " rename from a subdirectory into the root of the repository, use\n"
826 " '.' as the path to rename to."
826 " '.' as the path to rename to."
827 msgstr ""
827 msgstr ""
828
828
829 msgid ""
829 msgid ""
830 " The splicemap is a file that allows insertion of synthetic\n"
830 " The splicemap is a file that allows insertion of synthetic\n"
831 " history, letting you specify the parents of a revision. This is\n"
831 " history, letting you specify the parents of a revision. This is\n"
832 " useful if you want to e.g. give a Subversion merge two parents, or\n"
832 " useful if you want to e.g. give a Subversion merge two parents, or\n"
833 " graft two disconnected series of history together. Each entry\n"
833 " graft two disconnected series of history together. Each entry\n"
834 " contains a key, followed by a space, followed by one or two\n"
834 " contains a key, followed by a space, followed by one or two\n"
835 " comma-separated values. The key is the revision ID in the source\n"
835 " comma-separated values. The key is the revision ID in the source\n"
836 " revision control system whose parents should be modified (same\n"
836 " revision control system whose parents should be modified (same\n"
837 " format as a key in .hg/shamap). The values are the revision IDs\n"
837 " format as a key in .hg/shamap). The values are the revision IDs\n"
838 " (in either the source or destination revision control system) that\n"
838 " (in either the source or destination revision control system) that\n"
839 " should be used as the new parents for that node."
839 " should be used as the new parents for that node."
840 msgstr ""
840 msgstr ""
841
841
842 msgid ""
842 msgid ""
843 " The branchmap is a file that allows you to rename a branch when it is\n"
843 " The branchmap is a file that allows you to rename a branch when it is\n"
844 " being brought in from whatever external repository. When used in\n"
844 " being brought in from whatever external repository. When used in\n"
845 " conjunction with a splicemap, it allows for a powerful combination\n"
845 " conjunction with a splicemap, it allows for a powerful combination\n"
846 " to help fix even the most badly mismanaged repositories and turn them\n"
846 " to help fix even the most badly mismanaged repositories and turn them\n"
847 " into nicely structured Mercurial repositories. The branchmap contains\n"
847 " into nicely structured Mercurial repositories. The branchmap contains\n"
848 " lines of the form \"original_branch_name new_branch_name\".\n"
848 " lines of the form \"original_branch_name new_branch_name\".\n"
849 " \"original_branch_name\" is the name of the branch in the source\n"
849 " \"original_branch_name\" is the name of the branch in the source\n"
850 " repository, and \"new_branch_name\" is the name of the branch is the\n"
850 " repository, and \"new_branch_name\" is the name of the branch is the\n"
851 " destination repository. This can be used to (for instance) move code\n"
851 " destination repository. This can be used to (for instance) move code\n"
852 " in one repository from \"default\" to a named branch."
852 " in one repository from \"default\" to a named branch."
853 msgstr ""
853 msgstr ""
854
854
855 msgid ""
855 msgid ""
856 " Mercurial Source\n"
856 " Mercurial Source\n"
857 " ----------------"
857 " ----------------"
858 msgstr ""
858 msgstr ""
859
859
860 msgid ""
860 msgid ""
861 " --config convert.hg.ignoreerrors=False (boolean)\n"
861 " --config convert.hg.ignoreerrors=False (boolean)\n"
862 " ignore integrity errors when reading. Use it to fix Mercurial\n"
862 " ignore integrity errors when reading. Use it to fix Mercurial\n"
863 " repositories with missing revlogs, by converting from and to\n"
863 " repositories with missing revlogs, by converting from and to\n"
864 " Mercurial.\n"
864 " Mercurial.\n"
865 " --config convert.hg.saverev=False (boolean)\n"
865 " --config convert.hg.saverev=False (boolean)\n"
866 " store original revision ID in changeset (forces target IDs to\n"
866 " store original revision ID in changeset (forces target IDs to\n"
867 " change)\n"
867 " change)\n"
868 " --config convert.hg.startrev=0 (hg revision identifier)\n"
868 " --config convert.hg.startrev=0 (hg revision identifier)\n"
869 " convert start revision and its descendants"
869 " convert start revision and its descendants"
870 msgstr ""
870 msgstr ""
871
871
872 msgid ""
872 msgid ""
873 " CVS Source\n"
873 " CVS Source\n"
874 " ----------"
874 " ----------"
875 msgstr ""
875 msgstr ""
876
876
877 msgid ""
877 msgid ""
878 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
878 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
879 " to indicate the starting point of what will be converted. Direct\n"
879 " to indicate the starting point of what will be converted. Direct\n"
880 " access to the repository files is not needed, unless of course the\n"
880 " access to the repository files is not needed, unless of course the\n"
881 " repository is :local:. The conversion uses the top level directory\n"
881 " repository is :local:. The conversion uses the top level directory\n"
882 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
882 " in the sandbox to find the CVS repository, and then uses CVS rlog\n"
883 " commands to find files to convert. This means that unless a\n"
883 " commands to find files to convert. This means that unless a\n"
884 " filemap is given, all files under the starting directory will be\n"
884 " filemap is given, all files under the starting directory will be\n"
885 " converted, and that any directory reorganization in the CVS\n"
885 " converted, and that any directory reorganization in the CVS\n"
886 " sandbox is ignored."
886 " sandbox is ignored."
887 msgstr ""
887 msgstr ""
888
888
889 msgid ""
889 msgid ""
890 " Because CVS does not have changesets, it is necessary to collect\n"
890 " Because CVS does not have changesets, it is necessary to collect\n"
891 " individual commits to CVS and merge them into changesets. CVS\n"
891 " individual commits to CVS and merge them into changesets. CVS\n"
892 " source uses its internal changeset merging code by default but can\n"
892 " source uses its internal changeset merging code by default but can\n"
893 " be configured to call the external 'cvsps' program by setting::"
893 " be configured to call the external 'cvsps' program by setting::"
894 msgstr ""
894 msgstr ""
895
895
896 msgid " --config convert.cvsps='cvsps -A -u --cvs-direct -q'"
896 msgid " --config convert.cvsps='cvsps -A -u --cvs-direct -q'"
897 msgstr ""
897 msgstr ""
898
898
899 msgid " This option is deprecated and will be removed in Mercurial 1.4."
899 msgid " This option is deprecated and will be removed in Mercurial 1.4."
900 msgstr ""
900 msgstr ""
901
901
902 msgid " The options shown are the defaults."
902 msgid " The options shown are the defaults."
903 msgstr ""
903 msgstr ""
904
904
905 msgid " Internal cvsps is selected by setting ::"
905 msgid " Internal cvsps is selected by setting ::"
906 msgstr ""
906 msgstr ""
907
907
908 msgid " --config convert.cvsps=builtin"
908 msgid " --config convert.cvsps=builtin"
909 msgstr ""
909 msgstr ""
910
910
911 msgid " and has a few more configurable options:"
911 msgid " and has a few more configurable options:"
912 msgstr ""
912 msgstr ""
913
913
914 msgid ""
914 msgid ""
915 " --config convert.cvsps.cache=True (boolean)\n"
915 " --config convert.cvsps.cache=True (boolean)\n"
916 " Set to False to disable remote log caching, for testing and\n"
916 " Set to False to disable remote log caching, for testing and\n"
917 " debugging purposes.\n"
917 " debugging purposes.\n"
918 " --config convert.cvsps.fuzz=60 (integer)\n"
918 " --config convert.cvsps.fuzz=60 (integer)\n"
919 " Specify the maximum time (in seconds) that is allowed between\n"
919 " Specify the maximum time (in seconds) that is allowed between\n"
920 " commits with identical user and log message in a single\n"
920 " commits with identical user and log message in a single\n"
921 " changeset. When very large files were checked in as part of a\n"
921 " changeset. When very large files were checked in as part of a\n"
922 " changeset then the default may not be long enough.\n"
922 " changeset then the default may not be long enough.\n"
923 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
923 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
924 " Specify a regular expression to which commit log messages are\n"
924 " Specify a regular expression to which commit log messages are\n"
925 " matched. If a match occurs, then the conversion process will\n"
925 " matched. If a match occurs, then the conversion process will\n"
926 " insert a dummy revision merging the branch on which this log\n"
926 " insert a dummy revision merging the branch on which this log\n"
927 " message occurs to the branch indicated in the regex.\n"
927 " message occurs to the branch indicated in the regex.\n"
928 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
928 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
929 " Specify a regular expression to which commit log messages are\n"
929 " Specify a regular expression to which commit log messages are\n"
930 " matched. If a match occurs, then the conversion process will\n"
930 " matched. If a match occurs, then the conversion process will\n"
931 " add the most recent revision on the branch indicated in the\n"
931 " add the most recent revision on the branch indicated in the\n"
932 " regex as the second parent of the changeset."
932 " regex as the second parent of the changeset."
933 msgstr ""
933 msgstr ""
934
934
935 msgid ""
935 msgid ""
936 " The hgext/convert/cvsps wrapper script allows the builtin\n"
936 " The hgext/convert/cvsps wrapper script allows the builtin\n"
937 " changeset merging code to be run without doing a conversion. Its\n"
937 " changeset merging code to be run without doing a conversion. Its\n"
938 " parameters and output are similar to that of cvsps 2.1."
938 " parameters and output are similar to that of cvsps 2.1."
939 msgstr ""
939 msgstr ""
940
940
941 msgid ""
941 msgid ""
942 " Subversion Source\n"
942 " Subversion Source\n"
943 " -----------------"
943 " -----------------"
944 msgstr ""
944 msgstr ""
945
945
946 msgid ""
946 msgid ""
947 " Subversion source detects classical trunk/branches/tags layouts.\n"
947 " Subversion source detects classical trunk/branches/tags layouts.\n"
948 " By default, the supplied \"svn://repo/path/\" source URL is\n"
948 " By default, the supplied \"svn://repo/path/\" source URL is\n"
949 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
949 " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n"
950 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
950 " replaces the default branch. If \"svn://repo/path/branches\" exists,\n"
951 " its subdirectories are listed as possible branches. If\n"
951 " its subdirectories are listed as possible branches. If\n"
952 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
952 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
953 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
953 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
954 " can be overridden with following options. Set them to paths\n"
954 " can be overridden with following options. Set them to paths\n"
955 " relative to the source URL, or leave them blank to disable auto\n"
955 " relative to the source URL, or leave them blank to disable auto\n"
956 " detection."
956 " detection."
957 msgstr ""
957 msgstr ""
958
958
959 msgid ""
959 msgid ""
960 " --config convert.svn.branches=branches (directory name)\n"
960 " --config convert.svn.branches=branches (directory name)\n"
961 " specify the directory containing branches\n"
961 " specify the directory containing branches\n"
962 " --config convert.svn.tags=tags (directory name)\n"
962 " --config convert.svn.tags=tags (directory name)\n"
963 " specify the directory containing tags\n"
963 " specify the directory containing tags\n"
964 " --config convert.svn.trunk=trunk (directory name)\n"
964 " --config convert.svn.trunk=trunk (directory name)\n"
965 " specify the name of the trunk branch"
965 " specify the name of the trunk branch"
966 msgstr ""
966 msgstr ""
967
967
968 msgid ""
968 msgid ""
969 " Source history can be retrieved starting at a specific revision,\n"
969 " Source history can be retrieved starting at a specific revision,\n"
970 " instead of being integrally converted. Only single branch\n"
970 " instead of being integrally converted. Only single branch\n"
971 " conversions are supported."
971 " conversions are supported."
972 msgstr ""
972 msgstr ""
973
973
974 msgid ""
974 msgid ""
975 " --config convert.svn.startrev=0 (svn revision number)\n"
975 " --config convert.svn.startrev=0 (svn revision number)\n"
976 " specify start Subversion revision."
976 " specify start Subversion revision."
977 msgstr ""
977 msgstr ""
978
978
979 msgid ""
979 msgid ""
980 " Perforce Source\n"
980 " Perforce Source\n"
981 " ---------------"
981 " ---------------"
982 msgstr ""
982 msgstr ""
983
983
984 msgid ""
984 msgid ""
985 " The Perforce (P4) importer can be given a p4 depot path or a\n"
985 " The Perforce (P4) importer can be given a p4 depot path or a\n"
986 " client specification as source. It will convert all files in the\n"
986 " client specification as source. It will convert all files in the\n"
987 " source to a flat Mercurial repository, ignoring labels, branches\n"
987 " source to a flat Mercurial repository, ignoring labels, branches\n"
988 " and integrations. Note that when a depot path is given you then\n"
988 " and integrations. Note that when a depot path is given you then\n"
989 " usually should specify a target directory, because otherwise the\n"
989 " usually should specify a target directory, because otherwise the\n"
990 " target may be named ...-hg."
990 " target may be named ...-hg."
991 msgstr ""
991 msgstr ""
992
992
993 msgid ""
993 msgid ""
994 " It is possible to limit the amount of source history to be\n"
994 " It is possible to limit the amount of source history to be\n"
995 " converted by specifying an initial Perforce revision."
995 " converted by specifying an initial Perforce revision."
996 msgstr ""
996 msgstr ""
997
997
998 msgid ""
998 msgid ""
999 " --config convert.p4.startrev=0 (perforce changelist number)\n"
999 " --config convert.p4.startrev=0 (perforce changelist number)\n"
1000 " specify initial Perforce revision."
1000 " specify initial Perforce revision."
1001 msgstr ""
1001 msgstr ""
1002
1002
1003 msgid ""
1003 msgid ""
1004 " Mercurial Destination\n"
1004 " Mercurial Destination\n"
1005 " ---------------------"
1005 " ---------------------"
1006 msgstr ""
1006 msgstr ""
1007
1007
1008 msgid ""
1008 msgid ""
1009 " --config convert.hg.clonebranches=False (boolean)\n"
1009 " --config convert.hg.clonebranches=False (boolean)\n"
1010 " dispatch source branches in separate clones.\n"
1010 " dispatch source branches in separate clones.\n"
1011 " --config convert.hg.tagsbranch=default (branch name)\n"
1011 " --config convert.hg.tagsbranch=default (branch name)\n"
1012 " tag revisions branch name\n"
1012 " tag revisions branch name\n"
1013 " --config convert.hg.usebranchnames=True (boolean)\n"
1013 " --config convert.hg.usebranchnames=True (boolean)\n"
1014 " preserve branch names"
1014 " preserve branch names"
1015 msgstr ""
1015 msgstr ""
1016
1016
1017 msgid " "
1017 msgid " "
1018 msgstr ""
1018 msgstr ""
1019
1019
1020 msgid "create changeset information from CVS"
1020 msgid "create changeset information from CVS"
1021 msgstr ""
1021 msgstr ""
1022
1022
1023 msgid ""
1023 msgid ""
1024 " This command is intended as a debugging tool for the CVS to\n"
1024 " This command is intended as a debugging tool for the CVS to\n"
1025 " Mercurial converter, and can be used as a direct replacement for\n"
1025 " Mercurial converter, and can be used as a direct replacement for\n"
1026 " cvsps."
1026 " cvsps."
1027 msgstr ""
1027 msgstr ""
1028
1028
1029 msgid ""
1029 msgid ""
1030 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1030 " Hg debugcvsps reads the CVS rlog for current directory (or any\n"
1031 " named directory) in the CVS repository, and converts the log to a\n"
1031 " named directory) in the CVS repository, and converts the log to a\n"
1032 " series of changesets based on matching commit log entries and\n"
1032 " series of changesets based on matching commit log entries and\n"
1033 " dates."
1033 " dates."
1034 msgstr ""
1034 msgstr ""
1035
1035
1036 msgid "username mapping filename"
1036 msgid "username mapping filename"
1037 msgstr ""
1037 msgstr ""
1038
1038
1039 msgid "destination repository type"
1039 msgid "destination repository type"
1040 msgstr ""
1040 msgstr ""
1041
1041
1042 msgid "remap file names using contents of file"
1042 msgid "remap file names using contents of file"
1043 msgstr ""
1043 msgstr ""
1044
1044
1045 msgid "import up to target revision REV"
1045 msgid "import up to target revision REV"
1046 msgstr ""
1046 msgstr ""
1047
1047
1048 msgid "source repository type"
1048 msgid "source repository type"
1049 msgstr ""
1049 msgstr ""
1050
1050
1051 msgid "splice synthesized history into place"
1051 msgid "splice synthesized history into place"
1052 msgstr ""
1052 msgstr ""
1053
1053
1054 msgid "change branch names while converting"
1054 msgid "change branch names while converting"
1055 msgstr ""
1055 msgstr ""
1056
1056
1057 msgid "try to sort changesets by branches"
1057 msgid "try to sort changesets by branches"
1058 msgstr ""
1058 msgstr ""
1059
1059
1060 msgid "try to sort changesets by date"
1060 msgid "try to sort changesets by date"
1061 msgstr ""
1061 msgstr ""
1062
1062
1063 msgid "preserve source changesets order"
1063 msgid "preserve source changesets order"
1064 msgstr ""
1064 msgstr ""
1065
1065
1066 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1066 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
1067 msgstr ""
1067 msgstr ""
1068
1068
1069 msgid "only return changes on specified branches"
1069 msgid "only return changes on specified branches"
1070 msgstr ""
1070 msgstr ""
1071
1071
1072 msgid "prefix to remove from file names"
1072 msgid "prefix to remove from file names"
1073 msgstr ""
1073 msgstr ""
1074
1074
1075 msgid "only return changes after or between specified tags"
1075 msgid "only return changes after or between specified tags"
1076 msgstr ""
1076 msgstr ""
1077
1077
1078 msgid "update cvs log cache"
1078 msgid "update cvs log cache"
1079 msgstr ""
1079 msgstr ""
1080
1080
1081 msgid "create new cvs log cache"
1081 msgid "create new cvs log cache"
1082 msgstr ""
1082 msgstr ""
1083
1083
1084 msgid "set commit time fuzz in seconds"
1084 msgid "set commit time fuzz in seconds"
1085 msgstr ""
1085 msgstr ""
1086
1086
1087 msgid "specify cvsroot"
1087 msgid "specify cvsroot"
1088 msgstr ""
1088 msgstr ""
1089
1089
1090 msgid "show parent changesets"
1090 msgid "show parent changesets"
1091 msgstr ""
1091 msgstr ""
1092
1092
1093 msgid "show current changeset in ancestor branches"
1093 msgid "show current changeset in ancestor branches"
1094 msgstr ""
1094 msgstr ""
1095
1095
1096 msgid "ignored for compatibility"
1096 msgid "ignored for compatibility"
1097 msgstr ""
1097 msgstr ""
1098
1098
1099 msgid "hg debugcvsps [OPTION]... [PATH]..."
1099 msgid "hg debugcvsps [OPTION]... [PATH]..."
1100 msgstr ""
1100 msgstr ""
1101
1101
1102 msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
1102 msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
1103 msgstr ""
1103 msgstr ""
1104
1104
1105 msgid "bzr source type could not be determined\n"
1105 msgid "bzr source type could not be determined\n"
1106 msgstr ""
1106 msgstr ""
1107
1107
1108 #, python-format
1108 #, python-format
1109 msgid "%s is not a valid revision in current branch"
1109 msgid "%s is not a valid revision in current branch"
1110 msgstr ""
1110 msgstr ""
1111
1111
1112 #, python-format
1112 #, python-format
1113 msgid "%s is not available in %s anymore"
1113 msgid "%s is not available in %s anymore"
1114 msgstr ""
1114 msgstr ""
1115
1115
1116 #, python-format
1116 #, python-format
1117 msgid "%s.%s symlink has no target"
1117 msgid "%s.%s symlink has no target"
1118 msgstr ""
1118 msgstr ""
1119
1119
1120 #, python-format
1120 #, python-format
1121 msgid "cannot find required \"%s\" tool"
1121 msgid "cannot find required \"%s\" tool"
1122 msgstr ""
1122 msgstr ""
1123
1123
1124 #, python-format
1124 #, python-format
1125 msgid "running: %s\n"
1125 msgid "running: %s\n"
1126 msgstr ""
1126 msgstr ""
1127
1127
1128 #, python-format
1128 #, python-format
1129 msgid "%s error:\n"
1129 msgid "%s error:\n"
1130 msgstr ""
1130 msgstr ""
1131
1131
1132 #, python-format
1132 #, python-format
1133 msgid "syntax error in %s(%d): key/value pair expected"
1133 msgid "syntax error in %s(%d): key/value pair expected"
1134 msgstr ""
1134 msgstr ""
1135
1135
1136 #, python-format
1136 #, python-format
1137 msgid "could not open map file %r: %s"
1137 msgid "could not open map file %r: %s"
1138 msgstr ""
1138 msgstr ""
1139
1139
1140 #, python-format
1140 #, python-format
1141 msgid "%s: missing or unsupported repository"
1141 msgid "%s: missing or unsupported repository"
1142 msgstr ""
1142 msgstr ""
1143
1143
1144 #, python-format
1144 #, python-format
1145 msgid "convert: %s\n"
1145 msgid "convert: %s\n"
1146 msgstr ""
1146 msgstr ""
1147
1147
1148 #, python-format
1148 #, python-format
1149 msgid "%s: unknown repository type"
1149 msgid "%s: unknown repository type"
1150 msgstr ""
1150 msgstr ""
1151
1151
1152 #, python-format
1152 #, python-format
1153 msgid "unknown sort mode: %s"
1153 msgid "unknown sort mode: %s"
1154 msgstr "未知排序方式: %s"
1154 msgstr "未知排序方式: %s"
1155
1155
1156 #, python-format
1156 #, python-format
1157 msgid "cycle detected between %s and %s"
1157 msgid "cycle detected between %s and %s"
1158 msgstr ""
1158 msgstr ""
1159
1159
1160 msgid "not all revisions were sorted"
1160 msgid "not all revisions were sorted"
1161 msgstr ""
1161 msgstr ""
1162
1162
1163 #, python-format
1163 #, python-format
1164 msgid "Writing author map file %s\n"
1164 msgid "Writing author map file %s\n"
1165 msgstr ""
1165 msgstr ""
1166
1166
1167 #, python-format
1167 #, python-format
1168 msgid "Ignoring bad line in author map file %s: %s\n"
1168 msgid "Ignoring bad line in author map file %s: %s\n"
1169 msgstr ""
1169 msgstr ""
1170
1170
1171 #, python-format
1171 #, python-format
1172 msgid "mapping author %s to %s\n"
1172 msgid "mapping author %s to %s\n"
1173 msgstr ""
1173 msgstr ""
1174
1174
1175 #, python-format
1175 #, python-format
1176 msgid "overriding mapping for author %s, was %s, will be %s\n"
1176 msgid "overriding mapping for author %s, was %s, will be %s\n"
1177 msgstr ""
1177 msgstr ""
1178
1178
1179 #, python-format
1179 #, python-format
1180 msgid "spliced in %s as parents of %s\n"
1180 msgid "spliced in %s as parents of %s\n"
1181 msgstr ""
1181 msgstr ""
1182
1182
1183 msgid "scanning source...\n"
1183 msgid "scanning source...\n"
1184 msgstr ""
1184 msgstr ""
1185
1185
1186 msgid "sorting...\n"
1186 msgid "sorting...\n"
1187 msgstr ""
1187 msgstr ""
1188
1188
1189 msgid "converting...\n"
1189 msgid "converting...\n"
1190 msgstr ""
1190 msgstr ""
1191
1191
1192 #, python-format
1192 #, python-format
1193 msgid "source: %s\n"
1193 msgid "source: %s\n"
1194 msgstr ""
1194 msgstr ""
1195
1195
1196 #, python-format
1196 #, python-format
1197 msgid "assuming destination %s\n"
1197 msgid "assuming destination %s\n"
1198 msgstr ""
1198 msgstr ""
1199
1199
1200 msgid "more than one sort mode specified"
1200 msgid "more than one sort mode specified"
1201 msgstr ""
1201 msgstr ""
1202
1202
1203 msgid "--sourcesort is not supported by this data source"
1203 msgid "--sourcesort is not supported by this data source"
1204 msgstr ""
1204 msgstr ""
1205
1205
1206 msgid "warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4\n"
1206 msgid "warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4\n"
1207 msgstr ""
1207 msgstr ""
1208
1208
1209 #, python-format
1209 #, python-format
1210 msgid "revision %s is not a patchset number or date"
1210 msgid "revision %s is not a patchset number or date"
1211 msgstr ""
1211 msgstr ""
1212
1212
1213 msgid "using builtin cvsps\n"
1213 msgid "using builtin cvsps\n"
1214 msgstr ""
1214 msgstr ""
1215
1215
1216 #, python-format
1216 #, python-format
1217 msgid "connecting to %s\n"
1217 msgid "connecting to %s\n"
1218 msgstr ""
1218 msgstr ""
1219
1219
1220 msgid "CVS pserver authentication failed"
1220 msgid "CVS pserver authentication failed"
1221 msgstr ""
1221 msgstr ""
1222
1222
1223 #, python-format
1223 #, python-format
1224 msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1224 msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
1225 msgstr ""
1225 msgstr ""
1226
1226
1227 #, python-format
1227 #, python-format
1228 msgid "%d bytes missing from remote file"
1228 msgid "%d bytes missing from remote file"
1229 msgstr ""
1229 msgstr ""
1230
1230
1231 #, python-format
1231 #, python-format
1232 msgid "cvs server: %s\n"
1232 msgid "cvs server: %s\n"
1233 msgstr ""
1233 msgstr ""
1234
1234
1235 #, python-format
1235 #, python-format
1236 msgid "unknown CVS response: %s"
1236 msgid "unknown CVS response: %s"
1237 msgstr ""
1237 msgstr ""
1238
1238
1239 msgid "collecting CVS rlog\n"
1239 msgid "collecting CVS rlog\n"
1240 msgstr ""
1240 msgstr ""
1241
1241
1242 #, python-format
1242 #, python-format
1243 msgid "reading cvs log cache %s\n"
1243 msgid "reading cvs log cache %s\n"
1244 msgstr ""
1244 msgstr ""
1245
1245
1246 #, python-format
1246 #, python-format
1247 msgid "cache has %d log entries\n"
1247 msgid "cache has %d log entries\n"
1248 msgstr ""
1248 msgstr ""
1249
1249
1250 #, python-format
1250 #, python-format
1251 msgid "error reading cache: %r\n"
1251 msgid "error reading cache: %r\n"
1252 msgstr ""
1252 msgstr ""
1253
1253
1254 #, python-format
1254 #, python-format
1255 msgid "running %s\n"
1255 msgid "running %s\n"
1256 msgstr ""
1256 msgstr ""
1257
1257
1258 #, python-format
1258 #, python-format
1259 msgid "prefix=%r directory=%r root=%r\n"
1259 msgid "prefix=%r directory=%r root=%r\n"
1260 msgstr ""
1260 msgstr ""
1261
1261
1262 msgid "RCS file must be followed by working file"
1262 msgid "RCS file must be followed by working file"
1263 msgstr ""
1263 msgstr ""
1264
1264
1265 msgid "must have at least some revisions"
1265 msgid "must have at least some revisions"
1266 msgstr ""
1266 msgstr ""
1267
1267
1268 msgid "expected revision number"
1268 msgid "expected revision number"
1269 msgstr ""
1269 msgstr ""
1270
1270
1271 msgid "revision must be followed by date line"
1271 msgid "revision must be followed by date line"
1272 msgstr ""
1272 msgstr ""
1273
1273
1274 #, python-format
1274 #, python-format
1275 msgid "found synthetic revision in %s: %r\n"
1275 msgid "found synthetic revision in %s: %r\n"
1276 msgstr "%s 有伪造版本: %r\n"
1276 msgstr "%s 有伪造版本: %r\n"
1277
1277
1278 #, python-format
1278 #, python-format
1279 msgid "writing cvs log cache %s\n"
1279 msgid "writing cvs log cache %s\n"
1280 msgstr ""
1280 msgstr ""
1281
1281
1282 #, python-format
1282 #, python-format
1283 msgid "%d log entries\n"
1283 msgid "%d log entries\n"
1284 msgstr ""
1284 msgstr ""
1285
1285
1286 msgid "creating changesets\n"
1286 msgid "creating changesets\n"
1287 msgstr ""
1287 msgstr ""
1288
1288
1289 msgid "synthetic changeset cannot have multiple parents"
1289 msgid "synthetic changeset cannot have multiple parents"
1290 msgstr ""
1290 msgstr ""
1291
1291
1292 #, python-format
1292 #, python-format
1293 msgid ""
1293 msgid ""
1294 "warning: CVS commit message references non-existent branch %r:\n"
1294 "warning: CVS commit message references non-existent branch %r:\n"
1295 "%s\n"
1295 "%s\n"
1296 msgstr ""
1296 msgstr ""
1297
1297
1298 #, python-format
1298 #, python-format
1299 msgid "%d changeset entries\n"
1299 msgid "%d changeset entries\n"
1300 msgstr ""
1300 msgstr ""
1301
1301
1302 #, python-format
1302 #, python-format
1303 msgid "darcs version 2.1 or newer needed (found %r)"
1303 msgid "darcs version 2.1 or newer needed (found %r)"
1304 msgstr ""
1304 msgstr ""
1305
1305
1306 msgid "Python ElementTree module is not available"
1306 msgid "Python ElementTree module is not available"
1307 msgstr ""
1307 msgstr ""
1308
1308
1309 #, python-format
1309 #, python-format
1310 msgid "cleaning up %s\n"
1310 msgid "cleaning up %s\n"
1311 msgstr ""
1311 msgstr ""
1312
1312
1313 msgid "internal calling inconsistency"
1313 msgid "internal calling inconsistency"
1314 msgstr ""
1314 msgstr ""
1315
1315
1316 msgid "errors in filemap"
1316 msgid "errors in filemap"
1317 msgstr ""
1317 msgstr ""
1318
1318
1319 #, python-format
1319 #, python-format
1320 msgid "%s:%d: %r already in %s list\n"
1320 msgid "%s:%d: %r already in %s list\n"
1321 msgstr ""
1321 msgstr ""
1322
1322
1323 #, python-format
1323 #, python-format
1324 msgid "%s:%d: unknown directive %r\n"
1324 msgid "%s:%d: unknown directive %r\n"
1325 msgstr ""
1325 msgstr ""
1326
1326
1327 msgid "source repository doesn't support --filemap"
1327 msgid "source repository doesn't support --filemap"
1328 msgstr ""
1328 msgstr ""
1329
1329
1330 #, python-format
1330 #, python-format
1331 msgid "%s does not look like a GNU Arch repo"
1331 msgid "%s does not look like a GNU Arch repo"
1332 msgstr ""
1332 msgstr ""
1333
1333
1334 msgid "cannot find a GNU Arch tool"
1334 msgid "cannot find a GNU Arch tool"
1335 msgstr ""
1335 msgstr ""
1336
1336
1337 #, python-format
1337 #, python-format
1338 msgid "analyzing tree version %s...\n"
1338 msgid "analyzing tree version %s...\n"
1339 msgstr ""
1339 msgstr ""
1340
1340
1341 #, python-format
1341 #, python-format
1342 msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
1342 msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
1343 msgstr ""
1343 msgstr ""
1344
1344
1345 #, python-format
1345 #, python-format
1346 msgid "applying revision %s...\n"
1346 msgid "applying revision %s...\n"
1347 msgstr ""
1347 msgstr ""
1348
1348
1349 #, python-format
1349 #, python-format
1350 msgid "computing changeset between %s and %s...\n"
1350 msgid "computing changeset between %s and %s...\n"
1351 msgstr ""
1351 msgstr ""
1352
1352
1353 #, python-format
1353 #, python-format
1354 msgid "obtaining revision %s...\n"
1354 msgid "obtaining revision %s...\n"
1355 msgstr ""
1355 msgstr ""
1356
1356
1357 #, python-format
1357 #, python-format
1358 msgid "analyzing revision %s...\n"
1358 msgid "analyzing revision %s...\n"
1359 msgstr ""
1359 msgstr ""
1360
1360
1361 #, python-format
1361 #, python-format
1362 msgid "could not parse cat-log of %s"
1362 msgid "could not parse cat-log of %s"
1363 msgstr ""
1363 msgstr ""
1364
1364
1365 #, python-format
1365 #, python-format
1366 msgid "%s is not a local Mercurial repo"
1366 msgid "%s is not a local Mercurial repo"
1367 msgstr "%s 不是本地的水银版本库"
1367 msgstr "%s 不是本地的水银版本库"
1368
1368
1369 #, python-format
1369 #, python-format
1370 msgid "initializing destination %s repository\n"
1370 msgid "initializing destination %s repository\n"
1371 msgstr "初始化目标版本库 %s\n"
1371 msgstr "初始化目标版本库 %s\n"
1372
1372
1373 msgid "run hg sink pre-conversion action\n"
1373 msgid "run hg sink pre-conversion action\n"
1374 msgstr "执行动作 hg sink pre-conversion\n"
1374 msgstr "执行动作 hg sink pre-conversion\n"
1375
1375
1376 msgid "run hg sink post-conversion action\n"
1376 msgid "run hg sink post-conversion action\n"
1377 msgstr "执行动作 hg sink post-conversion action\n"
1377 msgstr "执行动作 hg sink post-conversion action\n"
1378
1378
1379 #, python-format
1379 #, python-format
1380 msgid "pulling from %s into %s\n"
1380 msgid "pulling from %s into %s\n"
1381 msgstr "自 %s 拉到 %s\n"
1381 msgstr "自 %s 拉到 %s\n"
1382
1382
1383 msgid "filtering out empty revision\n"
1383 msgid "filtering out empty revision\n"
1384 msgstr ""
1384 msgstr ""
1385
1385
1386 msgid "updating tags\n"
1386 msgid "updating tags\n"
1387 msgstr "正在更新标签\n"
1387 msgstr "正在更新标签\n"
1388
1388
1389 #, python-format
1389 #, python-format
1390 msgid "%s is not a valid start revision"
1390 msgid "%s is not a valid start revision"
1391 msgstr "%s 不是有效的开始版本"
1391 msgstr "%s 不是有效的开始版本"
1392
1392
1393 #, python-format
1393 #, python-format
1394 msgid "ignoring: %s\n"
1394 msgid "ignoring: %s\n"
1395 msgstr "忽略: %s\n"
1395 msgstr "忽略: %s\n"
1396
1396
1397 msgid "run hg source pre-conversion action\n"
1397 msgid "run hg source pre-conversion action\n"
1398 msgstr "执行动作 hg source pre-conversion\n"
1398 msgstr "执行动作 hg source pre-conversion\n"
1399
1399
1400 msgid "run hg source post-conversion action\n"
1400 msgid "run hg source post-conversion action\n"
1401 msgstr "执行动作 hg source post-conversion\n"
1401 msgstr "执行动作 hg source post-conversion\n"
1402
1402
1403 #, python-format
1403 #, python-format
1404 msgid "%s does not look like a monotone repo"
1404 msgid "%s does not look like a monotone repo"
1405 msgstr "%s 不像是单纯的 monotone 版本库"
1405 msgstr "%s 不像是单纯的 monotone 版本库"
1406
1406
1407 #, python-format
1407 #, python-format
1408 msgid "copying file in renamed directory from '%s' to '%s'"
1408 msgid "copying file in renamed directory from '%s' to '%s'"
1409 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
1409 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
1410
1410
1411 msgid "reading p4 views\n"
1411 msgid "reading p4 views\n"
1412 msgstr ""
1412 msgstr ""
1413
1413
1414 msgid "collecting p4 changelists\n"
1414 msgid "collecting p4 changelists\n"
1415 msgstr "正在搜索 p4 修改集\n"
1415 msgstr "正在搜索 p4 修改集\n"
1416
1416
1417 msgid "Subversion python bindings could not be loaded"
1417 msgid "Subversion python bindings could not be loaded"
1418 msgstr "不能加载 svn 的 python 绑定"
1418 msgstr "不能加载 svn 的 python 绑定"
1419
1419
1420 #, python-format
1420 #, python-format
1421 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1421 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1422 msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本"
1422 msgstr "发现 svn 的 python 绑定版本 %d.%d,需要 1.4 或更新的版本"
1423
1423
1424 msgid "Subversion python bindings are too old, 1.4 or later required"
1424 msgid "Subversion python bindings are too old, 1.4 or later required"
1425 msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本"
1425 msgstr "svn 的 python 绑定太旧,需要 1.4 或更新的版本"
1426
1426
1427 #, python-format
1427 #, python-format
1428 msgid "svn: revision %s is not an integer"
1428 msgid "svn: revision %s is not an integer"
1429 msgstr "svn: 版本 %s 不是整数"
1429 msgstr "svn: 版本 %s 不是整数"
1430
1430
1431 #, python-format
1431 #, python-format
1432 msgid "svn: start revision %s is not an integer"
1432 msgid "svn: start revision %s is not an integer"
1433 msgstr "svn: 开始版本 %s 不是整数"
1433 msgstr "svn: 开始版本 %s 不是整数"
1434
1434
1435 #, python-format
1435 #, python-format
1436 msgid "no revision found in module %s"
1436 msgid "no revision found in module %s"
1437 msgstr "没有在模块 %s 中发现版本"
1437 msgstr "没有在模块 %s 中发现版本"
1438
1438
1439 #, python-format
1439 #, python-format
1440 msgid "expected %s to be at %r, but not found"
1440 msgid "expected %s to be at %r, but not found"
1441 msgstr "期望 %s 位于 %r,但是没有发现"
1441 msgstr "期望 %s 位于 %r,但是没有发现"
1442
1442
1443 #, python-format
1443 #, python-format
1444 msgid "found %s at %r\n"
1444 msgid "found %s at %r\n"
1445 msgstr "发现 %s 位于 %r\n"
1445 msgstr "发现 %s 位于 %r\n"
1446
1446
1447 #, python-format
1447 #, python-format
1448 msgid "ignoring empty branch %s\n"
1448 msgid "ignoring empty branch %s\n"
1449 msgstr "忽略空的分支 %s\n"
1449 msgstr "忽略空的分支 %s\n"
1450
1450
1451 #, python-format
1451 #, python-format
1452 msgid "found branch %s at %d\n"
1452 msgid "found branch %s at %d\n"
1453 msgstr "发现分支 %s 位于 %d\n"
1453 msgstr "发现分支 %s 位于 %d\n"
1454
1454
1455 msgid "svn: start revision is not supported with more than one branch"
1455 msgid "svn: start revision is not supported with more than one branch"
1456 msgstr "svn: 在给出多于一个分支时不支持开始版本"
1456 msgstr "svn: 在给出多于一个分支时不支持开始版本"
1457
1457
1458 #, python-format
1458 #, python-format
1459 msgid "svn: no revision found after start revision %d"
1459 msgid "svn: no revision found after start revision %d"
1460 msgstr "svn: 在开始版本 %d 之后没有版本"
1460 msgstr "svn: 在开始版本 %d 之后没有版本"
1461
1461
1462 #, python-format
1462 #, python-format
1463 msgid "no tags found at revision %d\n"
1463 msgid "no tags found at revision %d\n"
1464 msgstr "在版本 %d 没有发现标签\n"
1464 msgstr "在版本 %d 没有发现标签\n"
1465
1465
1466 #, python-format
1466 #, python-format
1467 msgid "ignoring foreign branch %r\n"
1467 msgid "ignoring foreign branch %r\n"
1468 msgstr "忽略外部分支 %r\n"
1468 msgstr "忽略外部分支 %r\n"
1469
1469
1470 #, python-format
1470 #, python-format
1471 msgid "%s not found up to revision %d"
1471 msgid "%s not found up to revision %d"
1472 msgstr "没有发现 %s,一直到版本 %d"
1472 msgstr "没有发现 %s,一直到版本 %d"
1473
1473
1474 #, python-format
1474 #, python-format
1475 msgid "branch renamed from %s to %s at %d\n"
1475 msgid "branch renamed from %s to %s at %d\n"
1476 msgstr "分支从 %s 改名为 %s,在 %d\n"
1476 msgstr "分支从 %s 改名为 %s,在 %d\n"
1477
1477
1478 #, python-format
1478 #, python-format
1479 msgid "reparent to %s\n"
1479 msgid "reparent to %s\n"
1480 msgstr ""
1480 msgstr ""
1481
1481
1482 #, python-format
1482 #, python-format
1483 msgid "copied to %s from %s@%s\n"
1483 msgid "copied to %s from %s@%s\n"
1484 msgstr "复制到 %s,自 %s@%s\n"
1484 msgstr "复制到 %s,自 %s@%s\n"
1485
1485
1486 #, python-format
1486 #, python-format
1487 msgid "gone from %s\n"
1487 msgid "gone from %s\n"
1488 msgstr "离开 %s\n"
1488 msgstr "离开 %s\n"
1489
1489
1490 #, python-format
1490 #, python-format
1491 msgid "entry %s\n"
1491 msgid "entry %s\n"
1492 msgstr "入口 %s\n"
1492 msgstr "入口 %s\n"
1493
1493
1494 #, python-format
1494 #, python-format
1495 msgid "unknown path in revision %d: %s\n"
1495 msgid "unknown path in revision %d: %s\n"
1496 msgstr "版本 %d 有未知路径: %s\n"
1496 msgstr "版本 %d 有未知路径: %s\n"
1497
1497
1498 #, python-format
1498 #, python-format
1499 msgid "mark %s came from %s:%d\n"
1499 msgid "mark %s came from %s:%d\n"
1500 msgstr "标记 %s 来自 %s:%d\n"
1500 msgstr "标记 %s 来自 %s:%d\n"
1501
1501
1502 #, python-format
1502 #, python-format
1503 msgid "parsing revision %d (%d changes)\n"
1503 msgid "parsing revision %d (%d changes)\n"
1504 msgstr "解析版本 %d (%d 个改变)\n"
1504 msgstr "解析版本 %d (%d 个改变)\n"
1505
1505
1506 #, python-format
1506 #, python-format
1507 msgid "found parent of branch %s at %d: %s\n"
1507 msgid "found parent of branch %s at %d: %s\n"
1508 msgstr "发现分支 %s 的父亲,在 %d: %s\n"
1508 msgstr "发现分支 %s 的父亲,在 %d: %s\n"
1509
1509
1510 msgid "no copyfrom path, don't know what to do.\n"
1510 msgid "no copyfrom path, don't know what to do.\n"
1511 msgstr "没有 copyfrom 路径,不知道该怎么办。\n"
1511 msgstr "没有 copyfrom 路径,不知道该怎么办。\n"
1512
1512
1513 #, python-format
1513 #, python-format
1514 msgid "fetching revision log for \"%s\" from %d to %d\n"
1514 msgid "fetching revision log for \"%s\" from %d to %d\n"
1515 msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n"
1515 msgstr "为 \"%s\" 获取版本日志,自 %d 到 %d\n"
1516
1516
1517 #, python-format
1517 #, python-format
1518 msgid "revision %d has no entries\n"
1518 msgid "revision %d has no entries\n"
1519 msgstr "版本 %d 没有入口\n"
1519 msgstr "版本 %d 没有入口\n"
1520
1520
1521 #, python-format
1521 #, python-format
1522 msgid "svn: branch has no revision %s"
1522 msgid "svn: branch has no revision %s"
1523 msgstr "svn: 分支没有版本 %s"
1523 msgstr "svn: 分支没有版本 %s"
1524
1524
1525 #, python-format
1525 #, python-format
1526 msgid "%r is not under %r, ignoring\n"
1526 msgid "%r is not under %r, ignoring\n"
1527 msgstr "%r 不在 %r 之下,忽略之\n"
1527 msgstr "%r 不在 %r 之下,忽略之\n"
1528
1528
1529 #, python-format
1529 #, python-format
1530 msgid "initializing svn repo %r\n"
1530 msgid "initializing svn repo %r\n"
1531 msgstr "初始化 svn 版本库 %r\n"
1531 msgstr "初始化 svn 版本库 %r\n"
1532
1532
1533 #, python-format
1533 #, python-format
1534 msgid "initializing svn wc %r\n"
1534 msgid "initializing svn wc %r\n"
1535 msgstr "初始化 svn 工作副本 %r\n"
1535 msgstr "初始化 svn 工作副本 %r\n"
1536
1536
1537 msgid "unexpected svn output:\n"
1537 msgid "unexpected svn output:\n"
1538 msgstr "意外的 svn 输出:\n"
1538 msgstr "意外的 svn 输出:\n"
1539
1539
1540 msgid "unable to cope with svn output"
1540 msgid "unable to cope with svn output"
1541 msgstr "不能处理 svn 的输出"
1541 msgstr "不能处理 svn 的输出"
1542
1542
1543 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1543 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1544 msgstr ""
1544 msgstr ""
1545
1545
1546 msgid "command to allow external programs to compare revisions"
1546 msgid "command to allow external programs to compare revisions"
1547 msgstr ""
1547 msgstr ""
1548
1548
1549 msgid ""
1549 msgid ""
1550 "The extdiff Mercurial extension allows you to use external programs\n"
1550 "The extdiff Mercurial extension allows you to use external programs\n"
1551 "to compare revisions, or revision with working directory. The external\n"
1551 "to compare revisions, or revision with working directory. The external\n"
1552 "diff programs are called with a configurable set of options and two\n"
1552 "diff programs are called with a configurable set of options and two\n"
1553 "non-option arguments: paths to directories containing snapshots of\n"
1553 "non-option arguments: paths to directories containing snapshots of\n"
1554 "files to compare."
1554 "files to compare."
1555 msgstr ""
1555 msgstr ""
1556
1556
1557 msgid ""
1557 msgid ""
1558 "The extdiff extension also allows to configure new diff commands, so\n"
1558 "The extdiff extension also allows to configure new diff commands, so\n"
1559 "you do not need to type \"hg extdiff -p kdiff3\" always. ::"
1559 "you do not need to type \"hg extdiff -p kdiff3\" always. ::"
1560 msgstr ""
1560 msgstr ""
1561
1561
1562 msgid ""
1562 msgid ""
1563 " [extdiff]\n"
1563 " [extdiff]\n"
1564 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1564 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1565 " cdiff = gdiff -Nprc5\n"
1565 " cdiff = gdiff -Nprc5\n"
1566 " ## or the old way:\n"
1566 " ## or the old way:\n"
1567 " #cmd.cdiff = gdiff\n"
1567 " #cmd.cdiff = gdiff\n"
1568 " #opts.cdiff = -Nprc5"
1568 " #opts.cdiff = -Nprc5"
1569 msgstr ""
1569 msgstr ""
1570
1570
1571 msgid ""
1571 msgid ""
1572 " # add new command called vdiff, runs kdiff3\n"
1572 " # add new command called vdiff, runs kdiff3\n"
1573 " vdiff = kdiff3"
1573 " vdiff = kdiff3"
1574 msgstr ""
1574 msgstr ""
1575
1575
1576 msgid ""
1576 msgid ""
1577 " # add new command called meld, runs meld (no need to name twice)\n"
1577 " # add new command called meld, runs meld (no need to name twice)\n"
1578 " meld ="
1578 " meld ="
1579 msgstr ""
1579 msgstr ""
1580
1580
1581 msgid ""
1581 msgid ""
1582 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1582 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1583 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1583 " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
1584 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1584 " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
1585 " # your .vimrc\n"
1585 " # your .vimrc\n"
1586 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
1586 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
1587 msgstr ""
1587 msgstr ""
1588
1588
1589 msgid ""
1589 msgid ""
1590 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1590 "You can use -I/-X and list of file or directory names like normal \"hg\n"
1591 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1591 "diff\" command. The extdiff extension makes snapshots of only needed\n"
1592 "files, so running the external diff program will actually be pretty\n"
1592 "files, so running the external diff program will actually be pretty\n"
1593 "fast (at least faster than having to compare the entire tree).\n"
1593 "fast (at least faster than having to compare the entire tree).\n"
1594 msgstr ""
1594 msgstr ""
1595
1595
1596 #, python-format
1596 #, python-format
1597 msgid "making snapshot of %d files from rev %s\n"
1597 msgid "making snapshot of %d files from rev %s\n"
1598 msgstr ""
1598 msgstr ""
1599
1599
1600 #, python-format
1600 #, python-format
1601 msgid "making snapshot of %d files from working directory\n"
1601 msgid "making snapshot of %d files from working directory\n"
1602 msgstr ""
1602 msgstr ""
1603
1603
1604 msgid "cannot specify --rev and --change at the same time"
1604 msgid "cannot specify --rev and --change at the same time"
1605 msgstr "不能同时指定 '--rev' 和 '--change'"
1605 msgstr "不能同时指定 '--rev' 和 '--change'"
1606
1606
1607 #, python-format
1607 #, python-format
1608 msgid "running %r in %s\n"
1608 msgid "running %r in %s\n"
1609 msgstr ""
1609 msgstr ""
1610
1610
1611 #, python-format
1611 #, python-format
1612 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1612 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1613 msgstr ""
1613 msgstr ""
1614
1614
1615 msgid "cleaning up temp directory\n"
1615 msgid "cleaning up temp directory\n"
1616 msgstr ""
1616 msgstr ""
1617
1617
1618 msgid "use external program to diff repository (or selected files)"
1618 msgid "use external program to diff repository (or selected files)"
1619 msgstr ""
1619 msgstr ""
1620
1620
1621 msgid ""
1621 msgid ""
1622 " Show differences between revisions for the specified files, using\n"
1622 " Show differences between revisions for the specified files, using\n"
1623 " an external program. The default program used is diff, with\n"
1623 " an external program. The default program used is diff, with\n"
1624 " default options \"-Npru\"."
1624 " default options \"-Npru\"."
1625 msgstr ""
1625 msgstr ""
1626
1626
1627 msgid ""
1627 msgid ""
1628 " To select a different program, use the -p/--program option. The\n"
1628 " To select a different program, use the -p/--program option. The\n"
1629 " program will be passed the names of two directories to compare. To\n"
1629 " program will be passed the names of two directories to compare. To\n"
1630 " pass additional options to the program, use -o/--option. These\n"
1630 " pass additional options to the program, use -o/--option. These\n"
1631 " will be passed before the names of the directories to compare."
1631 " will be passed before the names of the directories to compare."
1632 msgstr ""
1632 msgstr ""
1633
1633
1634 msgid ""
1634 msgid ""
1635 " When two revision arguments are given, then changes are shown\n"
1635 " When two revision arguments are given, then changes are shown\n"
1636 " between those revisions. If only one revision is specified then\n"
1636 " between those revisions. If only one revision is specified then\n"
1637 " that revision is compared to the working directory, and, when no\n"
1637 " that revision is compared to the working directory, and, when no\n"
1638 " revisions are specified, the working directory files are compared\n"
1638 " revisions are specified, the working directory files are compared\n"
1639 " to its parent."
1639 " to its parent."
1640 msgstr ""
1640 msgstr ""
1641
1641
1642 msgid "comparison program to run"
1642 msgid "comparison program to run"
1643 msgstr ""
1643 msgstr ""
1644
1644
1645 msgid "pass option to comparison program"
1645 msgid "pass option to comparison program"
1646 msgstr ""
1646 msgstr ""
1647
1647
1648 msgid "change made by revision"
1648 msgid "change made by revision"
1649 msgstr "此版本的修改"
1649 msgstr "此版本的修改"
1650
1650
1651 msgid "hg extdiff [OPT]... [FILE]..."
1651 msgid "hg extdiff [OPT]... [FILE]..."
1652 msgstr ""
1652 msgstr ""
1653
1653
1654 #, python-format
1654 #, python-format
1655 msgid "use %(path)s to diff repository (or selected files)"
1655 msgid "use %(path)s to diff repository (or selected files)"
1656 msgstr ""
1656 msgstr ""
1657
1657
1658 #, python-format
1658 #, python-format
1659 msgid ""
1659 msgid ""
1660 " Show differences between revisions for the specified files, using the\n"
1660 " Show differences between revisions for the specified files, using the\n"
1661 " %(path)s program."
1661 " %(path)s program."
1662 msgstr ""
1662 msgstr ""
1663
1663
1664 #, python-format
1664 #, python-format
1665 msgid ""
1665 msgid ""
1666 " When two revision arguments are given, then changes are shown between\n"
1666 " When two revision arguments are given, then changes are shown between\n"
1667 " those revisions. If only one revision is specified then that revision is\n"
1667 " those revisions. If only one revision is specified then that revision is\n"
1668 " compared to the working directory, and, when no revisions are specified,\n"
1668 " compared to the working directory, and, when no revisions are specified,\n"
1669 " the working directory files are compared to its parent."
1669 " the working directory files are compared to its parent."
1670 msgstr ""
1670 msgstr ""
1671
1671
1672 #, python-format
1672 #, python-format
1673 msgid "hg %s [OPTION]... [FILE]..."
1673 msgid "hg %s [OPTION]... [FILE]..."
1674 msgstr ""
1674 msgstr ""
1675
1675
1676 msgid "pull, update and merge in one command"
1676 msgid "pull, update and merge in one command"
1677 msgstr ""
1677 msgstr ""
1678
1678
1679 msgid "pull changes from a remote repository, merge new changes if needed."
1679 msgid "pull changes from a remote repository, merge new changes if needed."
1680 msgstr ""
1680 msgstr ""
1681
1681
1682 msgid ""
1682 msgid ""
1683 " This finds all changes from the repository at the specified path\n"
1683 " This finds all changes from the repository at the specified path\n"
1684 " or URL and adds them to the local repository."
1684 " or URL and adds them to the local repository."
1685 msgstr ""
1685 msgstr ""
1686
1686
1687 msgid ""
1687 msgid ""
1688 " If the pulled changes add a new branch head, the head is\n"
1688 " If the pulled changes add a new branch head, the head is\n"
1689 " automatically merged, and the result of the merge is committed.\n"
1689 " automatically merged, and the result of the merge is committed.\n"
1690 " Otherwise, the working directory is updated to include the new\n"
1690 " Otherwise, the working directory is updated to include the new\n"
1691 " changes."
1691 " changes."
1692 msgstr ""
1692 msgstr ""
1693
1693
1694 msgid ""
1694 msgid ""
1695 " When a merge occurs, the newly pulled changes are assumed to be\n"
1695 " When a merge occurs, the newly pulled changes are assumed to be\n"
1696 " \"authoritative\". The head of the new changes is used as the first\n"
1696 " \"authoritative\". The head of the new changes is used as the first\n"
1697 " parent, with local changes as the second. To switch the merge\n"
1697 " parent, with local changes as the second. To switch the merge\n"
1698 " order, use --switch-parent."
1698 " order, use --switch-parent."
1699 msgstr ""
1699 msgstr ""
1700
1700
1701 msgid ""
1701 msgid ""
1702 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1702 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1703 " "
1703 " "
1704 msgstr ""
1704 msgstr ""
1705
1705
1706 msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1706 msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1707 msgstr ""
1707 msgstr ""
1708
1708
1709 msgid "outstanding uncommitted merge"
1709 msgid "outstanding uncommitted merge"
1710 msgstr ""
1710 msgstr ""
1711
1711
1712 msgid "outstanding uncommitted changes"
1712 msgid "outstanding uncommitted changes"
1713 msgstr ""
1713 msgstr ""
1714
1714
1715 msgid "working directory is missing some files"
1715 msgid "working directory is missing some files"
1716 msgstr ""
1716 msgstr ""
1717
1717
1718 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1718 msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1719 msgstr ""
1719 msgstr ""
1720
1720
1721 #, python-format
1721 #, python-format
1722 msgid "pulling from %s\n"
1722 msgid "pulling from %s\n"
1723 msgstr "正在拉自 %s\n"
1723 msgstr "正在拉自 %s\n"
1724
1724
1725 msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
1725 msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
1726 msgstr ""
1726 msgstr ""
1727
1727
1728 #, python-format
1728 #, python-format
1729 msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
1729 msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
1730 msgstr ""
1730 msgstr ""
1731
1731
1732 #, python-format
1732 #, python-format
1733 msgid "updating to %d:%s\n"
1733 msgid "updating to %d:%s\n"
1734 msgstr ""
1734 msgstr ""
1735
1735
1736 #, python-format
1736 #, python-format
1737 msgid "merging with %d:%s\n"
1737 msgid "merging with %d:%s\n"
1738 msgstr ""
1738 msgstr ""
1739
1739
1740 #, python-format
1740 #, python-format
1741 msgid "new changeset %d:%s merges remote changes with local\n"
1741 msgid "new changeset %d:%s merges remote changes with local\n"
1742 msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n"
1742 msgstr "新修改集 '%d:%s' 将远程修改与本地合并\n"
1743
1743
1744 msgid "a specific revision you would like to pull"
1744 msgid "a specific revision you would like to pull"
1745 msgstr "指定取得的版本"
1745 msgstr "指定取得的版本"
1746
1746
1747 msgid "edit commit message"
1747 msgid "edit commit message"
1748 msgstr "编辑提交日志"
1748 msgstr "编辑提交日志"
1749
1749
1750 msgid "edit commit message (DEPRECATED)"
1750 msgid "edit commit message (DEPRECATED)"
1751 msgstr "编辑提交日志(不赞成)"
1751 msgstr "编辑提交日志(不赞成)"
1752
1752
1753 msgid "switch parents when merging"
1753 msgid "switch parents when merging"
1754 msgstr "当合并时切换父亲"
1754 msgstr "当合并时切换父亲"
1755
1755
1756 msgid "hg fetch [SOURCE]"
1756 msgid "hg fetch [SOURCE]"
1757 msgstr "hg fetch [SOURCE]"
1757 msgstr "hg fetch [SOURCE]"
1758
1758
1759 msgid "commands to sign and verify changesets"
1759 msgid "commands to sign and verify changesets"
1760 msgstr "签署和校验修改集的命令"
1760 msgstr "签署和校验修改集的命令"
1761
1761
1762 msgid "error while verifying signature"
1762 msgid "error while verifying signature"
1763 msgstr ""
1763 msgstr ""
1764
1764
1765 #, python-format
1765 #, python-format
1766 msgid "%s Bad signature from \"%s\"\n"
1766 msgid "%s Bad signature from \"%s\"\n"
1767 msgstr ""
1767 msgstr ""
1768
1768
1769 #, python-format
1769 #, python-format
1770 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1770 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1771 msgstr ""
1771 msgstr ""
1772
1772
1773 #, python-format
1773 #, python-format
1774 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1774 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1775 msgstr ""
1775 msgstr ""
1776
1776
1777 msgid "list signed changesets"
1777 msgid "list signed changesets"
1778 msgstr ""
1778 msgstr ""
1779
1779
1780 #, python-format
1780 #, python-format
1781 msgid "%s:%d node does not exist\n"
1781 msgid "%s:%d node does not exist\n"
1782 msgstr ""
1782 msgstr ""
1783
1783
1784 msgid "verify all the signatures there may be for a particular revision"
1784 msgid "verify all the signatures there may be for a particular revision"
1785 msgstr ""
1785 msgstr ""
1786
1786
1787 #, python-format
1787 #, python-format
1788 msgid "No valid signature for %s\n"
1788 msgid "No valid signature for %s\n"
1789 msgstr ""
1789 msgstr ""
1790
1790
1791 msgid "add a signature for the current or given revision"
1791 msgid "add a signature for the current or given revision"
1792 msgstr ""
1792 msgstr ""
1793
1793
1794 msgid ""
1794 msgid ""
1795 " If no revision is given, the parent of the working directory is used,\n"
1795 " If no revision is given, the parent of the working directory is used,\n"
1796 " or tip if no revision is checked out."
1796 " or tip if no revision is checked out."
1797 msgstr ""
1797 msgstr ""
1798
1798
1799 msgid "uncommitted merge - please provide a specific revision"
1799 msgid "uncommitted merge - please provide a specific revision"
1800 msgstr ""
1800 msgstr ""
1801
1801
1802 msgid "Error while signing"
1802 msgid "Error while signing"
1803 msgstr ""
1803 msgstr ""
1804
1804
1805 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
1805 msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
1806 msgstr ""
1806 msgstr ""
1807
1807
1808 msgid "unknown signature version"
1808 msgid "unknown signature version"
1809 msgstr ""
1809 msgstr ""
1810
1810
1811 msgid "make the signature local"
1811 msgid "make the signature local"
1812 msgstr ""
1812 msgstr ""
1813
1813
1814 msgid "sign even if the sigfile is modified"
1814 msgid "sign even if the sigfile is modified"
1815 msgstr ""
1815 msgstr ""
1816
1816
1817 msgid "do not commit the sigfile after signing"
1817 msgid "do not commit the sigfile after signing"
1818 msgstr ""
1818 msgstr ""
1819
1819
1820 msgid "the key id to sign with"
1820 msgid "the key id to sign with"
1821 msgstr ""
1821 msgstr ""
1822
1822
1823 msgid "commit message"
1823 msgid "commit message"
1824 msgstr ""
1824 msgstr ""
1825
1825
1826 msgid "hg sign [OPTION]... [REVISION]..."
1826 msgid "hg sign [OPTION]... [REVISION]..."
1827 msgstr ""
1827 msgstr ""
1828
1828
1829 msgid "hg sigcheck REVISION"
1829 msgid "hg sigcheck REVISION"
1830 msgstr ""
1830 msgstr ""
1831
1831
1832 msgid "hg sigs"
1832 msgid "hg sigs"
1833 msgstr ""
1833 msgstr ""
1834
1834
1835 msgid "command to view revision graphs from a shell"
1835 msgid "command to view revision graphs from a shell"
1836 msgstr ""
1836 msgstr ""
1837
1837
1838 msgid ""
1838 msgid ""
1839 "This extension adds a --graph option to the incoming, outgoing and log\n"
1839 "This extension adds a --graph option to the incoming, outgoing and log\n"
1840 "commands. When this options is given, an ASCII representation of the\n"
1840 "commands. When this options is given, an ASCII representation of the\n"
1841 "revision graph is also shown.\n"
1841 "revision graph is also shown.\n"
1842 msgstr ""
1842 msgstr ""
1843
1843
1844 #, python-format
1844 #, python-format
1845 msgid "--graph option is incompatible with --%s"
1845 msgid "--graph option is incompatible with --%s"
1846 msgstr ""
1846 msgstr ""
1847
1847
1848 msgid "show revision history alongside an ASCII revision graph"
1848 msgid "show revision history alongside an ASCII revision graph"
1849 msgstr ""
1849 msgstr ""
1850
1850
1851 msgid ""
1851 msgid ""
1852 " Print a revision history alongside a revision graph drawn with\n"
1852 " Print a revision history alongside a revision graph drawn with\n"
1853 " ASCII characters."
1853 " ASCII characters."
1854 msgstr ""
1854 msgstr ""
1855
1855
1856 msgid ""
1856 msgid ""
1857 " Nodes printed as an @ character are parents of the working\n"
1857 " Nodes printed as an @ character are parents of the working\n"
1858 " directory.\n"
1858 " directory.\n"
1859 " "
1859 " "
1860 msgstr ""
1860 msgstr ""
1861
1861
1862 #, python-format
1862 #, python-format
1863 msgid "comparing with %s\n"
1863 msgid "comparing with %s\n"
1864 msgstr ""
1864 msgstr ""
1865
1865
1866 msgid "no changes found\n"
1866 msgid "no changes found\n"
1867 msgstr "没有发现修改\n"
1867 msgstr "没有发现修改\n"
1868
1868
1869 msgid "show the revision DAG"
1869 msgid "show the revision DAG"
1870 msgstr "显示版本分支图"
1870 msgstr "显示版本分支图"
1871
1871
1872 msgid "limit number of changes displayed"
1872 msgid "limit number of changes displayed"
1873 msgstr "限制显示的修改集数量"
1873 msgstr "限制显示的修改集数量"
1874
1874
1875 msgid "show patch"
1875 msgid "show patch"
1876 msgstr "显示补丁"
1876 msgstr "显示补丁"
1877
1877
1878 msgid "show the specified revision or range"
1878 msgid "show the specified revision or range"
1879 msgstr ""
1879 msgstr ""
1880
1880
1881 msgid "hg glog [OPTION]... [FILE]"
1881 msgid "hg glog [OPTION]... [FILE]"
1882 msgstr ""
1882 msgstr ""
1883
1883
1884 msgid "hooks for integrating with the CIA.vc notification service"
1884 msgid "hooks for integrating with the CIA.vc notification service"
1885 msgstr ""
1885 msgstr ""
1886
1886
1887 msgid ""
1887 msgid ""
1888 "This is meant to be run as a changegroup or incoming hook. To\n"
1888 "This is meant to be run as a changegroup or incoming hook. To\n"
1889 "configure it, set the following options in your hgrc::"
1889 "configure it, set the following options in your hgrc::"
1890 msgstr ""
1890 msgstr ""
1891
1891
1892 msgid ""
1892 msgid ""
1893 " [cia]\n"
1893 " [cia]\n"
1894 " # your registered CIA user name\n"
1894 " # your registered CIA user name\n"
1895 " user = foo\n"
1895 " user = foo\n"
1896 " # the name of the project in CIA\n"
1896 " # the name of the project in CIA\n"
1897 " project = foo\n"
1897 " project = foo\n"
1898 " # the module (subproject) (optional)\n"
1898 " # the module (subproject) (optional)\n"
1899 " #module = foo\n"
1899 " #module = foo\n"
1900 " # Append a diffstat to the log message (optional)\n"
1900 " # Append a diffstat to the log message (optional)\n"
1901 " #diffstat = False\n"
1901 " #diffstat = False\n"
1902 " # Template to use for log messages (optional)\n"
1902 " # Template to use for log messages (optional)\n"
1903 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1903 " #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
1904 " # Style to use (optional)\n"
1904 " # Style to use (optional)\n"
1905 " #style = foo\n"
1905 " #style = foo\n"
1906 " # The URL of the CIA notification service (optional)\n"
1906 " # The URL of the CIA notification service (optional)\n"
1907 " # You can use mailto: URLs to send by email, eg\n"
1907 " # You can use mailto: URLs to send by email, eg\n"
1908 " # mailto:cia@cia.vc\n"
1908 " # mailto:cia@cia.vc\n"
1909 " # Make sure to set email.from if you do this.\n"
1909 " # Make sure to set email.from if you do this.\n"
1910 " #url = http://cia.vc/\n"
1910 " #url = http://cia.vc/\n"
1911 " # print message instead of sending it (optional)\n"
1911 " # print message instead of sending it (optional)\n"
1912 " #test = False"
1912 " #test = False"
1913 msgstr ""
1913 msgstr ""
1914
1914
1915 msgid ""
1915 msgid ""
1916 " [hooks]\n"
1916 " [hooks]\n"
1917 " # one of these:\n"
1917 " # one of these:\n"
1918 " changegroup.cia = python:hgcia.hook\n"
1918 " changegroup.cia = python:hgcia.hook\n"
1919 " #incoming.cia = python:hgcia.hook"
1919 " #incoming.cia = python:hgcia.hook"
1920 msgstr ""
1920 msgstr ""
1921
1921
1922 msgid ""
1922 msgid ""
1923 " [web]\n"
1923 " [web]\n"
1924 " # If you want hyperlinks (optional)\n"
1924 " # If you want hyperlinks (optional)\n"
1925 " baseurl = http://server/path/to/repo\n"
1925 " baseurl = http://server/path/to/repo\n"
1926 msgstr ""
1926 msgstr ""
1927
1927
1928 #, python-format
1928 #, python-format
1929 msgid "hgcia: sending update to %s\n"
1929 msgid "hgcia: sending update to %s\n"
1930 msgstr ""
1930 msgstr ""
1931
1931
1932 msgid "email.from must be defined when sending by email"
1932 msgid "email.from must be defined when sending by email"
1933 msgstr ""
1933 msgstr ""
1934
1934
1935 msgid "cia: no user specified"
1935 msgid "cia: no user specified"
1936 msgstr ""
1936 msgstr ""
1937
1937
1938 msgid "cia: no project specified"
1938 msgid "cia: no project specified"
1939 msgstr ""
1939 msgstr ""
1940
1940
1941 msgid "browse the repository in a graphical way"
1941 msgid "browse the repository in a graphical way"
1942 msgstr ""
1942 msgstr ""
1943
1943
1944 msgid ""
1944 msgid ""
1945 "The hgk extension allows browsing the history of a repository in a\n"
1945 "The hgk extension allows browsing the history of a repository in a\n"
1946 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1946 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n"
1947 "distributed with Mercurial.)"
1947 "distributed with Mercurial.)"
1948 msgstr ""
1948 msgstr ""
1949
1949
1950 msgid ""
1950 msgid ""
1951 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1951 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1952 "querying of information, and an extension to Mercurial named hgk.py,\n"
1952 "querying of information, and an extension to Mercurial named hgk.py,\n"
1953 "which provides hooks for hgk to get information. hgk can be found in\n"
1953 "which provides hooks for hgk to get information. hgk can be found in\n"
1954 "the contrib directory, and the extension is shipped in the hgext\n"
1954 "the contrib directory, and the extension is shipped in the hgext\n"
1955 "repository, and needs to be enabled."
1955 "repository, and needs to be enabled."
1956 msgstr ""
1956 msgstr ""
1957
1957
1958 msgid ""
1958 msgid ""
1959 "The hg view command will launch the hgk Tcl script. For this command\n"
1959 "The hg view command will launch the hgk Tcl script. For this command\n"
1960 "to work, hgk must be in your search path. Alternately, you can specify\n"
1960 "to work, hgk must be in your search path. Alternately, you can specify\n"
1961 "the path to hgk in your .hgrc file::"
1961 "the path to hgk in your .hgrc file::"
1962 msgstr ""
1962 msgstr ""
1963
1963
1964 msgid ""
1964 msgid ""
1965 " [hgk]\n"
1965 " [hgk]\n"
1966 " path=/location/of/hgk"
1966 " path=/location/of/hgk"
1967 msgstr ""
1967 msgstr ""
1968
1968
1969 msgid ""
1969 msgid ""
1970 "hgk can make use of the extdiff extension to visualize revisions.\n"
1970 "hgk can make use of the extdiff extension to visualize revisions.\n"
1971 "Assuming you had already configured extdiff vdiff command, just add::"
1971 "Assuming you had already configured extdiff vdiff command, just add::"
1972 msgstr ""
1972 msgstr ""
1973
1973
1974 msgid ""
1974 msgid ""
1975 " [hgk]\n"
1975 " [hgk]\n"
1976 " vdiff=vdiff"
1976 " vdiff=vdiff"
1977 msgstr ""
1977 msgstr ""
1978
1978
1979 msgid ""
1979 msgid ""
1980 "Revisions context menu will now display additional entries to fire\n"
1980 "Revisions context menu will now display additional entries to fire\n"
1981 "vdiff on hovered and selected revisions.\n"
1981 "vdiff on hovered and selected revisions.\n"
1982 msgstr ""
1982 msgstr ""
1983
1983
1984 msgid "diff trees from two commits"
1984 msgid "diff trees from two commits"
1985 msgstr ""
1985 msgstr ""
1986
1986
1987 msgid "output common ancestor information"
1987 msgid "output common ancestor information"
1988 msgstr ""
1988 msgstr ""
1989
1989
1990 msgid "cat a specific revision"
1990 msgid "cat a specific revision"
1991 msgstr ""
1991 msgstr ""
1992
1992
1993 msgid "cat-file: type or revision not supplied\n"
1993 msgid "cat-file: type or revision not supplied\n"
1994 msgstr ""
1994 msgstr ""
1995
1995
1996 msgid "aborting hg cat-file only understands commits\n"
1996 msgid "aborting hg cat-file only understands commits\n"
1997 msgstr ""
1997 msgstr ""
1998
1998
1999 msgid "parse given revisions"
1999 msgid "parse given revisions"
2000 msgstr ""
2000 msgstr ""
2001
2001
2002 msgid "print revisions"
2002 msgid "print revisions"
2003 msgstr ""
2003 msgstr ""
2004
2004
2005 msgid "print extension options"
2005 msgid "print extension options"
2006 msgstr ""
2006 msgstr ""
2007
2007
2008 msgid "start interactive history viewer"
2008 msgid "start interactive history viewer"
2009 msgstr ""
2009 msgstr ""
2010
2010
2011 msgid "hg view [-l LIMIT] [REVRANGE]"
2011 msgid "hg view [-l LIMIT] [REVRANGE]"
2012 msgstr ""
2012 msgstr ""
2013
2013
2014 msgid "generate patch"
2014 msgid "generate patch"
2015 msgstr ""
2015 msgstr ""
2016
2016
2017 msgid "recursive"
2017 msgid "recursive"
2018 msgstr ""
2018 msgstr ""
2019
2019
2020 msgid "pretty"
2020 msgid "pretty"
2021 msgstr ""
2021 msgstr ""
2022
2022
2023 msgid "stdin"
2023 msgid "stdin"
2024 msgstr ""
2024 msgstr ""
2025
2025
2026 msgid "detect copies"
2026 msgid "detect copies"
2027 msgstr ""
2027 msgstr ""
2028
2028
2029 msgid "search"
2029 msgid "search"
2030 msgstr ""
2030 msgstr ""
2031
2031
2032 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2032 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
2033 msgstr ""
2033 msgstr ""
2034
2034
2035 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2035 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
2036 msgstr ""
2036 msgstr ""
2037
2037
2038 msgid "hg debug-config"
2038 msgid "hg debug-config"
2039 msgstr ""
2039 msgstr ""
2040
2040
2041 msgid "hg debug-merge-base REV REV"
2041 msgid "hg debug-merge-base REV REV"
2042 msgstr ""
2042 msgstr ""
2043
2043
2044 msgid "ignored"
2044 msgid "ignored"
2045 msgstr ""
2045 msgstr ""
2046
2046
2047 msgid "hg debug-rev-parse REV"
2047 msgid "hg debug-rev-parse REV"
2048 msgstr ""
2048 msgstr ""
2049
2049
2050 msgid "header"
2050 msgid "header"
2051 msgstr ""
2051 msgstr ""
2052
2052
2053 msgid "topo-order"
2053 msgid "topo-order"
2054 msgstr ""
2054 msgstr ""
2055
2055
2056 msgid "parents"
2056 msgid "parents"
2057 msgstr ""
2057 msgstr ""
2058
2058
2059 msgid "max-count"
2059 msgid "max-count"
2060 msgstr ""
2060 msgstr ""
2061
2061
2062 msgid "hg debug-rev-list [OPTION]... REV..."
2062 msgid "hg debug-rev-list [OPTION]... REV..."
2063 msgstr ""
2063 msgstr ""
2064
2064
2065 msgid "syntax highlighting for hgweb (requires Pygments)"
2065 msgid "syntax highlighting for hgweb (requires Pygments)"
2066 msgstr ""
2066 msgstr ""
2067
2067
2068 msgid ""
2068 msgid ""
2069 "It depends on the Pygments syntax highlighting library:\n"
2069 "It depends on the Pygments syntax highlighting library:\n"
2070 "http://pygments.org/"
2070 "http://pygments.org/"
2071 msgstr ""
2071 msgstr ""
2072
2072
2073 msgid "There is a single configuration option::"
2073 msgid "There is a single configuration option::"
2074 msgstr ""
2074 msgstr ""
2075
2075
2076 msgid ""
2076 msgid ""
2077 " [web]\n"
2077 " [web]\n"
2078 " pygments_style = <style>"
2078 " pygments_style = <style>"
2079 msgstr ""
2079 msgstr ""
2080
2080
2081 msgid "The default is 'colorful'.\n"
2081 msgid "The default is 'colorful'.\n"
2082 msgstr ""
2082 msgstr ""
2083
2083
2084 msgid "accelerate status report using Linux's inotify service"
2084 msgid "accelerate status report using Linux's inotify service"
2085 msgstr ""
2085 msgstr ""
2086
2086
2087 msgid "start an inotify server for this repository"
2087 msgid "start an inotify server for this repository"
2088 msgstr "为此版本库启动服务 'inotify'"
2088 msgstr "为此版本库启动服务 'inotify'"
2089
2089
2090 msgid "debugging information for inotify extension"
2090 msgid "debugging information for inotify extension"
2091 msgstr ""
2091 msgstr ""
2092
2092
2093 msgid ""
2093 msgid ""
2094 " Prints the list of directories being watched by the inotify server.\n"
2094 " Prints the list of directories being watched by the inotify server.\n"
2095 " "
2095 " "
2096 msgstr ""
2096 msgstr ""
2097
2097
2098 msgid "directories being watched:\n"
2098 msgid "directories being watched:\n"
2099 msgstr ""
2099 msgstr ""
2100
2100
2101 msgid "run server in background"
2101 msgid "run server in background"
2102 msgstr "在后台运行服务"
2102 msgstr "在后台运行服务"
2103
2103
2104 msgid "used internally by daemon mode"
2104 msgid "used internally by daemon mode"
2105 msgstr "在后台服务模式内部使用"
2105 msgstr "在后台服务模式内部使用"
2106
2106
2107 msgid "minutes to sit idle before exiting"
2107 msgid "minutes to sit idle before exiting"
2108 msgstr "空闲几分钟后退出"
2108 msgstr "空闲几分钟后退出"
2109
2109
2110 msgid "name of file to write process ID to"
2110 msgid "name of file to write process ID to"
2111 msgstr "写入进程标识符的文件名称"
2111 msgstr "写入进程标识符的文件名称"
2112
2112
2113 msgid "hg inserve [OPTION]..."
2113 msgid "hg inserve [OPTION]..."
2114 msgstr ""
2114 msgstr ""
2115
2115
2116 msgid "(found dead inotify server socket; removing it)\n"
2116 msgid "(found dead inotify server socket; removing it)\n"
2117 msgstr ""
2117 msgstr ""
2118
2118
2119 msgid "(starting inotify server)\n"
2119 msgid "(starting inotify server)\n"
2120 msgstr ""
2120 msgstr ""
2121
2121
2122 #, python-format
2122 #, python-format
2123 msgid "could not start inotify server: %s\n"
2123 msgid "could not start inotify server: %s\n"
2124 msgstr ""
2124 msgstr ""
2125
2125
2126 #, python-format
2126 #, python-format
2127 msgid "could not talk to new inotify server: %s\n"
2127 msgid "could not talk to new inotify server: %s\n"
2128 msgstr ""
2128 msgstr ""
2129
2129
2130 msgid "(inotify server not running)\n"
2130 msgid "(inotify server not running)\n"
2131 msgstr ""
2131 msgstr ""
2132
2132
2133 #, python-format
2133 #, python-format
2134 msgid "failed to contact inotify server: %s\n"
2134 msgid "failed to contact inotify server: %s\n"
2135 msgstr ""
2135 msgstr ""
2136
2136
2137 msgid "received empty answer from inotify server"
2137 msgid "received empty answer from inotify server"
2138 msgstr ""
2138 msgstr ""
2139
2139
2140 #, python-format
2140 #, python-format
2141 msgid "(inotify: received response from incompatible server version %d)\n"
2141 msgid "(inotify: received response from incompatible server version %d)\n"
2142 msgstr ""
2142 msgstr ""
2143
2143
2144 #, python-format
2144 #, python-format
2145 msgid "(inotify: received '%s' response when expecting '%s')\n"
2145 msgid "(inotify: received '%s' response when expecting '%s')\n"
2146 msgstr ""
2146 msgstr ""
2147
2147
2148 msgid "this system does not seem to support inotify"
2148 msgid "this system does not seem to support inotify"
2149 msgstr ""
2149 msgstr ""
2150
2150
2151 #, python-format
2151 #, python-format
2152 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2152 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2153 msgstr ""
2153 msgstr ""
2154
2154
2155 msgid "*** this limit is too low to watch every directory in this repository\n"
2155 msgid "*** this limit is too low to watch every directory in this repository\n"
2156 msgstr ""
2156 msgstr ""
2157
2157
2158 msgid "*** counting directories: "
2158 msgid "*** counting directories: "
2159 msgstr ""
2159 msgstr ""
2160
2160
2161 #, python-format
2161 #, python-format
2162 msgid "found %d\n"
2162 msgid "found %d\n"
2163 msgstr ""
2163 msgstr ""
2164
2164
2165 #, python-format
2165 #, python-format
2166 msgid "*** to raise the limit from %d to %d (run as root):\n"
2166 msgid "*** to raise the limit from %d to %d (run as root):\n"
2167 msgstr ""
2167 msgstr ""
2168
2168
2169 #, python-format
2169 #, python-format
2170 msgid "*** echo %d > %s\n"
2170 msgid "*** echo %d > %s\n"
2171 msgstr ""
2171 msgstr ""
2172
2172
2173 #, python-format
2173 #, python-format
2174 msgid "cannot watch %s until inotify watch limit is raised"
2174 msgid "cannot watch %s until inotify watch limit is raised"
2175 msgstr ""
2175 msgstr ""
2176
2176
2177 #, python-format
2177 #, python-format
2178 msgid "inotify service not available: %s"
2178 msgid "inotify service not available: %s"
2179 msgstr ""
2179 msgstr ""
2180
2180
2181 #, python-format
2181 #, python-format
2182 msgid "watching %r\n"
2182 msgid "watching %r\n"
2183 msgstr ""
2183 msgstr ""
2184
2184
2185 #, python-format
2185 #, python-format
2186 msgid "watching directories under %r\n"
2186 msgid "watching directories under %r\n"
2187 msgstr ""
2187 msgstr ""
2188
2188
2189 #, python-format
2189 #, python-format
2190 msgid "status: %r %s -> %s\n"
2190 msgid "status: %r %s -> %s\n"
2191 msgstr ""
2191 msgstr ""
2192
2192
2193 #, python-format
2193 #, python-format
2194 msgid "%s dirstate reload\n"
2194 msgid "%s dirstate reload\n"
2195 msgstr ""
2195 msgstr ""
2196
2196
2197 #, python-format
2197 #, python-format
2198 msgid "%s end dirstate reload\n"
2198 msgid "%s end dirstate reload\n"
2199 msgstr ""
2199 msgstr ""
2200
2200
2201 msgid "rescanning due to .hgignore change\n"
2201 msgid "rescanning due to .hgignore change\n"
2202 msgstr ""
2202 msgstr ""
2203
2203
2204 #, python-format
2204 #, python-format
2205 msgid "%s event: created %s\n"
2205 msgid "%s event: created %s\n"
2206 msgstr ""
2206 msgstr ""
2207
2207
2208 #, python-format
2208 #, python-format
2209 msgid "%s event: deleted %s\n"
2209 msgid "%s event: deleted %s\n"
2210 msgstr ""
2210 msgstr ""
2211
2211
2212 #, python-format
2212 #, python-format
2213 msgid "%s event: modified %s\n"
2213 msgid "%s event: modified %s\n"
2214 msgstr ""
2214 msgstr ""
2215
2215
2216 #, python-format
2216 #, python-format
2217 msgid "filesystem containing %s was unmounted\n"
2217 msgid "filesystem containing %s was unmounted\n"
2218 msgstr ""
2218 msgstr ""
2219
2219
2220 #, python-format
2220 #, python-format
2221 msgid "%s readable: %d bytes\n"
2221 msgid "%s readable: %d bytes\n"
2222 msgstr ""
2222 msgstr ""
2223
2223
2224 #, python-format
2224 #, python-format
2225 msgid "%s below threshold - unhooking\n"
2225 msgid "%s below threshold - unhooking\n"
2226 msgstr ""
2226 msgstr ""
2227
2227
2228 #, python-format
2228 #, python-format
2229 msgid "%s reading %d events\n"
2229 msgid "%s reading %d events\n"
2230 msgstr ""
2230 msgstr ""
2231
2231
2232 #, python-format
2232 #, python-format
2233 msgid "%s hooking back up with %d bytes readable\n"
2233 msgid "%s hooking back up with %d bytes readable\n"
2234 msgstr ""
2234 msgstr ""
2235
2235
2236 #, python-format
2236 #, python-format
2237 msgid "could not start server: %s"
2237 msgid "could not start server: %s"
2238 msgstr ""
2238 msgstr ""
2239
2239
2240 #, python-format
2240 #, python-format
2241 msgid "answering query for %r\n"
2241 msgid "answering query for %r\n"
2242 msgstr ""
2242 msgstr ""
2243
2243
2244 #, python-format
2244 #, python-format
2245 msgid "received query from incompatible client version %d\n"
2245 msgid "received query from incompatible client version %d\n"
2246 msgstr ""
2246 msgstr ""
2247
2247
2248 #, python-format
2248 #, python-format
2249 msgid "unrecognized query type: %s\n"
2249 msgid "unrecognized query type: %s\n"
2250 msgstr ""
2250 msgstr ""
2251
2251
2252 msgid "finished setup\n"
2252 msgid "finished setup\n"
2253 msgstr ""
2253 msgstr ""
2254
2254
2255 msgid "expand expressions into changelog and summaries"
2255 msgid "expand expressions into changelog and summaries"
2256 msgstr ""
2256 msgstr ""
2257
2257
2258 msgid ""
2258 msgid ""
2259 "This extension allows the use of a special syntax in summaries, which\n"
2259 "This extension allows the use of a special syntax in summaries, which\n"
2260 "will be automatically expanded into links or any other arbitrary\n"
2260 "will be automatically expanded into links or any other arbitrary\n"
2261 "expression, much like InterWiki does."
2261 "expression, much like InterWiki does."
2262 msgstr ""
2262 msgstr ""
2263
2263
2264 msgid ""
2264 msgid ""
2265 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2265 "A few example patterns (link to bug tracking, etc.) that may be used\n"
2266 "in your hgrc::"
2266 "in your hgrc::"
2267 msgstr ""
2267 msgstr ""
2268
2268
2269 msgid ""
2269 msgid ""
2270 " [interhg]\n"
2270 " [interhg]\n"
2271 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2271 " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
2272 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
2272 " bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
2273 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2273 " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
2274 msgstr ""
2274 msgstr ""
2275
2275
2276 #, python-format
2276 #, python-format
2277 msgid "interhg: invalid pattern for %s: %s\n"
2277 msgid "interhg: invalid pattern for %s: %s\n"
2278 msgstr ""
2278 msgstr ""
2279
2279
2280 #, python-format
2280 #, python-format
2281 msgid "interhg: invalid regexp for %s: %s\n"
2281 msgid "interhg: invalid regexp for %s: %s\n"
2282 msgstr ""
2282 msgstr ""
2283
2283
2284 msgid "expand keywords in tracked files"
2284 msgid "expand keywords in tracked files"
2285 msgstr ""
2285 msgstr ""
2286
2286
2287 msgid ""
2287 msgid ""
2288 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2288 "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
2289 "tracked text files selected by your configuration."
2289 "tracked text files selected by your configuration."
2290 msgstr ""
2290 msgstr ""
2291
2291
2292 msgid ""
2292 msgid ""
2293 "Keywords are only expanded in local repositories and not stored in the\n"
2293 "Keywords are only expanded in local repositories and not stored in the\n"
2294 "change history. The mechanism can be regarded as a convenience for the\n"
2294 "change history. The mechanism can be regarded as a convenience for the\n"
2295 "current user or for archive distribution."
2295 "current user or for archive distribution."
2296 msgstr ""
2296 msgstr ""
2297
2297
2298 msgid ""
2298 msgid ""
2299 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2299 "Configuration is done in the [keyword] and [keywordmaps] sections of\n"
2300 "hgrc files."
2300 "hgrc files."
2301 msgstr ""
2301 msgstr ""
2302
2302
2303 msgid "Example::"
2303 msgid "Example::"
2304 msgstr ""
2304 msgstr ""
2305
2305
2306 msgid ""
2306 msgid ""
2307 " [keyword]\n"
2307 " [keyword]\n"
2308 " # expand keywords in every python file except those matching \"x*\"\n"
2308 " # expand keywords in every python file except those matching \"x*\"\n"
2309 " **.py =\n"
2309 " **.py =\n"
2310 " x* = ignore"
2310 " x* = ignore"
2311 msgstr ""
2311 msgstr ""
2312
2312
2313 msgid ""
2313 msgid ""
2314 "NOTE: the more specific you are in your filename patterns the less you\n"
2314 "NOTE: the more specific you are in your filename patterns the less you\n"
2315 "lose speed in huge repositories."
2315 "lose speed in huge repositories."
2316 msgstr ""
2316 msgstr ""
2317
2317
2318 msgid ""
2318 msgid ""
2319 "For [keywordmaps] template mapping and expansion demonstration and\n"
2319 "For [keywordmaps] template mapping and expansion demonstration and\n"
2320 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2320 "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
2321 "available templates and filters."
2321 "available templates and filters."
2322 msgstr ""
2322 msgstr ""
2323
2323
2324 msgid ""
2324 msgid ""
2325 "An additional date template filter {date|utcdate} is provided. It\n"
2325 "An additional date template filter {date|utcdate} is provided. It\n"
2326 "returns a date like \"2006/09/18 15:13:13\"."
2326 "returns a date like \"2006/09/18 15:13:13\"."
2327 msgstr ""
2327 msgstr ""
2328
2328
2329 msgid ""
2329 msgid ""
2330 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2330 "The default template mappings (view with \"hg kwdemo -d\") can be\n"
2331 "replaced with customized keywords and templates. Again, run \"hg\n"
2331 "replaced with customized keywords and templates. Again, run \"hg\n"
2332 "kwdemo\" to control the results of your config changes."
2332 "kwdemo\" to control the results of your config changes."
2333 msgstr ""
2333 msgstr ""
2334
2334
2335 msgid ""
2335 msgid ""
2336 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2336 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2337 "the risk of inadvertently storing expanded keywords in the change\n"
2337 "the risk of inadvertently storing expanded keywords in the change\n"
2338 "history."
2338 "history."
2339 msgstr ""
2339 msgstr ""
2340
2340
2341 msgid ""
2341 msgid ""
2342 "To force expansion after enabling it, or a configuration change, run\n"
2342 "To force expansion after enabling it, or a configuration change, run\n"
2343 "\"hg kwexpand\"."
2343 "\"hg kwexpand\"."
2344 msgstr ""
2344 msgstr ""
2345
2345
2346 msgid ""
2346 msgid ""
2347 "Also, when committing with the record extension or using mq's qrecord,\n"
2347 "Also, when committing with the record extension or using mq's qrecord,\n"
2348 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2348 "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
2349 "the files in question to update keyword expansions after all changes\n"
2349 "the files in question to update keyword expansions after all changes\n"
2350 "have been checked in."
2350 "have been checked in."
2351 msgstr ""
2351 msgstr ""
2352
2352
2353 msgid ""
2353 msgid ""
2354 "Expansions spanning more than one line and incremental expansions,\n"
2354 "Expansions spanning more than one line and incremental expansions,\n"
2355 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2355 "like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
2356 "{desc}\" expands to the first line of the changeset description.\n"
2356 "{desc}\" expands to the first line of the changeset description.\n"
2357 msgstr ""
2357 msgstr ""
2358
2358
2359 #, python-format
2359 #, python-format
2360 msgid "overwriting %s expanding keywords\n"
2360 msgid "overwriting %s expanding keywords\n"
2361 msgstr ""
2361 msgstr ""
2362
2362
2363 #, python-format
2363 #, python-format
2364 msgid "overwriting %s shrinking keywords\n"
2364 msgid "overwriting %s shrinking keywords\n"
2365 msgstr ""
2365 msgstr ""
2366
2366
2367 msgid "[keyword] patterns cannot match"
2367 msgid "[keyword] patterns cannot match"
2368 msgstr ""
2368 msgstr ""
2369
2369
2370 msgid "no [keyword] patterns configured"
2370 msgid "no [keyword] patterns configured"
2371 msgstr ""
2371 msgstr ""
2372
2372
2373 msgid "print [keywordmaps] configuration and an expansion example"
2373 msgid "print [keywordmaps] configuration and an expansion example"
2374 msgstr ""
2374 msgstr ""
2375
2375
2376 msgid ""
2376 msgid ""
2377 " Show current, custom, or default keyword template maps and their\n"
2377 " Show current, custom, or default keyword template maps and their\n"
2378 " expansions."
2378 " expansions."
2379 msgstr ""
2379 msgstr ""
2380
2380
2381 msgid ""
2381 msgid ""
2382 " Extend the current configuration by specifying maps as arguments\n"
2382 " Extend the current configuration by specifying maps as arguments\n"
2383 " and using -f/--rcfile to source an external hgrc file."
2383 " and using -f/--rcfile to source an external hgrc file."
2384 msgstr ""
2384 msgstr ""
2385
2385
2386 msgid " Use -d/--default to disable current configuration."
2386 msgid " Use -d/--default to disable current configuration."
2387 msgstr ""
2387 msgstr ""
2388
2388
2389 msgid ""
2389 msgid ""
2390 " See \"hg help templates\" for information on templates and filters.\n"
2390 " See \"hg help templates\" for information on templates and filters.\n"
2391 " "
2391 " "
2392 msgstr ""
2392 msgstr ""
2393
2393
2394 #, python-format
2394 #, python-format
2395 msgid "creating temporary repository at %s\n"
2395 msgid "creating temporary repository at %s\n"
2396 msgstr "正在创建临时版本库 %s\n"
2396 msgstr "正在创建临时版本库 %s\n"
2397
2397
2398 msgid ""
2398 msgid ""
2399 "\n"
2399 "\n"
2400 "\tconfiguration using custom keyword template maps\n"
2400 "\tconfiguration using custom keyword template maps\n"
2401 msgstr ""
2401 msgstr ""
2402
2402
2403 msgid "\textending current template maps\n"
2403 msgid "\textending current template maps\n"
2404 msgstr ""
2404 msgstr ""
2405
2405
2406 msgid "\toverriding default template maps\n"
2406 msgid "\toverriding default template maps\n"
2407 msgstr ""
2407 msgstr ""
2408
2408
2409 msgid ""
2409 msgid ""
2410 "\n"
2410 "\n"
2411 "\tconfiguration using default keyword template maps\n"
2411 "\tconfiguration using default keyword template maps\n"
2412 msgstr ""
2412 msgstr ""
2413
2413
2414 msgid "\tdisabling current template maps\n"
2414 msgid "\tdisabling current template maps\n"
2415 msgstr "\t禁用当前模版映射\n"
2415 msgstr "\t禁用当前模版映射\n"
2416
2416
2417 msgid ""
2417 msgid ""
2418 "\n"
2418 "\n"
2419 "\tconfiguration using current keyword template maps\n"
2419 "\tconfiguration using current keyword template maps\n"
2420 msgstr ""
2420 msgstr ""
2421
2421
2422 #, python-format
2422 #, python-format
2423 msgid ""
2423 msgid ""
2424 "\n"
2424 "\n"
2425 "keywords written to %s:\n"
2425 "keywords written to %s:\n"
2426 msgstr ""
2426 msgstr ""
2427
2427
2428 msgid "unhooked all commit hooks\n"
2428 msgid "unhooked all commit hooks\n"
2429 msgstr ""
2429 msgstr ""
2430
2430
2431 msgid ""
2431 msgid ""
2432 "\n"
2432 "\n"
2433 "\tkeywords expanded\n"
2433 "\tkeywords expanded\n"
2434 msgstr ""
2434 msgstr ""
2435
2435
2436 #, python-format
2436 #, python-format
2437 msgid ""
2437 msgid ""
2438 "\n"
2438 "\n"
2439 "removing temporary repository %s\n"
2439 "removing temporary repository %s\n"
2440 msgstr ""
2440 msgstr ""
2441 "\n"
2441 "\n"
2442 "正在删除临时版本库 %s\n"
2442 "正在删除临时版本库 %s\n"
2443
2443
2444 msgid "expand keywords in the working directory"
2444 msgid "expand keywords in the working directory"
2445 msgstr ""
2445 msgstr ""
2446
2446
2447 msgid " Run after (re)enabling keyword expansion."
2447 msgid " Run after (re)enabling keyword expansion."
2448 msgstr ""
2448 msgstr ""
2449
2449
2450 msgid ""
2450 msgid ""
2451 " kwexpand refuses to run if given files contain local changes.\n"
2451 " kwexpand refuses to run if given files contain local changes.\n"
2452 " "
2452 " "
2453 msgstr ""
2453 msgstr ""
2454
2454
2455 msgid "show files configured for keyword expansion"
2455 msgid "show files configured for keyword expansion"
2456 msgstr ""
2456 msgstr ""
2457
2457
2458 msgid ""
2458 msgid ""
2459 " List which files in the working directory are matched by the\n"
2459 " List which files in the working directory are matched by the\n"
2460 " [keyword] configuration patterns."
2460 " [keyword] configuration patterns."
2461 msgstr ""
2461 msgstr ""
2462
2462
2463 msgid ""
2463 msgid ""
2464 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2464 " Useful to prevent inadvertent keyword expansion and to speed up\n"
2465 " execution by including only files that are actual candidates for\n"
2465 " execution by including only files that are actual candidates for\n"
2466 " expansion."
2466 " expansion."
2467 msgstr ""
2467 msgstr ""
2468
2468
2469 msgid ""
2469 msgid ""
2470 " See \"hg help keyword\" on how to construct patterns both for\n"
2470 " See \"hg help keyword\" on how to construct patterns both for\n"
2471 " inclusion and exclusion of files."
2471 " inclusion and exclusion of files."
2472 msgstr ""
2472 msgstr ""
2473
2473
2474 msgid " Use -u/--untracked to list untracked files as well."
2474 msgid " Use -u/--untracked to list untracked files as well."
2475 msgstr ""
2475 msgstr ""
2476
2476
2477 msgid ""
2477 msgid ""
2478 " With -a/--all and -v/--verbose the codes used to show the status\n"
2478 " With -a/--all and -v/--verbose the codes used to show the status\n"
2479 " of files are::"
2479 " of files are::"
2480 msgstr ""
2480 msgstr ""
2481
2481
2482 msgid ""
2482 msgid ""
2483 " K = keyword expansion candidate\n"
2483 " K = keyword expansion candidate\n"
2484 " k = keyword expansion candidate (untracked)\n"
2484 " k = keyword expansion candidate (untracked)\n"
2485 " I = ignored\n"
2485 " I = ignored\n"
2486 " i = ignored (untracked)\n"
2486 " i = ignored (untracked)\n"
2487 " "
2487 " "
2488 msgstr ""
2488 msgstr ""
2489
2489
2490 msgid "revert expanded keywords in the working directory"
2490 msgid "revert expanded keywords in the working directory"
2491 msgstr ""
2491 msgstr ""
2492
2492
2493 msgid ""
2493 msgid ""
2494 " Run before changing/disabling active keywords or if you experience\n"
2494 " Run before changing/disabling active keywords or if you experience\n"
2495 " problems with \"hg import\" or \"hg merge\"."
2495 " problems with \"hg import\" or \"hg merge\"."
2496 msgstr ""
2496 msgstr ""
2497
2497
2498 msgid ""
2498 msgid ""
2499 " kwshrink refuses to run if given files contain local changes.\n"
2499 " kwshrink refuses to run if given files contain local changes.\n"
2500 " "
2500 " "
2501 msgstr ""
2501 msgstr ""
2502
2502
2503 msgid "show default keyword template maps"
2503 msgid "show default keyword template maps"
2504 msgstr ""
2504 msgstr ""
2505
2505
2506 msgid "read maps from rcfile"
2506 msgid "read maps from rcfile"
2507 msgstr ""
2507 msgstr ""
2508
2508
2509 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2509 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2510 msgstr ""
2510 msgstr ""
2511
2511
2512 msgid "hg kwexpand [OPTION]... [FILE]..."
2512 msgid "hg kwexpand [OPTION]... [FILE]..."
2513 msgstr ""
2513 msgstr ""
2514
2514
2515 msgid "show keyword status flags of all files"
2515 msgid "show keyword status flags of all files"
2516 msgstr ""
2516 msgstr ""
2517
2517
2518 msgid "show files excluded from expansion"
2518 msgid "show files excluded from expansion"
2519 msgstr ""
2519 msgstr ""
2520
2520
2521 msgid "additionally show untracked files"
2521 msgid "additionally show untracked files"
2522 msgstr ""
2522 msgstr ""
2523
2523
2524 msgid "hg kwfiles [OPTION]... [FILE]..."
2524 msgid "hg kwfiles [OPTION]... [FILE]..."
2525 msgstr ""
2525 msgstr ""
2526
2526
2527 msgid "hg kwshrink [OPTION]... [FILE]..."
2527 msgid "hg kwshrink [OPTION]... [FILE]..."
2528 msgstr ""
2528 msgstr ""
2529
2529
2530 msgid "manage a stack of patches"
2530 msgid "manage a stack of patches"
2531 msgstr ""
2531 msgstr ""
2532
2532
2533 msgid ""
2533 msgid ""
2534 "This extension lets you work with a stack of patches in a Mercurial\n"
2534 "This extension lets you work with a stack of patches in a Mercurial\n"
2535 "repository. It manages two stacks of patches - all known patches, and\n"
2535 "repository. It manages two stacks of patches - all known patches, and\n"
2536 "applied patches (subset of known patches)."
2536 "applied patches (subset of known patches)."
2537 msgstr ""
2537 msgstr ""
2538
2538
2539 msgid ""
2539 msgid ""
2540 "Known patches are represented as patch files in the .hg/patches\n"
2540 "Known patches are represented as patch files in the .hg/patches\n"
2541 "directory. Applied patches are both patch files and changesets."
2541 "directory. Applied patches are both patch files and changesets."
2542 msgstr ""
2542 msgstr ""
2543
2543
2544 msgid "Common tasks (use \"hg help command\" for more details)::"
2544 msgid "Common tasks (use \"hg help command\" for more details)::"
2545 msgstr ""
2545 msgstr ""
2546
2546
2547 msgid ""
2547 msgid ""
2548 " prepare repository to work with patches qinit\n"
2548 " prepare repository to work with patches qinit\n"
2549 " create new patch qnew\n"
2549 " create new patch qnew\n"
2550 " import existing patch qimport"
2550 " import existing patch qimport"
2551 msgstr ""
2551 msgstr ""
2552
2552
2553 msgid ""
2553 msgid ""
2554 " print patch series qseries\n"
2554 " print patch series qseries\n"
2555 " print applied patches qapplied"
2555 " print applied patches qapplied"
2556 msgstr ""
2556 msgstr ""
2557
2557
2558 msgid ""
2558 msgid ""
2559 " add known patch to applied stack qpush\n"
2559 " add known patch to applied stack qpush\n"
2560 " remove patch from applied stack qpop\n"
2560 " remove patch from applied stack qpop\n"
2561 " refresh contents of top applied patch qrefresh\n"
2561 " refresh contents of top applied patch qrefresh\n"
2562 msgstr ""
2562 msgstr ""
2563
2563
2564 #, python-format
2564 #, python-format
2565 msgid "%s appears more than once in %s"
2565 msgid "%s appears more than once in %s"
2566 msgstr ""
2566 msgstr ""
2567
2567
2568 msgid "guard cannot be an empty string"
2568 msgid "guard cannot be an empty string"
2569 msgstr ""
2569 msgstr ""
2570
2570
2571 #, python-format
2571 #, python-format
2572 msgid "guard %r starts with invalid character: %r"
2572 msgid "guard %r starts with invalid character: %r"
2573 msgstr ""
2573 msgstr ""
2574
2574
2575 #, python-format
2575 #, python-format
2576 msgid "invalid character in guard %r: %r"
2576 msgid "invalid character in guard %r: %r"
2577 msgstr ""
2577 msgstr ""
2578
2578
2579 #, python-format
2579 #, python-format
2580 msgid "active guards: %s\n"
2580 msgid "active guards: %s\n"
2581 msgstr ""
2581 msgstr ""
2582
2582
2583 #, python-format
2583 #, python-format
2584 msgid "guard %r too short"
2584 msgid "guard %r too short"
2585 msgstr ""
2585 msgstr ""
2586
2586
2587 #, python-format
2587 #, python-format
2588 msgid "guard %r starts with invalid char"
2588 msgid "guard %r starts with invalid char"
2589 msgstr ""
2589 msgstr ""
2590
2590
2591 #, python-format
2591 #, python-format
2592 msgid "allowing %s - no guards in effect\n"
2592 msgid "allowing %s - no guards in effect\n"
2593 msgstr ""
2593 msgstr ""
2594
2594
2595 #, python-format
2595 #, python-format
2596 msgid "allowing %s - no matching negative guards\n"
2596 msgid "allowing %s - no matching negative guards\n"
2597 msgstr ""
2597 msgstr ""
2598
2598
2599 #, python-format
2599 #, python-format
2600 msgid "allowing %s - guarded by %r\n"
2600 msgid "allowing %s - guarded by %r\n"
2601 msgstr ""
2601 msgstr ""
2602
2602
2603 #, python-format
2603 #, python-format
2604 msgid "skipping %s - guarded by %r\n"
2604 msgid "skipping %s - guarded by %r\n"
2605 msgstr ""
2605 msgstr ""
2606
2606
2607 #, python-format
2607 #, python-format
2608 msgid "skipping %s - no matching guards\n"
2608 msgid "skipping %s - no matching guards\n"
2609 msgstr ""
2609 msgstr ""
2610
2610
2611 #, python-format
2611 #, python-format
2612 msgid "error removing undo: %s\n"
2612 msgid "error removing undo: %s\n"
2613 msgstr ""
2613 msgstr ""
2614
2614
2615 #, python-format
2615 #, python-format
2616 msgid "apply failed for patch %s"
2616 msgid "apply failed for patch %s"
2617 msgstr ""
2617 msgstr ""
2618
2618
2619 #, python-format
2619 #, python-format
2620 msgid "patch didn't work out, merging %s\n"
2620 msgid "patch didn't work out, merging %s\n"
2621 msgstr ""
2621 msgstr ""
2622
2622
2623 #, python-format
2623 #, python-format
2624 msgid "update returned %d"
2624 msgid "update returned %d"
2625 msgstr ""
2625 msgstr ""
2626
2626
2627 msgid "repo commit failed"
2627 msgid "repo commit failed"
2628 msgstr ""
2628 msgstr ""
2629
2629
2630 #, python-format
2630 #, python-format
2631 msgid "unable to read %s"
2631 msgid "unable to read %s"
2632 msgstr ""
2632 msgstr ""
2633
2633
2634 #, python-format
2634 #, python-format
2635 msgid "patch %s does not exist\n"
2635 msgid "patch %s does not exist\n"
2636 msgstr ""
2636 msgstr ""
2637
2637
2638 #, python-format
2638 #, python-format
2639 msgid "patch %s is not applied\n"
2639 msgid "patch %s is not applied\n"
2640 msgstr ""
2640 msgstr ""
2641
2641
2642 msgid "patch failed, unable to continue (try -v)\n"
2642 msgid "patch failed, unable to continue (try -v)\n"
2643 msgstr ""
2643 msgstr ""
2644
2644
2645 #, python-format
2645 #, python-format
2646 msgid "applying %s\n"
2646 msgid "applying %s\n"
2647 msgstr ""
2647 msgstr ""
2648
2648
2649 #, python-format
2649 #, python-format
2650 msgid "unable to read %s\n"
2650 msgid "unable to read %s\n"
2651 msgstr "读取 %s 失败\n"
2651 msgstr "读取 %s 失败\n"
2652
2652
2653 #, python-format
2653 #, python-format
2654 msgid "imported patch %s\n"
2654 msgid "imported patch %s\n"
2655 msgstr ""
2655 msgstr ""
2656
2656
2657 #, python-format
2657 #, python-format
2658 msgid ""
2658 msgid ""
2659 "\n"
2659 "\n"
2660 "imported patch %s"
2660 "imported patch %s"
2661 msgstr ""
2661 msgstr ""
2662
2662
2663 #, python-format
2663 #, python-format
2664 msgid "patch %s is empty\n"
2664 msgid "patch %s is empty\n"
2665 msgstr ""
2665 msgstr ""
2666
2666
2667 msgid "patch failed, rejects left in working dir\n"
2667 msgid "patch failed, rejects left in working dir\n"
2668 msgstr ""
2668 msgstr ""
2669
2669
2670 msgid "fuzz found when applying patch, stopping\n"
2670 msgid "fuzz found when applying patch, stopping\n"
2671 msgstr ""
2671 msgstr ""
2672
2672
2673 #, python-format
2673 #, python-format
2674 msgid "revision %d is not managed"
2674 msgid "revision %d is not managed"
2675 msgstr ""
2675 msgstr ""
2676
2676
2677 #, python-format
2677 #, python-format
2678 msgid "cannot delete revision %d above applied patches"
2678 msgid "cannot delete revision %d above applied patches"
2679 msgstr ""
2679 msgstr ""
2680
2680
2681 #, python-format
2681 #, python-format
2682 msgid "patch %s finalized without changeset message\n"
2682 msgid "patch %s finalized without changeset message\n"
2683 msgstr ""
2683 msgstr ""
2684
2684
2685 msgid "qdelete requires at least one revision or patch name"
2685 msgid "qdelete requires at least one revision or patch name"
2686 msgstr ""
2686 msgstr ""
2687
2687
2688 #, python-format
2688 #, python-format
2689 msgid "cannot delete applied patch %s"
2689 msgid "cannot delete applied patch %s"
2690 msgstr ""
2690 msgstr ""
2691
2691
2692 #, python-format
2692 #, python-format
2693 msgid "patch %s not in series file"
2693 msgid "patch %s not in series file"
2694 msgstr ""
2694 msgstr ""
2695
2695
2696 msgid "no patches applied"
2696 msgid "no patches applied"
2697 msgstr ""
2697 msgstr ""
2698
2698
2699 msgid "working directory revision is not qtip"
2699 msgid "working directory revision is not qtip"
2700 msgstr ""
2700 msgstr ""
2701
2701
2702 msgid "local changes found, refresh first"
2702 msgid "local changes found, refresh first"
2703 msgstr ""
2703 msgstr ""
2704
2704
2705 msgid "local changes found"
2705 msgid "local changes found"
2706 msgstr ""
2706 msgstr ""
2707
2707
2708 #, python-format
2708 #, python-format
2709 msgid "\"%s\" cannot be used as the name of a patch"
2709 msgid "\"%s\" cannot be used as the name of a patch"
2710 msgstr ""
2710 msgstr ""
2711
2711
2712 #, python-format
2712 #, python-format
2713 msgid "patch \"%s\" already exists"
2713 msgid "patch \"%s\" already exists"
2714 msgstr ""
2714 msgstr ""
2715
2715
2716 #, python-format
2716 #, python-format
2717 msgid "error unlinking %s\n"
2717 msgid "error unlinking %s\n"
2718 msgstr ""
2718 msgstr ""
2719
2719
2720 #, python-format
2720 #, python-format
2721 msgid "patch name \"%s\" is ambiguous:\n"
2721 msgid "patch name \"%s\" is ambiguous:\n"
2722 msgstr ""
2722 msgstr ""
2723
2723
2724 #, python-format
2724 #, python-format
2725 msgid "patch %s not in series"
2725 msgid "patch %s not in series"
2726 msgstr ""
2726 msgstr ""
2727
2727
2728 msgid "(working directory not at a head)\n"
2728 msgid "(working directory not at a head)\n"
2729 msgstr ""
2729 msgstr ""
2730
2730
2731 msgid "no patches in series\n"
2731 msgid "no patches in series\n"
2732 msgstr ""
2732 msgstr ""
2733
2733
2734 #, python-format
2734 #, python-format
2735 msgid "cannot push to a previous patch: %s"
2735 msgid "cannot push to a previous patch: %s"
2736 msgstr ""
2736 msgstr ""
2737
2737
2738 #, python-format
2738 #, python-format
2739 msgid "qpush: %s is already at the top\n"
2739 msgid "qpush: %s is already at the top\n"
2740 msgstr ""
2740 msgstr ""
2741
2741
2742 #, python-format
2742 #, python-format
2743 msgid "guarded by %r"
2743 msgid "guarded by %r"
2744 msgstr ""
2744 msgstr ""
2745
2745
2746 msgid "no matching guards"
2746 msgid "no matching guards"
2747 msgstr ""
2747 msgstr ""
2748
2748
2749 #, python-format
2749 #, python-format
2750 msgid "cannot push '%s' - %s\n"
2750 msgid "cannot push '%s' - %s\n"
2751 msgstr ""
2751 msgstr ""
2752
2752
2753 msgid "all patches are currently applied\n"
2753 msgid "all patches are currently applied\n"
2754 msgstr ""
2754 msgstr ""
2755
2755
2756 msgid "patch series already fully applied\n"
2756 msgid "patch series already fully applied\n"
2757 msgstr ""
2757 msgstr ""
2758
2758
2759 msgid "cleaning up working directory..."
2759 msgid "cleaning up working directory..."
2760 msgstr ""
2760 msgstr ""
2761
2761
2762 #, python-format
2762 #, python-format
2763 msgid "errors during apply, please fix and refresh %s\n"
2763 msgid "errors during apply, please fix and refresh %s\n"
2764 msgstr ""
2764 msgstr ""
2765
2765
2766 #, python-format
2766 #, python-format
2767 msgid "now at: %s\n"
2767 msgid "now at: %s\n"
2768 msgstr ""
2768 msgstr ""
2769
2769
2770 #, python-format
2770 #, python-format
2771 msgid "patch %s is not applied"
2771 msgid "patch %s is not applied"
2772 msgstr ""
2772 msgstr ""
2773
2773
2774 msgid "no patches applied\n"
2774 msgid "no patches applied\n"
2775 msgstr ""
2775 msgstr ""
2776
2776
2777 #, python-format
2777 #, python-format
2778 msgid "qpop: %s is already at the top\n"
2778 msgid "qpop: %s is already at the top\n"
2779 msgstr ""
2779 msgstr ""
2780
2780
2781 msgid "qpop: forcing dirstate update\n"
2781 msgid "qpop: forcing dirstate update\n"
2782 msgstr ""
2782 msgstr ""
2783
2783
2784 #, python-format
2784 #, python-format
2785 msgid "trying to pop unknown node %s"
2785 msgid "trying to pop unknown node %s"
2786 msgstr ""
2786 msgstr ""
2787
2787
2788 msgid "popping would remove a revision not managed by this patch queue"
2788 msgid "popping would remove a revision not managed by this patch queue"
2789 msgstr ""
2789 msgstr ""
2790
2790
2791 msgid "deletions found between repo revs"
2791 msgid "deletions found between repo revs"
2792 msgstr ""
2792 msgstr ""
2793
2793
2794 #, python-format
2794 #, python-format
2795 msgid "popping %s\n"
2795 msgid "popping %s\n"
2796 msgstr ""
2796 msgstr ""
2797
2797
2798 msgid "patch queue now empty\n"
2798 msgid "patch queue now empty\n"
2799 msgstr ""
2799 msgstr ""
2800
2800
2801 msgid "cannot refresh a revision with children"
2801 msgid "cannot refresh a revision with children"
2802 msgstr ""
2802 msgstr ""
2803
2803
2804 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2804 msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
2805 msgstr ""
2805 msgstr ""
2806
2806
2807 msgid "patch queue directory already exists"
2807 msgid "patch queue directory already exists"
2808 msgstr ""
2808 msgstr ""
2809
2809
2810 #, python-format
2810 #, python-format
2811 msgid "patch %s is not in series file"
2811 msgid "patch %s is not in series file"
2812 msgstr ""
2812 msgstr ""
2813
2813
2814 msgid "No saved patch data found\n"
2814 msgid "No saved patch data found\n"
2815 msgstr ""
2815 msgstr ""
2816
2816
2817 #, python-format
2817 #, python-format
2818 msgid "restoring status: %s\n"
2818 msgid "restoring status: %s\n"
2819 msgstr ""
2819 msgstr ""
2820
2820
2821 msgid "save entry has children, leaving it alone\n"
2821 msgid "save entry has children, leaving it alone\n"
2822 msgstr ""
2822 msgstr ""
2823
2823
2824 #, python-format
2824 #, python-format
2825 msgid "removing save entry %s\n"
2825 msgid "removing save entry %s\n"
2826 msgstr ""
2826 msgstr ""
2827
2827
2828 #, python-format
2828 #, python-format
2829 msgid "saved queue repository parents: %s %s\n"
2829 msgid "saved queue repository parents: %s %s\n"
2830 msgstr ""
2830 msgstr ""
2831
2831
2832 msgid "queue directory updating\n"
2832 msgid "queue directory updating\n"
2833 msgstr ""
2833 msgstr ""
2834
2834
2835 msgid "Unable to load queue repository\n"
2835 msgid "Unable to load queue repository\n"
2836 msgstr ""
2836 msgstr ""
2837
2837
2838 msgid "save: no patches applied, exiting\n"
2838 msgid "save: no patches applied, exiting\n"
2839 msgstr ""
2839 msgstr ""
2840
2840
2841 msgid "status is already saved\n"
2841 msgid "status is already saved\n"
2842 msgstr ""
2842 msgstr ""
2843
2843
2844 msgid "hg patches saved state"
2844 msgid "hg patches saved state"
2845 msgstr ""
2845 msgstr ""
2846
2846
2847 msgid "repo commit failed\n"
2847 msgid "repo commit failed\n"
2848 msgstr ""
2848 msgstr ""
2849
2849
2850 #, python-format
2850 #, python-format
2851 msgid "patch %s is already in the series file"
2851 msgid "patch %s is already in the series file"
2852 msgstr ""
2852 msgstr ""
2853
2853
2854 msgid "option \"-r\" not valid when importing files"
2854 msgid "option \"-r\" not valid when importing files"
2855 msgstr ""
2855 msgstr ""
2856
2856
2857 msgid "option \"-n\" not valid when importing multiple patches"
2857 msgid "option \"-n\" not valid when importing multiple patches"
2858 msgstr ""
2858 msgstr ""
2859
2859
2860 #, python-format
2860 #, python-format
2861 msgid "revision %d is the root of more than one branch"
2861 msgid "revision %d is the root of more than one branch"
2862 msgstr ""
2862 msgstr ""
2863
2863
2864 #, python-format
2864 #, python-format
2865 msgid "revision %d is already managed"
2865 msgid "revision %d is already managed"
2866 msgstr ""
2866 msgstr ""
2867
2867
2868 #, python-format
2868 #, python-format
2869 msgid "revision %d is not the parent of the queue"
2869 msgid "revision %d is not the parent of the queue"
2870 msgstr ""
2870 msgstr ""
2871
2871
2872 #, python-format
2872 #, python-format
2873 msgid "revision %d has unmanaged children"
2873 msgid "revision %d has unmanaged children"
2874 msgstr ""
2874 msgstr ""
2875
2875
2876 #, python-format
2876 #, python-format
2877 msgid "cannot import merge revision %d"
2877 msgid "cannot import merge revision %d"
2878 msgstr ""
2878 msgstr ""
2879
2879
2880 #, python-format
2880 #, python-format
2881 msgid "revision %d is not the parent of %d"
2881 msgid "revision %d is not the parent of %d"
2882 msgstr ""
2882 msgstr ""
2883
2883
2884 msgid "-e is incompatible with import from -"
2884 msgid "-e is incompatible with import from -"
2885 msgstr ""
2885 msgstr ""
2886
2886
2887 #, python-format
2887 #, python-format
2888 msgid "patch %s does not exist"
2888 msgid "patch %s does not exist"
2889 msgstr ""
2889 msgstr ""
2890
2890
2891 msgid "need --name to import a patch from -"
2891 msgid "need --name to import a patch from -"
2892 msgstr ""
2892 msgstr ""
2893
2893
2894 #, python-format
2894 #, python-format
2895 msgid "adding %s to series file\n"
2895 msgid "adding %s to series file\n"
2896 msgstr ""
2896 msgstr ""
2897
2897
2898 msgid "remove patches from queue"
2898 msgid "remove patches from queue"
2899 msgstr ""
2899 msgstr ""
2900
2900
2901 msgid ""
2901 msgid ""
2902 " The patches must not be applied, and at least one patch is required. With\n"
2902 " The patches must not be applied, and at least one patch is required. With\n"
2903 " -k/--keep, the patch files are preserved in the patch directory."
2903 " -k/--keep, the patch files are preserved in the patch directory."
2904 msgstr ""
2904 msgstr ""
2905
2905
2906 msgid ""
2906 msgid ""
2907 " To stop managing a patch and move it into permanent history,\n"
2907 " To stop managing a patch and move it into permanent history,\n"
2908 " use the qfinish command."
2908 " use the qfinish command."
2909 msgstr ""
2909 msgstr ""
2910
2910
2911 msgid "print the patches already applied"
2911 msgid "print the patches already applied"
2912 msgstr ""
2912 msgstr ""
2913
2913
2914 msgid "only one patch applied\n"
2914 msgid "only one patch applied\n"
2915 msgstr ""
2915 msgstr ""
2916
2916
2917 msgid "print the patches not yet applied"
2917 msgid "print the patches not yet applied"
2918 msgstr ""
2918 msgstr ""
2919
2919
2920 msgid "all patches applied\n"
2920 msgid "all patches applied\n"
2921 msgstr ""
2921 msgstr ""
2922
2922
2923 #, fuzzy
2923 #, fuzzy
2924 msgid "import a patch"
2924 msgid "import a patch"
2925 msgstr ""
2925 msgstr ""
2926 "导入补丁\n"
2926 "导入补丁"
2927 "\n"
2928 " 此补丁插入到最近一次应用的补丁序列中。\n"
2929 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2930 "\n"
2931 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2932 "\n"
2933 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2934 "\n"
2935 " 使用 '--force' 会覆盖已有的补丁。\n"
2936 "\n"
2937 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2938 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2939 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2940 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2941 " "
2942
2927
2943 #, fuzzy
2928 #, fuzzy
2944 msgid ""
2929 msgid ""
2945 " The patch is inserted into the series after the last applied\n"
2930 " The patch is inserted into the series after the last applied\n"
2946 " patch. If no patches have been applied, qimport prepends the patch\n"
2931 " patch. If no patches have been applied, qimport prepends the patch\n"
2947 " to the series."
2932 " to the series."
2948 msgstr ""
2933 msgstr ""
2949 "导入补丁\n"
2950 "\n"
2951 " 此补丁插入到最近一次应用的补丁序列中。\n"
2934 " 此补丁插入到最近一次应用的补丁序列中。\n"
2952 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2935 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。"
2953 "\n"
2954 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2955 "\n"
2956 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2957 "\n"
2958 " 使用 '--force' 会覆盖已有的补丁。\n"
2959 "\n"
2960 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2961 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2962 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2963 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2964 " "
2965
2936
2966 #, fuzzy
2937 #, fuzzy
2967 msgid ""
2938 msgid ""
2968 " The patch will have the same name as its source file unless you\n"
2939 " The patch will have the same name as its source file unless you\n"
2969 " give it a new one with -n/--name."
2940 " give it a new one with -n/--name."
2970 msgstr ""
2941 msgstr ""
2971 "导入补丁\n"
2942 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。"
2972 "\n"
2973 " 此补丁插入到最近一次应用的补丁序列中。\n"
2974 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2975 "\n"
2976 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2977 "\n"
2978 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
2979 "\n"
2980 " 使用 '--force' 会覆盖已有的补丁。\n"
2981 "\n"
2982 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2983 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2984 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2985 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2986 " "
2987
2943
2988 #, fuzzy
2944 #, fuzzy
2989 msgid ""
2945 msgid ""
2990 " You can register an existing patch inside the patch directory with\n"
2946 " You can register an existing patch inside the patch directory with\n"
2991 " the -e/--existing flag."
2947 " the -e/--existing flag."
2992 msgstr ""
2948 msgstr ""
2993 "导入补丁\n"
2949 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。"
2994 "\n"
2995 " 此补丁插入到最近一次应用的补丁序列中。\n"
2996 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
2997 "\n"
2998 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
2999 "\n"
3000 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3001 "\n"
3002 " 使用 '--force' 会覆盖已有的补丁。\n"
3003 "\n"
3004 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3005 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3006 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3007 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3008 " "
3009
2950
3010 #, fuzzy
2951 #, fuzzy
3011 msgid ""
2952 msgid ""
3012 " With -f/--force, an existing patch of the same name will be\n"
2953 " With -f/--force, an existing patch of the same name will be\n"
3013 " overwritten."
2954 " overwritten."
3014 msgstr ""
2955 msgstr ""
3015 "导入补丁\n"
2956 " 使用 '--force' 会覆盖已有的补丁。"
3016 "\n"
3017 " 此补丁插入到最近一次应用的补丁序列中。\n"
3018 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3019 "\n"
3020 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3021 "\n"
3022 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3023 "\n"
3024 " 使用 '--force' 会覆盖已有的补丁。\n"
3025 "\n"
3026 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3027 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3028 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3029 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3030 " "
3031
2957
3032 #, fuzzy
2958 #, fuzzy
3033 msgid ""
2959 msgid ""
3034 " An existing changeset may be placed under mq control with -r/--rev\n"
2960 " An existing changeset may be placed under mq control with -r/--rev\n"
3035 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2961 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
3036 " With -g/--git, patches imported with --rev will use the git diff\n"
2962 " With -g/--git, patches imported with --rev will use the git diff\n"
3037 " format. See the diffs help topic for information on why this is\n"
2963 " format. See the diffs help topic for information on why this is\n"
3038 " important for preserving rename/copy information and permission\n"
2964 " important for preserving rename/copy information and permission\n"
3039 " changes."
2965 " changes."
3040 msgstr ""
2966 msgstr ""
3041 "导入补丁\n"
3042 "\n"
3043 " 此补丁插入到最近一次应用的补丁序列中。\n"
3044 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3045 "\n"
3046 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3047 "\n"
3048 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3049 "\n"
3050 " 使用 '--force' 会覆盖已有的补丁。\n"
3051 "\n"
3052 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
2967 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3053 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
2968 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3054 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
2969 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3055 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
2970 " 为什么这对于保留改名/复制信息和权限修改很重要。"
3056 " "
3057
2971
3058 #, fuzzy
2972 #, fuzzy
3059 msgid ""
2973 msgid ""
3060 " To import a patch from standard input, pass - as the patch file.\n"
2974 " To import a patch from standard input, pass - as the patch file.\n"
3061 " When importing from standard input, a patch name must be specified\n"
2975 " When importing from standard input, a patch name must be specified\n"
3062 " using the --name flag.\n"
2976 " using the --name flag.\n"
3063 " "
2977 " "
3064 msgstr ""
2978 msgstr ""
3065 "导入补丁\n"
3066 "\n"
3067 " 此补丁插入到最近一次应用的补丁序列中。\n"
3068 " 如果尚无应用补丁,qimport 会插入补丁到序列开始。\n"
3069 "\n"
3070 " 除非你使用 '--name' 给出补丁名称,否则就与源文件同名。\n"
3071 "\n"
3072 " 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n"
3073 "\n"
3074 " 使用 '--force' 会覆盖已有的补丁。\n"
3075 "\n"
3076 " 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
3077 " 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
3078 " 时,'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题,以了解\n"
3079 " 为什么这对于保留改名/复制信息和权限修改很重要。\n"
3080 " "
3081
2979
3082 #, fuzzy
2980 #, fuzzy
3083 msgid "init a new queue repository"
2981 msgid "init a new queue repository"
3084 msgstr "初始化队列仓库"
2982 msgstr "初始化队列仓库"
3085
2983
3086 #, fuzzy
2984 #, fuzzy
3087 msgid ""
2985 msgid ""
3088 " The queue repository is unversioned by default. If\n"
2986 " The queue repository is unversioned by default. If\n"
3089 " -c/--create-repo is specified, qinit will create a separate nested\n"
2987 " -c/--create-repo is specified, qinit will create a separate nested\n"
3090 " repository for patches (qinit -c may also be run later to convert\n"
2988 " repository for patches (qinit -c may also be run later to convert\n"
3091 " an unversioned patch repository into a versioned one). You can use\n"
2989 " an unversioned patch repository into a versioned one). You can use\n"
3092 " qcommit to commit changes to this queue repository."
2990 " qcommit to commit changes to this queue repository."
3093 msgstr ""
2991 msgstr ""
3094 " 默认队列仓库不受版本控制。如果指定了 '-c',那么 qinit 会为补丁创建一个\n"
2992 " 默认队列仓库不受版本控制。如果指定了 '-c',那么 qinit 会为补丁创建一个\n"
3095 " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n"
2993 " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n"
3096 " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。"
2994 " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。"
3097
2995
3098 msgid "clone main and patch repository at same time"
2996 msgid "clone main and patch repository at same time"
3099 msgstr ""
2997 msgstr ""
3100
2998
3101 msgid ""
2999 msgid ""
3102 " If source is local, destination will have no patches applied. If\n"
3000 " If source is local, destination will have no patches applied. If\n"
3103 " source is remote, this command can not check if patches are\n"
3001 " source is remote, this command can not check if patches are\n"
3104 " applied in source, so cannot guarantee that patches are not\n"
3002 " applied in source, so cannot guarantee that patches are not\n"
3105 " applied in destination. If you clone remote repository, be sure\n"
3003 " applied in destination. If you clone remote repository, be sure\n"
3106 " before that it has no patches applied."
3004 " before that it has no patches applied."
3107 msgstr ""
3005 msgstr ""
3108
3006
3109 msgid ""
3007 msgid ""
3110 " Source patch repository is looked for in <src>/.hg/patches by\n"
3008 " Source patch repository is looked for in <src>/.hg/patches by\n"
3111 " default. Use -p <url> to change."
3009 " default. Use -p <url> to change."
3112 msgstr ""
3010 msgstr ""
3113
3011
3114 msgid ""
3012 msgid ""
3115 " The patch directory must be a nested Mercurial repository, as\n"
3013 " The patch directory must be a nested Mercurial repository, as\n"
3116 " would be created by qinit -c.\n"
3014 " would be created by qinit -c.\n"
3117 " "
3015 " "
3118 msgstr ""
3016 msgstr ""
3119
3017
3120 msgid "versioned patch repository not found (see qinit -c)"
3018 msgid "versioned patch repository not found (see qinit -c)"
3121 msgstr ""
3019 msgstr ""
3122
3020
3123 #, fuzzy
3021 #, fuzzy
3124 msgid "cloning main repository\n"
3022 msgid "cloning main repository\n"
3125 msgstr "初始化目标版本库 %s\n"
3023 msgstr "初始化目标版本库 %s\n"
3126
3024
3127 msgid "cloning patch repository\n"
3025 msgid "cloning patch repository\n"
3128 msgstr ""
3026 msgstr ""
3129
3027
3130 #, fuzzy
3028 #, fuzzy
3131 msgid "stripping applied patches from destination repository\n"
3029 msgid "stripping applied patches from destination repository\n"
3132 msgstr "初始化目标版本库 %s\n"
3030 msgstr "初始化目标版本库 %s\n"
3133
3031
3134 #, fuzzy
3032 #, fuzzy
3135 msgid "updating destination repository\n"
3033 msgid "updating destination repository\n"
3136 msgstr "初始化目标版本库 %s\n"
3034 msgstr "初始化目标版本库 %s\n"
3137
3035
3138 msgid "commit changes in the queue repository"
3036 msgid "commit changes in the queue repository"
3139 msgstr ""
3037 msgstr ""
3140
3038
3141 msgid "print the entire series file"
3039 msgid "print the entire series file"
3142 msgstr ""
3040 msgstr ""
3143
3041
3144 msgid "print the name of the current patch"
3042 msgid "print the name of the current patch"
3145 msgstr ""
3043 msgstr ""
3146
3044
3147 msgid "print the name of the next patch"
3045 msgid "print the name of the next patch"
3148 msgstr ""
3046 msgstr ""
3149
3047
3150 msgid "print the name of the previous patch"
3048 msgid "print the name of the previous patch"
3151 msgstr ""
3049 msgstr ""
3152
3050
3153 msgid "create a new patch"
3051 msgid "create a new patch"
3154 msgstr ""
3052 msgstr ""
3155
3053
3156 msgid ""
3054 msgid ""
3157 " qnew creates a new patch on top of the currently-applied patch (if\n"
3055 " qnew creates a new patch on top of the currently-applied patch (if\n"
3158 " any). It will refuse to run if there are any outstanding changes\n"
3056 " any). It will refuse to run if there are any outstanding changes\n"
3159 " unless -f/--force is specified, in which case the patch will be\n"
3057 " unless -f/--force is specified, in which case the patch will be\n"
3160 " initialized with them. You may also use -I/--include,\n"
3058 " initialized with them. You may also use -I/--include,\n"
3161 " -X/--exclude, and/or a list of files after the patch name to add\n"
3059 " -X/--exclude, and/or a list of files after the patch name to add\n"
3162 " only changes to matching files to the new patch, leaving the rest\n"
3060 " only changes to matching files to the new patch, leaving the rest\n"
3163 " as uncommitted modifications."
3061 " as uncommitted modifications."
3164 msgstr ""
3062 msgstr ""
3165
3063
3166 msgid ""
3064 msgid ""
3167 " -u/--user and -d/--date can be used to set the (given) user and\n"
3065 " -u/--user and -d/--date can be used to set the (given) user and\n"
3168 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3066 " date, respectively. -U/--currentuser and -D/--currentdate set user\n"
3169 " to current user and date to current date."
3067 " to current user and date to current date."
3170 msgstr ""
3068 msgstr ""
3171
3069
3172 msgid ""
3070 msgid ""
3173 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3071 " -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
3174 " well as the commit message. If none is specified, the header is\n"
3072 " well as the commit message. If none is specified, the header is\n"
3175 " empty and the commit message is '[mq]: PATCH'."
3073 " empty and the commit message is '[mq]: PATCH'."
3176 msgstr ""
3074 msgstr ""
3177
3075
3178 msgid ""
3076 msgid ""
3179 " Use the -g/--git option to keep the patch in the git extended diff\n"
3077 " Use the -g/--git option to keep the patch in the git extended diff\n"
3180 " format. Read the diffs help topic for more information on why this\n"
3078 " format. Read the diffs help topic for more information on why this\n"
3181 " is important for preserving permission changes and copy/rename\n"
3079 " is important for preserving permission changes and copy/rename\n"
3182 " information.\n"
3080 " information.\n"
3183 " "
3081 " "
3184 msgstr ""
3082 msgstr ""
3185
3083
3186 #, fuzzy
3084 #, fuzzy
3187 msgid "update the current patch"
3085 msgid "update the current patch"
3188 msgstr "更新当前补丁"
3086 msgstr "更新当前补丁"
3189
3087
3190 #, fuzzy
3088 #, fuzzy
3191 msgid ""
3089 msgid ""
3192 " If any file patterns are provided, the refreshed patch will\n"
3090 " If any file patterns are provided, the refreshed patch will\n"
3193 " contain only the modifications that match those patterns; the\n"
3091 " contain only the modifications that match those patterns; the\n"
3194 " remaining modifications will remain in the working directory."
3092 " remaining modifications will remain in the working directory."
3195 msgstr ""
3093 msgstr ""
3196 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
3094 " 如果提供了文件匹配模式,更新后的补丁只包含匹配这些模式的修改,其它\n"
3197 " 的修改仍旧在工作目录中。"
3095 " 的修改仍旧在工作目录中。"
3198
3096
3199 #, fuzzy
3097 #, fuzzy
3200 msgid ""
3098 msgid ""
3201 " If -s/--short is specified, files currently included in the patch\n"
3099 " If -s/--short is specified, files currently included in the patch\n"
3202 " will be refreshed just like matched files and remain in the patch."
3100 " will be refreshed just like matched files and remain in the patch."
3203 msgstr " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。"
3101 msgstr " 如果指定了 '--short',只更新已经在补丁中的文件,与文件匹配模式类似。"
3204
3102
3205 #, fuzzy
3103 #, fuzzy
3206 msgid ""
3104 msgid ""
3207 " hg add/remove/copy/rename work as usual, though you might want to\n"
3105 " hg add/remove/copy/rename work as usual, though you might want to\n"
3208 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3106 " use git-style patches (-g/--git or [diff] git=1) to track copies\n"
3209 " and renames. See the diffs help topic for more information on the\n"
3107 " and renames. See the diffs help topic for more information on the\n"
3210 " git diff format.\n"
3108 " git diff format.\n"
3211 " "
3109 " "
3212 msgstr ""
3110 msgstr ""
3213 " 'hg add/remove/copy/rename' 如常工作,你可能想使用 git 格式补丁(使\n"
3111 " 'hg add/remove/copy/rename' 如常工作,你可能想使用 git 格式补丁(使\n"
3214 " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n"
3112 " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n"
3215 " 名。请参见差异帮助主题,以了解关于 git 差异格式的更多信息。\n"
3113 " 名。请参见差异帮助主题,以了解关于 git 差异格式的更多信息。\n"
3216 " "
3114 " "
3217
3115
3218 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3116 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
3219 msgstr ""
3117 msgstr ""
3220
3118
3221 #, fuzzy
3119 #, fuzzy
3222 msgid "diff of the current patch and subsequent modifications"
3120 msgid "diff of the current patch and subsequent modifications"
3223 msgstr "显式当前的补丁和后续的修改"
3121 msgstr "显式当前的补丁和后续的修改"
3224
3122
3225 #, fuzzy
3123 #, fuzzy
3226 msgid ""
3124 msgid ""
3227 " Shows a diff which includes the current patch as well as any\n"
3125 " Shows a diff which includes the current patch as well as any\n"
3228 " changes which have been made in the working directory since the\n"
3126 " changes which have been made in the working directory since the\n"
3229 " last refresh (thus showing what the current patch would become\n"
3127 " last refresh (thus showing what the current patch would become\n"
3230 " after a qrefresh)."
3128 " after a qrefresh)."
3231 msgstr ""
3129 msgstr ""
3232 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
3130 " 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n"
3233 " 显示当前的补丁)。"
3131 " 显示当前的补丁)。"
3234
3132
3235 #, fuzzy
3133 #, fuzzy
3236 msgid ""
3134 msgid ""
3237 " Use 'hg diff' if you only want to see the changes made since the\n"
3135 " Use 'hg diff' if you only want to see the changes made since the\n"
3238 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3136 " last qrefresh, or 'hg export qtip' if you want to see changes made\n"
3239 " by the current patch without including changes made since the\n"
3137 " by the current patch without including changes made since the\n"
3240 " qrefresh.\n"
3138 " qrefresh.\n"
3241 " "
3139 " "
3242 msgstr ""
3140 msgstr ""
3243 " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff',如果你只想看到当\n"
3141 " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff',如果你只想看到当\n"
3244 " 前的补丁请使用 'hg export qtip'。\n"
3142 " 前的补丁请使用 'hg export qtip'。\n"
3245 " "
3143 " "
3246
3144
3247 msgid "fold the named patches into the current patch"
3145 msgid "fold the named patches into the current patch"
3248 msgstr ""
3146 msgstr ""
3249
3147
3250 msgid ""
3148 msgid ""
3251 " Patches must not yet be applied. Each patch will be successively\n"
3149 " Patches must not yet be applied. Each patch will be successively\n"
3252 " applied to the current patch in the order given. If all the\n"
3150 " applied to the current patch in the order given. If all the\n"
3253 " patches apply successfully, the current patch will be refreshed\n"
3151 " patches apply successfully, the current patch will be refreshed\n"
3254 " with the new cumulative patch, and the folded patches will be\n"
3152 " with the new cumulative patch, and the folded patches will be\n"
3255 " deleted. With -k/--keep, the folded patch files will not be\n"
3153 " deleted. With -k/--keep, the folded patch files will not be\n"
3256 " removed afterwards."
3154 " removed afterwards."
3257 msgstr ""
3155 msgstr ""
3258
3156
3259 msgid ""
3157 msgid ""
3260 " The header for each folded patch will be concatenated with the\n"
3158 " The header for each folded patch will be concatenated with the\n"
3261 " current patch header, separated by a line of '* * *'."
3159 " current patch header, separated by a line of '* * *'."
3262 msgstr ""
3160 msgstr ""
3263
3161
3264 msgid "qfold requires at least one patch name"
3162 msgid "qfold requires at least one patch name"
3265 msgstr ""
3163 msgstr ""
3266
3164
3267 msgid "No patches applied"
3165 msgid "No patches applied"
3268 msgstr ""
3166 msgstr ""
3269
3167
3270 #, python-format
3168 #, python-format
3271 msgid "Skipping already folded patch %s"
3169 msgid "Skipping already folded patch %s"
3272 msgstr ""
3170 msgstr ""
3273
3171
3274 #, python-format
3172 #, python-format
3275 msgid "qfold cannot fold already applied patch %s"
3173 msgid "qfold cannot fold already applied patch %s"
3276 msgstr ""
3174 msgstr ""
3277
3175
3278 #, python-format
3176 #, python-format
3279 msgid "Error folding patch %s"
3177 msgid "Error folding patch %s"
3280 msgstr ""
3178 msgstr ""
3281
3179
3282 msgid "push or pop patches until named patch is at top of stack"
3180 msgid "push or pop patches until named patch is at top of stack"
3283 msgstr ""
3181 msgstr ""
3284
3182
3285 msgid "set or print guards for a patch"
3183 msgid "set or print guards for a patch"
3286 msgstr ""
3184 msgstr ""
3287
3185
3288 msgid ""
3186 msgid ""
3289 " Guards control whether a patch can be pushed. A patch with no\n"
3187 " Guards control whether a patch can be pushed. A patch with no\n"
3290 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3188 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3291 " pushed only if the qselect command has activated it. A patch with\n"
3189 " pushed only if the qselect command has activated it. A patch with\n"
3292 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3190 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3293 " has activated it."
3191 " has activated it."
3294 msgstr ""
3192 msgstr ""
3295
3193
3296 msgid ""
3194 msgid ""
3297 " With no arguments, print the currently active guards.\n"
3195 " With no arguments, print the currently active guards.\n"
3298 " With arguments, set guards for the named patch.\n"
3196 " With arguments, set guards for the named patch.\n"
3299 " NOTE: Specifying negative guards now requires '--'."
3197 " NOTE: Specifying negative guards now requires '--'."
3300 msgstr ""
3198 msgstr ""
3301
3199
3302 msgid ""
3200 msgid ""
3303 " To set guards on another patch:\n"
3201 " To set guards on another patch:\n"
3304 " hg qguard -- other.patch +2.6.17 -stable\n"
3202 " hg qguard -- other.patch +2.6.17 -stable\n"
3305 " "
3203 " "
3306 msgstr ""
3204 msgstr ""
3307
3205
3308 msgid "cannot mix -l/--list with options or arguments"
3206 msgid "cannot mix -l/--list with options or arguments"
3309 msgstr ""
3207 msgstr ""
3310
3208
3311 msgid "no patch to work with"
3209 msgid "no patch to work with"
3312 msgstr ""
3210 msgstr ""
3313
3211
3314 #, python-format
3212 #, python-format
3315 msgid "no patch named %s"
3213 msgid "no patch named %s"
3316 msgstr ""
3214 msgstr ""
3317
3215
3318 msgid "print the header of the topmost or specified patch"
3216 msgid "print the header of the topmost or specified patch"
3319 msgstr ""
3217 msgstr ""
3320
3218
3321 #, fuzzy
3219 #, fuzzy
3322 msgid "push the next patch onto the stack"
3220 msgid "push the next patch onto the stack"
3323 msgstr "将下个补丁压入堆栈"
3221 msgstr "将下个补丁压入堆栈"
3324
3222
3325 #, fuzzy
3223 #, fuzzy
3326 msgid ""
3224 msgid ""
3327 " When -f/--force is applied, all local changes in patched files\n"
3225 " When -f/--force is applied, all local changes in patched files\n"
3328 " will be lost.\n"
3226 " will be lost.\n"
3329 " "
3227 " "
3330 msgstr ""
3228 msgstr ""
3331 " 当指定 '--force' 时,所有在补丁文件中的本地修改都会丢失。\n"
3229 " 当指定 '--force' 时,所有在补丁文件中的本地修改都会丢失。\n"
3332 " "
3230 " "
3333
3231
3334 msgid "no saved queues found, please use -n\n"
3232 msgid "no saved queues found, please use -n\n"
3335 msgstr ""
3233 msgstr ""
3336
3234
3337 #, python-format
3235 #, python-format
3338 msgid "merging with queue at: %s\n"
3236 msgid "merging with queue at: %s\n"
3339 msgstr ""
3237 msgstr ""
3340
3238
3341 #, fuzzy
3239 #, fuzzy
3342 msgid "pop the current patch off the stack"
3240 msgid "pop the current patch off the stack"
3343 msgstr "将当前补丁弹出堆栈"
3241 msgstr "将当前补丁弹出堆栈"
3344
3242
3345 #, fuzzy
3243 #, fuzzy
3346 msgid ""
3244 msgid ""
3347 " By default, pops off the top of the patch stack. If given a patch\n"
3245 " By default, pops off the top of the patch stack. If given a patch\n"
3348 " name, keeps popping off patches until the named patch is at the\n"
3246 " name, keeps popping off patches until the named patch is at the\n"
3349 " top of the stack.\n"
3247 " top of the stack.\n"
3350 " "
3248 " "
3351 msgstr ""
3249 msgstr ""
3352 " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称,那么就会一直弹出,直到此\n"
3250 " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称,那么就会一直弹出,直到此\n"
3353 " 补丁位于堆栈顶部。\n"
3251 " 补丁位于堆栈顶部。\n"
3354 " "
3252 " "
3355
3253
3356 #, python-format
3254 #, python-format
3357 msgid "using patch queue: %s\n"
3255 msgid "using patch queue: %s\n"
3358 msgstr ""
3256 msgstr ""
3359
3257
3360 msgid "rename a patch"
3258 msgid "rename a patch"
3361 msgstr ""
3259 msgstr ""
3362
3260
3363 msgid ""
3261 msgid ""
3364 " With one argument, renames the current patch to PATCH1.\n"
3262 " With one argument, renames the current patch to PATCH1.\n"
3365 " With two arguments, renames PATCH1 to PATCH2."
3263 " With two arguments, renames PATCH1 to PATCH2."
3366 msgstr ""
3264 msgstr ""
3367
3265
3368 #, python-format
3266 #, python-format
3369 msgid "%s already exists"
3267 msgid "%s already exists"
3370 msgstr ""
3268 msgstr ""
3371
3269
3372 #, python-format
3270 #, python-format
3373 msgid "A patch named %s already exists in the series file"
3271 msgid "A patch named %s already exists in the series file"
3374 msgstr ""
3272 msgstr ""
3375
3273
3376 msgid "restore the queue state saved by a revision"
3274 msgid "restore the queue state saved by a revision"
3377 msgstr ""
3275 msgstr ""
3378
3276
3379 msgid "save current queue state"
3277 msgid "save current queue state"
3380 msgstr ""
3278 msgstr ""
3381
3279
3382 #, python-format
3280 #, python-format
3383 msgid "destination %s exists and is not a directory"
3281 msgid "destination %s exists and is not a directory"
3384 msgstr ""
3282 msgstr ""
3385
3283
3386 #, python-format
3284 #, python-format
3387 msgid "destination %s exists, use -f to force"
3285 msgid "destination %s exists, use -f to force"
3388 msgstr ""
3286 msgstr ""
3389
3287
3390 #, python-format
3288 #, python-format
3391 msgid "copy %s to %s\n"
3289 msgid "copy %s to %s\n"
3392 msgstr ""
3290 msgstr ""
3393
3291
3394 #, fuzzy
3292 #, fuzzy
3395 msgid "strip a revision and all its descendants from the repository"
3293 msgid "strip a revision and all its descendants from the repository"
3396 msgstr "从版本库删除一个版本以及它的子孙"
3294 msgstr "从版本库删除一个版本以及它的子孙"
3397
3295
3398 #, fuzzy
3296 #, fuzzy
3399 msgid ""
3297 msgid ""
3400 " If one of the working directory's parent revisions is stripped, the\n"
3298 " If one of the working directory's parent revisions is stripped, the\n"
3401 " working directory will be updated to the parent of the stripped\n"
3299 " working directory will be updated to the parent of the stripped\n"
3402 " revision.\n"
3300 " revision.\n"
3403 " "
3301 " "
3404 msgstr ""
3302 msgstr ""
3405 " 如果有工作目录的父版本被删除,那么此目录会被更新到已删除版本的父版本。\n"
3303 " 如果有工作目录的父版本被删除,那么此目录会被更新到已删除版本的父版本。\n"
3406 " "
3304 " "
3407
3305
3408 msgid "set or print guarded patches to push"
3306 msgid "set or print guarded patches to push"
3409 msgstr ""
3307 msgstr ""
3410
3308
3411 msgid ""
3309 msgid ""
3412 " Use the qguard command to set or print guards on patch, then use\n"
3310 " Use the qguard command to set or print guards on patch, then use\n"
3413 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3311 " qselect to tell mq which guards to use. A patch will be pushed if\n"
3414 " it has no guards or any positive guards match the currently\n"
3312 " it has no guards or any positive guards match the currently\n"
3415 " selected guard, but will not be pushed if any negative guards\n"
3313 " selected guard, but will not be pushed if any negative guards\n"
3416 " match the current guard. For example:"
3314 " match the current guard. For example:"
3417 msgstr ""
3315 msgstr ""
3418
3316
3419 msgid ""
3317 msgid ""
3420 " qguard foo.patch -stable (negative guard)\n"
3318 " qguard foo.patch -stable (negative guard)\n"
3421 " qguard bar.patch +stable (positive guard)\n"
3319 " qguard bar.patch +stable (positive guard)\n"
3422 " qselect stable"
3320 " qselect stable"
3423 msgstr ""
3321 msgstr ""
3424
3322
3425 msgid ""
3323 msgid ""
3426 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3324 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3427 " it has a negative match) but push bar.patch (because it has a\n"
3325 " it has a negative match) but push bar.patch (because it has a\n"
3428 " positive match)."
3326 " positive match)."
3429 msgstr ""
3327 msgstr ""
3430
3328
3431 msgid ""
3329 msgid ""
3432 " With no arguments, prints the currently active guards.\n"
3330 " With no arguments, prints the currently active guards.\n"
3433 " With one argument, sets the active guard."
3331 " With one argument, sets the active guard."
3434 msgstr ""
3332 msgstr ""
3435
3333
3436 msgid ""
3334 msgid ""
3437 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3335 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3438 " When no guards are active, patches with positive guards are\n"
3336 " When no guards are active, patches with positive guards are\n"
3439 " skipped and patches with negative guards are pushed."
3337 " skipped and patches with negative guards are pushed."
3440 msgstr ""
3338 msgstr ""
3441
3339
3442 msgid ""
3340 msgid ""
3443 " qselect can change the guards on applied patches. It does not pop\n"
3341 " qselect can change the guards on applied patches. It does not pop\n"
3444 " guarded patches by default. Use --pop to pop back to the last\n"
3342 " guarded patches by default. Use --pop to pop back to the last\n"
3445 " applied patch that is not guarded. Use --reapply (which implies\n"
3343 " applied patch that is not guarded. Use --reapply (which implies\n"
3446 " --pop) to push back to the current patch afterwards, but skip\n"
3344 " --pop) to push back to the current patch afterwards, but skip\n"
3447 " guarded patches."
3345 " guarded patches."
3448 msgstr ""
3346 msgstr ""
3449
3347
3450 msgid ""
3348 msgid ""
3451 " Use -s/--series to print a list of all guards in the series file\n"
3349 " Use -s/--series to print a list of all guards in the series file\n"
3452 " (no other arguments needed). Use -v for more information."
3350 " (no other arguments needed). Use -v for more information."
3453 msgstr ""
3351 msgstr ""
3454
3352
3455 msgid "guards deactivated\n"
3353 msgid "guards deactivated\n"
3456 msgstr ""
3354 msgstr ""
3457
3355
3458 #, python-format
3356 #, python-format
3459 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3357 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3460 msgstr ""
3358 msgstr ""
3461
3359
3462 #, python-format
3360 #, python-format
3463 msgid "number of guarded, applied patches has changed from %d to %d\n"
3361 msgid "number of guarded, applied patches has changed from %d to %d\n"
3464 msgstr ""
3362 msgstr ""
3465
3363
3466 msgid "guards in series file:\n"
3364 msgid "guards in series file:\n"
3467 msgstr ""
3365 msgstr ""
3468
3366
3469 msgid "no guards in series file\n"
3367 msgid "no guards in series file\n"
3470 msgstr ""
3368 msgstr ""
3471
3369
3472 msgid "active guards:\n"
3370 msgid "active guards:\n"
3473 msgstr ""
3371 msgstr ""
3474
3372
3475 msgid "no active guards\n"
3373 msgid "no active guards\n"
3476 msgstr ""
3374 msgstr ""
3477
3375
3478 msgid "popping guarded patches\n"
3376 msgid "popping guarded patches\n"
3479 msgstr ""
3377 msgstr ""
3480
3378
3481 msgid "reapplying unguarded patches\n"
3379 msgid "reapplying unguarded patches\n"
3482 msgstr ""
3380 msgstr ""
3483
3381
3484 msgid "move applied patches into repository history"
3382 msgid "move applied patches into repository history"
3485 msgstr ""
3383 msgstr ""
3486
3384
3487 msgid ""
3385 msgid ""
3488 " Finishes the specified revisions (corresponding to applied\n"
3386 " Finishes the specified revisions (corresponding to applied\n"
3489 " patches) by moving them out of mq control into regular repository\n"
3387 " patches) by moving them out of mq control into regular repository\n"
3490 " history."
3388 " history."
3491 msgstr ""
3389 msgstr ""
3492
3390
3493 msgid ""
3391 msgid ""
3494 " Accepts a revision range or the -a/--applied option. If --applied\n"
3392 " Accepts a revision range or the -a/--applied option. If --applied\n"
3495 " is specified, all applied mq revisions are removed from mq\n"
3393 " is specified, all applied mq revisions are removed from mq\n"
3496 " control. Otherwise, the given revisions must be at the base of the\n"
3394 " control. Otherwise, the given revisions must be at the base of the\n"
3497 " stack of applied patches."
3395 " stack of applied patches."
3498 msgstr ""
3396 msgstr ""
3499
3397
3500 msgid ""
3398 msgid ""
3501 " This can be especially useful if your changes have been applied to\n"
3399 " This can be especially useful if your changes have been applied to\n"
3502 " an upstream repository, or if you are about to push your changes\n"
3400 " an upstream repository, or if you are about to push your changes\n"
3503 " to upstream.\n"
3401 " to upstream.\n"
3504 " "
3402 " "
3505 msgstr ""
3403 msgstr ""
3506
3404
3507 msgid "no revisions specified"
3405 msgid "no revisions specified"
3508 msgstr ""
3406 msgstr ""
3509
3407
3510 msgid "cannot commit over an applied mq patch"
3408 msgid "cannot commit over an applied mq patch"
3511 msgstr ""
3409 msgstr ""
3512
3410
3513 msgid "source has mq patches applied"
3411 msgid "source has mq patches applied"
3514 msgstr ""
3412 msgstr ""
3515
3413
3516 #, python-format
3414 #, python-format
3517 msgid "mq status file refers to unknown node %s\n"
3415 msgid "mq status file refers to unknown node %s\n"
3518 msgstr ""
3416 msgstr ""
3519
3417
3520 #, python-format
3418 #, python-format
3521 msgid "Tag %s overrides mq patch of the same name\n"
3419 msgid "Tag %s overrides mq patch of the same name\n"
3522 msgstr ""
3420 msgstr ""
3523
3421
3524 msgid "cannot import over an applied patch"
3422 msgid "cannot import over an applied patch"
3525 msgstr ""
3423 msgstr ""
3526
3424
3527 msgid "print first line of patch header"
3425 msgid "print first line of patch header"
3528 msgstr ""
3426 msgstr ""
3529
3427
3530 #, fuzzy
3428 #, fuzzy
3531 msgid "show only the last patch"
3429 msgid "show only the last patch"
3532 msgstr "只显示已增加文件的状态"
3430 msgstr "只显示已增加文件的状态"
3533
3431
3534 msgid "hg qapplied [-1] [-s] [PATCH]"
3432 msgid "hg qapplied [-1] [-s] [PATCH]"
3535 msgstr ""
3433 msgstr ""
3536
3434
3537 msgid "use pull protocol to copy metadata"
3435 msgid "use pull protocol to copy metadata"
3538 msgstr "数用协议 'pull' 来复制元数据"
3436 msgstr "数用协议 'pull' 来复制元数据"
3539
3437
3540 msgid "do not update the new working directories"
3438 msgid "do not update the new working directories"
3541 msgstr ""
3439 msgstr ""
3542
3440
3543 msgid "use uncompressed transfer (fast over LAN)"
3441 msgid "use uncompressed transfer (fast over LAN)"
3544 msgstr "使用不压缩的传输(在局域网更快)"
3442 msgstr "使用不压缩的传输(在局域网更快)"
3545
3443
3546 #, fuzzy
3444 #, fuzzy
3547 msgid "location of source patch repository"
3445 msgid "location of source patch repository"
3548 msgstr "为此版本库启动服务 'inotify'"
3446 msgstr "为此版本库启动服务 'inotify'"
3549
3447
3550 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3448 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3551 msgstr ""
3449 msgstr ""
3552
3450
3553 msgid "hg qcommit [OPTION]... [FILE]..."
3451 msgid "hg qcommit [OPTION]... [FILE]..."
3554 msgstr ""
3452 msgstr ""
3555
3453
3556 msgid "hg qdiff [OPTION]... [FILE]..."
3454 msgid "hg qdiff [OPTION]... [FILE]..."
3557 msgstr ""
3455 msgstr ""
3558
3456
3559 msgid "keep patch file"
3457 msgid "keep patch file"
3560 msgstr ""
3458 msgstr ""
3561
3459
3562 msgid "stop managing a revision (DEPRECATED)"
3460 msgid "stop managing a revision (DEPRECATED)"
3563 msgstr ""
3461 msgstr ""
3564
3462
3565 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3463 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3566 msgstr ""
3464 msgstr ""
3567
3465
3568 msgid "edit patch header"
3466 msgid "edit patch header"
3569 msgstr ""
3467 msgstr ""
3570
3468
3571 msgid "keep folded patch files"
3469 msgid "keep folded patch files"
3572 msgstr ""
3470 msgstr ""
3573
3471
3574 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3472 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3575 msgstr ""
3473 msgstr ""
3576
3474
3577 msgid "overwrite any local changes"
3475 msgid "overwrite any local changes"
3578 msgstr ""
3476 msgstr ""
3579
3477
3580 msgid "hg qgoto [OPTION]... PATCH"
3478 msgid "hg qgoto [OPTION]... PATCH"
3581 msgstr ""
3479 msgstr ""
3582
3480
3583 msgid "list all patches and guards"
3481 msgid "list all patches and guards"
3584 msgstr ""
3482 msgstr ""
3585
3483
3586 msgid "drop all guards"
3484 msgid "drop all guards"
3587 msgstr ""
3485 msgstr ""
3588
3486
3589 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3487 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3590 msgstr ""
3488 msgstr ""
3591
3489
3592 msgid "hg qheader [PATCH]"
3490 msgid "hg qheader [PATCH]"
3593 msgstr ""
3491 msgstr ""
3594
3492
3595 #, fuzzy
3493 #, fuzzy
3596 msgid "import file in patch directory"
3494 msgid "import file in patch directory"
3597 msgstr "从补丁目录导入文件"
3495 msgstr "从补丁目录导入文件"
3598
3496
3599 #, fuzzy
3497 #, fuzzy
3600 msgid "name of patch file"
3498 msgid "name of patch file"
3601 msgstr "补丁文件名称"
3499 msgstr "补丁文件名称"
3602
3500
3603 msgid "overwrite existing files"
3501 msgid "overwrite existing files"
3604 msgstr "覆盖已有文件"
3502 msgstr "覆盖已有文件"
3605
3503
3606 msgid "place existing revisions under mq control"
3504 msgid "place existing revisions under mq control"
3607 msgstr "将现有的版本置于 mq 控制下"
3505 msgstr "将现有的版本置于 mq 控制下"
3608
3506
3609 msgid "use git extended diff format"
3507 msgid "use git extended diff format"
3610 msgstr "使用 git 扩展差异格式"
3508 msgstr "使用 git 扩展差异格式"
3611
3509
3612 msgid "qpush after importing"
3510 msgid "qpush after importing"
3613 msgstr ""
3511 msgstr ""
3614
3512
3615 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3513 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..."
3616 msgstr ""
3514 msgstr ""
3617
3515
3618 msgid "create queue repository"
3516 msgid "create queue repository"
3619 msgstr "创建队列版本库"
3517 msgstr "创建队列版本库"
3620
3518
3621 msgid "hg qinit [-c]"
3519 msgid "hg qinit [-c]"
3622 msgstr ""
3520 msgstr ""
3623
3521
3624 msgid "import uncommitted changes into patch"
3522 msgid "import uncommitted changes into patch"
3625 msgstr ""
3523 msgstr ""
3626
3524
3627 msgid "add \"From: <current user>\" to patch"
3525 msgid "add \"From: <current user>\" to patch"
3628 msgstr ""
3526 msgstr ""
3629
3527
3630 msgid "add \"From: <given user>\" to patch"
3528 msgid "add \"From: <given user>\" to patch"
3631 msgstr ""
3529 msgstr ""
3632
3530
3633 msgid "add \"Date: <current date>\" to patch"
3531 msgid "add \"Date: <current date>\" to patch"
3634 msgstr ""
3532 msgstr ""
3635
3533
3636 msgid "add \"Date: <given date>\" to patch"
3534 msgid "add \"Date: <given date>\" to patch"
3637 msgstr ""
3535 msgstr ""
3638
3536
3639 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3537 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3640 msgstr ""
3538 msgstr ""
3641
3539
3642 msgid "hg qnext [-s]"
3540 msgid "hg qnext [-s]"
3643 msgstr ""
3541 msgstr ""
3644
3542
3645 msgid "hg qprev [-s]"
3543 msgid "hg qprev [-s]"
3646 msgstr ""
3544 msgstr ""
3647
3545
3648 msgid "pop all patches"
3546 msgid "pop all patches"
3649 msgstr "弹出全部补丁"
3547 msgstr "弹出全部补丁"
3650
3548
3651 msgid "queue name to pop"
3549 msgid "queue name to pop"
3652 msgstr "操作的队列名称"
3550 msgstr "操作的队列名称"
3653
3551
3654 msgid "forget any local changes"
3552 msgid "forget any local changes"
3655 msgstr "丢弃本地修改"
3553 msgstr "丢弃本地修改"
3656
3554
3657 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3555 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3658 msgstr ""
3556 msgstr ""
3659
3557
3660 msgid "apply if the patch has rejects"
3558 msgid "apply if the patch has rejects"
3661 msgstr "强制应用补丁"
3559 msgstr "强制应用补丁"
3662
3560
3663 msgid "list patch name in commit text"
3561 msgid "list patch name in commit text"
3664 msgstr "在提交日志中列出补丁名称"
3562 msgstr "在提交日志中列出补丁名称"
3665
3563
3666 msgid "apply all patches"
3564 msgid "apply all patches"
3667 msgstr "应用所有补丁"
3565 msgstr "应用所有补丁"
3668
3566
3669 msgid "merge from another queue"
3567 msgid "merge from another queue"
3670 msgstr "从其它队列合并"
3568 msgstr "从其它队列合并"
3671
3569
3672 msgid "merge queue name"
3570 msgid "merge queue name"
3673 msgstr "合并队列的名称"
3571 msgstr "合并队列的名称"
3674
3572
3675 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3573 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3676 msgstr ""
3574 msgstr ""
3677
3575
3678 msgid "refresh only files already in the patch and specified files"
3576 msgid "refresh only files already in the patch and specified files"
3679 msgstr "仅当文件已经在补丁或指定文件中时才更新"
3577 msgstr "仅当文件已经在补丁或指定文件中时才更新"
3680
3578
3681 msgid "add/update author field in patch with current user"
3579 msgid "add/update author field in patch with current user"
3682 msgstr ""
3580 msgstr ""
3683
3581
3684 msgid "add/update author field in patch with given user"
3582 msgid "add/update author field in patch with given user"
3685 msgstr ""
3583 msgstr ""
3686
3584
3687 #, fuzzy
3585 #, fuzzy
3688 msgid "add/update date field in patch with current date"
3586 msgid "add/update date field in patch with current date"
3689 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3587 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3690
3588
3691 #, fuzzy
3589 #, fuzzy
3692 msgid "add/update date field in patch with given date"
3590 msgid "add/update date field in patch with given date"
3693 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3591 msgstr "在补丁中更新 \"Date: <given date>\" (如果存在)"
3694
3592
3695 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3593 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3696 msgstr ""
3594 msgstr ""
3697
3595
3698 msgid "hg qrename PATCH1 [PATCH2]"
3596 msgid "hg qrename PATCH1 [PATCH2]"
3699 msgstr ""
3597 msgstr ""
3700
3598
3701 msgid "delete save entry"
3599 msgid "delete save entry"
3702 msgstr ""
3600 msgstr ""
3703
3601
3704 #, fuzzy
3602 #, fuzzy
3705 msgid "update queue working directory"
3603 msgid "update queue working directory"
3706 msgstr "正在更新工作目录\n"
3604 msgstr "正在更新工作目录\n"
3707
3605
3708 msgid "hg qrestore [-d] [-u] REV"
3606 msgid "hg qrestore [-d] [-u] REV"
3709 msgstr ""
3607 msgstr ""
3710
3608
3711 msgid "copy patch directory"
3609 msgid "copy patch directory"
3712 msgstr ""
3610 msgstr ""
3713
3611
3714 msgid "copy directory name"
3612 msgid "copy directory name"
3715 msgstr ""
3613 msgstr ""
3716
3614
3717 msgid "clear queue status file"
3615 msgid "clear queue status file"
3718 msgstr ""
3616 msgstr ""
3719
3617
3720 msgid "force copy"
3618 msgid "force copy"
3721 msgstr ""
3619 msgstr ""
3722
3620
3723 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3621 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3724 msgstr ""
3622 msgstr ""
3725
3623
3726 msgid "disable all guards"
3624 msgid "disable all guards"
3727 msgstr ""
3625 msgstr ""
3728
3626
3729 msgid "list all guards in series file"
3627 msgid "list all guards in series file"
3730 msgstr ""
3628 msgstr ""
3731
3629
3732 msgid "pop to before first guarded applied patch"
3630 msgid "pop to before first guarded applied patch"
3733 msgstr ""
3631 msgstr ""
3734
3632
3735 msgid "pop, then reapply patches"
3633 msgid "pop, then reapply patches"
3736 msgstr ""
3634 msgstr ""
3737
3635
3738 msgid "hg qselect [OPTION]... [GUARD]..."
3636 msgid "hg qselect [OPTION]... [GUARD]..."
3739 msgstr ""
3637 msgstr ""
3740
3638
3741 msgid "print patches not in series"
3639 msgid "print patches not in series"
3742 msgstr ""
3640 msgstr ""
3743
3641
3744 msgid "hg qseries [-ms]"
3642 msgid "hg qseries [-ms]"
3745 msgstr ""
3643 msgstr ""
3746
3644
3747 msgid "force removal with local changes"
3645 msgid "force removal with local changes"
3748 msgstr "强制删除,纵然有本地修改"
3646 msgstr "强制删除,纵然有本地修改"
3749
3647
3750 msgid "bundle unrelated changesets"
3648 msgid "bundle unrelated changesets"
3751 msgstr "打包不相关的修改集"
3649 msgstr "打包不相关的修改集"
3752
3650
3753 msgid "no backups"
3651 msgid "no backups"
3754 msgstr "不备份"
3652 msgstr "不备份"
3755
3653
3756 msgid "hg strip [-f] [-b] [-n] REV"
3654 msgid "hg strip [-f] [-b] [-n] REV"
3757 msgstr ""
3655 msgstr ""
3758
3656
3759 msgid "hg qtop [-s]"
3657 msgid "hg qtop [-s]"
3760 msgstr ""
3658 msgstr ""
3761
3659
3762 #, fuzzy
3660 #, fuzzy
3763 msgid "show only the first patch"
3661 msgid "show only the first patch"
3764 msgstr "只显示已增加文件的状态"
3662 msgstr "只显示已增加文件的状态"
3765
3663
3766 msgid "hg qunapplied [-1] [-s] [PATCH]"
3664 msgid "hg qunapplied [-1] [-s] [PATCH]"
3767 msgstr ""
3665 msgstr ""
3768
3666
3769 msgid "finish all applied changesets"
3667 msgid "finish all applied changesets"
3770 msgstr ""
3668 msgstr ""
3771
3669
3772 msgid "hg qfinish [-a] [REV]..."
3670 msgid "hg qfinish [-a] [REV]..."
3773 msgstr ""
3671 msgstr ""
3774
3672
3775 msgid "hooks for sending email notifications at commit/push time"
3673 msgid "hooks for sending email notifications at commit/push time"
3776 msgstr ""
3674 msgstr ""
3777
3675
3778 msgid ""
3676 msgid ""
3779 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3677 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
3780 "print messages to stdout, for testing and configuring."
3678 "print messages to stdout, for testing and configuring."
3781 msgstr ""
3679 msgstr ""
3782
3680
3783 msgid ""
3681 msgid ""
3784 "To use, configure the notify extension and enable it in hgrc like\n"
3682 "To use, configure the notify extension and enable it in hgrc like\n"
3785 "this::"
3683 "this::"
3786 msgstr ""
3684 msgstr ""
3787
3685
3788 msgid ""
3686 msgid ""
3789 " [extensions]\n"
3687 " [extensions]\n"
3790 " notify ="
3688 " notify ="
3791 msgstr ""
3689 msgstr ""
3792
3690
3793 msgid ""
3691 msgid ""
3794 " [hooks]\n"
3692 " [hooks]\n"
3795 " # one email for each incoming changeset\n"
3693 " # one email for each incoming changeset\n"
3796 " incoming.notify = python:hgext.notify.hook\n"
3694 " incoming.notify = python:hgext.notify.hook\n"
3797 " # batch emails when many changesets incoming at one time\n"
3695 " # batch emails when many changesets incoming at one time\n"
3798 " changegroup.notify = python:hgext.notify.hook"
3696 " changegroup.notify = python:hgext.notify.hook"
3799 msgstr ""
3697 msgstr ""
3800
3698
3801 msgid ""
3699 msgid ""
3802 " [notify]\n"
3700 " [notify]\n"
3803 " # config items go here"
3701 " # config items go here"
3804 msgstr ""
3702 msgstr ""
3805
3703
3806 msgid "Required configuration items::"
3704 msgid "Required configuration items::"
3807 msgstr ""
3705 msgstr ""
3808
3706
3809 msgid " config = /path/to/file # file containing subscriptions"
3707 msgid " config = /path/to/file # file containing subscriptions"
3810 msgstr ""
3708 msgstr ""
3811
3709
3812 msgid "Optional configuration items::"
3710 msgid "Optional configuration items::"
3813 msgstr ""
3711 msgstr ""
3814
3712
3815 msgid ""
3713 msgid ""
3816 " test = True # print messages to stdout for testing\n"
3714 " test = True # print messages to stdout for testing\n"
3817 " strip = 3 # number of slashes to strip for url paths\n"
3715 " strip = 3 # number of slashes to strip for url paths\n"
3818 " domain = example.com # domain to use if committer missing domain\n"
3716 " domain = example.com # domain to use if committer missing domain\n"
3819 " style = ... # style file to use when formatting email\n"
3717 " style = ... # style file to use when formatting email\n"
3820 " template = ... # template to use when formatting email\n"
3718 " template = ... # template to use when formatting email\n"
3821 " incoming = ... # template to use when run as incoming hook\n"
3719 " incoming = ... # template to use when run as incoming hook\n"
3822 " changegroup = ... # template when run as changegroup hook\n"
3720 " changegroup = ... # template when run as changegroup hook\n"
3823 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3721 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3824 " maxsubject = 67 # truncate subject line longer than this\n"
3722 " maxsubject = 67 # truncate subject line longer than this\n"
3825 " diffstat = True # add a diffstat before the diff content\n"
3723 " diffstat = True # add a diffstat before the diff content\n"
3826 " sources = serve # notify if source of incoming changes in this list\n"
3724 " sources = serve # notify if source of incoming changes in this list\n"
3827 " # (serve == ssh or http, push, pull, bundle)\n"
3725 " # (serve == ssh or http, push, pull, bundle)\n"
3828 " [email]\n"
3726 " [email]\n"
3829 " from = user@host.com # email address to send as if none given\n"
3727 " from = user@host.com # email address to send as if none given\n"
3830 " [web]\n"
3728 " [web]\n"
3831 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
3729 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
3832 msgstr ""
3730 msgstr ""
3833
3731
3834 msgid ""
3732 msgid ""
3835 "The notify config file has same format as a regular hgrc file. It has\n"
3733 "The notify config file has same format as a regular hgrc file. It has\n"
3836 "two sections so you can express subscriptions in whatever way is\n"
3734 "two sections so you can express subscriptions in whatever way is\n"
3837 "handier for you."
3735 "handier for you."
3838 msgstr ""
3736 msgstr ""
3839
3737
3840 msgid "::"
3738 msgid "::"
3841 msgstr ""
3739 msgstr ""
3842
3740
3843 msgid ""
3741 msgid ""
3844 " [usersubs]\n"
3742 " [usersubs]\n"
3845 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3743 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
3846 " user@host = pattern"
3744 " user@host = pattern"
3847 msgstr ""
3745 msgstr ""
3848
3746
3849 msgid ""
3747 msgid ""
3850 " [reposubs]\n"
3748 " [reposubs]\n"
3851 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3749 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
3852 " pattern = user@host"
3750 " pattern = user@host"
3853 msgstr ""
3751 msgstr ""
3854
3752
3855 msgid "Glob patterns are matched against path to repository root."
3753 msgid "Glob patterns are matched against path to repository root."
3856 msgstr ""
3754 msgstr ""
3857
3755
3858 msgid ""
3756 msgid ""
3859 "If you like, you can put notify config file in repository that users\n"
3757 "If you like, you can put notify config file in repository that users\n"
3860 "can push changes to, they can manage their own subscriptions.\n"
3758 "can push changes to, they can manage their own subscriptions.\n"
3861 msgstr ""
3759 msgstr ""
3862
3760
3863 #, python-format
3761 #, python-format
3864 msgid "%s: %d new changesets"
3762 msgid "%s: %d new changesets"
3865 msgstr ""
3763 msgstr ""
3866
3764
3867 #, python-format
3765 #, python-format
3868 msgid "notify: sending %d subscribers %d changes\n"
3766 msgid "notify: sending %d subscribers %d changes\n"
3869 msgstr ""
3767 msgstr ""
3870
3768
3871 #, python-format
3769 #, python-format
3872 msgid ""
3770 msgid ""
3873 "\n"
3771 "\n"
3874 "diffs (truncated from %d to %d lines):"
3772 "diffs (truncated from %d to %d lines):"
3875 msgstr ""
3773 msgstr ""
3876
3774
3877 #, python-format
3775 #, python-format
3878 msgid ""
3776 msgid ""
3879 "\n"
3777 "\n"
3880 "diffs (%d lines):"
3778 "diffs (%d lines):"
3881 msgstr ""
3779 msgstr ""
3882
3780
3883 #, python-format
3781 #, python-format
3884 msgid "notify: no subscribers to repository %s\n"
3782 msgid "notify: no subscribers to repository %s\n"
3885 msgstr ""
3783 msgstr ""
3886
3784
3887 #, python-format
3785 #, python-format
3888 msgid "notify: changes have source \"%s\" - skipping\n"
3786 msgid "notify: changes have source \"%s\" - skipping\n"
3889 msgstr ""
3787 msgstr ""
3890
3788
3891 msgid "browse command output with an external pager"
3789 msgid "browse command output with an external pager"
3892 msgstr ""
3790 msgstr ""
3893
3791
3894 msgid "To set the pager that should be used, set the application variable::"
3792 msgid "To set the pager that should be used, set the application variable::"
3895 msgstr ""
3793 msgstr ""
3896
3794
3897 msgid ""
3795 msgid ""
3898 " [pager]\n"
3796 " [pager]\n"
3899 " pager = LESS='FSRX' less"
3797 " pager = LESS='FSRX' less"
3900 msgstr ""
3798 msgstr ""
3901
3799
3902 msgid ""
3800 msgid ""
3903 "If no pager is set, the pager extensions uses the environment variable\n"
3801 "If no pager is set, the pager extensions uses the environment variable\n"
3904 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
3802 "$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used."
3905 msgstr ""
3803 msgstr ""
3906
3804
3907 msgid ""
3805 msgid ""
3908 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3806 "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
3909 "setting::"
3807 "setting::"
3910 msgstr ""
3808 msgstr ""
3911
3809
3912 msgid ""
3810 msgid ""
3913 " [pager]\n"
3811 " [pager]\n"
3914 " quiet = True"
3812 " quiet = True"
3915 msgstr ""
3813 msgstr ""
3916
3814
3917 msgid ""
3815 msgid ""
3918 "You can disable the pager for certain commands by adding them to the\n"
3816 "You can disable the pager for certain commands by adding them to the\n"
3919 "pager.ignore list::"
3817 "pager.ignore list::"
3920 msgstr ""
3818 msgstr ""
3921
3819
3922 msgid ""
3820 msgid ""
3923 " [pager]\n"
3821 " [pager]\n"
3924 " ignore = version, help, update"
3822 " ignore = version, help, update"
3925 msgstr ""
3823 msgstr ""
3926
3824
3927 msgid ""
3825 msgid ""
3928 "You can also enable the pager only for certain commands using\n"
3826 "You can also enable the pager only for certain commands using\n"
3929 "pager.attend::"
3827 "pager.attend::"
3930 msgstr ""
3828 msgstr ""
3931
3829
3932 msgid ""
3830 msgid ""
3933 " [pager]\n"
3831 " [pager]\n"
3934 " attend = log"
3832 " attend = log"
3935 msgstr ""
3833 msgstr ""
3936
3834
3937 msgid "If pager.attend is present, pager.ignore will be ignored."
3835 msgid "If pager.attend is present, pager.ignore will be ignored."
3938 msgstr ""
3836 msgstr ""
3939
3837
3940 msgid ""
3838 msgid ""
3941 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3839 "To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
3942 "specify them in the global .hgrc\n"
3840 "specify them in the global .hgrc\n"
3943 msgstr ""
3841 msgstr ""
3944
3842
3945 msgid "interpret suffixes to refer to ancestor revisions"
3843 msgid "interpret suffixes to refer to ancestor revisions"
3946 msgstr ""
3844 msgstr ""
3947
3845
3948 msgid ""
3846 msgid ""
3949 "This extension allows you to use git-style suffixes to refer to the\n"
3847 "This extension allows you to use git-style suffixes to refer to the\n"
3950 "ancestors of a specific revision."
3848 "ancestors of a specific revision."
3951 msgstr ""
3849 msgstr ""
3952
3850
3953 msgid "For example, if you can refer to a revision as \"foo\", then::"
3851 msgid "For example, if you can refer to a revision as \"foo\", then::"
3954 msgstr ""
3852 msgstr ""
3955
3853
3956 msgid ""
3854 msgid ""
3957 " foo^N = Nth parent of foo\n"
3855 " foo^N = Nth parent of foo\n"
3958 " foo^0 = foo\n"
3856 " foo^0 = foo\n"
3959 " foo^1 = first parent of foo\n"
3857 " foo^1 = first parent of foo\n"
3960 " foo^2 = second parent of foo\n"
3858 " foo^2 = second parent of foo\n"
3961 " foo^ = foo^1"
3859 " foo^ = foo^1"
3962 msgstr ""
3860 msgstr ""
3963
3861
3964 msgid ""
3862 msgid ""
3965 " foo~N = Nth first grandparent of foo\n"
3863 " foo~N = Nth first grandparent of foo\n"
3966 " foo~0 = foo\n"
3864 " foo~0 = foo\n"
3967 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3865 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3968 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3866 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3969 msgstr ""
3867 msgstr ""
3970
3868
3971 msgid "command to send changesets as (a series of) patch emails"
3869 msgid "command to send changesets as (a series of) patch emails"
3972 msgstr ""
3870 msgstr ""
3973
3871
3974 msgid ""
3872 msgid ""
3975 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3873 "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
3976 "describes the series as a whole."
3874 "describes the series as a whole."
3977 msgstr ""
3875 msgstr ""
3978
3876
3979 msgid ""
3877 msgid ""
3980 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3878 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n"
3981 "first line of the changeset description as the subject text. The\n"
3879 "first line of the changeset description as the subject text. The\n"
3982 "message contains two or three body parts:"
3880 "message contains two or three body parts:"
3983 msgstr ""
3881 msgstr ""
3984
3882
3985 msgid ""
3883 msgid ""
3986 "- The changeset description.\n"
3884 "- The changeset description.\n"
3987 "- [Optional] The result of running diffstat on the patch.\n"
3885 "- [Optional] The result of running diffstat on the patch.\n"
3988 "- The patch itself, as generated by \"hg export\"."
3886 "- The patch itself, as generated by \"hg export\"."
3989 msgstr ""
3887 msgstr ""
3990
3888
3991 msgid ""
3889 msgid ""
3992 "Each message refers to the first in the series using the In-Reply-To\n"
3890 "Each message refers to the first in the series using the In-Reply-To\n"
3993 "and References headers, so they will show up as a sequence in threaded\n"
3891 "and References headers, so they will show up as a sequence in threaded\n"
3994 "mail and news readers, and in mail archives."
3892 "mail and news readers, and in mail archives."
3995 msgstr ""
3893 msgstr ""
3996
3894
3997 msgid ""
3895 msgid ""
3998 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3896 "With the -d/--diffstat option, you will be prompted for each changeset\n"
3999 "with a diffstat summary and the changeset summary, so you can be sure\n"
3897 "with a diffstat summary and the changeset summary, so you can be sure\n"
4000 "you are sending the right changes."
3898 "you are sending the right changes."
4001 msgstr ""
3899 msgstr ""
4002
3900
4003 msgid ""
3901 msgid ""
4004 "To configure other defaults, add a section like this to your hgrc\n"
3902 "To configure other defaults, add a section like this to your hgrc\n"
4005 "file::"
3903 "file::"
4006 msgstr ""
3904 msgstr ""
4007
3905
4008 msgid ""
3906 msgid ""
4009 " [email]\n"
3907 " [email]\n"
4010 " from = My Name <my@email>\n"
3908 " from = My Name <my@email>\n"
4011 " to = recipient1, recipient2, ...\n"
3909 " to = recipient1, recipient2, ...\n"
4012 " cc = cc1, cc2, ...\n"
3910 " cc = cc1, cc2, ...\n"
4013 " bcc = bcc1, bcc2, ..."
3911 " bcc = bcc1, bcc2, ..."
4014 msgstr ""
3912 msgstr ""
4015
3913
4016 msgid ""
3914 msgid ""
4017 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3915 "Then you can use the \"hg email\" command to mail a series of changesets\n"
4018 "as a patchbomb."
3916 "as a patchbomb."
4019 msgstr ""
3917 msgstr ""
4020
3918
4021 msgid ""
3919 msgid ""
4022 "To avoid sending patches prematurely, it is a good idea to first run\n"
3920 "To avoid sending patches prematurely, it is a good idea to first run\n"
4023 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3921 "the \"email\" command with the \"-n\" option (test only). You will be\n"
4024 "prompted for an email recipient address, a subject and an introductory\n"
3922 "prompted for an email recipient address, a subject and an introductory\n"
4025 "message describing the patches of your patchbomb. Then when all is\n"
3923 "message describing the patches of your patchbomb. Then when all is\n"
4026 "done, patchbomb messages are displayed. If the PAGER environment\n"
3924 "done, patchbomb messages are displayed. If the PAGER environment\n"
4027 "variable is set, your pager will be fired up once for each patchbomb\n"
3925 "variable is set, your pager will be fired up once for each patchbomb\n"
4028 "message, so you can verify everything is alright."
3926 "message, so you can verify everything is alright."
4029 msgstr ""
3927 msgstr ""
4030
3928
4031 msgid ""
3929 msgid ""
4032 "The -m/--mbox option is also very useful. Instead of previewing each\n"
3930 "The -m/--mbox option is also very useful. Instead of previewing each\n"
4033 "patchbomb message in a pager or sending the messages directly, it will\n"
3931 "patchbomb message in a pager or sending the messages directly, it will\n"
4034 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
3932 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
4035 "can be previewed with any mail user agent which supports UNIX mbox\n"
3933 "can be previewed with any mail user agent which supports UNIX mbox\n"
4036 "files, e.g. with mutt::"
3934 "files, e.g. with mutt::"
4037 msgstr ""
3935 msgstr ""
4038
3936
4039 msgid " % mutt -R -f mbox"
3937 msgid " % mutt -R -f mbox"
4040 msgstr ""
3938 msgstr ""
4041
3939
4042 msgid ""
3940 msgid ""
4043 "When you are previewing the patchbomb messages, you can use ``formail``\n"
3941 "When you are previewing the patchbomb messages, you can use ``formail``\n"
4044 "(a utility that is commonly installed as part of the procmail\n"
3942 "(a utility that is commonly installed as part of the procmail\n"
4045 "package), to send each message out::"
3943 "package), to send each message out::"
4046 msgstr ""
3944 msgstr ""
4047
3945
4048 msgid " % formail -s sendmail -bm -t < mbox"
3946 msgid " % formail -s sendmail -bm -t < mbox"
4049 msgstr ""
3947 msgstr ""
4050
3948
4051 msgid "That should be all. Now your patchbomb is on its way out."
3949 msgid "That should be all. Now your patchbomb is on its way out."
4052 msgstr ""
3950 msgstr ""
4053
3951
4054 msgid ""
3952 msgid ""
4055 "You can also either configure the method option in the email section\n"
3953 "You can also either configure the method option in the email section\n"
4056 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
3954 "to be a sendmail compatible mailer or fill out the [smtp] section so\n"
4057 "that the patchbomb extension can automatically send patchbombs\n"
3955 "that the patchbomb extension can automatically send patchbombs\n"
4058 "directly from the commandline. See the [email] and [smtp] sections in\n"
3956 "directly from the commandline. See the [email] and [smtp] sections in\n"
4059 "hgrc(5) for details.\n"
3957 "hgrc(5) for details.\n"
4060 msgstr ""
3958 msgstr ""
4061
3959
4062 msgid "Please enter a valid value.\n"
3960 msgid "Please enter a valid value.\n"
4063 msgstr ""
3961 msgstr ""
4064
3962
4065 msgid "does the diffstat above look okay? "
3963 msgid "does the diffstat above look okay? "
4066 msgstr ""
3964 msgstr ""
4067
3965
4068 msgid "diffstat rejected"
3966 msgid "diffstat rejected"
4069 msgstr ""
3967 msgstr ""
4070
3968
4071 msgid "send changesets by email"
3969 msgid "send changesets by email"
4072 msgstr ""
3970 msgstr ""
4073
3971
4074 msgid ""
3972 msgid ""
4075 " By default, diffs are sent in the format generated by hg export,\n"
3973 " By default, diffs are sent in the format generated by hg export,\n"
4076 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3974 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
4077 " introduction, which describes the series as a whole."
3975 " introduction, which describes the series as a whole."
4078 msgstr ""
3976 msgstr ""
4079
3977
4080 msgid ""
3978 msgid ""
4081 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3979 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
4082 " the first line of the changeset description as the subject text.\n"
3980 " the first line of the changeset description as the subject text.\n"
4083 " The message contains two or three parts. First, the changeset\n"
3981 " The message contains two or three parts. First, the changeset\n"
4084 " description. Next, (optionally) if the diffstat program is\n"
3982 " description. Next, (optionally) if the diffstat program is\n"
4085 " installed and -d/--diffstat is used, the result of running\n"
3983 " installed and -d/--diffstat is used, the result of running\n"
4086 " diffstat on the patch. Finally, the patch itself, as generated by\n"
3984 " diffstat on the patch. Finally, the patch itself, as generated by\n"
4087 " \"hg export\"."
3985 " \"hg export\"."
4088 msgstr ""
3986 msgstr ""
4089
3987
4090 msgid ""
3988 msgid ""
4091 " By default the patch is included as text in the email body for\n"
3989 " By default the patch is included as text in the email body for\n"
4092 " easy reviewing. Using the -a/--attach option will instead create\n"
3990 " easy reviewing. Using the -a/--attach option will instead create\n"
4093 " an attachment for the patch. With -i/--inline an inline attachment\n"
3991 " an attachment for the patch. With -i/--inline an inline attachment\n"
4094 " will be created."
3992 " will be created."
4095 msgstr ""
3993 msgstr ""
4096
3994
4097 msgid ""
3995 msgid ""
4098 " With -o/--outgoing, emails will be generated for patches not found\n"
3996 " With -o/--outgoing, emails will be generated for patches not found\n"
4099 " in the destination repository (or only those which are ancestors\n"
3997 " in the destination repository (or only those which are ancestors\n"
4100 " of the specified revisions if any are provided)"
3998 " of the specified revisions if any are provided)"
4101 msgstr ""
3999 msgstr ""
4102
4000
4103 msgid ""
4001 msgid ""
4104 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4002 " With -b/--bundle, changesets are selected as for --outgoing, but a\n"
4105 " single email containing a binary Mercurial bundle as an attachment\n"
4003 " single email containing a binary Mercurial bundle as an attachment\n"
4106 " will be sent."
4004 " will be sent."
4107 msgstr ""
4005 msgstr ""
4108
4006
4109 msgid ""
4007 msgid ""
4110 " hg email -r 3000 # send patch 3000 only\n"
4008 " hg email -r 3000 # send patch 3000 only\n"
4111 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4009 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
4112 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4010 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
4113 " hg email 3000 # send patch 3000 (deprecated)"
4011 " hg email 3000 # send patch 3000 (deprecated)"
4114 msgstr ""
4012 msgstr ""
4115
4013
4116 msgid ""
4014 msgid ""
4117 " hg email -o # send all patches not in default\n"
4015 " hg email -o # send all patches not in default\n"
4118 " hg email -o DEST # send all patches not in DEST\n"
4016 " hg email -o DEST # send all patches not in DEST\n"
4119 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4017 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
4120 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST"
4018 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST"
4121 msgstr ""
4019 msgstr ""
4122
4020
4123 msgid ""
4021 msgid ""
4124 " hg email -b # send bundle of all patches not in default\n"
4022 " hg email -b # send bundle of all patches not in default\n"
4125 " hg email -b DEST # send bundle of all patches not in DEST\n"
4023 " hg email -b DEST # send bundle of all patches not in DEST\n"
4126 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
4024 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
4127 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
4025 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
4128 msgstr ""
4026 msgstr ""
4129
4027
4130 msgid ""
4028 msgid ""
4131 " Before using this command, you will need to enable email in your\n"
4029 " Before using this command, you will need to enable email in your\n"
4132 " hgrc. See the [email] section in hgrc(5) for details.\n"
4030 " hgrc. See the [email] section in hgrc(5) for details.\n"
4133 " "
4031 " "
4134 msgstr ""
4032 msgstr ""
4135
4033
4136 msgid "specify at least one changeset with -r or -o"
4034 msgid "specify at least one changeset with -r or -o"
4137 msgstr ""
4035 msgstr ""
4138
4036
4139 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
4037 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
4140 msgstr ""
4038 msgstr ""
4141
4039
4142 msgid "too many destinations"
4040 msgid "too many destinations"
4143 msgstr ""
4041 msgstr ""
4144
4042
4145 msgid "use only one form to specify the revision"
4043 msgid "use only one form to specify the revision"
4146 msgstr ""
4044 msgstr ""
4147
4045
4148 msgid ""
4046 msgid ""
4149 "\n"
4047 "\n"
4150 "Write the introductory message for the patch series."
4048 "Write the introductory message for the patch series."
4151 msgstr ""
4049 msgstr ""
4152
4050
4153 #, python-format
4051 #, python-format
4154 msgid "This patch series consists of %d patches."
4052 msgid "This patch series consists of %d patches."
4155 msgstr ""
4053 msgstr ""
4156
4054
4157 msgid "Final summary:\n"
4055 msgid "Final summary:\n"
4158 msgstr ""
4056 msgstr ""
4159
4057
4160 msgid "Displaying "
4058 msgid "Displaying "
4161 msgstr ""
4059 msgstr ""
4162
4060
4163 msgid "Writing "
4061 msgid "Writing "
4164 msgstr ""
4062 msgstr ""
4165
4063
4166 msgid "Sending "
4064 msgid "Sending "
4167 msgstr ""
4065 msgstr ""
4168
4066
4169 msgid "send patches as attachments"
4067 msgid "send patches as attachments"
4170 msgstr ""
4068 msgstr ""
4171
4069
4172 msgid "send patches as inline attachments"
4070 msgid "send patches as inline attachments"
4173 msgstr ""
4071 msgstr ""
4174
4072
4175 msgid "email addresses of blind carbon copy recipients"
4073 msgid "email addresses of blind carbon copy recipients"
4176 msgstr ""
4074 msgstr ""
4177
4075
4178 msgid "email addresses of copy recipients"
4076 msgid "email addresses of copy recipients"
4179 msgstr ""
4077 msgstr ""
4180
4078
4181 msgid "add diffstat output to messages"
4079 msgid "add diffstat output to messages"
4182 msgstr ""
4080 msgstr ""
4183
4081
4184 msgid "use the given date as the sending date"
4082 msgid "use the given date as the sending date"
4185 msgstr ""
4083 msgstr ""
4186
4084
4187 msgid "use the given file as the series description"
4085 msgid "use the given file as the series description"
4188 msgstr ""
4086 msgstr ""
4189
4087
4190 msgid "email address of sender"
4088 msgid "email address of sender"
4191 msgstr ""
4089 msgstr ""
4192
4090
4193 msgid "print messages that would be sent"
4091 msgid "print messages that would be sent"
4194 msgstr ""
4092 msgstr ""
4195
4093
4196 msgid "write messages to mbox file instead of sending them"
4094 msgid "write messages to mbox file instead of sending them"
4197 msgstr ""
4095 msgstr ""
4198
4096
4199 msgid "subject of first message (intro or single patch)"
4097 msgid "subject of first message (intro or single patch)"
4200 msgstr ""
4098 msgstr ""
4201
4099
4202 msgid "message identifier to reply to"
4100 msgid "message identifier to reply to"
4203 msgstr ""
4101 msgstr ""
4204
4102
4205 msgid "flags to add in subject prefixes"
4103 msgid "flags to add in subject prefixes"
4206 msgstr ""
4104 msgstr ""
4207
4105
4208 msgid "email addresses of recipients"
4106 msgid "email addresses of recipients"
4209 msgstr ""
4107 msgstr ""
4210
4108
4211 msgid "omit hg patch header"
4109 msgid "omit hg patch header"
4212 msgstr ""
4110 msgstr ""
4213
4111
4214 msgid "send changes not found in the target repository"
4112 msgid "send changes not found in the target repository"
4215 msgstr ""
4113 msgstr ""
4216
4114
4217 msgid "send changes not in target as a binary bundle"
4115 msgid "send changes not in target as a binary bundle"
4218 msgstr ""
4116 msgstr ""
4219
4117
4220 msgid "name of the bundle attachment file"
4118 msgid "name of the bundle attachment file"
4221 msgstr ""
4119 msgstr ""
4222
4120
4223 msgid "a revision to send"
4121 msgid "a revision to send"
4224 msgstr ""
4122 msgstr ""
4225
4123
4226 #, fuzzy
4124 #, fuzzy
4227 msgid "run even when remote repository is unrelated (with -b/--bundle)"
4125 msgid "run even when remote repository is unrelated (with -b/--bundle)"
4228 msgstr "纵然远程版本库是无关的也要执行"
4126 msgstr "纵然远程版本库是无关的也要执行"
4229
4127
4230 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
4128 msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
4231 msgstr ""
4129 msgstr ""
4232
4130
4233 msgid "send an introduction email for a single patch"
4131 msgid "send an introduction email for a single patch"
4234 msgstr ""
4132 msgstr ""
4235
4133
4236 msgid "hg email [OPTION]... [DEST]..."
4134 msgid "hg email [OPTION]... [DEST]..."
4237 msgstr ""
4135 msgstr ""
4238
4136
4239 msgid "command to delete untracked files from the working directory"
4137 msgid "command to delete untracked files from the working directory"
4240 msgstr ""
4138 msgstr ""
4241
4139
4242 msgid "removes files not tracked by Mercurial"
4140 msgid "removes files not tracked by Mercurial"
4243 msgstr ""
4141 msgstr ""
4244
4142
4245 msgid ""
4143 msgid ""
4246 " Delete files not known to Mercurial. This is useful to test local\n"
4144 " Delete files not known to Mercurial. This is useful to test local\n"
4247 " and uncommitted changes in an otherwise-clean source tree."
4145 " and uncommitted changes in an otherwise-clean source tree."
4248 msgstr ""
4146 msgstr ""
4249
4147
4250 msgid " This means that purge will delete:"
4148 msgid " This means that purge will delete:"
4251 msgstr ""
4149 msgstr ""
4252
4150
4253 msgid ""
4151 msgid ""
4254 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4152 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
4255 " - Empty directories: in fact Mercurial ignores directories unless\n"
4153 " - Empty directories: in fact Mercurial ignores directories unless\n"
4256 " they contain files under source control management"
4154 " they contain files under source control management"
4257 msgstr ""
4155 msgstr ""
4258
4156
4259 msgid " But it will leave untouched:"
4157 msgid " But it will leave untouched:"
4260 msgstr ""
4158 msgstr ""
4261
4159
4262 msgid ""
4160 msgid ""
4263 " - Modified and unmodified tracked files\n"
4161 " - Modified and unmodified tracked files\n"
4264 " - Ignored files (unless --all is specified)\n"
4162 " - Ignored files (unless --all is specified)\n"
4265 " - New files added to the repository (with \"hg add\")"
4163 " - New files added to the repository (with \"hg add\")"
4266 msgstr ""
4164 msgstr ""
4267
4165
4268 msgid ""
4166 msgid ""
4269 " If directories are given on the command line, only files in these\n"
4167 " If directories are given on the command line, only files in these\n"
4270 " directories are considered."
4168 " directories are considered."
4271 msgstr ""
4169 msgstr ""
4272
4170
4273 msgid ""
4171 msgid ""
4274 " Be careful with purge, as you could irreversibly delete some files\n"
4172 " Be careful with purge, as you could irreversibly delete some files\n"
4275 " you forgot to add to the repository. If you only want to print the\n"
4173 " you forgot to add to the repository. If you only want to print the\n"
4276 " list of files that this program would delete, use the --print\n"
4174 " list of files that this program would delete, use the --print\n"
4277 " option.\n"
4175 " option.\n"
4278 " "
4176 " "
4279 msgstr ""
4177 msgstr ""
4280
4178
4281 #, python-format
4179 #, python-format
4282 msgid "%s cannot be removed"
4180 msgid "%s cannot be removed"
4283 msgstr ""
4181 msgstr ""
4284
4182
4285 #, python-format
4183 #, python-format
4286 msgid "warning: %s\n"
4184 msgid "warning: %s\n"
4287 msgstr ""
4185 msgstr ""
4288
4186
4289 #, python-format
4187 #, python-format
4290 msgid "Removing file %s\n"
4188 msgid "Removing file %s\n"
4291 msgstr "正在删除文件 %s\n"
4189 msgstr "正在删除文件 %s\n"
4292
4190
4293 #, python-format
4191 #, python-format
4294 msgid "Removing directory %s\n"
4192 msgid "Removing directory %s\n"
4295 msgstr "正在删除目录 %s\n"
4193 msgstr "正在删除目录 %s\n"
4296
4194
4297 msgid "abort if an error occurs"
4195 msgid "abort if an error occurs"
4298 msgstr ""
4196 msgstr ""
4299
4197
4300 msgid "purge ignored files too"
4198 msgid "purge ignored files too"
4301 msgstr ""
4199 msgstr ""
4302
4200
4303 msgid "print filenames instead of deleting them"
4201 msgid "print filenames instead of deleting them"
4304 msgstr ""
4202 msgstr ""
4305
4203
4306 #, fuzzy
4204 #, fuzzy
4307 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
4205 msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
4308 msgstr "在文件名称结尾增加 NUL,用于 xargs"
4206 msgstr "在文件名称结尾增加 NUL,用于 xargs"
4309
4207
4310 msgid "hg purge [OPTION]... [DIR]..."
4208 msgid "hg purge [OPTION]... [DIR]..."
4311 msgstr ""
4209 msgstr ""
4312
4210
4313 msgid "command to move sets of revisions to a different ancestor"
4211 msgid "command to move sets of revisions to a different ancestor"
4314 msgstr ""
4212 msgstr ""
4315
4213
4316 msgid ""
4214 msgid ""
4317 "This extension lets you rebase changesets in an existing Mercurial\n"
4215 "This extension lets you rebase changesets in an existing Mercurial\n"
4318 "repository."
4216 "repository."
4319 msgstr ""
4217 msgstr ""
4320
4218
4321 msgid ""
4219 msgid ""
4322 "For more information:\n"
4220 "For more information:\n"
4323 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4221 "http://mercurial.selenic.com/wiki/RebaseExtension\n"
4324 msgstr ""
4222 msgstr ""
4325
4223
4326 msgid "first revision, do not change ancestor\n"
4224 msgid "first revision, do not change ancestor\n"
4327 msgstr ""
4225 msgstr ""
4328
4226
4329 msgid "move changeset (and descendants) to a different branch"
4227 msgid "move changeset (and descendants) to a different branch"
4330 msgstr ""
4228 msgstr ""
4331
4229
4332 msgid ""
4230 msgid ""
4333 " Rebase uses repeated merging to graft changesets from one part of\n"
4231 " Rebase uses repeated merging to graft changesets from one part of\n"
4334 " history onto another. This can be useful for linearizing local\n"
4232 " history onto another. This can be useful for linearizing local\n"
4335 " changes relative to a master development tree."
4233 " changes relative to a master development tree."
4336 msgstr ""
4234 msgstr ""
4337
4235
4338 msgid ""
4236 msgid ""
4339 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4237 " If a rebase is interrupted to manually resolve a merge, it can be\n"
4340 " continued with --continue/-c or aborted with --abort/-a.\n"
4238 " continued with --continue/-c or aborted with --abort/-a.\n"
4341 " "
4239 " "
4342 msgstr ""
4240 msgstr ""
4343
4241
4344 msgid "cannot use both abort and continue"
4242 msgid "cannot use both abort and continue"
4345 msgstr ""
4243 msgstr ""
4346
4244
4347 msgid "cannot use collapse with continue or abort"
4245 msgid "cannot use collapse with continue or abort"
4348 msgstr ""
4246 msgstr ""
4349
4247
4350 msgid "abort and continue do not allow specifying revisions"
4248 msgid "abort and continue do not allow specifying revisions"
4351 msgstr ""
4249 msgstr ""
4352
4250
4353 msgid "cannot specify both a revision and a base"
4251 msgid "cannot specify both a revision and a base"
4354 msgstr ""
4252 msgstr ""
4355
4253
4356 msgid "nothing to rebase\n"
4254 msgid "nothing to rebase\n"
4357 msgstr ""
4255 msgstr ""
4358
4256
4359 msgid "cannot use both keepbranches and extrafn"
4257 msgid "cannot use both keepbranches and extrafn"
4360 msgstr ""
4258 msgstr ""
4361
4259
4362 msgid "rebase merging completed\n"
4260 msgid "rebase merging completed\n"
4363 msgstr ""
4261 msgstr ""
4364
4262
4365 msgid "warning: new changesets detected on source branch, not stripping\n"
4263 msgid "warning: new changesets detected on source branch, not stripping\n"
4366 msgstr ""
4264 msgstr ""
4367
4265
4368 msgid "rebase completed\n"
4266 msgid "rebase completed\n"
4369 msgstr ""
4267 msgstr ""
4370
4268
4371 #, python-format
4269 #, python-format
4372 msgid "%d revisions have been skipped\n"
4270 msgid "%d revisions have been skipped\n"
4373 msgstr ""
4271 msgstr ""
4374
4272
4375 msgid " set parents\n"
4273 msgid " set parents\n"
4376 msgstr ""
4274 msgstr ""
4377
4275
4378 #, python-format
4276 #, python-format
4379 msgid "rebasing %d:%s\n"
4277 msgid "rebasing %d:%s\n"
4380 msgstr ""
4278 msgstr ""
4381
4279
4382 #, python-format
4280 #, python-format
4383 msgid " future parents are %d and %d\n"
4281 msgid " future parents are %d and %d\n"
4384 msgstr ""
4282 msgstr ""
4385
4283
4386 #, python-format
4284 #, python-format
4387 msgid " update to %d:%s\n"
4285 msgid " update to %d:%s\n"
4388 msgstr ""
4286 msgstr ""
4389
4287
4390 msgid " already in target\n"
4288 msgid " already in target\n"
4391 msgstr ""
4289 msgstr ""
4392
4290
4393 #, python-format
4291 #, python-format
4394 msgid " merge against %d:%s\n"
4292 msgid " merge against %d:%s\n"
4395 msgstr ""
4293 msgstr ""
4396
4294
4397 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4295 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4398 msgstr ""
4296 msgstr ""
4399
4297
4400 msgid "resuming interrupted rebase\n"
4298 msgid "resuming interrupted rebase\n"
4401 msgstr ""
4299 msgstr ""
4402
4300
4403 #, python-format
4301 #, python-format
4404 msgid "no changes, revision %d skipped\n"
4302 msgid "no changes, revision %d skipped\n"
4405 msgstr ""
4303 msgstr ""
4406
4304
4407 #, python-format
4305 #, python-format
4408 msgid "next revision set to %s\n"
4306 msgid "next revision set to %s\n"
4409 msgstr ""
4307 msgstr ""
4410
4308
4411 #, python-format
4309 #, python-format
4412 msgid "cannot use revision %d as base, result would have 3 parents"
4310 msgid "cannot use revision %d as base, result would have 3 parents"
4413 msgstr ""
4311 msgstr ""
4414
4312
4415 #, python-format
4313 #, python-format
4416 msgid "revision %d is an mq patch (%s), finalize it.\n"
4314 msgid "revision %d is an mq patch (%s), finalize it.\n"
4417 msgstr ""
4315 msgstr ""
4418
4316
4419 #, python-format
4317 #, python-format
4420 msgid "import mq patch %d (%s)\n"
4318 msgid "import mq patch %d (%s)\n"
4421 msgstr ""
4319 msgstr ""
4422
4320
4423 msgid "rebase status stored\n"
4321 msgid "rebase status stored\n"
4424 msgstr ""
4322 msgstr ""
4425
4323
4426 msgid "rebase status resumed\n"
4324 msgid "rebase status resumed\n"
4427 msgstr ""
4325 msgstr ""
4428
4326
4429 msgid "no rebase in progress"
4327 msgid "no rebase in progress"
4430 msgstr ""
4328 msgstr ""
4431
4329
4432 msgid "warning: new changesets detected on target branch, not stripping\n"
4330 msgid "warning: new changesets detected on target branch, not stripping\n"
4433 msgstr ""
4331 msgstr ""
4434
4332
4435 msgid "rebase aborted\n"
4333 msgid "rebase aborted\n"
4436 msgstr ""
4334 msgstr ""
4437
4335
4438 msgid "cannot rebase onto an applied mq patch"
4336 msgid "cannot rebase onto an applied mq patch"
4439 msgstr ""
4337 msgstr ""
4440
4338
4441 msgid "cannot rebase an ancestor"
4339 msgid "cannot rebase an ancestor"
4442 msgstr ""
4340 msgstr ""
4443
4341
4444 msgid "cannot rebase a descendant"
4342 msgid "cannot rebase a descendant"
4445 msgstr ""
4343 msgstr ""
4446
4344
4447 msgid "already working on current\n"
4345 msgid "already working on current\n"
4448 msgstr ""
4346 msgstr ""
4449
4347
4450 msgid "already working on the current branch\n"
4348 msgid "already working on the current branch\n"
4451 msgstr ""
4349 msgstr ""
4452
4350
4453 #, python-format
4351 #, python-format
4454 msgid "rebase onto %d starting from %d\n"
4352 msgid "rebase onto %d starting from %d\n"
4455 msgstr ""
4353 msgstr ""
4456
4354
4457 msgid "unable to collapse, there is more than one external parent"
4355 msgid "unable to collapse, there is more than one external parent"
4458 msgstr ""
4356 msgstr ""
4459
4357
4460 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4358 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4461 msgstr ""
4359 msgstr ""
4462
4360
4463 msgid "rebase working directory to branch head"
4361 msgid "rebase working directory to branch head"
4464 msgstr ""
4362 msgstr ""
4465
4363
4466 msgid "rebase from a given revision"
4364 msgid "rebase from a given revision"
4467 msgstr ""
4365 msgstr ""
4468
4366
4469 msgid "rebase from the base of a given revision"
4367 msgid "rebase from the base of a given revision"
4470 msgstr ""
4368 msgstr ""
4471
4369
4472 msgid "rebase onto a given revision"
4370 msgid "rebase onto a given revision"
4473 msgstr ""
4371 msgstr ""
4474
4372
4475 msgid "collapse the rebased revisions"
4373 msgid "collapse the rebased revisions"
4476 msgstr ""
4374 msgstr ""
4477
4375
4478 msgid "keep original revisions"
4376 msgid "keep original revisions"
4479 msgstr ""
4377 msgstr ""
4480
4378
4481 msgid "keep original branches"
4379 msgid "keep original branches"
4482 msgstr ""
4380 msgstr ""
4483
4381
4484 msgid "continue an interrupted rebase"
4382 msgid "continue an interrupted rebase"
4485 msgstr ""
4383 msgstr ""
4486
4384
4487 msgid "abort an interrupted rebase"
4385 msgid "abort an interrupted rebase"
4488 msgstr ""
4386 msgstr ""
4489
4387
4490 msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
4388 msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
4491 msgstr ""
4389 msgstr ""
4492
4390
4493 msgid "commands to interactively select changes for commit/qrefresh"
4391 msgid "commands to interactively select changes for commit/qrefresh"
4494 msgstr ""
4392 msgstr ""
4495
4393
4496 msgid "this modifies a binary file (all or nothing)\n"
4394 msgid "this modifies a binary file (all or nothing)\n"
4497 msgstr ""
4395 msgstr ""
4498
4396
4499 msgid "this is a binary file\n"
4397 msgid "this is a binary file\n"
4500 msgstr ""
4398 msgstr ""
4501
4399
4502 #, python-format
4400 #, python-format
4503 msgid "%d hunks, %d lines changed\n"
4401 msgid "%d hunks, %d lines changed\n"
4504 msgstr ""
4402 msgstr ""
4505
4403
4506 msgid "[Ynsfdaq?]"
4404 msgid "[Ynsfdaq?]"
4507 msgstr ""
4405 msgstr ""
4508
4406
4509 msgid "&Yes, record this change"
4407 msgid "&Yes, record this change"
4510 msgstr ""
4408 msgstr ""
4511
4409
4512 msgid "&No, skip this change"
4410 msgid "&No, skip this change"
4513 msgstr ""
4411 msgstr ""
4514
4412
4515 msgid "&Skip remaining changes to this file"
4413 msgid "&Skip remaining changes to this file"
4516 msgstr ""
4414 msgstr ""
4517
4415
4518 msgid "Record remaining changes to this &file"
4416 msgid "Record remaining changes to this &file"
4519 msgstr ""
4417 msgstr ""
4520
4418
4521 msgid "&Done, skip remaining changes and files"
4419 msgid "&Done, skip remaining changes and files"
4522 msgstr ""
4420 msgstr ""
4523
4421
4524 #, fuzzy
4422 #, fuzzy
4525 msgid "Record &all changes to all remaining files"
4423 msgid "Record &all changes to all remaining files"
4526 msgstr "将丢失的文件视为删除"
4424 msgstr "将丢失的文件视为删除"
4527
4425
4528 #, fuzzy
4426 #, fuzzy
4529 msgid "&Quit, recording no changes"
4427 msgid "&Quit, recording no changes"
4530 msgstr "正在搜索修改\n"
4428 msgstr "正在搜索修改\n"
4531
4429
4532 msgid "&?"
4430 msgid "&?"
4533 msgstr ""
4431 msgstr ""
4534
4432
4535 msgid "y - record this change"
4433 msgid "y - record this change"
4536 msgstr ""
4434 msgstr ""
4537
4435
4538 msgid "user quit"
4436 msgid "user quit"
4539 msgstr "用户退出"
4437 msgstr "用户退出"
4540
4438
4541 #, python-format
4439 #, python-format
4542 msgid "examine changes to %s?"
4440 msgid "examine changes to %s?"
4543 msgstr ""
4441 msgstr ""
4544
4442
4545 msgid " and "
4443 msgid " and "
4546 msgstr ""
4444 msgstr ""
4547
4445
4548 msgid "y"
4446 msgid "y"
4549 msgstr ""
4447 msgstr ""
4550
4448
4551 #, python-format
4449 #, python-format
4552 msgid "record this change to %r?"
4450 msgid "record this change to %r?"
4553 msgstr ""
4451 msgstr ""
4554
4452
4555 #, fuzzy, python-format
4453 #, fuzzy, python-format
4556 msgid "record change %d/%d to %r?"
4454 msgid "record change %d/%d to %r?"
4557 msgstr "不需要改变 %s\n"
4455 msgstr "不需要改变 %s\n"
4558
4456
4559 msgid "interactively select changes to commit"
4457 msgid "interactively select changes to commit"
4560 msgstr ""
4458 msgstr ""
4561
4459
4562 msgid ""
4460 msgid ""
4563 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4461 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4564 " will be candidates for recording."
4462 " will be candidates for recording."
4565 msgstr ""
4463 msgstr ""
4566
4464
4567 msgid " See 'hg help dates' for a list of formats valid for -d/--date."
4465 msgid " See 'hg help dates' for a list of formats valid for -d/--date."
4568 msgstr ""
4466 msgstr ""
4569
4467
4570 msgid ""
4468 msgid ""
4571 " You will be prompted for whether to record changes to each\n"
4469 " You will be prompted for whether to record changes to each\n"
4572 " modified file, and for files with multiple changes, for each\n"
4470 " modified file, and for files with multiple changes, for each\n"
4573 " change to use. For each query, the following responses are\n"
4471 " change to use. For each query, the following responses are\n"
4574 " possible::"
4472 " possible::"
4575 msgstr ""
4473 msgstr ""
4576
4474
4577 msgid ""
4475 msgid ""
4578 " y - record this change\n"
4476 " y - record this change\n"
4579 " n - skip this change"
4477 " n - skip this change"
4580 msgstr ""
4478 msgstr ""
4581
4479
4582 msgid ""
4480 msgid ""
4583 " s - skip remaining changes to this file\n"
4481 " s - skip remaining changes to this file\n"
4584 " f - record remaining changes to this file"
4482 " f - record remaining changes to this file"
4585 msgstr ""
4483 msgstr ""
4586
4484
4587 msgid ""
4485 msgid ""
4588 " d - done, skip remaining changes and files\n"
4486 " d - done, skip remaining changes and files\n"
4589 " a - record all changes to all remaining files\n"
4487 " a - record all changes to all remaining files\n"
4590 " q - quit, recording no changes"
4488 " q - quit, recording no changes"
4591 msgstr ""
4489 msgstr ""
4592
4490
4593 msgid " ? - display help"
4491 msgid " ? - display help"
4594 msgstr ""
4492 msgstr ""
4595
4493
4596 msgid "'mq' extension not loaded"
4494 msgid "'mq' extension not loaded"
4597 msgstr ""
4495 msgstr ""
4598
4496
4599 msgid "running non-interactively, use commit instead"
4497 msgid "running non-interactively, use commit instead"
4600 msgstr ""
4498 msgstr ""
4601
4499
4602 msgid "no changes to record\n"
4500 msgid "no changes to record\n"
4603 msgstr ""
4501 msgstr ""
4604
4502
4605 #, python-format
4503 #, python-format
4606 msgid "backup %r as %r\n"
4504 msgid "backup %r as %r\n"
4607 msgstr ""
4505 msgstr ""
4608
4506
4609 msgid "applying patch\n"
4507 msgid "applying patch\n"
4610 msgstr ""
4508 msgstr ""
4611
4509
4612 msgid "patch failed to apply"
4510 msgid "patch failed to apply"
4613 msgstr ""
4511 msgstr ""
4614
4512
4615 #, python-format
4513 #, python-format
4616 msgid "restoring %r to %r\n"
4514 msgid "restoring %r to %r\n"
4617 msgstr ""
4515 msgstr ""
4618
4516
4619 msgid "hg record [OPTION]... [FILE]..."
4517 msgid "hg record [OPTION]... [FILE]..."
4620 msgstr ""
4518 msgstr ""
4621
4519
4622 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4520 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4623 msgstr ""
4521 msgstr ""
4624
4522
4625 msgid "share a common history between several working directories"
4523 msgid "share a common history between several working directories"
4626 msgstr ""
4524 msgstr ""
4627
4525
4628 msgid "create a new shared repository (experimental)"
4526 msgid "create a new shared repository (experimental)"
4629 msgstr ""
4527 msgstr ""
4630
4528
4631 msgid ""
4529 msgid ""
4632 " Initialize a new repository and working directory that shares its\n"
4530 " Initialize a new repository and working directory that shares its\n"
4633 " history with another repository."
4531 " history with another repository."
4634 msgstr ""
4532 msgstr ""
4635
4533
4636 msgid ""
4534 msgid ""
4637 " NOTE: actions that change history such as rollback or moving the\n"
4535 " NOTE: actions that change history such as rollback or moving the\n"
4638 " source may confuse sharers.\n"
4536 " source may confuse sharers.\n"
4639 " "
4537 " "
4640 msgstr ""
4538 msgstr ""
4641
4539
4642 msgid "do not create a working copy"
4540 msgid "do not create a working copy"
4643 msgstr ""
4541 msgstr ""
4644
4542
4645 msgid "[-U] SOURCE [DEST]"
4543 msgid "[-U] SOURCE [DEST]"
4646 msgstr ""
4544 msgstr ""
4647
4545
4648 msgid "command to transplant changesets from another branch"
4546 msgid "command to transplant changesets from another branch"
4649 msgstr ""
4547 msgstr ""
4650
4548
4651 msgid "This extension allows you to transplant patches from another branch."
4549 msgid "This extension allows you to transplant patches from another branch."
4652 msgstr ""
4550 msgstr ""
4653
4551
4654 msgid ""
4552 msgid ""
4655 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4553 "Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
4656 "map from a changeset hash to its hash in the source repository.\n"
4554 "map from a changeset hash to its hash in the source repository.\n"
4657 msgstr ""
4555 msgstr ""
4658
4556
4659 #, python-format
4557 #, python-format
4660 msgid "skipping already applied revision %s\n"
4558 msgid "skipping already applied revision %s\n"
4661 msgstr ""
4559 msgstr ""
4662
4560
4663 #, python-format
4561 #, python-format
4664 msgid "skipping merge changeset %s:%s\n"
4562 msgid "skipping merge changeset %s:%s\n"
4665 msgstr ""
4563 msgstr ""
4666
4564
4667 #, python-format
4565 #, python-format
4668 msgid "%s merged at %s\n"
4566 msgid "%s merged at %s\n"
4669 msgstr ""
4567 msgstr ""
4670
4568
4671 #, python-format
4569 #, python-format
4672 msgid "%s transplanted to %s\n"
4570 msgid "%s transplanted to %s\n"
4673 msgstr ""
4571 msgstr ""
4674
4572
4675 #, python-format
4573 #, python-format
4676 msgid "filtering %s\n"
4574 msgid "filtering %s\n"
4677 msgstr ""
4575 msgstr ""
4678
4576
4679 msgid "filter failed"
4577 msgid "filter failed"
4680 msgstr ""
4578 msgstr ""
4681
4579
4682 msgid "can only omit patchfile if merging"
4580 msgid "can only omit patchfile if merging"
4683 msgstr ""
4581 msgstr ""
4684
4582
4685 #, python-format
4583 #, python-format
4686 msgid "%s: empty changeset"
4584 msgid "%s: empty changeset"
4687 msgstr ""
4585 msgstr ""
4688
4586
4689 msgid "Fix up the merge and run hg transplant --continue"
4587 msgid "Fix up the merge and run hg transplant --continue"
4690 msgstr ""
4588 msgstr ""
4691
4589
4692 #, python-format
4590 #, python-format
4693 msgid "%s transplanted as %s\n"
4591 msgid "%s transplanted as %s\n"
4694 msgstr ""
4592 msgstr ""
4695
4593
4696 msgid "transplant log file is corrupt"
4594 msgid "transplant log file is corrupt"
4697 msgstr ""
4595 msgstr ""
4698
4596
4699 #, python-format
4597 #, python-format
4700 msgid "working dir not at transplant parent %s"
4598 msgid "working dir not at transplant parent %s"
4701 msgstr ""
4599 msgstr ""
4702
4600
4703 msgid "commit failed"
4601 msgid "commit failed"
4704 msgstr ""
4602 msgstr ""
4705
4603
4706 msgid "apply changeset? [ynmpcq?]:"
4604 msgid "apply changeset? [ynmpcq?]:"
4707 msgstr ""
4605 msgstr ""
4708
4606
4709 msgid "transplant changesets from another branch"
4607 msgid "transplant changesets from another branch"
4710 msgstr ""
4608 msgstr ""
4711
4609
4712 msgid ""
4610 msgid ""
4713 " Selected changesets will be applied on top of the current working\n"
4611 " Selected changesets will be applied on top of the current working\n"
4714 " directory with the log of the original changeset. If --log is\n"
4612 " directory with the log of the original changeset. If --log is\n"
4715 " specified, log messages will have a comment appended of the form::"
4613 " specified, log messages will have a comment appended of the form::"
4716 msgstr ""
4614 msgstr ""
4717
4615
4718 msgid " (transplanted from CHANGESETHASH)"
4616 msgid " (transplanted from CHANGESETHASH)"
4719 msgstr ""
4617 msgstr ""
4720
4618
4721 msgid ""
4619 msgid ""
4722 " You can rewrite the changelog message with the --filter option.\n"
4620 " You can rewrite the changelog message with the --filter option.\n"
4723 " Its argument will be invoked with the current changelog message as\n"
4621 " Its argument will be invoked with the current changelog message as\n"
4724 " $1 and the patch as $2."
4622 " $1 and the patch as $2."
4725 msgstr ""
4623 msgstr ""
4726
4624
4727 msgid ""
4625 msgid ""
4728 " If --source/-s is specified, selects changesets from the named\n"
4626 " If --source/-s is specified, selects changesets from the named\n"
4729 " repository. If --branch/-b is specified, selects changesets from\n"
4627 " repository. If --branch/-b is specified, selects changesets from\n"
4730 " the branch holding the named revision, up to that revision. If\n"
4628 " the branch holding the named revision, up to that revision. If\n"
4731 " --all/-a is specified, all changesets on the branch will be\n"
4629 " --all/-a is specified, all changesets on the branch will be\n"
4732 " transplanted, otherwise you will be prompted to select the\n"
4630 " transplanted, otherwise you will be prompted to select the\n"
4733 " changesets you want."
4631 " changesets you want."
4734 msgstr ""
4632 msgstr ""
4735
4633
4736 msgid ""
4634 msgid ""
4737 " hg transplant --branch REVISION --all will rebase the selected\n"
4635 " hg transplant --branch REVISION --all will rebase the selected\n"
4738 " branch (up to the named revision) onto your current working\n"
4636 " branch (up to the named revision) onto your current working\n"
4739 " directory."
4637 " directory."
4740 msgstr ""
4638 msgstr ""
4741
4639
4742 msgid ""
4640 msgid ""
4743 " You can optionally mark selected transplanted changesets as merge\n"
4641 " You can optionally mark selected transplanted changesets as merge\n"
4744 " changesets. You will not be prompted to transplant any ancestors\n"
4642 " changesets. You will not be prompted to transplant any ancestors\n"
4745 " of a merged transplant, and you can merge descendants of them\n"
4643 " of a merged transplant, and you can merge descendants of them\n"
4746 " normally instead of transplanting them."
4644 " normally instead of transplanting them."
4747 msgstr ""
4645 msgstr ""
4748
4646
4749 msgid ""
4647 msgid ""
4750 " If no merges or revisions are provided, hg transplant will start\n"
4648 " If no merges or revisions are provided, hg transplant will start\n"
4751 " an interactive changeset browser."
4649 " an interactive changeset browser."
4752 msgstr ""
4650 msgstr ""
4753
4651
4754 msgid ""
4652 msgid ""
4755 " If a changeset application fails, you can fix the merge by hand\n"
4653 " If a changeset application fails, you can fix the merge by hand\n"
4756 " and then resume where you left off by calling hg transplant\n"
4654 " and then resume where you left off by calling hg transplant\n"
4757 " --continue/-c.\n"
4655 " --continue/-c.\n"
4758 " "
4656 " "
4759 msgstr ""
4657 msgstr ""
4760
4658
4761 msgid "--continue is incompatible with branch, all or merge"
4659 msgid "--continue is incompatible with branch, all or merge"
4762 msgstr ""
4660 msgstr ""
4763
4661
4764 msgid "no source URL, branch tag or revision list provided"
4662 msgid "no source URL, branch tag or revision list provided"
4765 msgstr ""
4663 msgstr ""
4766
4664
4767 msgid "--all requires a branch revision"
4665 msgid "--all requires a branch revision"
4768 msgstr ""
4666 msgstr ""
4769
4667
4770 msgid "--all is incompatible with a revision list"
4668 msgid "--all is incompatible with a revision list"
4771 msgstr ""
4669 msgstr ""
4772
4670
4773 msgid "no revision checked out"
4671 msgid "no revision checked out"
4774 msgstr ""
4672 msgstr ""
4775
4673
4776 msgid "outstanding uncommitted merges"
4674 msgid "outstanding uncommitted merges"
4777 msgstr ""
4675 msgstr ""
4778
4676
4779 msgid "outstanding local changes"
4677 msgid "outstanding local changes"
4780 msgstr ""
4678 msgstr ""
4781
4679
4782 msgid "pull patches from REPOSITORY"
4680 msgid "pull patches from REPOSITORY"
4783 msgstr ""
4681 msgstr ""
4784
4682
4785 msgid "pull patches from branch BRANCH"
4683 msgid "pull patches from branch BRANCH"
4786 msgstr ""
4684 msgstr ""
4787
4685
4788 msgid "pull all changesets up to BRANCH"
4686 msgid "pull all changesets up to BRANCH"
4789 msgstr ""
4687 msgstr ""
4790
4688
4791 msgid "skip over REV"
4689 msgid "skip over REV"
4792 msgstr ""
4690 msgstr ""
4793
4691
4794 msgid "merge at REV"
4692 msgid "merge at REV"
4795 msgstr ""
4693 msgstr ""
4796
4694
4797 msgid "append transplant info to log message"
4695 msgid "append transplant info to log message"
4798 msgstr ""
4696 msgstr ""
4799
4697
4800 msgid "continue last transplant session after repair"
4698 msgid "continue last transplant session after repair"
4801 msgstr ""
4699 msgstr ""
4802
4700
4803 msgid "filter changesets through FILTER"
4701 msgid "filter changesets through FILTER"
4804 msgstr ""
4702 msgstr ""
4805
4703
4806 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4704 msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4807 msgstr ""
4705 msgstr ""
4808
4706
4809 msgid "allow the use of MBCS paths with problematic encodings"
4707 msgid "allow the use of MBCS paths with problematic encodings"
4810 msgstr ""
4708 msgstr ""
4811
4709
4812 msgid ""
4710 msgid ""
4813 "Some MBCS encodings are not good for some path operations (i.e.\n"
4711 "Some MBCS encodings are not good for some path operations (i.e.\n"
4814 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4712 "splitting path, case conversion, etc.) with its encoded bytes. We call\n"
4815 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4713 "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n"
4816 "This extension can be used to fix the issue with those encodings by\n"
4714 "This extension can be used to fix the issue with those encodings by\n"
4817 "wrapping some functions to convert to Unicode string before path\n"
4715 "wrapping some functions to convert to Unicode string before path\n"
4818 "operation."
4716 "operation."
4819 msgstr ""
4717 msgstr ""
4820
4718
4821 msgid "This extension is useful for:"
4719 msgid "This extension is useful for:"
4822 msgstr ""
4720 msgstr ""
4823
4721
4824 msgid ""
4722 msgid ""
4825 "- Japanese Windows users using shift_jis encoding.\n"
4723 "- Japanese Windows users using shift_jis encoding.\n"
4826 "- Chinese Windows users using big5 encoding.\n"
4724 "- Chinese Windows users using big5 encoding.\n"
4827 "- All users who use a repository with one of problematic encodings on\n"
4725 "- All users who use a repository with one of problematic encodings on\n"
4828 " case-insensitive file system."
4726 " case-insensitive file system."
4829 msgstr ""
4727 msgstr ""
4830
4728
4831 msgid "This extension is not needed for:"
4729 msgid "This extension is not needed for:"
4832 msgstr ""
4730 msgstr ""
4833
4731
4834 msgid ""
4732 msgid ""
4835 "- Any user who use only ASCII chars in path.\n"
4733 "- Any user who use only ASCII chars in path.\n"
4836 "- Any user who do not use any of problematic encodings."
4734 "- Any user who do not use any of problematic encodings."
4837 msgstr ""
4735 msgstr ""
4838
4736
4839 msgid "Note that there are some limitations on using this extension:"
4737 msgid "Note that there are some limitations on using this extension:"
4840 msgstr ""
4738 msgstr ""
4841
4739
4842 msgid ""
4740 msgid ""
4843 "- You should use single encoding in one repository.\n"
4741 "- You should use single encoding in one repository.\n"
4844 "- You should set same encoding for the repository by locale or\n"
4742 "- You should set same encoding for the repository by locale or\n"
4845 " HGENCODING."
4743 " HGENCODING."
4846 msgstr ""
4744 msgstr ""
4847
4745
4848 msgid ""
4746 msgid ""
4849 "Path encoding conversion are done between Unicode and\n"
4747 "Path encoding conversion are done between Unicode and\n"
4850 "encoding.encoding which is decided by Mercurial from current locale\n"
4748 "encoding.encoding which is decided by Mercurial from current locale\n"
4851 "setting or HGENCODING.\n"
4749 "setting or HGENCODING.\n"
4852 msgstr ""
4750 msgstr ""
4853
4751
4854 #, python-format
4752 #, python-format
4855 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4753 msgid "[win32mbcs] filename conversion failed with %s encoding\n"
4856 msgstr ""
4754 msgstr ""
4857
4755
4858 msgid "[win32mbcs] cannot activate on this platform.\n"
4756 msgid "[win32mbcs] cannot activate on this platform.\n"
4859 msgstr ""
4757 msgstr ""
4860
4758
4861 #, python-format
4759 #, python-format
4862 msgid "[win32mbcs] activated with encoding: %s\n"
4760 msgid "[win32mbcs] activated with encoding: %s\n"
4863 msgstr ""
4761 msgstr ""
4864
4762
4865 msgid "perform automatic newline conversion"
4763 msgid "perform automatic newline conversion"
4866 msgstr ""
4764 msgstr ""
4867
4765
4868 msgid "To perform automatic newline conversion, use::"
4766 msgid "To perform automatic newline conversion, use::"
4869 msgstr ""
4767 msgstr ""
4870
4768
4871 msgid ""
4769 msgid ""
4872 " [extensions]\n"
4770 " [extensions]\n"
4873 " win32text =\n"
4771 " win32text =\n"
4874 " [encode]\n"
4772 " [encode]\n"
4875 " ** = cleverencode:\n"
4773 " ** = cleverencode:\n"
4876 " # or ** = macencode:"
4774 " # or ** = macencode:"
4877 msgstr ""
4775 msgstr ""
4878
4776
4879 msgid ""
4777 msgid ""
4880 " [decode]\n"
4778 " [decode]\n"
4881 " ** = cleverdecode:\n"
4779 " ** = cleverdecode:\n"
4882 " # or ** = macdecode:"
4780 " # or ** = macdecode:"
4883 msgstr ""
4781 msgstr ""
4884
4782
4885 msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
4783 msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
4886 msgstr ""
4784 msgstr ""
4887
4785
4888 msgid ""
4786 msgid ""
4889 " [hooks]\n"
4787 " [hooks]\n"
4890 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4788 " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
4891 " # or pretxncommit.cr = python:hgext.win32text.forbidcr"
4789 " # or pretxncommit.cr = python:hgext.win32text.forbidcr"
4892 msgstr ""
4790 msgstr ""
4893
4791
4894 msgid ""
4792 msgid ""
4895 "To do the same check on a server to prevent CRLF/CR from being\n"
4793 "To do the same check on a server to prevent CRLF/CR from being\n"
4896 "pushed or pulled::"
4794 "pushed or pulled::"
4897 msgstr ""
4795 msgstr ""
4898
4796
4899 msgid ""
4797 msgid ""
4900 " [hooks]\n"
4798 " [hooks]\n"
4901 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4799 " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
4902 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4800 " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
4903 msgstr ""
4801 msgstr ""
4904
4802
4905 #, python-format
4803 #, python-format
4906 msgid ""
4804 msgid ""
4907 "WARNING: %s already has %s line endings\n"
4805 "WARNING: %s already has %s line endings\n"
4908 "and does not need EOL conversion by the win32text plugin.\n"
4806 "and does not need EOL conversion by the win32text plugin.\n"
4909 "Before your next commit, please reconsider your encode/decode settings in \n"
4807 "Before your next commit, please reconsider your encode/decode settings in \n"
4910 "Mercurial.ini or %s.\n"
4808 "Mercurial.ini or %s.\n"
4911 msgstr ""
4809 msgstr ""
4912
4810
4913 #, python-format
4811 #, python-format
4914 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4812 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4915 msgstr ""
4813 msgstr ""
4916
4814
4917 #, python-format
4815 #, python-format
4918 msgid "in %s: %s\n"
4816 msgid "in %s: %s\n"
4919 msgstr ""
4817 msgstr ""
4920
4818
4921 #, python-format
4819 #, python-format
4922 msgid ""
4820 msgid ""
4923 "\n"
4821 "\n"
4924 "To prevent this mistake in your local repository,\n"
4822 "To prevent this mistake in your local repository,\n"
4925 "add to Mercurial.ini or .hg/hgrc:"
4823 "add to Mercurial.ini or .hg/hgrc:"
4926 msgstr ""
4824 msgstr ""
4927
4825
4928 #, python-format
4826 #, python-format
4929 msgid ""
4827 msgid ""
4930 "[hooks]\n"
4828 "[hooks]\n"
4931 "pretxncommit.%s = python:hgext.win32text.forbid%s"
4829 "pretxncommit.%s = python:hgext.win32text.forbid%s"
4932 msgstr ""
4830 msgstr ""
4933
4831
4934 #, python-format
4832 #, python-format
4935 msgid "and also consider adding:"
4833 msgid "and also consider adding:"
4936 msgstr ""
4834 msgstr ""
4937
4835
4938 #, python-format
4836 #, python-format
4939 msgid ""
4837 msgid ""
4940 "[extensions]\n"
4838 "[extensions]\n"
4941 "win32text =\n"
4839 "win32text =\n"
4942 "[encode]\n"
4840 "[encode]\n"
4943 "** = %sencode:\n"
4841 "** = %sencode:\n"
4944 "[decode]\n"
4842 "[decode]\n"
4945 "** = %sdecode:\n"
4843 "** = %sdecode:\n"
4946 msgstr ""
4844 msgstr ""
4947
4845
4948 msgid "discover and advertise repositories on the local network"
4846 msgid "discover and advertise repositories on the local network"
4949 msgstr ""
4847 msgstr ""
4950
4848
4951 msgid ""
4849 msgid ""
4952 "Zeroconf enabled repositories will be announced in a network without\n"
4850 "Zeroconf enabled repositories will be announced in a network without\n"
4953 "the need to configure a server or a service. They can be discovered\n"
4851 "the need to configure a server or a service. They can be discovered\n"
4954 "without knowing their actual IP address."
4852 "without knowing their actual IP address."
4955 msgstr ""
4853 msgstr ""
4956
4854
4957 msgid ""
4855 msgid ""
4958 "To allow other people to discover your repository using run \"hg serve\"\n"
4856 "To allow other people to discover your repository using run \"hg serve\"\n"
4959 "in your repository::"
4857 "in your repository::"
4960 msgstr ""
4858 msgstr ""
4961
4859
4962 msgid ""
4860 msgid ""
4963 " $ cd test\n"
4861 " $ cd test\n"
4964 " $ hg serve"
4862 " $ hg serve"
4965 msgstr ""
4863 msgstr ""
4966
4864
4967 msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
4865 msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
4968 msgstr ""
4866 msgstr ""
4969
4867
4970 msgid ""
4868 msgid ""
4971 " $ hg paths\n"
4869 " $ hg paths\n"
4972 " zc-test = http://example.com:8000/test\n"
4870 " zc-test = http://example.com:8000/test\n"
4973 msgstr ""
4871 msgstr ""
4974
4872
4975 msgid "archive prefix contains illegal components"
4873 msgid "archive prefix contains illegal components"
4976 msgstr ""
4874 msgstr ""
4977
4875
4978 msgid "cannot give prefix when archiving to files"
4876 msgid "cannot give prefix when archiving to files"
4979 msgstr ""
4877 msgstr ""
4980
4878
4981 #, python-format
4879 #, python-format
4982 msgid "unknown archive type '%s'"
4880 msgid "unknown archive type '%s'"
4983 msgstr ""
4881 msgstr ""
4984
4882
4985 msgid "invalid changegroup"
4883 msgid "invalid changegroup"
4986 msgstr ""
4884 msgstr ""
4987
4885
4988 msgid "unknown parent"
4886 msgid "unknown parent"
4989 msgstr ""
4887 msgstr ""
4990
4888
4991 #, python-format
4889 #, python-format
4992 msgid "integrity check failed on %s:%d"
4890 msgid "integrity check failed on %s:%d"
4993 msgstr ""
4891 msgstr ""
4994
4892
4995 #, python-format
4893 #, python-format
4996 msgid "%s: not a Mercurial bundle file"
4894 msgid "%s: not a Mercurial bundle file"
4997 msgstr ""
4895 msgstr ""
4998
4896
4999 #, python-format
4897 #, python-format
5000 msgid "%s: unknown bundle version"
4898 msgid "%s: unknown bundle version"
5001 msgstr ""
4899 msgstr ""
5002
4900
5003 #, python-format
4901 #, python-format
5004 msgid "%s: unknown bundle compression type"
4902 msgid "%s: unknown bundle compression type"
5005 msgstr ""
4903 msgstr ""
5006
4904
5007 msgid "cannot create new bundle repository"
4905 msgid "cannot create new bundle repository"
5008 msgstr ""
4906 msgstr ""
5009
4907
5010 #, python-format
4908 #, python-format
5011 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4909 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
5012 msgstr ""
4910 msgstr ""
5013
4911
5014 msgid "empty username"
4912 msgid "empty username"
5015 msgstr ""
4913 msgstr ""
5016
4914
5017 #, python-format
4915 #, python-format
5018 msgid "username %s contains a newline"
4916 msgid "username %s contains a newline"
5019 msgstr ""
4917 msgstr ""
5020
4918
5021 msgid "options --message and --logfile are mutually exclusive"
4919 msgid "options --message and --logfile are mutually exclusive"
5022 msgstr ""
4920 msgstr ""
5023
4921
5024 #, python-format
4922 #, python-format
5025 msgid "can't read commit message '%s': %s"
4923 msgid "can't read commit message '%s': %s"
5026 msgstr ""
4924 msgstr ""
5027
4925
5028 msgid "limit must be a positive integer"
4926 msgid "limit must be a positive integer"
5029 msgstr ""
4927 msgstr ""
5030
4928
5031 msgid "limit must be positive"
4929 msgid "limit must be positive"
5032 msgstr ""
4930 msgstr ""
5033
4931
5034 msgid "too many revisions specified"
4932 msgid "too many revisions specified"
5035 msgstr ""
4933 msgstr ""
5036
4934
5037 #, python-format
4935 #, python-format
5038 msgid "invalid format spec '%%%s' in output filename"
4936 msgid "invalid format spec '%%%s' in output filename"
5039 msgstr ""
4937 msgstr ""
5040
4938
5041 #, python-format
4939 #, python-format
5042 msgid "adding %s\n"
4940 msgid "adding %s\n"
5043 msgstr ""
4941 msgstr ""
5044
4942
5045 #, python-format
4943 #, python-format
5046 msgid "removing %s\n"
4944 msgid "removing %s\n"
5047 msgstr "正在删除 %s\n"
4945 msgstr "正在删除 %s\n"
5048
4946
5049 #, python-format
4947 #, python-format
5050 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4948 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
5051 msgstr ""
4949 msgstr ""
5052
4950
5053 #, python-format
4951 #, python-format
5054 msgid "%s: not copying - file is not managed\n"
4952 msgid "%s: not copying - file is not managed\n"
5055 msgstr ""
4953 msgstr ""
5056
4954
5057 #, python-format
4955 #, python-format
5058 msgid "%s: not copying - file has been marked for remove\n"
4956 msgid "%s: not copying - file has been marked for remove\n"
5059 msgstr ""
4957 msgstr ""
5060
4958
5061 #, python-format
4959 #, python-format
5062 msgid "%s: not overwriting - %s collides with %s\n"
4960 msgid "%s: not overwriting - %s collides with %s\n"
5063 msgstr ""
4961 msgstr ""
5064
4962
5065 #, python-format
4963 #, python-format
5066 msgid "%s: not overwriting - file exists\n"
4964 msgid "%s: not overwriting - file exists\n"
5067 msgstr ""
4965 msgstr ""
5068
4966
5069 #, python-format
4967 #, python-format
5070 msgid "%s: deleted in working copy\n"
4968 msgid "%s: deleted in working copy\n"
5071 msgstr ""
4969 msgstr ""
5072
4970
5073 #, python-format
4971 #, python-format
5074 msgid "%s: cannot copy - %s\n"
4972 msgid "%s: cannot copy - %s\n"
5075 msgstr ""
4973 msgstr ""
5076
4974
5077 #, python-format
4975 #, python-format
5078 msgid "moving %s to %s\n"
4976 msgid "moving %s to %s\n"
5079 msgstr ""
4977 msgstr ""
5080
4978
5081 #, fuzzy, python-format
4979 #, fuzzy, python-format
5082 msgid "copying %s to %s\n"
4980 msgid "copying %s to %s\n"
5083 msgstr "正在推到 %s\n"
4981 msgstr "正在推到 %s\n"
5084
4982
5085 #, python-format
4983 #, python-format
5086 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4984 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
5087 msgstr ""
4985 msgstr ""
5088
4986
5089 msgid "no source or destination specified"
4987 msgid "no source or destination specified"
5090 msgstr ""
4988 msgstr ""
5091
4989
5092 msgid "no destination specified"
4990 msgid "no destination specified"
5093 msgstr ""
4991 msgstr ""
5094
4992
5095 msgid "with multiple sources, destination must be an existing directory"
4993 msgid "with multiple sources, destination must be an existing directory"
5096 msgstr ""
4994 msgstr ""
5097
4995
5098 #, python-format
4996 #, python-format
5099 msgid "destination %s is not a directory"
4997 msgid "destination %s is not a directory"
5100 msgstr ""
4998 msgstr ""
5101
4999
5102 msgid "no files to copy"
5000 msgid "no files to copy"
5103 msgstr ""
5001 msgstr ""
5104
5002
5105 msgid "(consider using --after)\n"
5003 msgid "(consider using --after)\n"
5106 msgstr "(考虑使用 --after)\n"
5004 msgstr "(考虑使用 --after)\n"
5107
5005
5108 #, python-format
5006 #, python-format
5109 msgid "changeset: %d:%s\n"
5007 msgid "changeset: %d:%s\n"
5110 msgstr "修改集: %d:%s\n"
5008 msgstr "修改集: %d:%s\n"
5111
5009
5112 #, python-format
5010 #, python-format
5113 msgid "branch: %s\n"
5011 msgid "branch: %s\n"
5114 msgstr "分支: %s\n"
5012 msgstr "分支: %s\n"
5115
5013
5116 #, python-format
5014 #, python-format
5117 msgid "tag: %s\n"
5015 msgid "tag: %s\n"
5118 msgstr "标签: %s\n"
5016 msgstr "标签: %s\n"
5119
5017
5120 #, python-format
5018 #, python-format
5121 msgid "parent: %d:%s\n"
5019 msgid "parent: %d:%s\n"
5122 msgstr "父亲: %d:%s\n"
5020 msgstr "父亲: %d:%s\n"
5123
5021
5124 #, python-format
5022 #, python-format
5125 msgid "manifest: %d:%s\n"
5023 msgid "manifest: %d:%s\n"
5126 msgstr "清单: %d:%s\n"
5024 msgstr "清单: %d:%s\n"
5127
5025
5128 #, python-format
5026 #, python-format
5129 msgid "user: %s\n"
5027 msgid "user: %s\n"
5130 msgstr "用户: %s\n"
5028 msgstr "用户: %s\n"
5131
5029
5132 #, python-format
5030 #, python-format
5133 msgid "date: %s\n"
5031 msgid "date: %s\n"
5134 msgstr "日期: %s\n"
5032 msgstr "日期: %s\n"
5135
5033
5136 msgid "files+:"
5034 msgid "files+:"
5137 msgstr "文件+:"
5035 msgstr "文件+:"
5138
5036
5139 msgid "files-:"
5037 msgid "files-:"
5140 msgstr "文件-:"
5038 msgstr "文件-:"
5141
5039
5142 msgid "files:"
5040 msgid "files:"
5143 msgstr "文件:"
5041 msgstr "文件:"
5144
5042
5145 #, python-format
5043 #, python-format
5146 msgid "files: %s\n"
5044 msgid "files: %s\n"
5147 msgstr "文件: %s\n"
5045 msgstr "文件: %s\n"
5148
5046
5149 #, python-format
5047 #, python-format
5150 msgid "copies: %s\n"
5048 msgid "copies: %s\n"
5151 msgstr "复制: %s\n"
5049 msgstr "复制: %s\n"
5152
5050
5153 #, python-format
5051 #, python-format
5154 msgid "extra: %s=%s\n"
5052 msgid "extra: %s=%s\n"
5155 msgstr "额外: %s=%s\n"
5053 msgstr "额外: %s=%s\n"
5156
5054
5157 msgid "description:\n"
5055 msgid "description:\n"
5158 msgstr "描述:\n"
5056 msgstr "描述:\n"
5159
5057
5160 #, python-format
5058 #, python-format
5161 msgid "summary: %s\n"
5059 msgid "summary: %s\n"
5162 msgstr "摘要: %s\n"
5060 msgstr "摘要: %s\n"
5163
5061
5164 #, python-format
5062 #, python-format
5165 msgid "%s: no key named '%s'"
5063 msgid "%s: no key named '%s'"
5166 msgstr ""
5064 msgstr ""
5167
5065
5168 #, python-format
5066 #, python-format
5169 msgid "%s: %s"
5067 msgid "%s: %s"
5170 msgstr ""
5068 msgstr ""
5171
5069
5172 #, python-format
5070 #, python-format
5173 msgid "Found revision %s from %s\n"
5071 msgid "Found revision %s from %s\n"
5174 msgstr ""
5072 msgstr ""
5175
5073
5176 msgid "revision matching date not found"
5074 msgid "revision matching date not found"
5177 msgstr ""
5075 msgstr ""
5178
5076
5179 #, python-format
5077 #, python-format
5180 msgid "cannot follow nonexistent file: \"%s\""
5078 msgid "cannot follow nonexistent file: \"%s\""
5181 msgstr ""
5079 msgstr ""
5182
5080
5183 #, python-format
5081 #, python-format
5184 msgid "%s:%s copy source revision cannot be found!\n"
5082 msgid "%s:%s copy source revision cannot be found!\n"
5185 msgstr ""
5083 msgstr ""
5186
5084
5187 msgid "can only follow copies/renames for explicit filenames"
5085 msgid "can only follow copies/renames for explicit filenames"
5188 msgstr ""
5086 msgstr ""
5189
5087
5190 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
5088 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
5191 msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。"
5089 msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。"
5192
5090
5193 msgid "HG: Leave message empty to abort commit."
5091 msgid "HG: Leave message empty to abort commit."
5194 msgstr ""
5092 msgstr ""
5195
5093
5196 #, fuzzy, python-format
5094 #, fuzzy, python-format
5197 msgid "HG: user: %s"
5095 msgid "HG: user: %s"
5198 msgstr "用户: %s\n"
5096 msgstr "用户: %s\n"
5199
5097
5200 msgid "HG: branch merge"
5098 msgid "HG: branch merge"
5201 msgstr ""
5099 msgstr ""
5202
5100
5203 #, python-format
5101 #, python-format
5204 msgid "HG: branch '%s'"
5102 msgid "HG: branch '%s'"
5205 msgstr ""
5103 msgstr ""
5206
5104
5207 #, fuzzy, python-format
5105 #, fuzzy, python-format
5208 msgid "HG: subrepo %s"
5106 msgid "HG: subrepo %s"
5209 msgstr "已删除"
5107 msgstr "已删除"
5210
5108
5211 #, python-format
5109 #, python-format
5212 msgid "HG: added %s"
5110 msgid "HG: added %s"
5213 msgstr ""
5111 msgstr ""
5214
5112
5215 #, python-format
5113 #, python-format
5216 msgid "HG: changed %s"
5114 msgid "HG: changed %s"
5217 msgstr ""
5115 msgstr ""
5218
5116
5219 #, fuzzy, python-format
5117 #, fuzzy, python-format
5220 msgid "HG: removed %s"
5118 msgid "HG: removed %s"
5221 msgstr "已删除"
5119 msgstr "已删除"
5222
5120
5223 #, fuzzy
5121 #, fuzzy
5224 msgid "HG: no files changed"
5122 msgid "HG: no files changed"
5225 msgstr "正在增加文件改变\n"
5123 msgstr "正在增加文件改变\n"
5226
5124
5227 msgid "empty commit message"
5125 msgid "empty commit message"
5228 msgstr "空的提交日志"
5126 msgstr "空的提交日志"
5229
5127
5230 #, fuzzy
5128 #, fuzzy
5231 msgid "add the specified files on the next commit"
5129 msgid "add the specified files on the next commit"
5232 msgstr "增加指定文件用于下次提交"
5130 msgstr "增加指定文件用于下次提交"
5233
5131
5234 #, fuzzy
5132 #, fuzzy
5235 msgid ""
5133 msgid ""
5236 " Schedule files to be version controlled and added to the\n"
5134 " Schedule files to be version controlled and added to the\n"
5237 " repository."
5135 " repository."
5238 msgstr " 调度文件受版本控制,增加到版本库。"
5136 msgstr " 调度文件受版本控制,增加到版本库。"
5239
5137
5240 #, fuzzy
5138 #, fuzzy
5241 msgid ""
5139 msgid ""
5242 " The files will be added to the repository at the next commit. To\n"
5140 " The files will be added to the repository at the next commit. To\n"
5243 " undo an add before that, see hg forget."
5141 " undo an add before that, see hg forget."
5244 msgstr ""
5142 msgstr ""
5245 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
5143 " 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加,\n"
5246 " 参见 'hg revert'。"
5144 " 参见 'hg revert'。"
5247
5145
5248 #, fuzzy
5146 #, fuzzy
5249 msgid ""
5147 msgid ""
5250 " If no names are given, add all files to the repository.\n"
5148 " If no names are given, add all files to the repository.\n"
5251 " "
5149 " "
5252 msgstr ""
5150 msgstr ""
5253 " 如果没有给出文件名称,就增加所有文件到版本库。\n"
5151 " 如果没有给出文件名称,就增加所有文件到版本库。\n"
5254 " "
5152 " "
5255
5153
5256 msgid "add all new files, delete all missing files"
5154 msgid "add all new files, delete all missing files"
5257 msgstr ""
5155 msgstr ""
5258
5156
5259 msgid ""
5157 msgid ""
5260 " Add all new files and remove all missing files from the\n"
5158 " Add all new files and remove all missing files from the\n"
5261 " repository."
5159 " repository."
5262 msgstr ""
5160 msgstr ""
5263
5161
5264 msgid ""
5162 msgid ""
5265 " New files are ignored if they match any of the patterns in\n"
5163 " New files are ignored if they match any of the patterns in\n"
5266 " .hgignore. As with add, these changes take effect at the next\n"
5164 " .hgignore. As with add, these changes take effect at the next\n"
5267 " commit."
5165 " commit."
5268 msgstr ""
5166 msgstr ""
5269
5167
5270 msgid ""
5168 msgid ""
5271 " Use the -s/--similarity option to detect renamed files. With a\n"
5169 " Use the -s/--similarity option to detect renamed files. With a\n"
5272 " parameter greater than 0, this compares every removed file with\n"
5170 " parameter greater than 0, this compares every removed file with\n"
5273 " every added file and records those similar enough as renames. This\n"
5171 " every added file and records those similar enough as renames. This\n"
5274 " option takes a percentage between 0 (disabled) and 100 (files must\n"
5172 " option takes a percentage between 0 (disabled) and 100 (files must\n"
5275 " be identical) as its parameter. Detecting renamed files this way\n"
5173 " be identical) as its parameter. Detecting renamed files this way\n"
5276 " can be expensive.\n"
5174 " can be expensive.\n"
5277 " "
5175 " "
5278 msgstr ""
5176 msgstr ""
5279
5177
5280 msgid "similarity must be a number"
5178 msgid "similarity must be a number"
5281 msgstr ""
5179 msgstr ""
5282
5180
5283 msgid "similarity must be between 0 and 100"
5181 msgid "similarity must be between 0 and 100"
5284 msgstr ""
5182 msgstr ""
5285
5183
5286 #, fuzzy
5184 #, fuzzy
5287 msgid "show changeset information by line for each file"
5185 msgid "show changeset information by line for each file"
5288 msgstr "显示指定文件每行的修改集信息"
5186 msgstr "显示指定文件每行的修改集信息"
5289
5187
5290 #, fuzzy
5188 #, fuzzy
5291 msgid ""
5189 msgid ""
5292 " List changes in files, showing the revision id responsible for\n"
5190 " List changes in files, showing the revision id responsible for\n"
5293 " each line"
5191 " each line"
5294 msgstr " 列出文件中的修改,为每行显示版本标识"
5192 msgstr " 列出文件中的修改,为每行显示版本标识"
5295
5193
5296 #, fuzzy
5194 #, fuzzy
5297 msgid ""
5195 msgid ""
5298 " This command is useful for discovering when a change was made and\n"
5196 " This command is useful for discovering when a change was made and\n"
5299 " by whom."
5197 " by whom."
5300 msgstr " 此命令用于查找谁做出的修改,或者什么时候发生的修改"
5198 msgstr " 此命令用于查找谁做出的修改,或者什么时候发生的修改"
5301
5199
5302 #, fuzzy
5200 #, fuzzy
5303 msgid ""
5201 msgid ""
5304 " Without the -a/--text option, annotate will avoid processing files\n"
5202 " Without the -a/--text option, annotate will avoid processing files\n"
5305 " it detects as binary. With -a, annotate will annotate the file\n"
5203 " it detects as binary. With -a, annotate will annotate the file\n"
5306 " anyway, although the results will probably be neither useful\n"
5204 " anyway, although the results will probably be neither useful\n"
5307 " nor desirable.\n"
5205 " nor desirable.\n"
5308 " "
5206 " "
5309 msgstr ""
5207 msgstr ""
5310 " 当没有选项 '-a' 时,annotate 会避免处理检测为二进制的文件\n"
5208 " 当没有选项 '-a' 时,annotate 会避免处理检测为二进制的文件\n"
5311 " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n"
5209 " 当使用选项 '-a' 时,annotate 会直接产生追溯,可能会有不合需要的结果\n"
5312 " "
5210 " "
5313
5211
5314 msgid "at least one filename or pattern is required"
5212 msgid "at least one filename or pattern is required"
5315 msgstr ""
5213 msgstr ""
5316
5214
5317 msgid "at least one of -n/-c is required for -l"
5215 msgid "at least one of -n/-c is required for -l"
5318 msgstr ""
5216 msgstr ""
5319
5217
5320 #, python-format
5218 #, python-format
5321 msgid "%s: binary file\n"
5219 msgid "%s: binary file\n"
5322 msgstr ""
5220 msgstr ""
5323
5221
5324 msgid "create an unversioned archive of a repository revision"
5222 msgid "create an unversioned archive of a repository revision"
5325 msgstr ""
5223 msgstr ""
5326
5224
5327 msgid ""
5225 msgid ""
5328 " By default, the revision used is the parent of the working\n"
5226 " By default, the revision used is the parent of the working\n"
5329 " directory; use -r/--rev to specify a different revision."
5227 " directory; use -r/--rev to specify a different revision."
5330 msgstr ""
5228 msgstr ""
5331
5229
5332 msgid ""
5230 msgid ""
5333 " To specify the type of archive to create, use -t/--type. Valid\n"
5231 " To specify the type of archive to create, use -t/--type. Valid\n"
5334 " types are::"
5232 " types are::"
5335 msgstr ""
5233 msgstr ""
5336
5234
5337 msgid ""
5235 msgid ""
5338 " \"files\" (default): a directory full of files\n"
5236 " \"files\" (default): a directory full of files\n"
5339 " \"tar\": tar archive, uncompressed\n"
5237 " \"tar\": tar archive, uncompressed\n"
5340 " \"tbz2\": tar archive, compressed using bzip2\n"
5238 " \"tbz2\": tar archive, compressed using bzip2\n"
5341 " \"tgz\": tar archive, compressed using gzip\n"
5239 " \"tgz\": tar archive, compressed using gzip\n"
5342 " \"uzip\": zip archive, uncompressed\n"
5240 " \"uzip\": zip archive, uncompressed\n"
5343 " \"zip\": zip archive, compressed using deflate"
5241 " \"zip\": zip archive, compressed using deflate"
5344 msgstr ""
5242 msgstr ""
5345
5243
5346 msgid ""
5244 msgid ""
5347 " The exact name of the destination archive or directory is given\n"
5245 " The exact name of the destination archive or directory is given\n"
5348 " using a format string; see 'hg help export' for details."
5246 " using a format string; see 'hg help export' for details."
5349 msgstr ""
5247 msgstr ""
5350
5248
5351 msgid ""
5249 msgid ""
5352 " Each member added to an archive file has a directory prefix\n"
5250 " Each member added to an archive file has a directory prefix\n"
5353 " prepended. Use -p/--prefix to specify a format string for the\n"
5251 " prepended. Use -p/--prefix to specify a format string for the\n"
5354 " prefix. The default is the basename of the archive, with suffixes\n"
5252 " prefix. The default is the basename of the archive, with suffixes\n"
5355 " removed.\n"
5253 " removed.\n"
5356 " "
5254 " "
5357 msgstr ""
5255 msgstr ""
5358
5256
5359 msgid "no working directory: please specify a revision"
5257 msgid "no working directory: please specify a revision"
5360 msgstr ""
5258 msgstr ""
5361
5259
5362 msgid "repository root cannot be destination"
5260 msgid "repository root cannot be destination"
5363 msgstr ""
5261 msgstr ""
5364
5262
5365 msgid "cannot archive plain files to stdout"
5263 msgid "cannot archive plain files to stdout"
5366 msgstr ""
5264 msgstr ""
5367
5265
5368 msgid "reverse effect of earlier changeset"
5266 msgid "reverse effect of earlier changeset"
5369 msgstr ""
5267 msgstr ""
5370
5268
5371 msgid ""
5269 msgid ""
5372 " Commit the backed out changes as a new changeset. The new\n"
5270 " Commit the backed out changes as a new changeset. The new\n"
5373 " changeset is a child of the backed out changeset."
5271 " changeset is a child of the backed out changeset."
5374 msgstr ""
5272 msgstr ""
5375
5273
5376 msgid ""
5274 msgid ""
5377 " If you backout a changeset other than the tip, a new head is\n"
5275 " If you backout a changeset other than the tip, a new head is\n"
5378 " created. This head will be the new tip and you should merge this\n"
5276 " created. This head will be the new tip and you should merge this\n"
5379 " backout changeset with another head."
5277 " backout changeset with another head."
5380 msgstr ""
5278 msgstr ""
5381
5279
5382 msgid ""
5280 msgid ""
5383 " The --merge option remembers the parent of the working directory\n"
5281 " The --merge option remembers the parent of the working directory\n"
5384 " before starting the backout, then merges the new head with that\n"
5282 " before starting the backout, then merges the new head with that\n"
5385 " changeset afterwards. This saves you from doing the merge by hand.\n"
5283 " changeset afterwards. This saves you from doing the merge by hand.\n"
5386 " The result of this merge is not committed, as with a normal merge."
5284 " The result of this merge is not committed, as with a normal merge."
5387 msgstr ""
5285 msgstr ""
5388
5286
5389 msgid "please specify just one revision"
5287 msgid "please specify just one revision"
5390 msgstr ""
5288 msgstr ""
5391
5289
5392 msgid "please specify a revision to backout"
5290 msgid "please specify a revision to backout"
5393 msgstr ""
5291 msgstr ""
5394
5292
5395 msgid "cannot backout change on a different branch"
5293 msgid "cannot backout change on a different branch"
5396 msgstr ""
5294 msgstr ""
5397
5295
5398 msgid "cannot backout a change with no parents"
5296 msgid "cannot backout a change with no parents"
5399 msgstr ""
5297 msgstr ""
5400
5298
5401 msgid "cannot backout a merge changeset without --parent"
5299 msgid "cannot backout a merge changeset without --parent"
5402 msgstr ""
5300 msgstr ""
5403
5301
5404 #, python-format
5302 #, python-format
5405 msgid "%s is not a parent of %s"
5303 msgid "%s is not a parent of %s"
5406 msgstr ""
5304 msgstr ""
5407
5305
5408 msgid "cannot use --parent on non-merge changeset"
5306 msgid "cannot use --parent on non-merge changeset"
5409 msgstr ""
5307 msgstr ""
5410
5308
5411 #, python-format
5309 #, python-format
5412 msgid "changeset %s backs out changeset %s\n"
5310 msgid "changeset %s backs out changeset %s\n"
5413 msgstr ""
5311 msgstr ""
5414
5312
5415 #, python-format
5313 #, python-format
5416 msgid "merging with changeset %s\n"
5314 msgid "merging with changeset %s\n"
5417 msgstr ""
5315 msgstr ""
5418
5316
5419 msgid "the backout changeset is a new head - do not forget to merge\n"
5317 msgid "the backout changeset is a new head - do not forget to merge\n"
5420 msgstr ""
5318 msgstr ""
5421
5319
5422 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5320 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5423 msgstr ""
5321 msgstr ""
5424
5322
5425 msgid "subdivision search of changesets"
5323 msgid "subdivision search of changesets"
5426 msgstr ""
5324 msgstr ""
5427
5325
5428 msgid ""
5326 msgid ""
5429 " This command helps to find changesets which introduce problems. To\n"
5327 " This command helps to find changesets which introduce problems. To\n"
5430 " use, mark the earliest changeset you know exhibits the problem as\n"
5328 " use, mark the earliest changeset you know exhibits the problem as\n"
5431 " bad, then mark the latest changeset which is free from the problem\n"
5329 " bad, then mark the latest changeset which is free from the problem\n"
5432 " as good. Bisect will update your working directory to a revision\n"
5330 " as good. Bisect will update your working directory to a revision\n"
5433 " for testing (unless the -U/--noupdate option is specified). Once\n"
5331 " for testing (unless the -U/--noupdate option is specified). Once\n"
5434 " you have performed tests, mark the working directory as good or\n"
5332 " you have performed tests, mark the working directory as good or\n"
5435 " bad, and bisect will either update to another candidate changeset\n"
5333 " bad, and bisect will either update to another candidate changeset\n"
5436 " or announce that it has found the bad revision."
5334 " or announce that it has found the bad revision."
5437 msgstr ""
5335 msgstr ""
5438
5336
5439 msgid ""
5337 msgid ""
5440 " As a shortcut, you can also use the revision argument to mark a\n"
5338 " As a shortcut, you can also use the revision argument to mark a\n"
5441 " revision as good or bad without checking it out first."
5339 " revision as good or bad without checking it out first."
5442 msgstr ""
5340 msgstr ""
5443
5341
5444 msgid ""
5342 msgid ""
5445 " If you supply a command, it will be used for automatic bisection.\n"
5343 " If you supply a command, it will be used for automatic bisection.\n"
5446 " Its exit status will be used to mark revisions as good or bad:\n"
5344 " Its exit status will be used to mark revisions as good or bad:\n"
5447 " status 0 means good, 125 means to skip the revision, 127\n"
5345 " status 0 means good, 125 means to skip the revision, 127\n"
5448 " (command not found) will abort the bisection, and any other\n"
5346 " (command not found) will abort the bisection, and any other\n"
5449 " non-zero exit status means the revision is bad.\n"
5347 " non-zero exit status means the revision is bad.\n"
5450 " "
5348 " "
5451 msgstr ""
5349 msgstr ""
5452
5350
5453 msgid "The first good revision is:\n"
5351 msgid "The first good revision is:\n"
5454 msgstr ""
5352 msgstr ""
5455
5353
5456 msgid "The first bad revision is:\n"
5354 msgid "The first bad revision is:\n"
5457 msgstr ""
5355 msgstr ""
5458
5356
5459 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5357 msgid "Due to skipped revisions, the first good revision could be any of:\n"
5460 msgstr ""
5358 msgstr ""
5461
5359
5462 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5360 msgid "Due to skipped revisions, the first bad revision could be any of:\n"
5463 msgstr ""
5361 msgstr ""
5464
5362
5465 msgid "cannot bisect (no known good revisions)"
5363 msgid "cannot bisect (no known good revisions)"
5466 msgstr ""
5364 msgstr ""
5467
5365
5468 msgid "cannot bisect (no known bad revisions)"
5366 msgid "cannot bisect (no known bad revisions)"
5469 msgstr ""
5367 msgstr ""
5470
5368
5471 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5369 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5472 msgstr ""
5370 msgstr ""
5473
5371
5474 msgid "incompatible arguments"
5372 msgid "incompatible arguments"
5475 msgstr ""
5373 msgstr ""
5476
5374
5477 #, python-format
5375 #, python-format
5478 msgid "cannot find executable: %s"
5376 msgid "cannot find executable: %s"
5479 msgstr ""
5377 msgstr ""
5480
5378
5481 #, python-format
5379 #, python-format
5482 msgid "failed to execute %s"
5380 msgid "failed to execute %s"
5483 msgstr ""
5381 msgstr ""
5484
5382
5485 #, python-format
5383 #, python-format
5486 msgid "%s killed"
5384 msgid "%s killed"
5487 msgstr ""
5385 msgstr ""
5488
5386
5489 #, fuzzy, python-format
5387 #, fuzzy, python-format
5490 msgid "Changeset %d:%s: %s\n"
5388 msgid "Changeset %d:%s: %s\n"
5491 msgstr "修改集: %d:%s\n"
5389 msgstr "修改集: %d:%s\n"
5492
5390
5493 #, python-format
5391 #, python-format
5494 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5392 msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
5495 msgstr ""
5393 msgstr ""
5496
5394
5497 msgid "set or show the current branch name"
5395 msgid "set or show the current branch name"
5498 msgstr ""
5396 msgstr ""
5499
5397
5500 msgid ""
5398 msgid ""
5501 " With no argument, show the current branch name. With one argument,\n"
5399 " With no argument, show the current branch name. With one argument,\n"
5502 " set the working directory branch name (the branch will not exist\n"
5400 " set the working directory branch name (the branch will not exist\n"
5503 " in the repository until the next commit). Standard practice\n"
5401 " in the repository until the next commit). Standard practice\n"
5504 " recommends that primary development take place on the 'default'\n"
5402 " recommends that primary development take place on the 'default'\n"
5505 " branch."
5403 " branch."
5506 msgstr ""
5404 msgstr ""
5507
5405
5508 msgid ""
5406 msgid ""
5509 " Unless -f/--force is specified, branch will not let you set a\n"
5407 " Unless -f/--force is specified, branch will not let you set a\n"
5510 " branch name that already exists, even if it's inactive."
5408 " branch name that already exists, even if it's inactive."
5511 msgstr ""
5409 msgstr ""
5512
5410
5513 msgid ""
5411 msgid ""
5514 " Use -C/--clean to reset the working directory branch to that of\n"
5412 " Use -C/--clean to reset the working directory branch to that of\n"
5515 " the parent of the working directory, negating a previous branch\n"
5413 " the parent of the working directory, negating a previous branch\n"
5516 " change."
5414 " change."
5517 msgstr ""
5415 msgstr ""
5518
5416
5519 msgid ""
5417 msgid ""
5520 " Use the command 'hg update' to switch to an existing branch. Use\n"
5418 " Use the command 'hg update' to switch to an existing branch. Use\n"
5521 " 'hg commit --close-branch' to mark this branch as closed.\n"
5419 " 'hg commit --close-branch' to mark this branch as closed.\n"
5522 " "
5420 " "
5523 msgstr ""
5421 msgstr ""
5524
5422
5525 #, python-format
5423 #, python-format
5526 msgid "reset working directory to branch %s\n"
5424 msgid "reset working directory to branch %s\n"
5527 msgstr ""
5425 msgstr ""
5528
5426
5529 msgid "a branch of the same name already exists (use --force to override)"
5427 msgid "a branch of the same name already exists (use --force to override)"
5530 msgstr ""
5428 msgstr ""
5531
5429
5532 #, python-format
5430 #, python-format
5533 msgid "marked working directory as branch %s\n"
5431 msgid "marked working directory as branch %s\n"
5534 msgstr ""
5432 msgstr ""
5535
5433
5536 msgid "list repository named branches"
5434 msgid "list repository named branches"
5537 msgstr ""
5435 msgstr ""
5538
5436
5539 msgid ""
5437 msgid ""
5540 " List the repository's named branches, indicating which ones are\n"
5438 " List the repository's named branches, indicating which ones are\n"
5541 " inactive. If -c/--closed is specified, also list branches which have\n"
5439 " inactive. If -c/--closed is specified, also list branches which have\n"
5542 " been marked closed (see hg commit --close-branch)."
5440 " been marked closed (see hg commit --close-branch)."
5543 msgstr ""
5441 msgstr ""
5544
5442
5545 msgid ""
5443 msgid ""
5546 " If -a/--active is specified, only show active branches. A branch\n"
5444 " If -a/--active is specified, only show active branches. A branch\n"
5547 " is considered active if it contains repository heads."
5445 " is considered active if it contains repository heads."
5548 msgstr ""
5446 msgstr ""
5549
5447
5550 msgid ""
5448 msgid ""
5551 " Use the command 'hg update' to switch to an existing branch.\n"
5449 " Use the command 'hg update' to switch to an existing branch.\n"
5552 " "
5450 " "
5553 msgstr ""
5451 msgstr ""
5554
5452
5555 msgid "create a changegroup file"
5453 msgid "create a changegroup file"
5556 msgstr ""
5454 msgstr ""
5557
5455
5558 msgid ""
5456 msgid ""
5559 " Generate a compressed changegroup file collecting changesets not\n"
5457 " Generate a compressed changegroup file collecting changesets not\n"
5560 " known to be in another repository."
5458 " known to be in another repository."
5561 msgstr ""
5459 msgstr ""
5562
5460
5563 msgid ""
5461 msgid ""
5564 " If no destination repository is specified the destination is\n"
5462 " If no destination repository is specified the destination is\n"
5565 " assumed to have all the nodes specified by one or more --base\n"
5463 " assumed to have all the nodes specified by one or more --base\n"
5566 " parameters. To create a bundle containing all changesets, use\n"
5464 " parameters. To create a bundle containing all changesets, use\n"
5567 " -a/--all (or --base null)."
5465 " -a/--all (or --base null)."
5568 msgstr ""
5466 msgstr ""
5569
5467
5570 msgid ""
5468 msgid ""
5571 " You can change compression method with the -t/--type option.\n"
5469 " You can change compression method with the -t/--type option.\n"
5572 " The available compression methods are: none, bzip2, and\n"
5470 " The available compression methods are: none, bzip2, and\n"
5573 " gzip (by default, bundles are compressed using bzip2)."
5471 " gzip (by default, bundles are compressed using bzip2)."
5574 msgstr ""
5472 msgstr ""
5575
5473
5576 msgid ""
5474 msgid ""
5577 " The bundle file can then be transferred using conventional means\n"
5475 " The bundle file can then be transferred using conventional means\n"
5578 " and applied to another repository with the unbundle or pull\n"
5476 " and applied to another repository with the unbundle or pull\n"
5579 " command. This is useful when direct push and pull are not\n"
5477 " command. This is useful when direct push and pull are not\n"
5580 " available or when exporting an entire repository is undesirable."
5478 " available or when exporting an entire repository is undesirable."
5581 msgstr ""
5479 msgstr ""
5582
5480
5583 msgid ""
5481 msgid ""
5584 " Applying bundles preserves all changeset contents including\n"
5482 " Applying bundles preserves all changeset contents including\n"
5585 " permissions, copy/rename information, and revision history.\n"
5483 " permissions, copy/rename information, and revision history.\n"
5586 " "
5484 " "
5587 msgstr ""
5485 msgstr ""
5588
5486
5589 msgid "--base is incompatible with specifying a destination"
5487 msgid "--base is incompatible with specifying a destination"
5590 msgstr ""
5488 msgstr ""
5591
5489
5592 msgid "unknown bundle type specified with --type"
5490 msgid "unknown bundle type specified with --type"
5593 msgstr ""
5491 msgstr ""
5594
5492
5595 msgid "output the current or given revision of files"
5493 msgid "output the current or given revision of files"
5596 msgstr ""
5494 msgstr ""
5597
5495
5598 msgid ""
5496 msgid ""
5599 " Print the specified files as they were at the given revision. If\n"
5497 " Print the specified files as they were at the given revision. If\n"
5600 " no revision is given, the parent of the working directory is used,\n"
5498 " no revision is given, the parent of the working directory is used,\n"
5601 " or tip if no revision is checked out."
5499 " or tip if no revision is checked out."
5602 msgstr ""
5500 msgstr ""
5603
5501
5604 msgid ""
5502 msgid ""
5605 " Output may be to a file, in which case the name of the file is\n"
5503 " Output may be to a file, in which case the name of the file is\n"
5606 " given using a format string. The formatting rules are the same as\n"
5504 " given using a format string. The formatting rules are the same as\n"
5607 " for the export command, with the following additions::"
5505 " for the export command, with the following additions::"
5608 msgstr ""
5506 msgstr ""
5609
5507
5610 msgid ""
5508 msgid ""
5611 " %s basename of file being printed\n"
5509 " %s basename of file being printed\n"
5612 " %d dirname of file being printed, or '.' if in repository root\n"
5510 " %d dirname of file being printed, or '.' if in repository root\n"
5613 " %p root-relative path name of file being printed\n"
5511 " %p root-relative path name of file being printed\n"
5614 " "
5512 " "
5615 msgstr ""
5513 msgstr ""
5616
5514
5617 msgid "make a copy of an existing repository"
5515 msgid "make a copy of an existing repository"
5618 msgstr ""
5516 msgstr ""
5619
5517
5620 msgid " Create a copy of an existing repository in a new directory."
5518 msgid " Create a copy of an existing repository in a new directory."
5621 msgstr ""
5519 msgstr ""
5622
5520
5623 msgid ""
5521 msgid ""
5624 " If no destination directory name is specified, it defaults to the\n"
5522 " If no destination directory name is specified, it defaults to the\n"
5625 " basename of the source."
5523 " basename of the source."
5626 msgstr ""
5524 msgstr ""
5627
5525
5628 msgid ""
5526 msgid ""
5629 " The location of the source is added to the new repository's\n"
5527 " The location of the source is added to the new repository's\n"
5630 " .hg/hgrc file, as the default to be used for future pulls."
5528 " .hg/hgrc file, as the default to be used for future pulls."
5631 msgstr ""
5529 msgstr ""
5632
5530
5633 msgid ""
5531 msgid ""
5634 " If you use the -r/--rev option to clone up to a specific revision,\n"
5532 " If you use the -r/--rev option to clone up to a specific revision,\n"
5635 " no subsequent revisions (including subsequent tags) will be\n"
5533 " no subsequent revisions (including subsequent tags) will be\n"
5636 " present in the cloned repository. This option implies --pull, even\n"
5534 " present in the cloned repository. This option implies --pull, even\n"
5637 " on local repositories."
5535 " on local repositories."
5638 msgstr ""
5536 msgstr ""
5639
5537
5640 msgid ""
5538 msgid ""
5641 " By default, clone will check out the head of the 'default' branch.\n"
5539 " By default, clone will check out the head of the 'default' branch.\n"
5642 " If the -U/--noupdate option is used, the new clone will contain\n"
5540 " If the -U/--noupdate option is used, the new clone will contain\n"
5643 " only a repository (.hg) and no working copy (the working copy\n"
5541 " only a repository (.hg) and no working copy (the working copy\n"
5644 " parent is the null revision)."
5542 " parent is the null revision)."
5645 msgstr ""
5543 msgstr ""
5646
5544
5647 msgid " See 'hg help urls' for valid source format details."
5545 msgid " See 'hg help urls' for valid source format details."
5648 msgstr ""
5546 msgstr ""
5649
5547
5650 msgid ""
5548 msgid ""
5651 " It is possible to specify an ssh:// URL as the destination, but no\n"
5549 " It is possible to specify an ssh:// URL as the destination, but no\n"
5652 " .hg/hgrc and working directory will be created on the remote side.\n"
5550 " .hg/hgrc and working directory will be created on the remote side.\n"
5653 " Please see 'hg help urls' for important details about ssh:// URLs."
5551 " Please see 'hg help urls' for important details about ssh:// URLs."
5654 msgstr ""
5552 msgstr ""
5655
5553
5656 msgid ""
5554 msgid ""
5657 " For efficiency, hardlinks are used for cloning whenever the source\n"
5555 " For efficiency, hardlinks are used for cloning whenever the source\n"
5658 " and destination are on the same filesystem (note this applies only\n"
5556 " and destination are on the same filesystem (note this applies only\n"
5659 " to the repository data, not to the checked out files). Some\n"
5557 " to the repository data, not to the checked out files). Some\n"
5660 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5558 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5661 " do not report errors. In these cases, use the --pull option to\n"
5559 " do not report errors. In these cases, use the --pull option to\n"
5662 " avoid hardlinking."
5560 " avoid hardlinking."
5663 msgstr ""
5561 msgstr ""
5664
5562
5665 msgid ""
5563 msgid ""
5666 " In some cases, you can clone repositories and checked out files\n"
5564 " In some cases, you can clone repositories and checked out files\n"
5667 " using full hardlinks with ::"
5565 " using full hardlinks with ::"
5668 msgstr ""
5566 msgstr ""
5669
5567
5670 msgid " $ cp -al REPO REPOCLONE"
5568 msgid " $ cp -al REPO REPOCLONE"
5671 msgstr ""
5569 msgstr ""
5672
5570
5673 msgid ""
5571 msgid ""
5674 " This is the fastest way to clone, but it is not always safe. The\n"
5572 " This is the fastest way to clone, but it is not always safe. The\n"
5675 " operation is not atomic (making sure REPO is not modified during\n"
5573 " operation is not atomic (making sure REPO is not modified during\n"
5676 " the operation is up to you) and you have to make sure your editor\n"
5574 " the operation is up to you) and you have to make sure your editor\n"
5677 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5575 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5678 " this is not compatible with certain extensions that place their\n"
5576 " this is not compatible with certain extensions that place their\n"
5679 " metadata under the .hg directory, such as mq.\n"
5577 " metadata under the .hg directory, such as mq.\n"
5680 " "
5578 " "
5681 msgstr ""
5579 msgstr ""
5682
5580
5683 #, fuzzy
5581 #, fuzzy
5684 msgid "commit the specified files or all outstanding changes"
5582 msgid "commit the specified files or all outstanding changes"
5685 msgstr "提交指定文件的修改或全部修改"
5583 msgstr "提交指定文件的修改或全部修改"
5686
5584
5687 #, fuzzy
5585 #, fuzzy
5688 msgid ""
5586 msgid ""
5689 " Commit changes to the given files into the repository. Unlike a\n"
5587 " Commit changes to the given files into the repository. Unlike a\n"
5690 " centralized RCS, this operation is a local operation. See hg push\n"
5588 " centralized RCS, this operation is a local operation. See hg push\n"
5691 " for a way to actively distribute your changes."
5589 " for a way to actively distribute your changes."
5692 msgstr " 将指定文件的修改提交到版本库。"
5590 msgstr " 将指定文件的修改提交到版本库。"
5693
5591
5694 #, fuzzy
5592 #, fuzzy
5695 msgid ""
5593 msgid ""
5696 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5594 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5697 " will be committed."
5595 " will be committed."
5698 msgstr " 如果省略了文件列表,那么 \"hg status\" 报告的所有修改都被提交。"
5596 msgstr " 如果省略了文件列表,那么 \"hg status\" 报告的所有修改都被提交。"
5699
5597
5700 #, fuzzy
5598 #, fuzzy
5701 msgid ""
5599 msgid ""
5702 " If you are committing the result of a merge, do not provide any\n"
5600 " If you are committing the result of a merge, do not provide any\n"
5703 " filenames or -I/-X filters."
5601 " filenames or -I/-X filters."
5704 msgstr " 如果你要提交合并结果,请不要提供任何文件名称或过滤器 '-I/-X'。"
5602 msgstr " 如果你要提交合并结果,请不要提供任何文件名称或过滤器 '-I/-X'。"
5705
5603
5706 #, fuzzy
5604 #, fuzzy
5707 msgid ""
5605 msgid ""
5708 " If no commit message is specified, the configured editor is\n"
5606 " If no commit message is specified, the configured editor is\n"
5709 " started to prompt you for a message."
5607 " started to prompt you for a message."
5710 msgstr " 如果没有指定提交日志,将会启动配置的编辑器,让你输入信息。"
5608 msgstr " 如果没有指定提交日志,将会启动配置的编辑器,让你输入信息。"
5711
5609
5712 msgid "nothing changed\n"
5610 msgid "nothing changed\n"
5713 msgstr "没有改变\n"
5611 msgstr "没有改变\n"
5714
5612
5715 msgid "created new head\n"
5613 msgid "created new head\n"
5716 msgstr "已经创建新顶点\n"
5614 msgstr "已经创建新顶点\n"
5717
5615
5718 #, python-format
5616 #, python-format
5719 msgid "committed changeset %d:%s\n"
5617 msgid "committed changeset %d:%s\n"
5720 msgstr "提交修改集 %d:%s\n"
5618 msgstr "提交修改集 %d:%s\n"
5721
5619
5722 msgid "mark files as copied for the next commit"
5620 msgid "mark files as copied for the next commit"
5723 msgstr ""
5621 msgstr ""
5724
5622
5725 msgid ""
5623 msgid ""
5726 " Mark dest as having copies of source files. If dest is a\n"
5624 " Mark dest as having copies of source files. If dest is a\n"
5727 " directory, copies are put in that directory. If dest is a file,\n"
5625 " directory, copies are put in that directory. If dest is a file,\n"
5728 " the source must be a single file."
5626 " the source must be a single file."
5729 msgstr ""
5627 msgstr ""
5730
5628
5731 msgid ""
5629 msgid ""
5732 " By default, this command copies the contents of files as they\n"
5630 " By default, this command copies the contents of files as they\n"
5733 " exist in the working directory. If invoked with -A/--after, the\n"
5631 " exist in the working directory. If invoked with -A/--after, the\n"
5734 " operation is recorded, but no copying is performed."
5632 " operation is recorded, but no copying is performed."
5735 msgstr ""
5633 msgstr ""
5736
5634
5737 msgid ""
5635 msgid ""
5738 " This command takes effect with the next commit. To undo a copy\n"
5636 " This command takes effect with the next commit. To undo a copy\n"
5739 " before that, see hg revert.\n"
5637 " before that, see hg revert.\n"
5740 " "
5638 " "
5741 msgstr ""
5639 msgstr ""
5742
5640
5743 msgid "find the ancestor revision of two revisions in a given index"
5641 msgid "find the ancestor revision of two revisions in a given index"
5744 msgstr ""
5642 msgstr ""
5745
5643
5746 msgid "There is no Mercurial repository here (.hg not found)"
5644 msgid "There is no Mercurial repository here (.hg not found)"
5747 msgstr "此处没有水银版本库(没有找到 .hg)"
5645 msgstr "此处没有水银版本库(没有找到 .hg)"
5748
5646
5749 msgid "either two or three arguments required"
5647 msgid "either two or three arguments required"
5750 msgstr "需要两个或三个参数"
5648 msgstr "需要两个或三个参数"
5751
5649
5752 msgid "returns the completion list associated with the given command"
5650 msgid "returns the completion list associated with the given command"
5753 msgstr ""
5651 msgstr ""
5754
5652
5755 msgid "rebuild the dirstate as it would look like for the given revision"
5653 msgid "rebuild the dirstate as it would look like for the given revision"
5756 msgstr ""
5654 msgstr ""
5757
5655
5758 msgid "validate the correctness of the current dirstate"
5656 msgid "validate the correctness of the current dirstate"
5759 msgstr ""
5657 msgstr ""
5760
5658
5761 #, python-format
5659 #, python-format
5762 msgid "%s in state %s, but not in manifest1\n"
5660 msgid "%s in state %s, but not in manifest1\n"
5763 msgstr ""
5661 msgstr ""
5764
5662
5765 #, python-format
5663 #, python-format
5766 msgid "%s in state %s, but also in manifest1\n"
5664 msgid "%s in state %s, but also in manifest1\n"
5767 msgstr ""
5665 msgstr ""
5768
5666
5769 #, python-format
5667 #, python-format
5770 msgid "%s in state %s, but not in either manifest\n"
5668 msgid "%s in state %s, but not in either manifest\n"
5771 msgstr ""
5669 msgstr ""
5772
5670
5773 #, python-format
5671 #, python-format
5774 msgid "%s in manifest1, but listed as state %s"
5672 msgid "%s in manifest1, but listed as state %s"
5775 msgstr ""
5673 msgstr ""
5776
5674
5777 msgid ".hg/dirstate inconsistent with current parent's manifest"
5675 msgid ".hg/dirstate inconsistent with current parent's manifest"
5778 msgstr ""
5676 msgstr ""
5779
5677
5780 msgid "show combined config settings from all hgrc files"
5678 msgid "show combined config settings from all hgrc files"
5781 msgstr ""
5679 msgstr ""
5782
5680
5783 msgid " With no arguments, print names and values of all config items."
5681 msgid " With no arguments, print names and values of all config items."
5784 msgstr ""
5682 msgstr ""
5785
5683
5786 msgid ""
5684 msgid ""
5787 " With one argument of the form section.name, print just the value\n"
5685 " With one argument of the form section.name, print just the value\n"
5788 " of that config item."
5686 " of that config item."
5789 msgstr ""
5687 msgstr ""
5790
5688
5791 msgid ""
5689 msgid ""
5792 " With multiple arguments, print names and values of all config\n"
5690 " With multiple arguments, print names and values of all config\n"
5793 " items with matching section names."
5691 " items with matching section names."
5794 msgstr ""
5692 msgstr ""
5795
5693
5796 msgid ""
5694 msgid ""
5797 " With --debug, the source (filename and line number) is printed\n"
5695 " With --debug, the source (filename and line number) is printed\n"
5798 " for each config item.\n"
5696 " for each config item.\n"
5799 " "
5697 " "
5800 msgstr ""
5698 msgstr ""
5801
5699
5802 msgid "only one config item permitted"
5700 msgid "only one config item permitted"
5803 msgstr ""
5701 msgstr ""
5804
5702
5805 msgid "manually set the parents of the current working directory"
5703 msgid "manually set the parents of the current working directory"
5806 msgstr ""
5704 msgstr ""
5807
5705
5808 msgid ""
5706 msgid ""
5809 " This is useful for writing repository conversion tools, but should\n"
5707 " This is useful for writing repository conversion tools, but should\n"
5810 " be used with care.\n"
5708 " be used with care.\n"
5811 " "
5709 " "
5812 msgstr ""
5710 msgstr ""
5813
5711
5814 msgid "show the contents of the current dirstate"
5712 msgid "show the contents of the current dirstate"
5815 msgstr ""
5713 msgstr ""
5816
5714
5817 #, python-format
5715 #, python-format
5818 msgid "copy: %s -> %s\n"
5716 msgid "copy: %s -> %s\n"
5819 msgstr ""
5717 msgstr ""
5820
5718
5821 msgid "dump the contents of a data file revision"
5719 msgid "dump the contents of a data file revision"
5822 msgstr ""
5720 msgstr ""
5823
5721
5824 #, python-format
5722 #, python-format
5825 msgid "invalid revision identifier %s"
5723 msgid "invalid revision identifier %s"
5826 msgstr ""
5724 msgstr ""
5827
5725
5828 msgid "parse and display a date"
5726 msgid "parse and display a date"
5829 msgstr ""
5727 msgstr ""
5830
5728
5831 msgid "dump the contents of an index file"
5729 msgid "dump the contents of an index file"
5832 msgstr ""
5730 msgstr ""
5833
5731
5834 msgid "dump an index DAG as a graphviz dot file"
5732 msgid "dump an index DAG as a graphviz dot file"
5835 msgstr ""
5733 msgstr ""
5836
5734
5837 msgid "test Mercurial installation"
5735 msgid "test Mercurial installation"
5838 msgstr ""
5736 msgstr ""
5839
5737
5840 #, python-format
5738 #, python-format
5841 msgid "Checking encoding (%s)...\n"
5739 msgid "Checking encoding (%s)...\n"
5842 msgstr ""
5740 msgstr ""
5843
5741
5844 msgid " (check that your locale is properly set)\n"
5742 msgid " (check that your locale is properly set)\n"
5845 msgstr ""
5743 msgstr ""
5846
5744
5847 msgid "Checking extensions...\n"
5745 msgid "Checking extensions...\n"
5848 msgstr ""
5746 msgstr ""
5849
5747
5850 msgid " One or more extensions could not be found"
5748 msgid " One or more extensions could not be found"
5851 msgstr ""
5749 msgstr ""
5852
5750
5853 msgid " (check that you compiled the extensions)\n"
5751 msgid " (check that you compiled the extensions)\n"
5854 msgstr ""
5752 msgstr ""
5855
5753
5856 msgid "Checking templates...\n"
5754 msgid "Checking templates...\n"
5857 msgstr ""
5755 msgstr ""
5858
5756
5859 msgid " (templates seem to have been installed incorrectly)\n"
5757 msgid " (templates seem to have been installed incorrectly)\n"
5860 msgstr ""
5758 msgstr ""
5861
5759
5862 msgid "Checking patch...\n"
5760 msgid "Checking patch...\n"
5863 msgstr ""
5761 msgstr ""
5864
5762
5865 msgid " patch call failed:\n"
5763 msgid " patch call failed:\n"
5866 msgstr ""
5764 msgstr ""
5867
5765
5868 msgid " unexpected patch output!\n"
5766 msgid " unexpected patch output!\n"
5869 msgstr ""
5767 msgstr ""
5870
5768
5871 msgid " patch test failed!\n"
5769 msgid " patch test failed!\n"
5872 msgstr ""
5770 msgstr ""
5873
5771
5874 msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
5772 msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
5875 msgstr ""
5773 msgstr ""
5876
5774
5877 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
5775 msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
5878 msgstr ""
5776 msgstr ""
5879
5777
5880 msgid "Checking commit editor...\n"
5778 msgid "Checking commit editor...\n"
5881 msgstr ""
5779 msgstr ""
5882
5780
5883 msgid " No commit editor set and can't find vi in PATH\n"
5781 msgid " No commit editor set and can't find vi in PATH\n"
5884 msgstr ""
5782 msgstr ""
5885
5783
5886 msgid " (specify a commit editor in your .hgrc file)\n"
5784 msgid " (specify a commit editor in your .hgrc file)\n"
5887 msgstr ""
5785 msgstr ""
5888
5786
5889 #, python-format
5787 #, python-format
5890 msgid " Can't find editor '%s' in PATH\n"
5788 msgid " Can't find editor '%s' in PATH\n"
5891 msgstr ""
5789 msgstr ""
5892
5790
5893 msgid "Checking username...\n"
5791 msgid "Checking username...\n"
5894 msgstr ""
5792 msgstr ""
5895
5793
5896 msgid " (specify a username in your .hgrc file)\n"
5794 msgid " (specify a username in your .hgrc file)\n"
5897 msgstr ""
5795 msgstr ""
5898
5796
5899 msgid "No problems detected\n"
5797 msgid "No problems detected\n"
5900 msgstr ""
5798 msgstr ""
5901
5799
5902 #, python-format
5800 #, python-format
5903 msgid "%s problems detected, please check your install!\n"
5801 msgid "%s problems detected, please check your install!\n"
5904 msgstr ""
5802 msgstr ""
5905
5803
5906 msgid "dump rename information"
5804 msgid "dump rename information"
5907 msgstr ""
5805 msgstr ""
5908
5806
5909 #, python-format
5807 #, python-format
5910 msgid "%s renamed from %s:%s\n"
5808 msgid "%s renamed from %s:%s\n"
5911 msgstr ""
5809 msgstr ""
5912
5810
5913 #, python-format
5811 #, python-format
5914 msgid "%s not renamed\n"
5812 msgid "%s not renamed\n"
5915 msgstr ""
5813 msgstr ""
5916
5814
5917 msgid "show how files match on given patterns"
5815 msgid "show how files match on given patterns"
5918 msgstr ""
5816 msgstr ""
5919
5817
5920 #, fuzzy
5818 #, fuzzy
5921 msgid "diff repository (or selected files)"
5819 msgid "diff repository (or selected files)"
5922 msgstr "在版本库中比较(指定的文件)"
5820 msgstr "在版本库中比较(指定的文件)"
5923
5821
5924 #, fuzzy
5822 #, fuzzy
5925 msgid " Show differences between revisions for the specified files."
5823 msgid " Show differences between revisions for the specified files."
5926 msgstr " 显示指定文件在版本间的差异。"
5824 msgstr " 显示指定文件在版本间的差异。"
5927
5825
5928 #, fuzzy
5826 #, fuzzy
5929 msgid " Differences between files are shown using the unified diff format."
5827 msgid " Differences between files are shown using the unified diff format."
5930 msgstr " 文件间的差异使用同一差异格式显示。"
5828 msgstr " 文件间的差异使用同一差异格式显示。"
5931
5829
5932 #, fuzzy
5830 #, fuzzy
5933 msgid ""
5831 msgid ""
5934 " NOTE: diff may generate unexpected results for merges, as it will\n"
5832 " NOTE: diff may generate unexpected results for merges, as it will\n"
5935 " default to comparing against the working directory's first parent\n"
5833 " default to comparing against the working directory's first parent\n"
5936 " changeset if no revisions are specified."
5834 " changeset if no revisions are specified."
5937 msgstr ""
5835 msgstr ""
5938 " 注意: 对合并的比较可能会产生不期望的结果,因为没有指定版本时,默认\n"
5836 " 注意: 对合并的比较可能会产生不期望的结果,因为没有指定版本时,默认\n"
5939 " 与工作目录的直接父亲比较。"
5837 " 与工作目录的直接父亲比较。"
5940
5838
5941 #, fuzzy
5839 #, fuzzy
5942 msgid ""
5840 msgid ""
5943 " Without the -a/--text option, diff will avoid generating diffs of\n"
5841 " Without the -a/--text option, diff will avoid generating diffs of\n"
5944 " files it detects as binary. With -a, diff will generate a diff\n"
5842 " files it detects as binary. With -a, diff will generate a diff\n"
5945 " anyway, probably with undesirable results."
5843 " anyway, probably with undesirable results."
5946 msgstr ""
5844 msgstr ""
5947 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5845 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5948 " 时,可能会有不合需要的结果。"
5846 " 时,可能会有不合需要的结果。"
5949
5847
5950 #, fuzzy
5848 #, fuzzy
5951 msgid ""
5849 msgid ""
5952 " Use the -g/--git option to generate diffs in the git extended diff\n"
5850 " Use the -g/--git option to generate diffs in the git extended diff\n"
5953 " format. For more information, read 'hg help diffs'.\n"
5851 " format. For more information, read 'hg help diffs'.\n"
5954 " "
5852 " "
5955 msgstr ""
5853 msgstr ""
5956 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
5854 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
5957 " 了解更多信息。\n"
5855 " 了解更多信息。\n"
5958 " "
5856 " "
5959
5857
5960 #, fuzzy
5858 #, fuzzy
5961 msgid "dump the header and diffs for one or more changesets"
5859 msgid "dump the header and diffs for one or more changesets"
5962 msgstr "为一个或多个修改集输出标题和差异"
5860 msgstr "为一个或多个修改集输出标题和差异"
5963
5861
5964 #, fuzzy
5862 #, fuzzy
5965 msgid " Print the changeset header and diffs for one or more revisions."
5863 msgid " Print the changeset header and diffs for one or more revisions."
5966 msgstr " 为一个或多个版本输出标题和差异。"
5864 msgstr " 为一个或多个版本输出标题和差异。"
5967
5865
5968 #, fuzzy
5866 #, fuzzy
5969 msgid ""
5867 msgid ""
5970 " The information shown in the changeset header is: author,\n"
5868 " The information shown in the changeset header is: author,\n"
5971 " changeset hash, parent(s) and commit comment."
5869 " changeset hash, parent(s) and commit comment."
5972 msgstr " 在修改集标题中显示的信息是: 作者,修改集哈希,父亲和提交日志。"
5870 msgstr " 在修改集标题中显示的信息是: 作者,修改集哈希,父亲和提交日志。"
5973
5871
5974 #, fuzzy
5872 #, fuzzy
5975 msgid ""
5873 msgid ""
5976 " NOTE: export may generate unexpected diff output for merge\n"
5874 " NOTE: export may generate unexpected diff output for merge\n"
5977 " changesets, as it will compare the merge changeset against its\n"
5875 " changesets, as it will compare the merge changeset against its\n"
5978 " first parent only."
5876 " first parent only."
5979 msgstr ""
5877 msgstr ""
5980 " 注意: 对于合并修改集,导出可能产生不期望的差异输出,因为它只会将合并\n"
5878 " 注意: 对于合并修改集,导出可能产生不期望的差异输出,因为它只会将合并\n"
5981 " 修改集与其第一个父亲比较。"
5879 " 修改集与其第一个父亲比较。"
5982
5880
5983 #, fuzzy
5881 #, fuzzy
5984 msgid ""
5882 msgid ""
5985 " Output may be to a file, in which case the name of the file is\n"
5883 " Output may be to a file, in which case the name of the file is\n"
5986 " given using a format string. The formatting rules are as follows::"
5884 " given using a format string. The formatting rules are as follows::"
5987 msgstr ""
5885 msgstr ""
5988 " 可以输出到文件,这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
5886 " 可以输出到文件,这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
5989 " 如下::"
5887 " 如下::"
5990
5888
5991 #, fuzzy
5889 #, fuzzy
5992 msgid ""
5890 msgid ""
5993 " %% literal \"%\" character\n"
5891 " %% literal \"%\" character\n"
5994 " %H changeset hash (40 bytes of hexadecimal)\n"
5892 " %H changeset hash (40 bytes of hexadecimal)\n"
5995 " %N number of patches being generated\n"
5893 " %N number of patches being generated\n"
5996 " %R changeset revision number\n"
5894 " %R changeset revision number\n"
5997 " %b basename of the exporting repository\n"
5895 " %b basename of the exporting repository\n"
5998 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5896 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5999 " %n zero-padded sequence number, starting at 1\n"
5897 " %n zero-padded sequence number, starting at 1\n"
6000 " %r zero-padded changeset revision number"
5898 " %r zero-padded changeset revision number"
6001 msgstr ""
5899 msgstr ""
6002 " %% 字符 \"%\"\n"
5900 " %% 字符 \"%\"\n"
6003 " %H 修改集哈希 (40 位十六进制数字)\n"
5901 " %H 修改集哈希 (40 位十六进制数字)\n"
6004 " %N 产生的补丁号\n"
5902 " %N 产生的补丁号\n"
6005 " %R 修改集版本号\n"
5903 " %R 修改集版本号\n"
6006 " %b 待导出的版本库的基本名称\n"
5904 " %b 待导出的版本库的基本名称\n"
6007 " %h 短修改集哈希(12 位十六进制数字)\n"
5905 " %h 短修改集哈希(12 位十六进制数字)\n"
6008 " %n 从 1 开始补 0 的序列号\n"
5906 " %n 从 1 开始补 0 的序列号\n"
6009 " %r 补 0 的修改集版本号"
5907 " %r 补 0 的修改集版本号"
6010
5908
6011 #, fuzzy
5909 #, fuzzy
6012 msgid ""
5910 msgid ""
6013 " Without the -a/--text option, export will avoid generating diffs\n"
5911 " Without the -a/--text option, export will avoid generating diffs\n"
6014 " of files it detects as binary. With -a, export will generate a\n"
5912 " of files it detects as binary. With -a, export will generate a\n"
6015 " diff anyway, probably with undesirable results."
5913 " diff anyway, probably with undesirable results."
6016 msgstr ""
5914 msgstr ""
6017 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
5915 " 当没有选项 '-a' 时,将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
6018 " 时,可能会有不合需要的结果。"
5916 " 时,可能会有不合需要的结果。"
6019
5917
6020 #, fuzzy
5918 #, fuzzy
6021 msgid ""
5919 msgid ""
6022 " Use the -g/--git option to generate diffs in the git extended diff\n"
5920 " Use the -g/--git option to generate diffs in the git extended diff\n"
6023 " format. See 'hg help diffs' for more information."
5921 " format. See 'hg help diffs' for more information."
6024 msgstr ""
5922 msgstr ""
6025 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
5923 " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
6026 " 更多信息。"
5924 " 更多信息。"
6027
5925
6028 #, fuzzy
5926 #, fuzzy
6029 msgid ""
5927 msgid ""
6030 " With the --switch-parent option, the diff will be against the\n"
5928 " With the --switch-parent option, the diff will be against the\n"
6031 " second parent. It can be useful to review a merge.\n"
5929 " second parent. It can be useful to review a merge.\n"
6032 " "
5930 " "
6033 msgstr ""
5931 msgstr ""
6034 " 使用选项 '--switch-parent',将会与第二个父亲比较。对于复审合并很有用。\n"
5932 " 使用选项 '--switch-parent',将会与第二个父亲比较。对于复审合并很有用。\n"
6035 " "
5933 " "
6036
5934
6037 msgid "export requires at least one changeset"
5935 msgid "export requires at least one changeset"
6038 msgstr ""
5936 msgstr ""
6039
5937
6040 msgid "exporting patches:\n"
5938 msgid "exporting patches:\n"
6041 msgstr ""
5939 msgstr ""
6042
5940
6043 msgid "exporting patch:\n"
5941 msgid "exporting patch:\n"
6044 msgstr ""
5942 msgstr ""
6045
5943
6046 msgid "forget the specified files on the next commit"
5944 msgid "forget the specified files on the next commit"
6047 msgstr ""
5945 msgstr ""
6048
5946
6049 msgid ""
5947 msgid ""
6050 " Mark the specified files so they will no longer be tracked\n"
5948 " Mark the specified files so they will no longer be tracked\n"
6051 " after the next commit."
5949 " after the next commit."
6052 msgstr ""
5950 msgstr ""
6053
5951
6054 msgid ""
5952 msgid ""
6055 " This only removes files from the current branch, not from the\n"
5953 " This only removes files from the current branch, not from the\n"
6056 " entire project history, and it does not delete them from the\n"
5954 " entire project history, and it does not delete them from the\n"
6057 " working directory."
5955 " working directory."
6058 msgstr ""
5956 msgstr ""
6059
5957
6060 msgid ""
5958 msgid ""
6061 " To undo a forget before the next commit, see hg add.\n"
5959 " To undo a forget before the next commit, see hg add.\n"
6062 " "
5960 " "
6063 msgstr ""
5961 msgstr ""
6064
5962
6065 msgid "no files specified"
5963 msgid "no files specified"
6066 msgstr ""
5964 msgstr ""
6067
5965
6068 #, python-format
5966 #, python-format
6069 msgid "not removing %s: file is already untracked\n"
5967 msgid "not removing %s: file is already untracked\n"
6070 msgstr ""
5968 msgstr ""
6071
5969
6072 msgid "search for a pattern in specified files and revisions"
5970 msgid "search for a pattern in specified files and revisions"
6073 msgstr ""
5971 msgstr ""
6074
5972
6075 msgid " Search revisions of files for a regular expression."
5973 msgid " Search revisions of files for a regular expression."
6076 msgstr ""
5974 msgstr ""
6077
5975
6078 msgid ""
5976 msgid ""
6079 " This command behaves differently than Unix grep. It only accepts\n"
5977 " This command behaves differently than Unix grep. It only accepts\n"
6080 " Python/Perl regexps. It searches repository history, not the\n"
5978 " Python/Perl regexps. It searches repository history, not the\n"
6081 " working directory. It always prints the revision number in which a\n"
5979 " working directory. It always prints the revision number in which a\n"
6082 " match appears."
5980 " match appears."
6083 msgstr ""
5981 msgstr ""
6084
5982
6085 msgid ""
5983 msgid ""
6086 " By default, grep only prints output for the first revision of a\n"
5984 " By default, grep only prints output for the first revision of a\n"
6087 " file in which it finds a match. To get it to print every revision\n"
5985 " file in which it finds a match. To get it to print every revision\n"
6088 " that contains a change in match status (\"-\" for a match that\n"
5986 " that contains a change in match status (\"-\" for a match that\n"
6089 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5987 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
6090 " use the --all flag.\n"
5988 " use the --all flag.\n"
6091 " "
5989 " "
6092 msgstr ""
5990 msgstr ""
6093
5991
6094 #, python-format
5992 #, python-format
6095 msgid "grep: invalid match pattern: %s\n"
5993 msgid "grep: invalid match pattern: %s\n"
6096 msgstr ""
5994 msgstr ""
6097
5995
6098 msgid "show current repository heads or show branch heads"
5996 msgid "show current repository heads or show branch heads"
6099 msgstr ""
5997 msgstr ""
6100
5998
6101 msgid " With no arguments, show all repository head changesets."
5999 msgid " With no arguments, show all repository head changesets."
6102 msgstr ""
6000 msgstr ""
6103
6001
6104 msgid ""
6002 msgid ""
6105 " Repository \"heads\" are changesets with no child changesets. They are\n"
6003 " Repository \"heads\" are changesets with no child changesets. They are\n"
6106 " where development generally takes place and are the usual targets\n"
6004 " where development generally takes place and are the usual targets\n"
6107 " for update and merge operations."
6005 " for update and merge operations."
6108 msgstr ""
6006 msgstr ""
6109
6007
6110 msgid ""
6008 msgid ""
6111 " If one or more REV is given, the \"branch heads\" will be shown for\n"
6009 " If one or more REV is given, the \"branch heads\" will be shown for\n"
6112 " the named branch associated with the specified changeset(s)."
6010 " the named branch associated with the specified changeset(s)."
6113 msgstr ""
6011 msgstr ""
6114
6012
6115 msgid ""
6013 msgid ""
6116 " Branch heads are changesets on a named branch with no descendants on\n"
6014 " Branch heads are changesets on a named branch with no descendants on\n"
6117 " the same branch. A branch head could be a \"true\" (repository) head,\n"
6015 " the same branch. A branch head could be a \"true\" (repository) head,\n"
6118 " or it could be the last changeset on that branch before it was\n"
6016 " or it could be the last changeset on that branch before it was\n"
6119 " merged into another branch, or it could be the last changeset on the\n"
6017 " merged into another branch, or it could be the last changeset on the\n"
6120 " branch before a new branch was created. If none of the branch heads\n"
6018 " branch before a new branch was created. If none of the branch heads\n"
6121 " are true heads, the branch is considered inactive."
6019 " are true heads, the branch is considered inactive."
6122 msgstr ""
6020 msgstr ""
6123
6021
6124 msgid ""
6022 msgid ""
6125 " If -c/--closed is specified, also show branch heads marked closed\n"
6023 " If -c/--closed is specified, also show branch heads marked closed\n"
6126 " (see hg commit --close-branch)."
6024 " (see hg commit --close-branch)."
6127 msgstr ""
6025 msgstr ""
6128
6026
6129 msgid ""
6027 msgid ""
6130 " If STARTREV is specified, only those heads that are descendants of\n"
6028 " If STARTREV is specified, only those heads that are descendants of\n"
6131 " STARTREV will be displayed.\n"
6029 " STARTREV will be displayed.\n"
6132 " "
6030 " "
6133 msgstr ""
6031 msgstr ""
6134
6032
6135 msgid "you must specify a branch to use --closed"
6033 msgid "you must specify a branch to use --closed"
6136 msgstr ""
6034 msgstr ""
6137
6035
6138 #, fuzzy, python-format
6036 #, fuzzy, python-format
6139 msgid "no open branch heads on branch %s\n"
6037 msgid "no open branch heads on branch %s\n"
6140 msgstr "svn: 分支没有版本 %s"
6038 msgstr "svn: 分支没有版本 %s"
6141
6039
6142 #, python-format
6040 #, python-format
6143 msgid "no changes on branch %s containing %s are reachable from %s\n"
6041 msgid "no changes on branch %s containing %s are reachable from %s\n"
6144 msgstr ""
6042 msgstr ""
6145
6043
6146 #, python-format
6044 #, python-format
6147 msgid "no changes on branch %s are reachable from %s\n"
6045 msgid "no changes on branch %s are reachable from %s\n"
6148 msgstr ""
6046 msgstr ""
6149
6047
6150 msgid "show help for a given topic or a help overview"
6048 msgid "show help for a given topic or a help overview"
6151 msgstr ""
6049 msgstr ""
6152
6050
6153 msgid " With no arguments, print a list of commands with short help messages."
6051 msgid " With no arguments, print a list of commands with short help messages."
6154 msgstr ""
6052 msgstr ""
6155
6053
6156 msgid ""
6054 msgid ""
6157 " Given a topic, extension, or command name, print help for that\n"
6055 " Given a topic, extension, or command name, print help for that\n"
6158 " topic."
6056 " topic."
6159 msgstr ""
6057 msgstr ""
6160
6058
6161 msgid "global options:"
6059 msgid "global options:"
6162 msgstr "全局选项:"
6060 msgstr "全局选项:"
6163
6061
6164 msgid "use \"hg help\" for the full list of commands"
6062 msgid "use \"hg help\" for the full list of commands"
6165 msgstr "使用 \"hg help\" 获得全部命令的列表"
6063 msgstr "使用 \"hg help\" 获得全部命令的列表"
6166
6064
6167 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
6065 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
6168 msgstr "使用 \"hg help\" 获得全部命令的列表,或 \"hg -v\" 获得详细信息"
6066 msgstr "使用 \"hg help\" 获得全部命令的列表,或 \"hg -v\" 获得详细信息"
6169
6067
6170 #, python-format
6068 #, python-format
6171 msgid "use \"hg -v help%s\" to show aliases and global options"
6069 msgid "use \"hg -v help%s\" to show aliases and global options"
6172 msgstr "使用 \"hg -v help%s\" 显示别名和全局选项"
6070 msgstr "使用 \"hg -v help%s\" 显示别名和全局选项"
6173
6071
6174 #, python-format
6072 #, python-format
6175 msgid "use \"hg -v help %s\" to show global options"
6073 msgid "use \"hg -v help %s\" to show global options"
6176 msgstr "使用 \"hg -v help %s\" 显示全局选项"
6074 msgstr "使用 \"hg -v help %s\" 显示全局选项"
6177
6075
6178 msgid "list of commands:"
6076 msgid "list of commands:"
6179 msgstr "命令列表:"
6077 msgstr "命令列表:"
6180
6078
6181 #, python-format
6079 #, python-format
6182 msgid ""
6080 msgid ""
6183 "\n"
6081 "\n"
6184 "aliases: %s\n"
6082 "aliases: %s\n"
6185 msgstr ""
6083 msgstr ""
6186 "\n"
6084 "\n"
6187 "别名: %s\n"
6085 "别名: %s\n"
6188
6086
6189 msgid "(no help text available)"
6087 msgid "(no help text available)"
6190 msgstr "(没有可用的帮助信息)"
6088 msgstr "(没有可用的帮助信息)"
6191
6089
6192 msgid "options:\n"
6090 msgid "options:\n"
6193 msgstr "选项:\n"
6091 msgstr "选项:\n"
6194
6092
6195 msgid "no commands defined\n"
6093 msgid "no commands defined\n"
6196 msgstr ""
6094 msgstr ""
6197
6095
6198 #, fuzzy
6096 #, fuzzy
6199 msgid "enabled extensions:"
6097 msgid "enabled extensions:"
6200 msgstr ""
6098 msgstr ""
6201 "\n"
6099 "\n"
6202 "启用的扩展:\n"
6100 "启用的扩展:\n"
6203 "\n"
6101 "\n"
6204
6102
6205 msgid "no help text available"
6103 msgid "no help text available"
6206 msgstr "没有可用的帮助信息"
6104 msgstr "没有可用的帮助信息"
6207
6105
6208 #, fuzzy, python-format
6106 #, fuzzy, python-format
6209 msgid "%s extension - %s"
6107 msgid "%s extension - %s"
6210 msgstr "** 已加载的扩展: %s\n"
6108 msgstr "** 已加载的扩展: %s\n"
6211
6109
6212 msgid "Mercurial Distributed SCM\n"
6110 msgid "Mercurial Distributed SCM\n"
6213 msgstr "分布式软件配置管理工具 - 水银\n"
6111 msgstr "分布式软件配置管理工具 - 水银\n"
6214
6112
6215 msgid "basic commands:"
6113 msgid "basic commands:"
6216 msgstr "基本命令:"
6114 msgstr "基本命令:"
6217
6115
6218 msgid ""
6116 msgid ""
6219 "\n"
6117 "\n"
6220 "additional help topics:"
6118 "additional help topics:"
6221 msgstr ""
6119 msgstr ""
6222 "\n"
6120 "\n"
6223 "额外的帮助主题:"
6121 "额外的帮助主题:"
6224
6122
6225 msgid "identify the working copy or specified revision"
6123 msgid "identify the working copy or specified revision"
6226 msgstr ""
6124 msgstr ""
6227
6125
6228 msgid ""
6126 msgid ""
6229 " With no revision, print a summary of the current state of the\n"
6127 " With no revision, print a summary of the current state of the\n"
6230 " repository."
6128 " repository."
6231 msgstr ""
6129 msgstr ""
6232
6130
6233 msgid ""
6131 msgid ""
6234 " Specifying a path to a repository root or Mercurial bundle will\n"
6132 " Specifying a path to a repository root or Mercurial bundle will\n"
6235 " cause lookup to operate on that repository/bundle."
6133 " cause lookup to operate on that repository/bundle."
6236 msgstr ""
6134 msgstr ""
6237
6135
6238 msgid ""
6136 msgid ""
6239 " This summary identifies the repository state using one or two\n"
6137 " This summary identifies the repository state using one or two\n"
6240 " parent hash identifiers, followed by a \"+\" if there are\n"
6138 " parent hash identifiers, followed by a \"+\" if there are\n"
6241 " uncommitted changes in the working directory, a list of tags for\n"
6139 " uncommitted changes in the working directory, a list of tags for\n"
6242 " this revision and a branch name for non-default branches.\n"
6140 " this revision and a branch name for non-default branches.\n"
6243 " "
6141 " "
6244 msgstr ""
6142 msgstr ""
6245
6143
6246 msgid "import an ordered set of patches"
6144 msgid "import an ordered set of patches"
6247 msgstr ""
6145 msgstr ""
6248
6146
6249 msgid " Import a list of patches and commit them individually."
6147 msgid " Import a list of patches and commit them individually."
6250 msgstr ""
6148 msgstr ""
6251
6149
6252 msgid ""
6150 msgid ""
6253 " If there are outstanding changes in the working directory, import\n"
6151 " If there are outstanding changes in the working directory, import\n"
6254 " will abort unless given the -f/--force flag."
6152 " will abort unless given the -f/--force flag."
6255 msgstr ""
6153 msgstr ""
6256
6154
6257 msgid ""
6155 msgid ""
6258 " You can import a patch straight from a mail message. Even patches\n"
6156 " You can import a patch straight from a mail message. Even patches\n"
6259 " as attachments work (to use the body part, it must have type\n"
6157 " as attachments work (to use the body part, it must have type\n"
6260 " text/plain or text/x-patch). From and Subject headers of email\n"
6158 " text/plain or text/x-patch). From and Subject headers of email\n"
6261 " message are used as default committer and commit message. All\n"
6159 " message are used as default committer and commit message. All\n"
6262 " text/plain body parts before first diff are added to commit\n"
6160 " text/plain body parts before first diff are added to commit\n"
6263 " message."
6161 " message."
6264 msgstr ""
6162 msgstr ""
6265
6163
6266 msgid ""
6164 msgid ""
6267 " If the imported patch was generated by hg export, user and\n"
6165 " If the imported patch was generated by hg export, user and\n"
6268 " description from patch override values from message headers and\n"
6166 " description from patch override values from message headers and\n"
6269 " body. Values given on command line with -m/--message and -u/--user\n"
6167 " body. Values given on command line with -m/--message and -u/--user\n"
6270 " override these."
6168 " override these."
6271 msgstr ""
6169 msgstr ""
6272
6170
6273 msgid ""
6171 msgid ""
6274 " If --exact is specified, import will set the working directory to\n"
6172 " If --exact is specified, import will set the working directory to\n"
6275 " the parent of each patch before applying it, and will abort if the\n"
6173 " the parent of each patch before applying it, and will abort if the\n"
6276 " resulting changeset has a different ID than the one recorded in\n"
6174 " resulting changeset has a different ID than the one recorded in\n"
6277 " the patch. This may happen due to character set problems or other\n"
6175 " the patch. This may happen due to character set problems or other\n"
6278 " deficiencies in the text patch format."
6176 " deficiencies in the text patch format."
6279 msgstr ""
6177 msgstr ""
6280
6178
6281 msgid ""
6179 msgid ""
6282 " With -s/--similarity, hg will attempt to discover renames and\n"
6180 " With -s/--similarity, hg will attempt to discover renames and\n"
6283 " copies in the patch in the same way as 'addremove'."
6181 " copies in the patch in the same way as 'addremove'."
6284 msgstr ""
6182 msgstr ""
6285
6183
6286 msgid ""
6184 msgid ""
6287 " To read a patch from standard input, use \"-\" as the patch name. If\n"
6185 " To read a patch from standard input, use \"-\" as the patch name. If\n"
6288 " a URL is specified, the patch will be downloaded from it.\n"
6186 " a URL is specified, the patch will be downloaded from it.\n"
6289 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6187 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6290 " "
6188 " "
6291 msgstr ""
6189 msgstr ""
6292
6190
6293 msgid "applying patch from stdin\n"
6191 msgid "applying patch from stdin\n"
6294 msgstr ""
6192 msgstr ""
6295
6193
6296 msgid "no diffs found"
6194 msgid "no diffs found"
6297 msgstr ""
6195 msgstr ""
6298
6196
6299 #, python-format
6197 #, python-format
6300 msgid ""
6198 msgid ""
6301 "message:\n"
6199 "message:\n"
6302 "%s\n"
6200 "%s\n"
6303 msgstr ""
6201 msgstr ""
6304
6202
6305 #, fuzzy
6203 #, fuzzy
6306 msgid "not a Mercurial patch"
6204 msgid "not a Mercurial patch"
6307 msgstr "%s 不是本地的水银版本库"
6205 msgstr "%s 不是本地的水银版本库"
6308
6206
6309 msgid "patch is damaged or loses information"
6207 msgid "patch is damaged or loses information"
6310 msgstr ""
6208 msgstr ""
6311
6209
6312 msgid "show new changesets found in source"
6210 msgid "show new changesets found in source"
6313 msgstr ""
6211 msgstr ""
6314
6212
6315 msgid ""
6213 msgid ""
6316 " Show new changesets found in the specified path/URL or the default\n"
6214 " Show new changesets found in the specified path/URL or the default\n"
6317 " pull location. These are the changesets that would have been pulled\n"
6215 " pull location. These are the changesets that would have been pulled\n"
6318 " if a pull at the time you issued this command."
6216 " if a pull at the time you issued this command."
6319 msgstr ""
6217 msgstr ""
6320
6218
6321 msgid ""
6219 msgid ""
6322 " For remote repository, using --bundle avoids downloading the\n"
6220 " For remote repository, using --bundle avoids downloading the\n"
6323 " changesets twice if the incoming is followed by a pull."
6221 " changesets twice if the incoming is followed by a pull."
6324 msgstr ""
6222 msgstr ""
6325
6223
6326 msgid ""
6224 msgid ""
6327 " See pull for valid source format details.\n"
6225 " See pull for valid source format details.\n"
6328 " "
6226 " "
6329 msgstr ""
6227 msgstr ""
6330
6228
6331 #, fuzzy
6229 #, fuzzy
6332 msgid "create a new repository in the given directory"
6230 msgid "create a new repository in the given directory"
6333 msgstr "在指定目录创建新版本库"
6231 msgstr "在指定目录创建新版本库"
6334
6232
6335 #, fuzzy
6233 #, fuzzy
6336 msgid ""
6234 msgid ""
6337 " Initialize a new repository in the given directory. If the given\n"
6235 " Initialize a new repository in the given directory. If the given\n"
6338 " directory does not exist, it will be created."
6236 " directory does not exist, it will be created."
6339 msgstr " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。"
6237 msgstr " 在指定目录初始化新版本库。如果指定的目录不存在,那么会被创建。"
6340
6238
6341 #, fuzzy
6239 #, fuzzy
6342 msgid " If no directory is given, the current directory is used."
6240 msgid " If no directory is given, the current directory is used."
6343 msgstr " 如果没有指定目录,就使用当前目录。"
6241 msgstr " 如果没有指定目录,就使用当前目录。"
6344
6242
6345 #, fuzzy
6243 #, fuzzy
6346 msgid ""
6244 msgid ""
6347 " It is possible to specify an ssh:// URL as the destination.\n"
6245 " It is possible to specify an ssh:// URL as the destination.\n"
6348 " See 'hg help urls' for more information.\n"
6246 " See 'hg help urls' for more information.\n"
6349 " "
6247 " "
6350 msgstr ""
6248 msgstr ""
6351 " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息,\n"
6249 " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息,\n"
6352 " 以了解位置 'ssh://' 的重要详情。\n"
6250 " 以了解位置 'ssh://' 的重要详情。\n"
6353 " "
6251 " "
6354
6252
6355 msgid "locate files matching specific patterns"
6253 msgid "locate files matching specific patterns"
6356 msgstr ""
6254 msgstr ""
6357
6255
6358 msgid ""
6256 msgid ""
6359 " Print files under Mercurial control in the working directory whose\n"
6257 " Print files under Mercurial control in the working directory whose\n"
6360 " names match the given patterns."
6258 " names match the given patterns."
6361 msgstr ""
6259 msgstr ""
6362
6260
6363 msgid ""
6261 msgid ""
6364 " By default, this command searches all directories in the working\n"
6262 " By default, this command searches all directories in the working\n"
6365 " directory. To search just the current directory and its\n"
6263 " directory. To search just the current directory and its\n"
6366 " subdirectories, use \"--include .\"."
6264 " subdirectories, use \"--include .\"."
6367 msgstr ""
6265 msgstr ""
6368
6266
6369 msgid ""
6267 msgid ""
6370 " If no patterns are given to match, this command prints the names\n"
6268 " If no patterns are given to match, this command prints the names\n"
6371 " of all files under Mercurial control in the working directory."
6269 " of all files under Mercurial control in the working directory."
6372 msgstr ""
6270 msgstr ""
6373
6271
6374 msgid ""
6272 msgid ""
6375 " If you want to feed the output of this command into the \"xargs\"\n"
6273 " If you want to feed the output of this command into the \"xargs\"\n"
6376 " command, use the -0 option to both this command and \"xargs\". This\n"
6274 " command, use the -0 option to both this command and \"xargs\". This\n"
6377 " will avoid the problem of \"xargs\" treating single filenames that\n"
6275 " will avoid the problem of \"xargs\" treating single filenames that\n"
6378 " contain whitespace as multiple filenames.\n"
6276 " contain whitespace as multiple filenames.\n"
6379 " "
6277 " "
6380 msgstr ""
6278 msgstr ""
6381
6279
6382 #, fuzzy
6280 #, fuzzy
6383 msgid "show revision history of entire repository or files"
6281 msgid "show revision history of entire repository or files"
6384 msgstr ""
6282 msgstr ""
6385 "显示全部版本库或指定文件的版本历史\n"
6283 "显示全部版本库或指定文件的版本历史\n"
6386 "\n"
6284 "\n"
6387 " 显示全部版本库或指定文件的版本历史。\n"
6285 " 显示全部版本库或指定文件的版本历史。\n"
6388 "\n"
6286 "\n"
6389 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6287 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6390 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6288 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6391 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6289 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6392 " 个父亲。\n"
6290 " 个父亲。\n"
6393 "\n"
6291 "\n"
6394 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6292 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6395 " 工作目录的父亲作为开始版本。\n"
6293 " 工作目录的父亲作为开始版本。\n"
6396 "\n"
6294 "\n"
6397 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6295 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6398 "\n"
6296 "\n"
6399 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6297 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6400 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6298 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6401 " 变更列表和完整的提交信息。\n"
6299 " 变更列表和完整的提交信息。\n"
6402 "\n"
6300 "\n"
6403 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6301 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6404 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6302 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6405 " 文件列表。\n"
6303 " 文件列表。\n"
6406 "\n"
6304 "\n"
6407 " "
6305 " "
6408
6306
6409 #, fuzzy
6307 #, fuzzy
6410 msgid ""
6308 msgid ""
6411 " Print the revision history of the specified files or the entire\n"
6309 " Print the revision history of the specified files or the entire\n"
6412 " project."
6310 " project."
6413 msgstr ""
6311 msgstr ""
6414 "显示全部版本库或指定文件的版本历史\n"
6312 "显示全部版本库或指定文件的版本历史\n"
6415 "\n"
6313 "\n"
6416 " 显示全部版本库或指定文件的版本历史。\n"
6314 " 显示全部版本库或指定文件的版本历史。\n"
6417 "\n"
6315 "\n"
6418 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6316 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6419 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6317 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6420 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6318 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6421 " 个父亲。\n"
6319 " 个父亲。\n"
6422 "\n"
6320 "\n"
6423 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6321 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6424 " 工作目录的父亲作为开始版本。\n"
6322 " 工作目录的父亲作为开始版本。\n"
6425 "\n"
6323 "\n"
6426 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6324 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6427 "\n"
6325 "\n"
6428 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6326 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6429 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6327 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6430 " 变更列表和完整的提交信息。\n"
6328 " 变更列表和完整的提交信息。\n"
6431 "\n"
6329 "\n"
6432 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6330 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6433 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6331 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6434 " 文件列表。\n"
6332 " 文件列表。\n"
6435 "\n"
6333 "\n"
6436 " "
6334 " "
6437
6335
6438 #, fuzzy
6336 #, fuzzy
6439 msgid ""
6337 msgid ""
6440 " File history is shown without following rename or copy history of\n"
6338 " File history is shown without following rename or copy history of\n"
6441 " files. Use -f/--follow with a filename to follow history across\n"
6339 " files. Use -f/--follow with a filename to follow history across\n"
6442 " renames and copies. --follow without a filename will only show\n"
6340 " renames and copies. --follow without a filename will only show\n"
6443 " ancestors or descendants of the starting revision. --follow-first\n"
6341 " ancestors or descendants of the starting revision. --follow-first\n"
6444 " only follows the first parent of merge revisions."
6342 " only follows the first parent of merge revisions."
6445 msgstr ""
6343 msgstr ""
6446 "显示全部版本库或指定文件的版本历史\n"
6344 "显示全部版本库或指定文件的版本历史\n"
6447 "\n"
6345 "\n"
6448 " 显示全部版本库或指定文件的版本历史。\n"
6346 " 显示全部版本库或指定文件的版本历史。\n"
6449 "\n"
6347 "\n"
6450 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6348 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6451 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6349 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6452 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6350 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6453 " 个父亲。\n"
6351 " 个父亲。\n"
6454 "\n"
6352 "\n"
6455 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6353 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6456 " 工作目录的父亲作为开始版本。\n"
6354 " 工作目录的父亲作为开始版本。\n"
6457 "\n"
6355 "\n"
6458 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6356 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6459 "\n"
6357 "\n"
6460 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6358 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6461 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6359 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6462 " 变更列表和完整的提交信息。\n"
6360 " 变更列表和完整的提交信息。\n"
6463 "\n"
6361 "\n"
6464 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6362 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6465 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6363 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6466 " 文件列表。\n"
6364 " 文件列表。\n"
6467 "\n"
6365 "\n"
6468 " "
6366 " "
6469
6367
6470 #, fuzzy
6368 #, fuzzy
6471 msgid ""
6369 msgid ""
6472 " If no revision range is specified, the default is tip:0 unless\n"
6370 " If no revision range is specified, the default is tip:0 unless\n"
6473 " --follow is set, in which case the working directory parent is\n"
6371 " --follow is set, in which case the working directory parent is\n"
6474 " used as the starting revision."
6372 " used as the starting revision."
6475 msgstr ""
6373 msgstr ""
6476 "显示全部版本库或指定文件的版本历史\n"
6374 "显示全部版本库或指定文件的版本历史\n"
6477 "\n"
6375 "\n"
6478 " 显示全部版本库或指定文件的版本历史。\n"
6376 " 显示全部版本库或指定文件的版本历史。\n"
6479 "\n"
6377 "\n"
6480 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6378 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6481 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6379 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6482 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6380 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6483 " 个父亲。\n"
6381 " 个父亲。\n"
6484 "\n"
6382 "\n"
6485 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6383 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6486 " 工作目录的父亲作为开始版本。\n"
6384 " 工作目录的父亲作为开始版本。\n"
6487 "\n"
6385 "\n"
6488 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6386 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6489 "\n"
6387 "\n"
6490 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6388 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6491 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6389 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6492 " 变更列表和完整的提交信息。\n"
6390 " 变更列表和完整的提交信息。\n"
6493 "\n"
6391 "\n"
6494 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6392 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6495 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6393 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6496 " 文件列表。\n"
6394 " 文件列表。\n"
6497 "\n"
6395 "\n"
6498 " "
6396 " "
6499
6397
6500 #, fuzzy
6398 #, fuzzy
6501 msgid ""
6399 msgid ""
6502 " By default this command prints revision number and changeset id,\n"
6400 " By default this command prints revision number and changeset id,\n"
6503 " tags, non-trivial parents, user, date and time, and a summary for\n"
6401 " tags, non-trivial parents, user, date and time, and a summary for\n"
6504 " each commit. When the -v/--verbose switch is used, the list of\n"
6402 " each commit. When the -v/--verbose switch is used, the list of\n"
6505 " changed files and full commit message are shown."
6403 " changed files and full commit message are shown."
6506 msgstr ""
6404 msgstr ""
6507 "显示全部版本库或指定文件的版本历史\n"
6405 "显示全部版本库或指定文件的版本历史\n"
6508 "\n"
6406 "\n"
6509 " 显示全部版本库或指定文件的版本历史。\n"
6407 " 显示全部版本库或指定文件的版本历史。\n"
6510 "\n"
6408 "\n"
6511 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6409 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6512 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6410 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6513 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6411 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6514 " 个父亲。\n"
6412 " 个父亲。\n"
6515 "\n"
6413 "\n"
6516 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6414 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6517 " 工作目录的父亲作为开始版本。\n"
6415 " 工作目录的父亲作为开始版本。\n"
6518 "\n"
6416 "\n"
6519 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6417 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6520 "\n"
6418 "\n"
6521 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6419 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6522 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6420 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6523 " 变更列表和完整的提交信息。\n"
6421 " 变更列表和完整的提交信息。\n"
6524 "\n"
6422 "\n"
6525 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6423 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6526 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6424 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6527 " 文件列表。\n"
6425 " 文件列表。\n"
6528 "\n"
6426 "\n"
6529 " "
6427 " "
6530
6428
6531 #, fuzzy
6429 #, fuzzy
6532 msgid ""
6430 msgid ""
6533 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6431 " NOTE: log -p/--patch may generate unexpected diff output for merge\n"
6534 " changesets, as it will only compare the merge changeset against\n"
6432 " changesets, as it will only compare the merge changeset against\n"
6535 " its first parent. Also, only files different from BOTH parents\n"
6433 " its first parent. Also, only files different from BOTH parents\n"
6536 " will appear in files:.\n"
6434 " will appear in files:.\n"
6537 " "
6435 " "
6538 msgstr ""
6436 msgstr ""
6539 "显示全部版本库或指定文件的版本历史\n"
6437 "显示全部版本库或指定文件的版本历史\n"
6540 "\n"
6438 "\n"
6541 " 显示全部版本库或指定文件的版本历史。\n"
6439 " 显示全部版本库或指定文件的版本历史。\n"
6542 "\n"
6440 "\n"
6543 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6441 " 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n"
6544 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6442 " 会跟踪改名或复制的历史。当不给出文件名称时,使用 '--follow' 只显\n"
6545 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6443 " 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n"
6546 " 个父亲。\n"
6444 " 个父亲。\n"
6547 "\n"
6445 "\n"
6548 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6446 " 如果没有指定版本范围,默认是 'tip:0'。当使用 '--follow' 时,使用\n"
6549 " 工作目录的父亲作为开始版本。\n"
6447 " 工作目录的父亲作为开始版本。\n"
6550 "\n"
6448 "\n"
6551 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6449 " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
6552 "\n"
6450 "\n"
6553 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6451 " 此命令缺省输出: 修改集标识和哈希,标签,父亲,提交者,日期和时间,\n"
6554 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6452 " 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时,会显示文件\n"
6555 " 变更列表和完整的提交信息。\n"
6453 " 变更列表和完整的提交信息。\n"
6556 "\n"
6454 "\n"
6557 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6455 " 注意: 对于合并修改集,'log -p' 可能产生不期望的差异输出,因为它只\n"
6558 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6456 " 会将合并修改集与其第一个父亲比较。而且,只显示对所有父亲都不同的\n"
6559 " 文件列表。\n"
6457 " 文件列表。\n"
6560 "\n"
6458 "\n"
6561 " "
6459 " "
6562
6460
6563 msgid "output the current or given revision of the project manifest"
6461 msgid "output the current or given revision of the project manifest"
6564 msgstr ""
6462 msgstr ""
6565
6463
6566 msgid ""
6464 msgid ""
6567 " Print a list of version controlled files for the given revision.\n"
6465 " Print a list of version controlled files for the given revision.\n"
6568 " If no revision is given, the first parent of the working directory\n"
6466 " If no revision is given, the first parent of the working directory\n"
6569 " is used, or the null revision if no revision is checked out."
6467 " is used, or the null revision if no revision is checked out."
6570 msgstr ""
6468 msgstr ""
6571
6469
6572 msgid ""
6470 msgid ""
6573 " With -v, print file permissions, symlink and executable bits.\n"
6471 " With -v, print file permissions, symlink and executable bits.\n"
6574 " With --debug, print file revision hashes.\n"
6472 " With --debug, print file revision hashes.\n"
6575 " "
6473 " "
6576 msgstr ""
6474 msgstr ""
6577
6475
6578 #, fuzzy
6476 #, fuzzy
6579 msgid "merge working directory with another revision"
6477 msgid "merge working directory with another revision"
6580 msgstr ""
6478 msgstr ""
6581 "将工作目录与其它版本合并\n"
6479 "将工作目录与其它版本合并\n"
6582 "\n"
6480 "\n"
6583 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6481 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6584 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6482 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6585 "\n"
6483 "\n"
6586 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6484 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6587 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6485 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6588 " "
6486 " "
6589
6487
6590 #, fuzzy
6488 #, fuzzy
6591 msgid ""
6489 msgid ""
6592 " The current working directory is updated with all changes made in\n"
6490 " The current working directory is updated with all changes made in\n"
6593 " the requested revision since the last common predecessor revision."
6491 " the requested revision since the last common predecessor revision."
6594 msgstr ""
6492 msgstr ""
6595 "将工作目录与其它版本合并\n"
6493 "将工作目录与其它版本合并\n"
6596 "\n"
6494 "\n"
6597 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6495 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6598 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6496 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6599 "\n"
6497 "\n"
6600 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6498 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6601 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6499 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6602 " "
6500 " "
6603
6501
6604 #, fuzzy
6502 #, fuzzy
6605 msgid ""
6503 msgid ""
6606 " Files that changed between either parent are marked as changed for\n"
6504 " Files that changed between either parent are marked as changed for\n"
6607 " the next commit and a commit must be performed before any further\n"
6505 " the next commit and a commit must be performed before any further\n"
6608 " updates to the repository are allowed. The next commit will have\n"
6506 " updates to the repository are allowed. The next commit will have\n"
6609 " two parents."
6507 " two parents."
6610 msgstr ""
6508 msgstr ""
6611 "将工作目录与其它版本合并\n"
6509 "将工作目录与其它版本合并\n"
6612 "\n"
6510 "\n"
6613 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6511 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6614 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6512 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6615 "\n"
6513 "\n"
6616 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6514 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6617 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6515 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6618 " "
6516 " "
6619
6517
6620 #, fuzzy
6518 #, fuzzy
6621 msgid ""
6519 msgid ""
6622 " If no revision is specified, the working directory's parent is a\n"
6520 " If no revision is specified, the working directory's parent is a\n"
6623 " head revision, and the current branch contains exactly one other\n"
6521 " head revision, and the current branch contains exactly one other\n"
6624 " head, the other head is merged with by default. Otherwise, an\n"
6522 " head, the other head is merged with by default. Otherwise, an\n"
6625 " explicit revision with which to merge with must be provided.\n"
6523 " explicit revision with which to merge with must be provided.\n"
6626 " "
6524 " "
6627 msgstr ""
6525 msgstr ""
6628 "将工作目录与其它版本合并\n"
6526 "将工作目录与其它版本合并\n"
6629 "\n"
6527 "\n"
6630 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6528 " 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n"
6631 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6529 " 下次提交标记为已修改,在提交之前不允许再执行更新。\n"
6632 "\n"
6530 "\n"
6633 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6531 " 如果没有指定版本,那么工作目录的父亲是一个合并顶点,另一个在当前分支\n"
6634 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6532 " 中,合并后的内容是新的顶点。否则,必须明确的指定要合并的版本。\n"
6635 " "
6533 " "
6636
6534
6637 #, python-format
6535 #, python-format
6638 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6536 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6639 msgstr ""
6537 msgstr ""
6640
6538
6641 #, python-format
6539 #, python-format
6642 msgid "branch '%s' has one head - please merge with an explicit rev"
6540 msgid "branch '%s' has one head - please merge with an explicit rev"
6643 msgstr ""
6541 msgstr ""
6644
6542
6645 msgid "there is nothing to merge"
6543 msgid "there is nothing to merge"
6646 msgstr ""
6544 msgstr ""
6647
6545
6648 #, python-format
6546 #, python-format
6649 msgid "%s - use \"hg update\" instead"
6547 msgid "%s - use \"hg update\" instead"
6650 msgstr ""
6548 msgstr ""
6651
6549
6652 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
6550 msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
6653 msgstr ""
6551 msgstr ""
6654
6552
6655 msgid "show changesets not found in destination"
6553 msgid "show changesets not found in destination"
6656 msgstr ""
6554 msgstr ""
6657
6555
6658 msgid ""
6556 msgid ""
6659 " Show changesets not found in the specified destination repository\n"
6557 " Show changesets not found in the specified destination repository\n"
6660 " or the default push location. These are the changesets that would\n"
6558 " or the default push location. These are the changesets that would\n"
6661 " be pushed if a push was requested."
6559 " be pushed if a push was requested."
6662 msgstr ""
6560 msgstr ""
6663
6561
6664 msgid ""
6562 msgid ""
6665 " See pull for valid destination format details.\n"
6563 " See pull for valid destination format details.\n"
6666 " "
6564 " "
6667 msgstr ""
6565 msgstr ""
6668
6566
6669 #, fuzzy
6567 #, fuzzy
6670 msgid "show the parents of the working directory or revision"
6568 msgid "show the parents of the working directory or revision"
6671 msgstr "显示工作目录或指定版本的父亲"
6569 msgstr "显示工作目录或指定版本的父亲"
6672
6570
6673 #, fuzzy
6571 #, fuzzy
6674 msgid ""
6572 msgid ""
6675 " Print the working directory's parent revisions. If a revision is\n"
6573 " Print the working directory's parent revisions. If a revision is\n"
6676 " given via -r/--rev, the parent of that revision will be printed.\n"
6574 " given via -r/--rev, the parent of that revision will be printed.\n"
6677 " If a file argument is given, the revision in which the file was\n"
6575 " If a file argument is given, the revision in which the file was\n"
6678 " last changed (before the working directory revision or the\n"
6576 " last changed (before the working directory revision or the\n"
6679 " argument to --rev if given) is printed.\n"
6577 " argument to --rev if given) is printed.\n"
6680 " "
6578 " "
6681 msgstr ""
6579 msgstr ""
6682 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
6580 " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本,就显示此版本的\n"
6683 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
6581 " 父亲。如果指定了文件,那么使用此文件最后修改的版本(工作目录的起源\n"
6684 " 版本,或 '--rev' 指定的版本)。\n"
6582 " 版本,或 '--rev' 指定的版本)。\n"
6685 " "
6583 " "
6686
6584
6687 msgid "can only specify an explicit filename"
6585 msgid "can only specify an explicit filename"
6688 msgstr ""
6586 msgstr ""
6689
6587
6690 #, python-format
6588 #, python-format
6691 msgid "'%s' not found in manifest!"
6589 msgid "'%s' not found in manifest!"
6692 msgstr ""
6590 msgstr ""
6693
6591
6694 msgid "show aliases for remote repositories"
6592 msgid "show aliases for remote repositories"
6695 msgstr ""
6593 msgstr ""
6696
6594
6697 msgid ""
6595 msgid ""
6698 " Show definition of symbolic path name NAME. If no name is given,\n"
6596 " Show definition of symbolic path name NAME. If no name is given,\n"
6699 " show definition of all available names."
6597 " show definition of all available names."
6700 msgstr ""
6598 msgstr ""
6701
6599
6702 msgid ""
6600 msgid ""
6703 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6601 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6704 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
6602 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
6705 msgstr ""
6603 msgstr ""
6706
6604
6707 msgid ""
6605 msgid ""
6708 " See 'hg help urls' for more information.\n"
6606 " See 'hg help urls' for more information.\n"
6709 " "
6607 " "
6710 msgstr ""
6608 msgstr ""
6711
6609
6712 msgid "not found!\n"
6610 msgid "not found!\n"
6713 msgstr ""
6611 msgstr ""
6714
6612
6715 msgid "not updating, since new heads added\n"
6613 msgid "not updating, since new heads added\n"
6716 msgstr ""
6614 msgstr ""
6717
6615
6718 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6616 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6719 msgstr ""
6617 msgstr ""
6720
6618
6721 msgid "(run 'hg update' to get a working copy)\n"
6619 msgid "(run 'hg update' to get a working copy)\n"
6722 msgstr ""
6620 msgstr ""
6723
6621
6724 #, fuzzy
6622 #, fuzzy
6725 msgid "pull changes from the specified source"
6623 msgid "pull changes from the specified source"
6726 msgstr ""
6624 msgstr ""
6727 "从指定版本库取得修改集\n"
6625 "从指定版本库取得修改集\n"
6728 "\n"
6626 "\n"
6729 " 从远程版本库取得修改集到本地版本库。\n"
6627 " 从远程版本库取得修改集到本地版本库。\n"
6730 "\n"
6628 "\n"
6731 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6629 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6732 " 更新工作目录。\n"
6630 " 更新工作目录。\n"
6733 "\n"
6631 "\n"
6734 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6632 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6735 " 更多信息。\n"
6633 " 更多信息。\n"
6736 " "
6634 " "
6737
6635
6738 #, fuzzy
6636 #, fuzzy
6739 msgid " Pull changes from a remote repository to a local one."
6637 msgid " Pull changes from a remote repository to a local one."
6740 msgstr ""
6638 msgstr ""
6741 "从指定版本库取得修改集\n"
6639 "从指定版本库取得修改集\n"
6742 "\n"
6640 "\n"
6743 " 从远程版本库取得修改集到本地版本库。\n"
6641 " 从远程版本库取得修改集到本地版本库。\n"
6744 "\n"
6642 "\n"
6745 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6643 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6746 " 更新工作目录。\n"
6644 " 更新工作目录。\n"
6747 "\n"
6645 "\n"
6748 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6646 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6749 " 更多信息。\n"
6647 " 更多信息。\n"
6750 " "
6648 " "
6751
6649
6752 #, fuzzy
6650 #, fuzzy
6753 msgid ""
6651 msgid ""
6754 " This finds all changes from the repository at the specified path\n"
6652 " This finds all changes from the repository at the specified path\n"
6755 " or URL and adds them to a local repository (the current one unless\n"
6653 " or URL and adds them to a local repository (the current one unless\n"
6756 " -R is specified). By default, this does not update the copy of the\n"
6654 " -R is specified). By default, this does not update the copy of the\n"
6757 " project in the working directory."
6655 " project in the working directory."
6758 msgstr ""
6656 msgstr ""
6759 "从指定版本库取得修改集\n"
6657 "从指定版本库取得修改集\n"
6760 "\n"
6658 "\n"
6761 " 从远程版本库取得修改集到本地版本库。\n"
6659 " 从远程版本库取得修改集到本地版本库。\n"
6762 "\n"
6660 "\n"
6763 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6661 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6764 " 更新工作目录。\n"
6662 " 更新工作目录。\n"
6765 "\n"
6663 "\n"
6766 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6664 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6767 " 更多信息。\n"
6665 " 更多信息。\n"
6768 " "
6666 " "
6769
6667
6770 #, fuzzy
6668 #, fuzzy
6771 msgid ""
6669 msgid ""
6772 " Use hg incoming if you want to see what would have been added by a\n"
6670 " Use hg incoming if you want to see what would have been added by a\n"
6773 " pull at the time you issued this command. If you then decide to\n"
6671 " pull at the time you issued this command. If you then decide to\n"
6774 " added those changes to the repository, you should use pull -r X\n"
6672 " added those changes to the repository, you should use pull -r X\n"
6775 " where X is the last changeset listed by hg incoming."
6673 " where X is the last changeset listed by hg incoming."
6776 msgstr ""
6674 msgstr ""
6777 "从指定版本库取得修改集\n"
6675 "从指定版本库取得修改集\n"
6778 "\n"
6676 "\n"
6779 " 从远程版本库取得修改集到本地版本库。\n"
6677 " 从远程版本库取得修改集到本地版本库。\n"
6780 "\n"
6678 "\n"
6781 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6679 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6782 " 更新工作目录。\n"
6680 " 更新工作目录。\n"
6783 "\n"
6681 "\n"
6784 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6682 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6785 " 更多信息。\n"
6683 " 更多信息。\n"
6786 " "
6684 " "
6787
6685
6788 #, fuzzy
6686 #, fuzzy
6789 msgid ""
6687 msgid ""
6790 " If SOURCE is omitted, the 'default' path will be used.\n"
6688 " If SOURCE is omitted, the 'default' path will be used.\n"
6791 " See 'hg help urls' for more information.\n"
6689 " See 'hg help urls' for more information.\n"
6792 " "
6690 " "
6793 msgstr ""
6691 msgstr ""
6794 "从指定版本库取得修改集\n"
6692 "从指定版本库取得修改集\n"
6795 "\n"
6693 "\n"
6796 " 从远程版本库取得修改集到本地版本库。\n"
6694 " 从远程版本库取得修改集到本地版本库。\n"
6797 "\n"
6695 "\n"
6798 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6696 " 查找位于指定路径或位置的版本库的全部修改,增加到版本版本库。默认不\n"
6799 " 更新工作目录。\n"
6697 " 更新工作目录。\n"
6800 "\n"
6698 "\n"
6801 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6699 " 如果没有指定位置,就使用路径 'default'。参见 'hg help urls' 以了解\n"
6802 " 更多信息。\n"
6700 " 更多信息。\n"
6803 " "
6701 " "
6804
6702
6805 #, fuzzy
6703 #, fuzzy
6806 msgid "push changes to the specified destination"
6704 msgid "push changes to the specified destination"
6807 msgstr "推送改变到指定位置"
6705 msgstr "推送改变到指定位置"
6808
6706
6809 #, fuzzy
6707 #, fuzzy
6810 msgid " Push changes from the local repository to the given destination."
6708 msgid " Push changes from the local repository to the given destination."
6811 msgstr " 从本地版本库推送改变到指定位置。"
6709 msgstr " 从本地版本库推送改变到指定位置。"
6812
6710
6813 #, fuzzy
6711 #, fuzzy
6814 msgid ""
6712 msgid ""
6815 " This is the symmetrical operation for pull. It moves changes from\n"
6713 " This is the symmetrical operation for pull. It moves changes from\n"
6816 " the current repository to a different one. If the destination is\n"
6714 " the current repository to a different one. If the destination is\n"
6817 " local this is identical to a pull in that directory from the\n"
6715 " local this is identical to a pull in that directory from the\n"
6818 " current one."
6716 " current one."
6819 msgstr ""
6717 msgstr ""
6820 " 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n"
6718 " 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n"
6821 " 是本地版本库,那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n"
6719 " 是本地版本库,那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n"
6822 " 同。"
6720 " 同。"
6823
6721
6824 #, fuzzy
6722 #, fuzzy
6825 msgid ""
6723 msgid ""
6826 " By default, push will refuse to run if it detects the result would\n"
6724 " By default, push will refuse to run if it detects the result would\n"
6827 " increase the number of remote heads. This generally indicates the\n"
6725 " increase the number of remote heads. This generally indicates the\n"
6828 " user forgot to pull and merge before pushing."
6726 " user forgot to pull and merge before pushing."
6829 msgstr ""
6727 msgstr ""
6830 " 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
6728 " 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
6831 " 之前忘记取得远程版本库的修改,并且合并。"
6729 " 之前忘记取得远程版本库的修改,并且合并。"
6832
6730
6833 #, fuzzy
6731 #, fuzzy
6834 msgid ""
6732 msgid ""
6835 " If -r/--rev is used, the named revision and all its ancestors will\n"
6733 " If -r/--rev is used, the named revision and all its ancestors will\n"
6836 " be pushed to the remote repository."
6734 " be pushed to the remote repository."
6837 msgstr ""
6735 msgstr ""
6838 " 如果使用了选项 '-r',此命名修改集以及其祖先都会被推送到远程版本库。\n"
6736 " 如果使用了选项 '-r',此命名修改集以及其祖先都会被推送到远程版本库。\n"
6839 " "
6737 " "
6840
6738
6841 #, fuzzy
6739 #, fuzzy
6842 msgid ""
6740 msgid ""
6843 " Please see 'hg help urls' for important details about ssh://\n"
6741 " Please see 'hg help urls' for important details about ssh://\n"
6844 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6742 " URLs. If DESTINATION is omitted, a default path will be used.\n"
6845 " "
6743 " "
6846 msgstr ""
6744 msgstr ""
6847 " 参见主题 'urls' 的帮助信息,以了解位置 'ssh://' 的重要详情。如果没有\n"
6745 " 参见主题 'urls' 的帮助信息,以了解位置 'ssh://' 的重要详情。如果没有\n"
6848 " 给出目标位置,那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n"
6746 " 给出目标位置,那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n"
6849 " "
6747 " "
6850
6748
6851 #, python-format
6749 #, python-format
6852 msgid "pushing to %s\n"
6750 msgid "pushing to %s\n"
6853 msgstr "正在推到 %s\n"
6751 msgstr "正在推到 %s\n"
6854
6752
6855 msgid "roll back an interrupted transaction"
6753 msgid "roll back an interrupted transaction"
6856 msgstr ""
6754 msgstr ""
6857
6755
6858 msgid " Recover from an interrupted commit or pull."
6756 msgid " Recover from an interrupted commit or pull."
6859 msgstr ""
6757 msgstr ""
6860
6758
6861 msgid ""
6759 msgid ""
6862 " This command tries to fix the repository status after an\n"
6760 " This command tries to fix the repository status after an\n"
6863 " interrupted operation. It should only be necessary when Mercurial\n"
6761 " interrupted operation. It should only be necessary when Mercurial\n"
6864 " suggests it.\n"
6762 " suggests it.\n"
6865 " "
6763 " "
6866 msgstr ""
6764 msgstr ""
6867
6765
6868 #, fuzzy
6766 #, fuzzy
6869 msgid "remove the specified files on the next commit"
6767 msgid "remove the specified files on the next commit"
6870 msgstr "在下次提交时删除指定文件"
6768 msgstr "在下次提交时删除指定文件"
6871
6769
6872 #, fuzzy
6770 #, fuzzy
6873 msgid " Schedule the indicated files for removal from the repository."
6771 msgid " Schedule the indicated files for removal from the repository."
6874 msgstr " 调度从版本库删除指定文件。"
6772 msgstr " 调度从版本库删除指定文件。"
6875
6773
6876 #, fuzzy
6774 #, fuzzy
6877 msgid ""
6775 msgid ""
6878 " This only removes files from the current branch, not from the\n"
6776 " This only removes files from the current branch, not from the\n"
6879 " entire project history. -A/--after can be used to remove only\n"
6777 " entire project history. -A/--after can be used to remove only\n"
6880 " files that have already been deleted, -f/--force can be used to\n"
6778 " files that have already been deleted, -f/--force can be used to\n"
6881 " force deletion, and -Af can be used to remove files from the next\n"
6779 " force deletion, and -Af can be used to remove files from the next\n"
6882 " revision without deleting them from the working directory."
6780 " revision without deleting them from the working directory."
6883 msgstr ""
6781 msgstr ""
6884 " 它只从当前分支删除文件,不删除历史。'-A' 用于只移除已经删除的文\n"
6782 " 它只从当前分支删除文件,不删除历史。'-A' 用于只移除已经删除的文\n"
6885 " 件,'-f' 用于强制删除,'-Af' 用于从下个版本移除文件,但是不删除\n"
6783 " 件,'-f' 用于强制删除,'-Af' 用于从下个版本移除文件,但是不删除\n"
6886 " 它们。"
6784 " 它们。"
6887
6785
6888 #, fuzzy
6786 #, fuzzy
6889 msgid ""
6787 msgid ""
6890 " The following table details the behavior of remove for different\n"
6788 " The following table details the behavior of remove for different\n"
6891 " file states (columns) and option combinations (rows). The file\n"
6789 " file states (columns) and option combinations (rows). The file\n"
6892 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6790 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
6893 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6791 " reported by hg status). The actions are Warn, Remove (from branch)\n"
6894 " and Delete (from disk)::"
6792 " and Delete (from disk)::"
6895 msgstr ""
6793 msgstr ""
6896 " 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n"
6794 " 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n"
6897 " ('hg status' 报告的状态)是增加(A),干净(C),已修改(M),丢失(!)。\n"
6795 " ('hg status' 报告的状态)是增加(A),干净(C),已修改(M),丢失(!)。\n"
6898 " 动作是警告(W),移除(R,从分支),以及删除(D,从磁盘)。::"
6796 " 动作是警告(W),移除(R,从分支),以及删除(D,从磁盘)。::"
6899
6797
6900 #, fuzzy
6798 #, fuzzy
6901 msgid ""
6799 msgid ""
6902 " A C M !\n"
6800 " A C M !\n"
6903 " none W RD W R\n"
6801 " none W RD W R\n"
6904 " -f R RD RD R\n"
6802 " -f R RD RD R\n"
6905 " -A W W W R\n"
6803 " -A W W W R\n"
6906 " -Af R R R R"
6804 " -Af R R R R"
6907 msgstr ""
6805 msgstr ""
6908 " A C M !\n"
6806 " A C M !\n"
6909 " none W RD W R\n"
6807 " none W RD W R\n"
6910 " -f R RD RD R\n"
6808 " -f R RD RD R\n"
6911 " -A W W W R\n"
6809 " -A W W W R\n"
6912 " -Af R R R R"
6810 " -Af R R R R"
6913
6811
6914 #, fuzzy
6812 #, fuzzy
6915 msgid ""
6813 msgid ""
6916 " This command schedules the files to be removed at the next commit.\n"
6814 " This command schedules the files to be removed at the next commit.\n"
6917 " To undo a remove before that, see hg revert.\n"
6815 " To undo a remove before that, see hg revert.\n"
6918 " "
6816 " "
6919 msgstr ""
6817 msgstr ""
6920 " 此命令调度下次提交时删除文件。\n"
6818 " 此命令调度下次提交时删除文件。\n"
6921 " 要在此之前撤销删除,请参见 'hg revert'。\n"
6819 " 要在此之前撤销删除,请参见 'hg revert'。\n"
6922 " "
6820 " "
6923
6821
6924 #, python-format
6822 #, python-format
6925 msgid "not removing %s: file is untracked\n"
6823 msgid "not removing %s: file is untracked\n"
6926 msgstr ""
6824 msgstr ""
6927
6825
6928 #, python-format
6826 #, python-format
6929 msgid "not removing %s: file %s (use -f to force removal)\n"
6827 msgid "not removing %s: file %s (use -f to force removal)\n"
6930 msgstr ""
6828 msgstr ""
6931
6829
6932 msgid "still exists"
6830 msgid "still exists"
6933 msgstr ""
6831 msgstr ""
6934
6832
6935 msgid "is modified"
6833 msgid "is modified"
6936 msgstr ""
6834 msgstr ""
6937
6835
6938 msgid "has been marked for add"
6836 msgid "has been marked for add"
6939 msgstr ""
6837 msgstr ""
6940
6838
6941 msgid "rename files; equivalent of copy + remove"
6839 msgid "rename files; equivalent of copy + remove"
6942 msgstr ""
6840 msgstr ""
6943
6841
6944 msgid ""
6842 msgid ""
6945 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6843 " Mark dest as copies of sources; mark sources for deletion. If dest\n"
6946 " is a directory, copies are put in that directory. If dest is a\n"
6844 " is a directory, copies are put in that directory. If dest is a\n"
6947 " file, there can only be one source."
6845 " file, there can only be one source."
6948 msgstr ""
6846 msgstr ""
6949
6847
6950 msgid ""
6848 msgid ""
6951 " This command takes effect at the next commit. To undo a rename\n"
6849 " This command takes effect at the next commit. To undo a rename\n"
6952 " before that, see hg revert.\n"
6850 " before that, see hg revert.\n"
6953 " "
6851 " "
6954 msgstr ""
6852 msgstr ""
6955
6853
6956 msgid "retry file merges from a merge or update"
6854 msgid "retry file merges from a merge or update"
6957 msgstr ""
6855 msgstr ""
6958
6856
6959 msgid ""
6857 msgid ""
6960 " This command will cleanly retry unresolved file merges using file\n"
6858 " This command will cleanly retry unresolved file merges using file\n"
6961 " revisions preserved from the last update or merge. To attempt to\n"
6859 " revisions preserved from the last update or merge. To attempt to\n"
6962 " resolve all unresolved files, use the -a/--all switch."
6860 " resolve all unresolved files, use the -a/--all switch."
6963 msgstr ""
6861 msgstr ""
6964
6862
6965 msgid ""
6863 msgid ""
6966 " If a conflict is resolved manually, please note that the changes\n"
6864 " If a conflict is resolved manually, please note that the changes\n"
6967 " will be overwritten if the merge is retried with resolve. The\n"
6865 " will be overwritten if the merge is retried with resolve. The\n"
6968 " -m/--mark switch should be used to mark the file as resolved."
6866 " -m/--mark switch should be used to mark the file as resolved."
6969 msgstr ""
6867 msgstr ""
6970
6868
6971 msgid ""
6869 msgid ""
6972 " This command also allows listing resolved files and manually\n"
6870 " This command also allows listing resolved files and manually\n"
6973 " indicating whether or not files are resolved. All files must be\n"
6871 " indicating whether or not files are resolved. All files must be\n"
6974 " marked as resolved before a commit is permitted."
6872 " marked as resolved before a commit is permitted."
6975 msgstr ""
6873 msgstr ""
6976
6874
6977 msgid " The codes used to show the status of files are::"
6875 msgid " The codes used to show the status of files are::"
6978 msgstr ""
6876 msgstr ""
6979
6877
6980 msgid ""
6878 msgid ""
6981 " U = unresolved\n"
6879 " U = unresolved\n"
6982 " R = resolved\n"
6880 " R = resolved\n"
6983 " "
6881 " "
6984 msgstr ""
6882 msgstr ""
6985
6883
6986 msgid "too many options specified"
6884 msgid "too many options specified"
6987 msgstr ""
6885 msgstr ""
6988
6886
6989 msgid "can't specify --all and patterns"
6887 msgid "can't specify --all and patterns"
6990 msgstr ""
6888 msgstr ""
6991
6889
6992 msgid "no files or directories specified; use --all to remerge all files"
6890 msgid "no files or directories specified; use --all to remerge all files"
6993 msgstr ""
6891 msgstr ""
6994
6892
6995 msgid "restore individual files or directories to an earlier state"
6893 msgid "restore individual files or directories to an earlier state"
6996 msgstr ""
6894 msgstr ""
6997
6895
6998 msgid ""
6896 msgid ""
6999 " (Use update -r to check out earlier revisions, revert does not\n"
6897 " (Use update -r to check out earlier revisions, revert does not\n"
7000 " change the working directory parents.)"
6898 " change the working directory parents.)"
7001 msgstr ""
6899 msgstr ""
7002
6900
7003 msgid ""
6901 msgid ""
7004 " With no revision specified, revert the named files or directories\n"
6902 " With no revision specified, revert the named files or directories\n"
7005 " to the contents they had in the parent of the working directory.\n"
6903 " to the contents they had in the parent of the working directory.\n"
7006 " This restores the contents of the affected files to an unmodified\n"
6904 " This restores the contents of the affected files to an unmodified\n"
7007 " state and unschedules adds, removes, copies, and renames. If the\n"
6905 " state and unschedules adds, removes, copies, and renames. If the\n"
7008 " working directory has two parents, you must explicitly specify the\n"
6906 " working directory has two parents, you must explicitly specify the\n"
7009 " revision to revert to."
6907 " revision to revert to."
7010 msgstr ""
6908 msgstr ""
7011
6909
7012 msgid ""
6910 msgid ""
7013 " Using the -r/--rev option, revert the given files or directories\n"
6911 " Using the -r/--rev option, revert the given files or directories\n"
7014 " to their contents as of a specific revision. This can be helpful\n"
6912 " to their contents as of a specific revision. This can be helpful\n"
7015 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
6913 " to \"roll back\" some or all of an earlier change. See 'hg help\n"
7016 " dates' for a list of formats valid for -d/--date."
6914 " dates' for a list of formats valid for -d/--date."
7017 msgstr ""
6915 msgstr ""
7018
6916
7019 msgid ""
6917 msgid ""
7020 " Revert modifies the working directory. It does not commit any\n"
6918 " Revert modifies the working directory. It does not commit any\n"
7021 " changes, or change the parent of the working directory. If you\n"
6919 " changes, or change the parent of the working directory. If you\n"
7022 " revert to a revision other than the parent of the working\n"
6920 " revert to a revision other than the parent of the working\n"
7023 " directory, the reverted files will thus appear modified\n"
6921 " directory, the reverted files will thus appear modified\n"
7024 " afterwards."
6922 " afterwards."
7025 msgstr ""
6923 msgstr ""
7026
6924
7027 msgid ""
6925 msgid ""
7028 " If a file has been deleted, it is restored. If the executable mode\n"
6926 " If a file has been deleted, it is restored. If the executable mode\n"
7029 " of a file was changed, it is reset."
6927 " of a file was changed, it is reset."
7030 msgstr ""
6928 msgstr ""
7031
6929
7032 msgid ""
6930 msgid ""
7033 " If names are given, all files matching the names are reverted.\n"
6931 " If names are given, all files matching the names are reverted.\n"
7034 " If no arguments are given, no files are reverted."
6932 " If no arguments are given, no files are reverted."
7035 msgstr ""
6933 msgstr ""
7036
6934
7037 msgid ""
6935 msgid ""
7038 " Modified files are saved with a .orig suffix before reverting.\n"
6936 " Modified files are saved with a .orig suffix before reverting.\n"
7039 " To disable these backups, use --no-backup.\n"
6937 " To disable these backups, use --no-backup.\n"
7040 " "
6938 " "
7041 msgstr ""
6939 msgstr ""
7042
6940
7043 msgid "you can't specify a revision and a date"
6941 msgid "you can't specify a revision and a date"
7044 msgstr ""
6942 msgstr ""
7045
6943
7046 msgid "no files or directories specified; use --all to revert the whole repo"
6944 msgid "no files or directories specified; use --all to revert the whole repo"
7047 msgstr ""
6945 msgstr ""
7048
6946
7049 #, python-format
6947 #, python-format
7050 msgid "forgetting %s\n"
6948 msgid "forgetting %s\n"
7051 msgstr ""
6949 msgstr ""
7052
6950
7053 #, python-format
6951 #, python-format
7054 msgid "reverting %s\n"
6952 msgid "reverting %s\n"
7055 msgstr "正在恢复 %s\n"
6953 msgstr "正在恢复 %s\n"
7056
6954
7057 #, python-format
6955 #, python-format
7058 msgid "undeleting %s\n"
6956 msgid "undeleting %s\n"
7059 msgstr "正在撤销删除 %s\n"
6957 msgstr "正在撤销删除 %s\n"
7060
6958
7061 #, python-format
6959 #, python-format
7062 msgid "saving current version of %s as %s\n"
6960 msgid "saving current version of %s as %s\n"
7063 msgstr "保存当前版本的 %s 为 %s\n"
6961 msgstr "保存当前版本的 %s 为 %s\n"
7064
6962
7065 #, python-format
6963 #, python-format
7066 msgid "file not managed: %s\n"
6964 msgid "file not managed: %s\n"
7067 msgstr "文件未被控制: %s\n"
6965 msgstr "文件未被控制: %s\n"
7068
6966
7069 #, python-format
6967 #, python-format
7070 msgid "no changes needed to %s\n"
6968 msgid "no changes needed to %s\n"
7071 msgstr "不需要改变 %s\n"
6969 msgstr "不需要改变 %s\n"
7072
6970
7073 msgid "roll back the last transaction"
6971 msgid "roll back the last transaction"
7074 msgstr ""
6972 msgstr ""
7075
6973
7076 msgid ""
6974 msgid ""
7077 " This command should be used with care. There is only one level of\n"
6975 " This command should be used with care. There is only one level of\n"
7078 " rollback, and there is no way to undo a rollback. It will also\n"
6976 " rollback, and there is no way to undo a rollback. It will also\n"
7079 " restore the dirstate at the time of the last transaction, losing\n"
6977 " restore the dirstate at the time of the last transaction, losing\n"
7080 " any dirstate changes since that time. This command does not alter\n"
6978 " any dirstate changes since that time. This command does not alter\n"
7081 " the working directory."
6979 " the working directory."
7082 msgstr ""
6980 msgstr ""
7083
6981
7084 msgid ""
6982 msgid ""
7085 " Transactions are used to encapsulate the effects of all commands\n"
6983 " Transactions are used to encapsulate the effects of all commands\n"
7086 " that create new changesets or propagate existing changesets into a\n"
6984 " that create new changesets or propagate existing changesets into a\n"
7087 " repository. For example, the following commands are transactional,\n"
6985 " repository. For example, the following commands are transactional,\n"
7088 " and their effects can be rolled back::"
6986 " and their effects can be rolled back::"
7089 msgstr ""
6987 msgstr ""
7090
6988
7091 msgid ""
6989 msgid ""
7092 " commit\n"
6990 " commit\n"
7093 " import\n"
6991 " import\n"
7094 " pull\n"
6992 " pull\n"
7095 " push (with this repository as destination)\n"
6993 " push (with this repository as destination)\n"
7096 " unbundle"
6994 " unbundle"
7097 msgstr ""
6995 msgstr ""
7098
6996
7099 msgid ""
6997 msgid ""
7100 " This command is not intended for use on public repositories. Once\n"
6998 " This command is not intended for use on public repositories. Once\n"
7101 " changes are visible for pull by other users, rolling a transaction\n"
6999 " changes are visible for pull by other users, rolling a transaction\n"
7102 " back locally is ineffective (someone else may already have pulled\n"
7000 " back locally is ineffective (someone else may already have pulled\n"
7103 " the changes). Furthermore, a race is possible with readers of the\n"
7001 " the changes). Furthermore, a race is possible with readers of the\n"
7104 " repository; for example an in-progress pull from the repository\n"
7002 " repository; for example an in-progress pull from the repository\n"
7105 " may fail if a rollback is performed.\n"
7003 " may fail if a rollback is performed.\n"
7106 " "
7004 " "
7107 msgstr ""
7005 msgstr ""
7108
7006
7109 msgid "print the root (top) of the current working directory"
7007 msgid "print the root (top) of the current working directory"
7110 msgstr ""
7008 msgstr ""
7111
7009
7112 msgid ""
7010 msgid ""
7113 " Print the root directory of the current repository.\n"
7011 " Print the root directory of the current repository.\n"
7114 " "
7012 " "
7115 msgstr ""
7013 msgstr ""
7116
7014
7117 #, fuzzy
7015 #, fuzzy
7118 msgid "export the repository via HTTP"
7016 msgid "export the repository via HTTP"
7119 msgstr "通过 HTTP 发布版本库"
7017 msgstr "通过 HTTP 发布版本库"
7120
7018
7121 #, fuzzy
7019 #, fuzzy
7122 msgid " Start a local HTTP repository browser and pull server."
7020 msgid " Start a local HTTP repository browser and pull server."
7123 msgstr " 启动本地 HTTP 版本库浏览器和发布服务器。"
7021 msgstr " 启动本地 HTTP 版本库浏览器和发布服务器。"
7124
7022
7125 #, fuzzy
7023 #, fuzzy
7126 msgid ""
7024 msgid ""
7127 " By default, the server logs accesses to stdout and errors to\n"
7025 " By default, the server logs accesses to stdout and errors to\n"
7128 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
7026 " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
7129 " files.\n"
7027 " files.\n"
7130 " "
7028 " "
7131 msgstr ""
7029 msgstr ""
7132 " 默认服务器访问日志输出到 stdout,错误日志输出到 stderr。\n"
7030 " 默认服务器访问日志输出到 stdout,错误日志输出到 stderr。\n"
7133 " 可以使用选项 \"-A\" 和 \"-E\",将这些日志输出到文件。\n"
7031 " 可以使用选项 \"-A\" 和 \"-E\",将这些日志输出到文件。\n"
7134 " "
7032 " "
7135
7033
7136 #, python-format
7034 #, python-format
7137 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
7035 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
7138 msgstr ""
7036 msgstr ""
7139
7037
7140 #, fuzzy
7038 #, fuzzy
7141 msgid "show changed files in the working directory"
7039 msgid "show changed files in the working directory"
7142 msgstr ""
7040 msgstr ""
7143 "显示工作目录中已改变的文件\n"
7041 "显示工作目录中已改变的文件\n"
7144 "\n"
7042 "\n"
7145 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7043 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7146 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7044 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7147 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7045 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7148 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7046 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7149 "\n"
7047 "\n"
7150 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7048 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7151 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7049 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7152 "\n"
7050 "\n"
7153 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7051 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7154 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7052 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7155 " 父亲的改变。\n"
7053 " 父亲的改变。\n"
7156 "\n"
7054 "\n"
7157 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7055 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7158 "\n"
7056 "\n"
7159 " 显示文件状态的代码是:\n"
7057 " 显示文件状态的代码是:\n"
7160 " M = 已修改\n"
7058 " M = 已修改\n"
7161 " A = 已增加\n"
7059 " A = 已增加\n"
7162 " R = 已移除\n"
7060 " R = 已移除\n"
7163 " C = 干净的\n"
7061 " C = 干净的\n"
7164 " ! = 已删除,仍旧被跟踪\n"
7062 " ! = 已删除,仍旧被跟踪\n"
7165 " ? = 未跟踪\n"
7063 " ? = 未跟踪\n"
7166 " I = 已忽略\n"
7064 " I = 已忽略\n"
7167 " = 早先增加的文件自此复制\n"
7065 " = 早先增加的文件自此复制\n"
7168 " "
7066 " "
7169
7067
7170 #, fuzzy
7068 #, fuzzy
7171 msgid ""
7069 msgid ""
7172 " Show status of files in the repository. If names are given, only\n"
7070 " Show status of files in the repository. If names are given, only\n"
7173 " files that match are shown. Files that are clean or ignored or\n"
7071 " files that match are shown. Files that are clean or ignored or\n"
7174 " the source of a copy/move operation, are not listed unless\n"
7072 " the source of a copy/move operation, are not listed unless\n"
7175 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
7073 " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
7176 " Unless options described with \"show only ...\" are given, the\n"
7074 " Unless options described with \"show only ...\" are given, the\n"
7177 " options -mardu are used."
7075 " options -mardu are used."
7178 msgstr ""
7076 msgstr ""
7179 "显示工作目录中已改变的文件\n"
7077 "显示工作目录中已改变的文件\n"
7180 "\n"
7078 "\n"
7181 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7079 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7182 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7080 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7183 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7081 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7184 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7082 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7185 "\n"
7083 "\n"
7186 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7084 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7187 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7085 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7188 "\n"
7086 "\n"
7189 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7087 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7190 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7088 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7191 " 父亲的改变。\n"
7089 " 父亲的改变。\n"
7192 "\n"
7090 "\n"
7193 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7091 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7194 "\n"
7092 "\n"
7195 " 显示文件状态的代码是:\n"
7093 " 显示文件状态的代码是:\n"
7196 " M = 已修改\n"
7094 " M = 已修改\n"
7197 " A = 已增加\n"
7095 " A = 已增加\n"
7198 " R = 已移除\n"
7096 " R = 已移除\n"
7199 " C = 干净的\n"
7097 " C = 干净的\n"
7200 " ! = 已删除,仍旧被跟踪\n"
7098 " ! = 已删除,仍旧被跟踪\n"
7201 " ? = 未跟踪\n"
7099 " ? = 未跟踪\n"
7202 " I = 已忽略\n"
7100 " I = 已忽略\n"
7203 " = 早先增加的文件自此复制\n"
7101 " = 早先增加的文件自此复制\n"
7204 " "
7102 " "
7205
7103
7206 #, fuzzy
7104 #, fuzzy
7207 msgid ""
7105 msgid ""
7208 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
7106 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
7209 " unless explicitly requested with -u/--unknown or -i/--ignored."
7107 " unless explicitly requested with -u/--unknown or -i/--ignored."
7210 msgstr ""
7108 msgstr ""
7211 "显示工作目录中已改变的文件\n"
7109 "显示工作目录中已改变的文件\n"
7212 "\n"
7110 "\n"
7213 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7111 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7214 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7112 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7215 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7113 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7216 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7114 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7217 "\n"
7115 "\n"
7218 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7116 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7219 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7117 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7220 "\n"
7118 "\n"
7221 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7119 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7222 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7120 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7223 " 父亲的改变。\n"
7121 " 父亲的改变。\n"
7224 "\n"
7122 "\n"
7225 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7123 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7226 "\n"
7124 "\n"
7227 " 显示文件状态的代码是:\n"
7125 " 显示文件状态的代码是:\n"
7228 " M = 已修改\n"
7126 " M = 已修改\n"
7229 " A = 已增加\n"
7127 " A = 已增加\n"
7230 " R = 已移除\n"
7128 " R = 已移除\n"
7231 " C = 干净的\n"
7129 " C = 干净的\n"
7232 " ! = 已删除,仍旧被跟踪\n"
7130 " ! = 已删除,仍旧被跟踪\n"
7233 " ? = 未跟踪\n"
7131 " ? = 未跟踪\n"
7234 " I = 已忽略\n"
7132 " I = 已忽略\n"
7235 " = 早先增加的文件自此复制\n"
7133 " = 早先增加的文件自此复制\n"
7236 " "
7134 " "
7237
7135
7238 #, fuzzy
7136 #, fuzzy
7239 msgid ""
7137 msgid ""
7240 " NOTE: status may appear to disagree with diff if permissions have\n"
7138 " NOTE: status may appear to disagree with diff if permissions have\n"
7241 " changed or a merge has occurred. The standard diff format does not\n"
7139 " changed or a merge has occurred. The standard diff format does not\n"
7242 " report permission changes and diff only reports changes relative\n"
7140 " report permission changes and diff only reports changes relative\n"
7243 " to one merge parent."
7141 " to one merge parent."
7244 msgstr ""
7142 msgstr ""
7245 "显示工作目录中已改变的文件\n"
7143 "显示工作目录中已改变的文件\n"
7246 "\n"
7144 "\n"
7247 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7145 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7248 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7146 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7249 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7147 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7250 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7148 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7251 "\n"
7149 "\n"
7252 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7150 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7253 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7151 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7254 "\n"
7152 "\n"
7255 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7153 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7256 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7154 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7257 " 父亲的改变。\n"
7155 " 父亲的改变。\n"
7258 "\n"
7156 "\n"
7259 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7157 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7260 "\n"
7158 "\n"
7261 " 显示文件状态的代码是:\n"
7159 " 显示文件状态的代码是:\n"
7262 " M = 已修改\n"
7160 " M = 已修改\n"
7263 " A = 已增加\n"
7161 " A = 已增加\n"
7264 " R = 已移除\n"
7162 " R = 已移除\n"
7265 " C = 干净的\n"
7163 " C = 干净的\n"
7266 " ! = 已删除,仍旧被跟踪\n"
7164 " ! = 已删除,仍旧被跟踪\n"
7267 " ? = 未跟踪\n"
7165 " ? = 未跟踪\n"
7268 " I = 已忽略\n"
7166 " I = 已忽略\n"
7269 " = 早先增加的文件自此复制\n"
7167 " = 早先增加的文件自此复制\n"
7270 " "
7168 " "
7271
7169
7272 #, fuzzy
7170 #, fuzzy
7273 msgid ""
7171 msgid ""
7274 " If one revision is given, it is used as the base revision.\n"
7172 " If one revision is given, it is used as the base revision.\n"
7275 " If two revisions are given, the differences between them are\n"
7173 " If two revisions are given, the differences between them are\n"
7276 " shown."
7174 " shown."
7277 msgstr ""
7175 msgstr ""
7278 "显示工作目录中已改变的文件\n"
7176 "显示工作目录中已改变的文件\n"
7279 "\n"
7177 "\n"
7280 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7178 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7281 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7179 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7282 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7180 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7283 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7181 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7284 "\n"
7182 "\n"
7285 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7183 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7286 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7184 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7287 "\n"
7185 "\n"
7288 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7186 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7289 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7187 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7290 " 父亲的改变。\n"
7188 " 父亲的改变。\n"
7291 "\n"
7189 "\n"
7292 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7190 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7293 "\n"
7191 "\n"
7294 " 显示文件状态的代码是:\n"
7192 " 显示文件状态的代码是:\n"
7295 " M = 已修改\n"
7193 " M = 已修改\n"
7296 " A = 已增加\n"
7194 " A = 已增加\n"
7297 " R = 已移除\n"
7195 " R = 已移除\n"
7298 " C = 干净的\n"
7196 " C = 干净的\n"
7299 " ! = 已删除,仍旧被跟踪\n"
7197 " ! = 已删除,仍旧被跟踪\n"
7300 " ? = 未跟踪\n"
7198 " ? = 未跟踪\n"
7301 " I = 已忽略\n"
7199 " I = 已忽略\n"
7302 " = 早先增加的文件自此复制\n"
7200 " = 早先增加的文件自此复制\n"
7303 " "
7201 " "
7304
7202
7305 #, fuzzy
7203 #, fuzzy
7306 msgid ""
7204 msgid ""
7307 " M = modified\n"
7205 " M = modified\n"
7308 " A = added\n"
7206 " A = added\n"
7309 " R = removed\n"
7207 " R = removed\n"
7310 " C = clean\n"
7208 " C = clean\n"
7311 " ! = missing (deleted by non-hg command, but still tracked)\n"
7209 " ! = missing (deleted by non-hg command, but still tracked)\n"
7312 " ? = not tracked\n"
7210 " ? = not tracked\n"
7313 " I = ignored\n"
7211 " I = ignored\n"
7314 " = origin of the previous file listed as A (added)\n"
7212 " = origin of the previous file listed as A (added)\n"
7315 " "
7213 " "
7316 msgstr ""
7214 msgstr ""
7317 "显示工作目录中已改变的文件\n"
7215 "显示工作目录中已改变的文件\n"
7318 "\n"
7216 "\n"
7319 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7217 " 显示版本库中的文件状态。如果指定文件名称,只显示匹配的文件。干净的\n"
7320 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7218 " 文件,被忽略的文件,复制/移动的源文件,不会被显示,除非使用了选项\n"
7321 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7219 " '-c' (干净的),'-i' (被忽略的),'-C' (复制源) 或者 '-A' (全部)。除\n"
7322 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7220 " 非使用了选项 \"只显示 ...\",否则就使用选项 '-mardu'。\n"
7323 "\n"
7221 "\n"
7324 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7222 " 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件,除非明确地使用选\n"
7325 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7223 " 项 '-u/--unknown' 或 ‘-i/-ignored’。\n"
7326 "\n"
7224 "\n"
7327 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7225 " 注意: 如果修改了权限或者执行了合并,'status' 与 'diff' 的显示可能\n"
7328 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7226 " 不一致。标准差异格式不报告权限的改变,'diff' 只报告相对于一个合并\n"
7329 " 父亲的改变。\n"
7227 " 父亲的改变。\n"
7330 "\n"
7228 "\n"
7331 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7229 " 如果给出 1 个版本,就用于基础版本。如果给出 2 个版本,就显示其差异。\n"
7332 "\n"
7230 "\n"
7333 " 显示文件状态的代码是:\n"
7231 " 显示文件状态的代码是:\n"
7334 " M = 已修改\n"
7232 " M = 已修改\n"
7335 " A = 已增加\n"
7233 " A = 已增加\n"
7336 " R = 已移除\n"
7234 " R = 已移除\n"
7337 " C = 干净的\n"
7235 " C = 干净的\n"
7338 " ! = 已删除,仍旧被跟踪\n"
7236 " ! = 已删除,仍旧被跟踪\n"
7339 " ? = 未跟踪\n"
7237 " ? = 未跟踪\n"
7340 " I = 已忽略\n"
7238 " I = 已忽略\n"
7341 " = 早先增加的文件自此复制\n"
7239 " = 早先增加的文件自此复制\n"
7342 " "
7240 " "
7343
7241
7344 msgid "add one or more tags for the current or given revision"
7242 msgid "add one or more tags for the current or given revision"
7345 msgstr ""
7243 msgstr ""
7346
7244
7347 msgid " Name a particular revision using <name>."
7245 msgid " Name a particular revision using <name>."
7348 msgstr ""
7246 msgstr ""
7349
7247
7350 msgid ""
7248 msgid ""
7351 " Tags are used to name particular revisions of the repository and are\n"
7249 " Tags are used to name particular revisions of the repository and are\n"
7352 " very useful to compare different revisions, to go back to significant\n"
7250 " very useful to compare different revisions, to go back to significant\n"
7353 " earlier versions or to mark branch points as releases, etc."
7251 " earlier versions or to mark branch points as releases, etc."
7354 msgstr ""
7252 msgstr ""
7355
7253
7356 msgid ""
7254 msgid ""
7357 " If no revision is given, the parent of the working directory is\n"
7255 " If no revision is given, the parent of the working directory is\n"
7358 " used, or tip if no revision is checked out."
7256 " used, or tip if no revision is checked out."
7359 msgstr ""
7257 msgstr ""
7360
7258
7361 msgid ""
7259 msgid ""
7362 " To facilitate version control, distribution, and merging of tags,\n"
7260 " To facilitate version control, distribution, and merging of tags,\n"
7363 " they are stored as a file named \".hgtags\" which is managed\n"
7261 " they are stored as a file named \".hgtags\" which is managed\n"
7364 " similarly to other project files and can be hand-edited if\n"
7262 " similarly to other project files and can be hand-edited if\n"
7365 " necessary. The file '.hg/localtags' is used for local tags (not\n"
7263 " necessary. The file '.hg/localtags' is used for local tags (not\n"
7366 " shared among repositories)."
7264 " shared among repositories)."
7367 msgstr ""
7265 msgstr ""
7368
7266
7369 msgid "tag names must be unique"
7267 msgid "tag names must be unique"
7370 msgstr ""
7268 msgstr ""
7371
7269
7372 #, python-format
7270 #, python-format
7373 msgid "the name '%s' is reserved"
7271 msgid "the name '%s' is reserved"
7374 msgstr ""
7272 msgstr ""
7375
7273
7376 msgid "--rev and --remove are incompatible"
7274 msgid "--rev and --remove are incompatible"
7377 msgstr ""
7275 msgstr ""
7378
7276
7379 #, python-format
7277 #, python-format
7380 msgid "tag '%s' does not exist"
7278 msgid "tag '%s' does not exist"
7381 msgstr ""
7279 msgstr ""
7382
7280
7383 #, fuzzy, python-format
7281 #, fuzzy, python-format
7384 msgid "tag '%s' is not a global tag"
7282 msgid "tag '%s' is not a global tag"
7385 msgstr "非本地版本库 '%s'"
7283 msgstr "非本地版本库 '%s'"
7386
7284
7387 #, fuzzy, python-format
7285 #, fuzzy, python-format
7388 msgid "tag '%s' is not a local tag"
7286 msgid "tag '%s' is not a local tag"
7389 msgstr "非本地版本库 '%s'"
7287 msgstr "非本地版本库 '%s'"
7390
7288
7391 #, python-format
7289 #, python-format
7392 msgid "tag '%s' already exists (use -f to force)"
7290 msgid "tag '%s' already exists (use -f to force)"
7393 msgstr ""
7291 msgstr ""
7394
7292
7395 msgid "list repository tags"
7293 msgid "list repository tags"
7396 msgstr ""
7294 msgstr ""
7397
7295
7398 msgid ""
7296 msgid ""
7399 " This lists both regular and local tags. When the -v/--verbose\n"
7297 " This lists both regular and local tags. When the -v/--verbose\n"
7400 " switch is used, a third column \"local\" is printed for local tags.\n"
7298 " switch is used, a third column \"local\" is printed for local tags.\n"
7401 " "
7299 " "
7402 msgstr ""
7300 msgstr ""
7403
7301
7404 msgid "show the tip revision"
7302 msgid "show the tip revision"
7405 msgstr ""
7303 msgstr ""
7406
7304
7407 msgid ""
7305 msgid ""
7408 " The tip revision (usually just called the tip) is the changeset\n"
7306 " The tip revision (usually just called the tip) is the changeset\n"
7409 " most recently added to the repository (and therefore the most\n"
7307 " most recently added to the repository (and therefore the most\n"
7410 " recently changed head)."
7308 " recently changed head)."
7411 msgstr ""
7309 msgstr ""
7412
7310
7413 msgid ""
7311 msgid ""
7414 " If you have just made a commit, that commit will be the tip. If\n"
7312 " If you have just made a commit, that commit will be the tip. If\n"
7415 " you have just pulled changes from another repository, the tip of\n"
7313 " you have just pulled changes from another repository, the tip of\n"
7416 " that repository becomes the current tip. The \"tip\" tag is special\n"
7314 " that repository becomes the current tip. The \"tip\" tag is special\n"
7417 " and cannot be renamed or assigned to a different changeset.\n"
7315 " and cannot be renamed or assigned to a different changeset.\n"
7418 " "
7316 " "
7419 msgstr ""
7317 msgstr ""
7420
7318
7421 msgid "apply one or more changegroup files"
7319 msgid "apply one or more changegroup files"
7422 msgstr ""
7320 msgstr ""
7423
7321
7424 msgid ""
7322 msgid ""
7425 " Apply one or more compressed changegroup files generated by the\n"
7323 " Apply one or more compressed changegroup files generated by the\n"
7426 " bundle command.\n"
7324 " bundle command.\n"
7427 " "
7325 " "
7428 msgstr ""
7326 msgstr ""
7429
7327
7430 #, fuzzy
7328 #, fuzzy
7431 msgid "update working directory"
7329 msgid "update working directory"
7432 msgstr "更新工作目录"
7330 msgstr "更新工作目录"
7433
7331
7434 #, fuzzy
7332 #, fuzzy
7435 msgid ""
7333 msgid ""
7436 " Update the repository's working directory to the specified\n"
7334 " Update the repository's working directory to the specified\n"
7437 " revision, or the tip of the current branch if none is specified.\n"
7335 " revision, or the tip of the current branch if none is specified.\n"
7438 " Use null as the revision to remove the working copy (like 'hg\n"
7336 " Use null as the revision to remove the working copy (like 'hg\n"
7439 " clone -U')."
7337 " clone -U')."
7440 msgstr ""
7338 msgstr ""
7441 " 更新工作目录到指定版本,或者到当前分支的顶点。使用 'null' 作为版本可以\n"
7339 " 更新工作目录到指定版本,或者到当前分支的顶点。使用 'null' 作为版本可以\n"
7442 " 删除工作副本(类似于 'hg clone -U')。"
7340 " 删除工作副本(类似于 'hg clone -U')。"
7443
7341
7444 #, fuzzy
7342 #, fuzzy
7445 msgid ""
7343 msgid ""
7446 " When the working directory contains no uncommitted changes, it\n"
7344 " When the working directory contains no uncommitted changes, it\n"
7447 " will be replaced by the state of the requested revision from the\n"
7345 " will be replaced by the state of the requested revision from the\n"
7448 " repository. When the requested revision is on a different branch,\n"
7346 " repository. When the requested revision is on a different branch,\n"
7449 " the working directory will additionally be switched to that\n"
7347 " the working directory will additionally be switched to that\n"
7450 " branch."
7348 " branch."
7451 msgstr ""
7349 msgstr ""
7452 " 当工作目录包含未提交的修改时,它会被版本库中指定版本的状态替换。当请求\n"
7350 " 当工作目录包含未提交的修改时,它会被版本库中指定版本的状态替换。当请求\n"
7453 " 的版本位于不同分支时,工作目录会被切换到此分支。"
7351 " 的版本位于不同分支时,工作目录会被切换到此分支。"
7454
7352
7455 #, fuzzy
7353 #, fuzzy
7456 msgid ""
7354 msgid ""
7457 " When there are uncommitted changes, use option -C/--clean to\n"
7355 " When there are uncommitted changes, use option -C/--clean to\n"
7458 " discard them, forcibly replacing the state of the working\n"
7356 " discard them, forcibly replacing the state of the working\n"
7459 " directory with the requested revision. Alternately, use -c/--check\n"
7357 " directory with the requested revision. Alternately, use -c/--check\n"
7460 " to abort."
7358 " to abort."
7461 msgstr ""
7359 msgstr ""
7462 " 可以使用选项 '-C' 来丢弃未提交的修改,强制使用请求的版本替换工作目录的\n"
7360 " 可以使用选项 '-C' 来丢弃未提交的修改,强制使用请求的版本替换工作目录的\n"
7463 " 状态。"
7361 " 状态。"
7464
7362
7465 #, fuzzy
7363 #, fuzzy
7466 msgid ""
7364 msgid ""
7467 " When there are uncommitted changes and option -C/--clean is not\n"
7365 " When there are uncommitted changes and option -C/--clean is not\n"
7468 " used, and the parent revision and requested revision are on the\n"
7366 " used, and the parent revision and requested revision are on the\n"
7469 " same branch, and one of them is an ancestor of the other, then the\n"
7367 " same branch, and one of them is an ancestor of the other, then the\n"
7470 " new working directory will contain the requested revision merged\n"
7368 " new working directory will contain the requested revision merged\n"
7471 " with the uncommitted changes. Otherwise, the update will fail with\n"
7369 " with the uncommitted changes. Otherwise, the update will fail with\n"
7472 " a suggestion to use 'merge' or 'update -C' instead."
7370 " a suggestion to use 'merge' or 'update -C' instead."
7473 msgstr ""
7371 msgstr ""
7474 " 当有未提交的修改,没有使用选项 '-C',父版本和请求版本位于不同分支,并且\n"
7372 " 当有未提交的修改,没有使用选项 '-C',父版本和请求版本位于不同分支,并且\n"
7475 " 其中一个是另一个的祖先时,那么新的工作目录包含请求版本与未提交的修改的\n"
7373 " 其中一个是另一个的祖先时,那么新的工作目录包含请求版本与未提交的修改的\n"
7476 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。"
7374 " 合并结果。否则,更新会失败,建议使用 'merge' 或 'update -C'。"
7477
7375
7478 #, fuzzy
7376 #, fuzzy
7479 msgid ""
7377 msgid ""
7480 " If you want to update just one file to an older revision, use\n"
7378 " If you want to update just one file to an older revision, use\n"
7481 " revert."
7379 " revert."
7482 msgstr " 如果你只想更新一个文件到旧版本,请使用 'revert'。"
7380 msgstr " 如果你只想更新一个文件到旧版本,请使用 'revert'。"
7483
7381
7484 msgid "cannot specify both -c/--check and -C/--clean"
7382 msgid "cannot specify both -c/--check and -C/--clean"
7485 msgstr ""
7383 msgstr ""
7486
7384
7487 #, fuzzy
7385 #, fuzzy
7488 msgid "uncommitted local changes"
7386 msgid "uncommitted local changes"
7489 msgstr "提交修改集 %d:%s\n"
7387 msgstr "提交修改集 %d:%s\n"
7490
7388
7491 msgid "verify the integrity of the repository"
7389 msgid "verify the integrity of the repository"
7492 msgstr ""
7390 msgstr ""
7493
7391
7494 msgid " Verify the integrity of the current repository."
7392 msgid " Verify the integrity of the current repository."
7495 msgstr ""
7393 msgstr ""
7496
7394
7497 msgid ""
7395 msgid ""
7498 " This will perform an extensive check of the repository's\n"
7396 " This will perform an extensive check of the repository's\n"
7499 " integrity, validating the hashes and checksums of each entry in\n"
7397 " integrity, validating the hashes and checksums of each entry in\n"
7500 " the changelog, manifest, and tracked files, as well as the\n"
7398 " the changelog, manifest, and tracked files, as well as the\n"
7501 " integrity of their crosslinks and indices.\n"
7399 " integrity of their crosslinks and indices.\n"
7502 " "
7400 " "
7503 msgstr ""
7401 msgstr ""
7504
7402
7505 msgid "output version and copyright information"
7403 msgid "output version and copyright information"
7506 msgstr "输出版本和版权信息"
7404 msgstr "输出版本和版权信息"
7507
7405
7508 #, python-format
7406 #, python-format
7509 msgid "Mercurial Distributed SCM (version %s)\n"
7407 msgid "Mercurial Distributed SCM (version %s)\n"
7510 msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n"
7408 msgstr "分布式软件配置管理工具 - 水银 (版本 %s)\n"
7511
7409
7512 msgid ""
7410 msgid ""
7513 "\n"
7411 "\n"
7514 "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
7412 "Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
7515 "This is free software; see the source for copying conditions. There is NO\n"
7413 "This is free software; see the source for copying conditions. There is NO\n"
7516 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7414 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7517 msgstr ""
7415 msgstr ""
7518 "\n"
7416 "\n"
7519 "版权所有 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 和其他人。\n"
7417 "版权所有 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 和其他人。\n"
7520 "这是自由软件,具体参见版权条款。这里没有任何担保,甚至没有适合\n"
7418 "这是自由软件,具体参见版权条款。这里没有任何担保,甚至没有适合\n"
7521 "特定目的的隐含的担保。\n"
7419 "特定目的的隐含的担保。\n"
7522
7420
7523 msgid "repository root directory or symbolic path name"
7421 msgid "repository root directory or symbolic path name"
7524 msgstr "版本库的根目录或符号路径名称"
7422 msgstr "版本库的根目录或符号路径名称"
7525
7423
7526 msgid "change working directory"
7424 msgid "change working directory"
7527 msgstr "改变工作目录"
7425 msgstr "改变工作目录"
7528
7426
7529 msgid "do not prompt, assume 'yes' for any required answers"
7427 msgid "do not prompt, assume 'yes' for any required answers"
7530 msgstr "不再询问,假定所有答案都是 'yes'"
7428 msgstr "不再询问,假定所有答案都是 'yes'"
7531
7429
7532 msgid "suppress output"
7430 msgid "suppress output"
7533 msgstr "抑制输出"
7431 msgstr "抑制输出"
7534
7432
7535 msgid "enable additional output"
7433 msgid "enable additional output"
7536 msgstr "启用额外的输出"
7434 msgstr "启用额外的输出"
7537
7435
7538 msgid "set/override config option"
7436 msgid "set/override config option"
7539 msgstr "设置/覆盖配置选项"
7437 msgstr "设置/覆盖配置选项"
7540
7438
7541 msgid "enable debugging output"
7439 msgid "enable debugging output"
7542 msgstr "启用调试输出"
7440 msgstr "启用调试输出"
7543
7441
7544 msgid "start debugger"
7442 msgid "start debugger"
7545 msgstr "启动调试器"
7443 msgstr "启动调试器"
7546
7444
7547 msgid "set the charset encoding"
7445 msgid "set the charset encoding"
7548 msgstr "设置字符集编码"
7446 msgstr "设置字符集编码"
7549
7447
7550 msgid "set the charset encoding mode"
7448 msgid "set the charset encoding mode"
7551 msgstr "设置字符集编码模式"
7449 msgstr "设置字符集编码模式"
7552
7450
7553 msgid "print traceback on exception"
7451 msgid "print traceback on exception"
7554 msgstr "显示异常的跟踪"
7452 msgstr "显示异常的跟踪"
7555
7453
7556 msgid "time how long the command takes"
7454 msgid "time how long the command takes"
7557 msgstr "为命令计时"
7455 msgstr "为命令计时"
7558
7456
7559 msgid "print command execution profile"
7457 msgid "print command execution profile"
7560 msgstr "显示命令执行的剖析"
7458 msgstr "显示命令执行的剖析"
7561
7459
7562 msgid "output version information and exit"
7460 msgid "output version information and exit"
7563 msgstr "显示版本信息后退出"
7461 msgstr "显示版本信息后退出"
7564
7462
7565 msgid "display help and exit"
7463 msgid "display help and exit"
7566 msgstr "显示帮助后退出"
7464 msgstr "显示帮助后退出"
7567
7465
7568 msgid "do not perform actions, just print output"
7466 msgid "do not perform actions, just print output"
7569 msgstr "不执行操作,只打印输出"
7467 msgstr "不执行操作,只打印输出"
7570
7468
7571 msgid "specify ssh command to use"
7469 msgid "specify ssh command to use"
7572 msgstr "指定要使用的 'ssh' 命令"
7470 msgstr "指定要使用的 'ssh' 命令"
7573
7471
7574 msgid "specify hg command to run on the remote side"
7472 msgid "specify hg command to run on the remote side"
7575 msgstr "指定要在远程运行的 'hg' 命令"
7473 msgstr "指定要在远程运行的 'hg' 命令"
7576
7474
7577 msgid "include names matching the given patterns"
7475 msgid "include names matching the given patterns"
7578 msgstr "包含匹配指定模式的名称"
7476 msgstr "包含匹配指定模式的名称"
7579
7477
7580 msgid "exclude names matching the given patterns"
7478 msgid "exclude names matching the given patterns"
7581 msgstr "拒绝匹配指定模式的名称"
7479 msgstr "拒绝匹配指定模式的名称"
7582
7480
7583 msgid "use <text> as commit message"
7481 msgid "use <text> as commit message"
7584 msgstr "使用 <text> 作为提交日志"
7482 msgstr "使用 <text> 作为提交日志"
7585
7483
7586 msgid "read commit message from <file>"
7484 msgid "read commit message from <file>"
7587 msgstr "从 <file> 读取提交日志"
7485 msgstr "从 <file> 读取提交日志"
7588
7486
7589 msgid "record datecode as commit date"
7487 msgid "record datecode as commit date"
7590 msgstr "将提供的日期作为提交日期"
7488 msgstr "将提供的日期作为提交日期"
7591
7489
7592 #, fuzzy
7490 #, fuzzy
7593 msgid "record the specified user as committer"
7491 msgid "record the specified user as committer"
7594 msgstr "将提供的用户作为提交者"
7492 msgstr "将提供的用户作为提交者"
7595
7493
7596 msgid "display using template map file"
7494 msgid "display using template map file"
7597 msgstr "使用指定的样式显示"
7495 msgstr "使用指定的样式显示"
7598
7496
7599 msgid "display with template"
7497 msgid "display with template"
7600 msgstr "使用指定的模板显示"
7498 msgstr "使用指定的模板显示"
7601
7499
7602 msgid "do not show merges"
7500 msgid "do not show merges"
7603 msgstr "不显示合并"
7501 msgstr "不显示合并"
7604
7502
7605 msgid "treat all files as text"
7503 msgid "treat all files as text"
7606 msgstr "将所有文件视为文本文件"
7504 msgstr "将所有文件视为文本文件"
7607
7505
7608 msgid "don't include dates in diff headers"
7506 msgid "don't include dates in diff headers"
7609 msgstr "不要的差异头中包含日期"
7507 msgstr "不要的差异头中包含日期"
7610
7508
7611 msgid "show which function each change is in"
7509 msgid "show which function each change is in"
7612 msgstr "为每个修改显示在什么函数中"
7510 msgstr "为每个修改显示在什么函数中"
7613
7511
7614 msgid "ignore white space when comparing lines"
7512 msgid "ignore white space when comparing lines"
7615 msgstr "当比较行时忽略空白"
7513 msgstr "当比较行时忽略空白"
7616
7514
7617 msgid "ignore changes in the amount of white space"
7515 msgid "ignore changes in the amount of white space"
7618 msgstr "忽略空白数量的改变"
7516 msgstr "忽略空白数量的改变"
7619
7517
7620 msgid "ignore changes whose lines are all blank"
7518 msgid "ignore changes whose lines are all blank"
7621 msgstr "忽略空行的改变"
7519 msgstr "忽略空行的改变"
7622
7520
7623 msgid "number of lines of context to show"
7521 msgid "number of lines of context to show"
7624 msgstr "显示几行上下文"
7522 msgstr "显示几行上下文"
7625
7523
7626 msgid "guess renamed files by similarity (0<=s<=100)"
7524 msgid "guess renamed files by similarity (0<=s<=100)"
7627 msgstr ""
7525 msgstr ""
7628
7526
7629 msgid "[OPTION]... [FILE]..."
7527 msgid "[OPTION]... [FILE]..."
7630 msgstr ""
7528 msgstr ""
7631
7529
7632 msgid "annotate the specified revision"
7530 msgid "annotate the specified revision"
7633 msgstr "追溯指定版本"
7531 msgstr "追溯指定版本"
7634
7532
7635 msgid "follow file copies and renames"
7533 msgid "follow file copies and renames"
7636 msgstr "处理文件复制与改名"
7534 msgstr "处理文件复制与改名"
7637
7535
7638 msgid "list the author (long with -v)"
7536 msgid "list the author (long with -v)"
7639 msgstr "列出作者 (增加 '-v' 会以长格式显示)"
7537 msgstr "列出作者 (增加 '-v' 会以长格式显示)"
7640
7538
7641 msgid "list the date (short with -q)"
7539 msgid "list the date (short with -q)"
7642 msgstr "列出日期 (增加 '-q' 会以短格式显示)"
7540 msgstr "列出日期 (增加 '-q' 会以短格式显示)"
7643
7541
7644 msgid "list the revision number (default)"
7542 msgid "list the revision number (default)"
7645 msgstr "列出版本号 (默认)"
7543 msgstr "列出版本号 (默认)"
7646
7544
7647 msgid "list the changeset"
7545 msgid "list the changeset"
7648 msgstr "列出修改集"
7546 msgstr "列出修改集"
7649
7547
7650 msgid "show line number at the first appearance"
7548 msgid "show line number at the first appearance"
7651 msgstr "列出首次出现时的行号"
7549 msgstr "列出首次出现时的行号"
7652
7550
7653 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
7551 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
7654 msgstr ""
7552 msgstr ""
7655
7553
7656 msgid "do not pass files through decoders"
7554 msgid "do not pass files through decoders"
7657 msgstr ""
7555 msgstr ""
7658
7556
7659 msgid "directory prefix for files in archive"
7557 msgid "directory prefix for files in archive"
7660 msgstr ""
7558 msgstr ""
7661
7559
7662 msgid "revision to distribute"
7560 msgid "revision to distribute"
7663 msgstr ""
7561 msgstr ""
7664
7562
7665 msgid "type of distribution to create"
7563 msgid "type of distribution to create"
7666 msgstr ""
7564 msgstr ""
7667
7565
7668 msgid "[OPTION]... DEST"
7566 msgid "[OPTION]... DEST"
7669 msgstr ""
7567 msgstr ""
7670
7568
7671 msgid "merge with old dirstate parent after backout"
7569 msgid "merge with old dirstate parent after backout"
7672 msgstr ""
7570 msgstr ""
7673
7571
7674 msgid "parent to choose when backing out merge"
7572 msgid "parent to choose when backing out merge"
7675 msgstr ""
7573 msgstr ""
7676
7574
7677 msgid "revision to backout"
7575 msgid "revision to backout"
7678 msgstr ""
7576 msgstr ""
7679
7577
7680 msgid "[OPTION]... [-r] REV"
7578 msgid "[OPTION]... [-r] REV"
7681 msgstr ""
7579 msgstr ""
7682
7580
7683 msgid "reset bisect state"
7581 msgid "reset bisect state"
7684 msgstr ""
7582 msgstr ""
7685
7583
7686 msgid "mark changeset good"
7584 msgid "mark changeset good"
7687 msgstr ""
7585 msgstr ""
7688
7586
7689 msgid "mark changeset bad"
7587 msgid "mark changeset bad"
7690 msgstr ""
7588 msgstr ""
7691
7589
7692 msgid "skip testing changeset"
7590 msgid "skip testing changeset"
7693 msgstr ""
7591 msgstr ""
7694
7592
7695 msgid "use command to check changeset state"
7593 msgid "use command to check changeset state"
7696 msgstr ""
7594 msgstr ""
7697
7595
7698 msgid "do not update to target"
7596 msgid "do not update to target"
7699 msgstr ""
7597 msgstr ""
7700
7598
7701 msgid "[-gbsr] [-c CMD] [REV]"
7599 msgid "[-gbsr] [-c CMD] [REV]"
7702 msgstr ""
7600 msgstr ""
7703
7601
7704 msgid "set branch name even if it shadows an existing branch"
7602 msgid "set branch name even if it shadows an existing branch"
7705 msgstr ""
7603 msgstr ""
7706
7604
7707 msgid "reset branch name to parent branch name"
7605 msgid "reset branch name to parent branch name"
7708 msgstr ""
7606 msgstr ""
7709
7607
7710 msgid "[-fC] [NAME]"
7608 msgid "[-fC] [NAME]"
7711 msgstr ""
7609 msgstr ""
7712
7610
7713 msgid "show only branches that have unmerged heads"
7611 msgid "show only branches that have unmerged heads"
7714 msgstr ""
7612 msgstr ""
7715
7613
7716 #, fuzzy
7614 #, fuzzy
7717 msgid "show normal and closed branches"
7615 msgid "show normal and closed branches"
7718 msgstr "只显示已增加文件的状态"
7616 msgstr "只显示已增加文件的状态"
7719
7617
7720 msgid "[-a]"
7618 msgid "[-a]"
7721 msgstr ""
7619 msgstr ""
7722
7620
7723 msgid "run even when remote repository is unrelated"
7621 msgid "run even when remote repository is unrelated"
7724 msgstr "纵然远程版本库是无关的也要执行"
7622 msgstr "纵然远程版本库是无关的也要执行"
7725
7623
7726 msgid "a changeset up to which you would like to bundle"
7624 msgid "a changeset up to which you would like to bundle"
7727 msgstr ""
7625 msgstr ""
7728
7626
7729 msgid "a base changeset to specify instead of a destination"
7627 msgid "a base changeset to specify instead of a destination"
7730 msgstr ""
7628 msgstr ""
7731
7629
7732 msgid "bundle all changesets in the repository"
7630 msgid "bundle all changesets in the repository"
7733 msgstr ""
7631 msgstr ""
7734
7632
7735 msgid "bundle compression type to use"
7633 msgid "bundle compression type to use"
7736 msgstr ""
7634 msgstr ""
7737
7635
7738 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7636 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7739 msgstr ""
7637 msgstr ""
7740
7638
7741 msgid "print output to file with formatted name"
7639 msgid "print output to file with formatted name"
7742 msgstr "输出到使用格式化名称的文件中"
7640 msgstr "输出到使用格式化名称的文件中"
7743
7641
7744 msgid "print the given revision"
7642 msgid "print the given revision"
7745 msgstr ""
7643 msgstr ""
7746
7644
7747 msgid "apply any matching decode filter"
7645 msgid "apply any matching decode filter"
7748 msgstr ""
7646 msgstr ""
7749
7647
7750 msgid "[OPTION]... FILE..."
7648 msgid "[OPTION]... FILE..."
7751 msgstr ""
7649 msgstr ""
7752
7650
7753 msgid "the clone will only contain a repository (no working copy)"
7651 msgid "the clone will only contain a repository (no working copy)"
7754 msgstr "只复制版本库(没有工作副本)"
7652 msgstr "只复制版本库(没有工作副本)"
7755
7653
7756 msgid "a changeset you would like to have after cloning"
7654 msgid "a changeset you would like to have after cloning"
7757 msgstr "复制后你期望有的修改集"
7655 msgstr "复制后你期望有的修改集"
7758
7656
7759 msgid "[OPTION]... SOURCE [DEST]"
7657 msgid "[OPTION]... SOURCE [DEST]"
7760 msgstr ""
7658 msgstr ""
7761
7659
7762 msgid "mark new/missing files as added/removed before committing"
7660 msgid "mark new/missing files as added/removed before committing"
7763 msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'"
7661 msgstr "在提交之前将'新的/丢失的'文件标记为'已增加/已删除'"
7764
7662
7765 msgid "mark a branch as closed, hiding it from the branch list"
7663 msgid "mark a branch as closed, hiding it from the branch list"
7766 msgstr "标记一个分支已关闭,不在分支列表中显示"
7664 msgstr "标记一个分支已关闭,不在分支列表中显示"
7767
7665
7768 msgid "record a copy that has already occurred"
7666 msgid "record a copy that has already occurred"
7769 msgstr ""
7667 msgstr ""
7770
7668
7771 msgid "forcibly copy over an existing managed file"
7669 msgid "forcibly copy over an existing managed file"
7772 msgstr ""
7670 msgstr ""
7773
7671
7774 msgid "[OPTION]... [SOURCE]... DEST"
7672 msgid "[OPTION]... [SOURCE]... DEST"
7775 msgstr ""
7673 msgstr ""
7776
7674
7777 msgid "[INDEX] REV1 REV2"
7675 msgid "[INDEX] REV1 REV2"
7778 msgstr ""
7676 msgstr ""
7779
7677
7780 #, fuzzy
7678 #, fuzzy
7781 msgid "[COMMAND]"
7679 msgid "[COMMAND]"
7782 msgstr "命令"
7680 msgstr "命令"
7783
7681
7784 msgid "show the command options"
7682 msgid "show the command options"
7785 msgstr ""
7683 msgstr ""
7786
7684
7787 msgid "[-o] CMD"
7685 msgid "[-o] CMD"
7788 msgstr ""
7686 msgstr ""
7789
7687
7790 msgid "try extended date formats"
7688 msgid "try extended date formats"
7791 msgstr ""
7689 msgstr ""
7792
7690
7793 msgid "[-e] DATE [RANGE]"
7691 msgid "[-e] DATE [RANGE]"
7794 msgstr ""
7692 msgstr ""
7795
7693
7796 msgid "FILE REV"
7694 msgid "FILE REV"
7797 msgstr ""
7695 msgstr ""
7798
7696
7799 msgid "[PATH]"
7697 msgid "[PATH]"
7800 msgstr ""
7698 msgstr ""
7801
7699
7802 msgid "FILE"
7700 msgid "FILE"
7803 msgstr ""
7701 msgstr ""
7804
7702
7805 msgid "revision to rebuild to"
7703 msgid "revision to rebuild to"
7806 msgstr ""
7704 msgstr ""
7807
7705
7808 msgid "[-r REV] [REV]"
7706 msgid "[-r REV] [REV]"
7809 msgstr ""
7707 msgstr ""
7810
7708
7811 msgid "revision to debug"
7709 msgid "revision to debug"
7812 msgstr ""
7710 msgstr ""
7813
7711
7814 msgid "[-r REV] FILE"
7712 msgid "[-r REV] FILE"
7815 msgstr ""
7713 msgstr ""
7816
7714
7817 msgid "REV1 [REV2]"
7715 msgid "REV1 [REV2]"
7818 msgstr ""
7716 msgstr ""
7819
7717
7820 msgid "do not display the saved mtime"
7718 msgid "do not display the saved mtime"
7821 msgstr ""
7719 msgstr ""
7822
7720
7823 msgid "[OPTION]..."
7721 msgid "[OPTION]..."
7824 msgstr ""
7722 msgstr ""
7825
7723
7826 #, fuzzy
7724 #, fuzzy
7827 msgid "revision to check"
7725 msgid "revision to check"
7828 msgstr "要合并的版本"
7726 msgstr "要合并的版本"
7829
7727
7830 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7728 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7831 msgstr ""
7729 msgstr ""
7832
7730
7833 msgid "diff against the second parent"
7731 msgid "diff against the second parent"
7834 msgstr "与第二个父亲比较"
7732 msgstr "与第二个父亲比较"
7835
7733
7836 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7734 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7837 msgstr ""
7735 msgstr ""
7838
7736
7839 msgid "end fields with NUL"
7737 msgid "end fields with NUL"
7840 msgstr ""
7738 msgstr ""
7841
7739
7842 msgid "print all revisions that match"
7740 msgid "print all revisions that match"
7843 msgstr ""
7741 msgstr ""
7844
7742
7845 msgid "follow changeset history, or file history across copies and renames"
7743 msgid "follow changeset history, or file history across copies and renames"
7846 msgstr "跟踪修改集历史,或者跟踪文件的复制与改名操作"
7744 msgstr "跟踪修改集历史,或者跟踪文件的复制与改名操作"
7847
7745
7848 msgid "ignore case when matching"
7746 msgid "ignore case when matching"
7849 msgstr ""
7747 msgstr ""
7850
7748
7851 msgid "print only filenames and revisions that match"
7749 msgid "print only filenames and revisions that match"
7852 msgstr ""
7750 msgstr ""
7853
7751
7854 msgid "print matching line numbers"
7752 msgid "print matching line numbers"
7855 msgstr ""
7753 msgstr ""
7856
7754
7857 msgid "search in given revision range"
7755 msgid "search in given revision range"
7858 msgstr ""
7756 msgstr ""
7859
7757
7860 msgid "[OPTION]... PATTERN [FILE]..."
7758 msgid "[OPTION]... PATTERN [FILE]..."
7861 msgstr ""
7759 msgstr ""
7862
7760
7863 msgid "show only heads which are descendants of REV"
7761 msgid "show only heads which are descendants of REV"
7864 msgstr ""
7762 msgstr ""
7865
7763
7866 #, fuzzy
7764 #, fuzzy
7867 msgid "show only the active branch heads from open branches"
7765 msgid "show only the active branch heads from open branches"
7868 msgstr "svn: 分支没有版本 %s"
7766 msgstr "svn: 分支没有版本 %s"
7869
7767
7870 #, fuzzy
7768 #, fuzzy
7871 msgid "show normal and closed branch heads"
7769 msgid "show normal and closed branch heads"
7872 msgstr "只显示已增加文件的状态"
7770 msgstr "只显示已增加文件的状态"
7873
7771
7874 msgid "[-r STARTREV] [REV]..."
7772 msgid "[-r STARTREV] [REV]..."
7875 msgstr ""
7773 msgstr ""
7876
7774
7877 msgid "[TOPIC]"
7775 msgid "[TOPIC]"
7878 msgstr ""
7776 msgstr ""
7879
7777
7880 #, fuzzy
7778 #, fuzzy
7881 msgid "identify the specified revision"
7779 msgid "identify the specified revision"
7882 msgstr "追溯指定版本"
7780 msgstr "追溯指定版本"
7883
7781
7884 msgid "show local revision number"
7782 msgid "show local revision number"
7885 msgstr ""
7783 msgstr ""
7886
7784
7887 msgid "show global revision id"
7785 msgid "show global revision id"
7888 msgstr ""
7786 msgstr ""
7889
7787
7890 msgid "show branch"
7788 msgid "show branch"
7891 msgstr ""
7789 msgstr ""
7892
7790
7893 msgid "show tags"
7791 msgid "show tags"
7894 msgstr ""
7792 msgstr ""
7895
7793
7896 msgid "[-nibt] [-r REV] [SOURCE]"
7794 msgid "[-nibt] [-r REV] [SOURCE]"
7897 msgstr ""
7795 msgstr ""
7898
7796
7899 msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
7797 msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
7900 msgstr ""
7798 msgstr ""
7901
7799
7902 msgid "base path"
7800 msgid "base path"
7903 msgstr ""
7801 msgstr ""
7904
7802
7905 msgid "skip check for outstanding uncommitted changes"
7803 msgid "skip check for outstanding uncommitted changes"
7906 msgstr ""
7804 msgstr ""
7907
7805
7908 msgid "don't commit, just update the working directory"
7806 msgid "don't commit, just update the working directory"
7909 msgstr ""
7807 msgstr ""
7910
7808
7911 msgid "apply patch to the nodes from which it was generated"
7809 msgid "apply patch to the nodes from which it was generated"
7912 msgstr ""
7810 msgstr ""
7913
7811
7914 msgid "use any branch information in patch (implied by --exact)"
7812 msgid "use any branch information in patch (implied by --exact)"
7915 msgstr ""
7813 msgstr ""
7916
7814
7917 msgid "[OPTION]... PATCH..."
7815 msgid "[OPTION]... PATCH..."
7918 msgstr ""
7816 msgstr ""
7919
7817
7920 msgid "show newest record first"
7818 msgid "show newest record first"
7921 msgstr ""
7819 msgstr ""
7922
7820
7923 msgid "file to store the bundles into"
7821 msgid "file to store the bundles into"
7924 msgstr ""
7822 msgstr ""
7925
7823
7926 msgid "a specific revision up to which you would like to pull"
7824 msgid "a specific revision up to which you would like to pull"
7927 msgstr "指定要取得的最高版本"
7825 msgstr "指定要取得的最高版本"
7928
7826
7929 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7827 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7930 msgstr ""
7828 msgstr ""
7931
7829
7932 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7830 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7933 msgstr ""
7831 msgstr ""
7934
7832
7935 msgid "search the repository as it stood at REV"
7833 msgid "search the repository as it stood at REV"
7936 msgstr ""
7834 msgstr ""
7937
7835
7938 msgid "end filenames with NUL, for use with xargs"
7836 msgid "end filenames with NUL, for use with xargs"
7939 msgstr "在文件名称结尾增加 NUL,用于 xargs"
7837 msgstr "在文件名称结尾增加 NUL,用于 xargs"
7940
7838
7941 msgid "print complete paths from the filesystem root"
7839 msgid "print complete paths from the filesystem root"
7942 msgstr ""
7840 msgstr ""
7943
7841
7944 msgid "[OPTION]... [PATTERN]..."
7842 msgid "[OPTION]... [PATTERN]..."
7945 msgstr ""
7843 msgstr ""
7946
7844
7947 msgid "only follow the first parent of merge changesets"
7845 msgid "only follow the first parent of merge changesets"
7948 msgstr "只跟踪修改集的第一个父亲"
7846 msgstr "只跟踪修改集的第一个父亲"
7949
7847
7950 #, fuzzy
7848 #, fuzzy
7951 msgid "show revisions matching date spec"
7849 msgid "show revisions matching date spec"
7952 msgstr "显示匹配日期的版本"
7850 msgstr "显示匹配日期的版本"
7953
7851
7954 msgid "show copied files"
7852 msgid "show copied files"
7955 msgstr "显示复制的文件"
7853 msgstr "显示复制的文件"
7956
7854
7957 msgid "do case-insensitive search for a keyword"
7855 msgid "do case-insensitive search for a keyword"
7958 msgstr "对关键字执行不区分大小写的搜索"
7856 msgstr "对关键字执行不区分大小写的搜索"
7959
7857
7960 #, fuzzy
7858 #, fuzzy
7961 msgid "include revisions where files were removed"
7859 msgid "include revisions where files were removed"
7962 msgstr "包含删除文件的版本"
7860 msgstr "包含删除文件的版本"
7963
7861
7964 msgid "show only merges"
7862 msgid "show only merges"
7965 msgstr "只显示合并"
7863 msgstr "只显示合并"
7966
7864
7967 #, fuzzy
7865 #, fuzzy
7968 msgid "revisions committed by user"
7866 msgid "revisions committed by user"
7969 msgstr "指定用户提交的版本"
7867 msgstr "指定用户提交的版本"
7970
7868
7971 msgid "show only changesets within the given named branch"
7869 msgid "show only changesets within the given named branch"
7972 msgstr "只显示位于指定命名分支中的修改集"
7870 msgstr "只显示位于指定命名分支中的修改集"
7973
7871
7974 msgid "do not display revision or any of its ancestors"
7872 msgid "do not display revision or any of its ancestors"
7975 msgstr "不显示指定版本或其祖先"
7873 msgstr "不显示指定版本或其祖先"
7976
7874
7977 msgid "[OPTION]... [FILE]"
7875 msgid "[OPTION]... [FILE]"
7978 msgstr ""
7876 msgstr ""
7979
7877
7980 msgid "revision to display"
7878 msgid "revision to display"
7981 msgstr ""
7879 msgstr ""
7982
7880
7983 msgid "[-r REV]"
7881 msgid "[-r REV]"
7984 msgstr ""
7882 msgstr ""
7985
7883
7986 msgid "force a merge with outstanding changes"
7884 msgid "force a merge with outstanding changes"
7987 msgstr "强制与已有修改合并"
7885 msgstr "强制与已有修改合并"
7988
7886
7989 msgid "revision to merge"
7887 msgid "revision to merge"
7990 msgstr "要合并的版本"
7888 msgstr "要合并的版本"
7991
7889
7992 msgid "review revisions to merge (no merge is performed)"
7890 msgid "review revisions to merge (no merge is performed)"
7993 msgstr ""
7891 msgstr ""
7994
7892
7995 msgid "[-f] [[-r] REV]"
7893 msgid "[-f] [[-r] REV]"
7996 msgstr ""
7894 msgstr ""
7997
7895
7998 msgid "a specific revision up to which you would like to push"
7896 msgid "a specific revision up to which you would like to push"
7999 msgstr "指定你要推送的最高版本"
7897 msgstr "指定你要推送的最高版本"
8000
7898
8001 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7899 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
8002 msgstr ""
7900 msgstr ""
8003
7901
8004 #, fuzzy
7902 #, fuzzy
8005 msgid "show parents from the specified revision"
7903 msgid "show parents from the specified revision"
8006 msgstr "从指定的版本显示父亲"
7904 msgstr "从指定的版本显示父亲"
8007
7905
8008 msgid "[-r REV] [FILE]"
7906 msgid "[-r REV] [FILE]"
8009 msgstr ""
7907 msgstr ""
8010
7908
8011 msgid "[NAME]"
7909 msgid "[NAME]"
8012 msgstr ""
7910 msgstr ""
8013
7911
8014 msgid "update to new tip if changesets were pulled"
7912 msgid "update to new tip if changesets were pulled"
8015 msgstr "如果有新的修改集,就更新到最新版本"
7913 msgstr "如果有新的修改集,就更新到最新版本"
8016
7914
8017 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7915 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
8018 msgstr ""
7916 msgstr ""
8019
7917
8020 msgid "force push"
7918 msgid "force push"
8021 msgstr "强制推送"
7919 msgstr "强制推送"
8022
7920
8023 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7921 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
8024 msgstr ""
7922 msgstr ""
8025
7923
8026 msgid "record delete for missing files"
7924 msgid "record delete for missing files"
8027 msgstr "将丢失的文件视为删除"
7925 msgstr "将丢失的文件视为删除"
8028
7926
8029 msgid "remove (and delete) file even if added or modified"
7927 msgid "remove (and delete) file even if added or modified"
8030 msgstr "删除文件,纵然它已被增加或修改"
7928 msgstr "删除文件,纵然它已被增加或修改"
8031
7929
8032 msgid "record a rename that has already occurred"
7930 msgid "record a rename that has already occurred"
8033 msgstr "记录已经发生的改名"
7931 msgstr "记录已经发生的改名"
8034
7932
8035 msgid "[OPTION]... SOURCE... DEST"
7933 msgid "[OPTION]... SOURCE... DEST"
8036 msgstr ""
7934 msgstr ""
8037
7935
8038 msgid "remerge all unresolved files"
7936 msgid "remerge all unresolved files"
8039 msgstr ""
7937 msgstr ""
8040
7938
8041 msgid "list state of files needing merge"
7939 msgid "list state of files needing merge"
8042 msgstr ""
7940 msgstr ""
8043
7941
8044 msgid "mark files as resolved"
7942 msgid "mark files as resolved"
8045 msgstr ""
7943 msgstr ""
8046
7944
8047 msgid "unmark files as resolved"
7945 msgid "unmark files as resolved"
8048 msgstr ""
7946 msgstr ""
8049
7947
8050 msgid "revert all changes when no arguments given"
7948 msgid "revert all changes when no arguments given"
8051 msgstr ""
7949 msgstr ""
8052
7950
8053 msgid "tipmost revision matching date"
7951 msgid "tipmost revision matching date"
8054 msgstr "匹配最接近顶点的日期"
7952 msgstr "匹配最接近顶点的日期"
8055
7953
8056 msgid "revision to revert to"
7954 msgid "revision to revert to"
8057 msgstr ""
7955 msgstr ""
8058
7956
8059 msgid "do not save backup copies of files"
7957 msgid "do not save backup copies of files"
8060 msgstr ""
7958 msgstr ""
8061
7959
8062 msgid "[OPTION]... [-r REV] [NAME]..."
7960 msgid "[OPTION]... [-r REV] [NAME]..."
8063 msgstr ""
7961 msgstr ""
8064
7962
8065 msgid "name of access log file to write to"
7963 msgid "name of access log file to write to"
8066 msgstr "记录访问日志的文件名称"
7964 msgstr "记录访问日志的文件名称"
8067
7965
8068 msgid "name of error log file to write to"
7966 msgid "name of error log file to write to"
8069 msgstr "记录错误日志的文件名称"
7967 msgstr "记录错误日志的文件名称"
8070
7968
8071 msgid "port to listen on (default: 8000)"
7969 msgid "port to listen on (default: 8000)"
8072 msgstr "监听的端口(默认: 8000)"
7970 msgstr "监听的端口(默认: 8000)"
8073
7971
8074 msgid "address to listen on (default: all interfaces)"
7972 msgid "address to listen on (default: all interfaces)"
8075 msgstr "监听地址(默认: 所有地址)"
7973 msgstr "监听地址(默认: 所有地址)"
8076
7974
8077 msgid "prefix path to serve from (default: server root)"
7975 msgid "prefix path to serve from (default: server root)"
8078 msgstr "服务路径前缀(默认: 服务器根)"
7976 msgstr "服务路径前缀(默认: 服务器根)"
8079
7977
8080 #, fuzzy
7978 #, fuzzy
8081 msgid "name to show in web pages (default: working directory)"
7979 msgid "name to show in web pages (default: working directory)"
8082 msgstr "在 WEB 页面中显示的名称(默认: 工作目录)"
7980 msgstr "在 WEB 页面中显示的名称(默认: 工作目录)"
8083
7981
8084 #, fuzzy
7982 #, fuzzy
8085 msgid "name of the webdir config file (serve more than one repository)"
7983 msgid "name of the webdir config file (serve more than one repository)"
8086 msgstr "webdir 配置文件的名称(发布多个版本库)"
7984 msgstr "webdir 配置文件的名称(发布多个版本库)"
8087
7985
8088 msgid "for remote clients"
7986 msgid "for remote clients"
8089 msgstr "针对远程客户端"
7987 msgstr "针对远程客户端"
8090
7988
8091 msgid "web templates to use"
7989 msgid "web templates to use"
8092 msgstr "使用的 WEB 模板"
7990 msgstr "使用的 WEB 模板"
8093
7991
8094 msgid "template style to use"
7992 msgid "template style to use"
8095 msgstr "使用的显示样式"
7993 msgstr "使用的显示样式"
8096
7994
8097 msgid "use IPv6 in addition to IPv4"
7995 msgid "use IPv6 in addition to IPv4"
8098 msgstr "同时使用 IPv6 和 IPv4"
7996 msgstr "同时使用 IPv6 和 IPv4"
8099
7997
8100 msgid "SSL certificate file"
7998 msgid "SSL certificate file"
8101 msgstr "SSL 证书文件"
7999 msgstr "SSL 证书文件"
8102
8000
8103 msgid "show untrusted configuration options"
8001 msgid "show untrusted configuration options"
8104 msgstr "显示不能信赖的配置选项"
8002 msgstr "显示不能信赖的配置选项"
8105
8003
8106 msgid "[-u] [NAME]..."
8004 msgid "[-u] [NAME]..."
8107 msgstr ""
8005 msgstr ""
8108
8006
8109 msgid "show status of all files"
8007 msgid "show status of all files"
8110 msgstr "显示全部文件的状态"
8008 msgstr "显示全部文件的状态"
8111
8009
8112 msgid "show only modified files"
8010 msgid "show only modified files"
8113 msgstr "只显示已修改文件的状态"
8011 msgstr "只显示已修改文件的状态"
8114
8012
8115 msgid "show only added files"
8013 msgid "show only added files"
8116 msgstr "只显示已增加文件的状态"
8014 msgstr "只显示已增加文件的状态"
8117
8015
8118 msgid "show only removed files"
8016 msgid "show only removed files"
8119 msgstr "只显示已移除文件的状态"
8017 msgstr "只显示已移除文件的状态"
8120
8018
8121 msgid "show only deleted (but tracked) files"
8019 msgid "show only deleted (but tracked) files"
8122 msgstr "只显示已删除(但被跟踪)文件的状态"
8020 msgstr "只显示已删除(但被跟踪)文件的状态"
8123
8021
8124 msgid "show only files without changes"
8022 msgid "show only files without changes"
8125 msgstr "只显示无改动文件的状态"
8023 msgstr "只显示无改动文件的状态"
8126
8024
8127 msgid "show only unknown (not tracked) files"
8025 msgid "show only unknown (not tracked) files"
8128 msgstr "只显示未知(未被跟踪)文件的状态"
8026 msgstr "只显示未知(未被跟踪)文件的状态"
8129
8027
8130 msgid "show only ignored files"
8028 msgid "show only ignored files"
8131 msgstr "只显示被忽略文件的状态"
8029 msgstr "只显示被忽略文件的状态"
8132
8030
8133 msgid "hide status prefix"
8031 msgid "hide status prefix"
8134 msgstr "隐藏状态前缀"
8032 msgstr "隐藏状态前缀"
8135
8033
8136 msgid "show source of copied files"
8034 msgid "show source of copied files"
8137 msgstr "显示文件的复制源"
8035 msgstr "显示文件的复制源"
8138
8036
8139 msgid "show difference from revision"
8037 msgid "show difference from revision"
8140 msgstr "显示版本差异"
8038 msgstr "显示版本差异"
8141
8039
8142 msgid "replace existing tag"
8040 msgid "replace existing tag"
8143 msgstr "替换已有的标签"
8041 msgstr "替换已有的标签"
8144
8042
8145 msgid "make the tag local"
8043 msgid "make the tag local"
8146 msgstr "标记标签为本地"
8044 msgstr "标记标签为本地"
8147
8045
8148 msgid "revision to tag"
8046 msgid "revision to tag"
8149 msgstr "标签对应的版本"
8047 msgstr "标签对应的版本"
8150
8048
8151 msgid "remove a tag"
8049 msgid "remove a tag"
8152 msgstr "删除标签"
8050 msgstr "删除标签"
8153
8051
8154 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
8052 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
8155 msgstr ""
8053 msgstr ""
8156
8054
8157 msgid "[-p]"
8055 msgid "[-p]"
8158 msgstr ""
8056 msgstr ""
8159
8057
8160 msgid "update to new tip if changesets were unbundled"
8058 msgid "update to new tip if changesets were unbundled"
8161 msgstr ""
8059 msgstr ""
8162
8060
8163 msgid "[-u] FILE..."
8061 msgid "[-u] FILE..."
8164 msgstr ""
8062 msgstr ""
8165
8063
8166 msgid "overwrite locally modified files (no backup)"
8064 msgid "overwrite locally modified files (no backup)"
8167 msgstr "覆盖本地修改的文件(不备份)"
8065 msgstr "覆盖本地修改的文件(不备份)"
8168
8066
8169 #, fuzzy
8067 #, fuzzy
8170 msgid "check for uncommitted changes"
8068 msgid "check for uncommitted changes"
8171 msgstr "提交修改集 %d:%s\n"
8069 msgstr "提交修改集 %d:%s\n"
8172
8070
8173 msgid "[-C] [-d DATE] [[-r] REV]"
8071 msgid "[-C] [-d DATE] [[-r] REV]"
8174 msgstr ""
8072 msgstr ""
8175
8073
8176 #, python-format
8074 #, python-format
8177 msgid "config error at %s:%d: '%s'"
8075 msgid "config error at %s:%d: '%s'"
8178 msgstr ""
8076 msgstr ""
8179
8077
8180 msgid "not found in manifest"
8078 msgid "not found in manifest"
8181 msgstr ""
8079 msgstr ""
8182
8080
8183 msgid "branch name not in UTF-8!"
8081 msgid "branch name not in UTF-8!"
8184 msgstr ""
8082 msgstr ""
8185
8083
8186 #, python-format
8084 #, python-format
8187 msgid " searching for copies back to rev %d\n"
8085 msgid " searching for copies back to rev %d\n"
8188 msgstr ""
8086 msgstr ""
8189
8087
8190 #, python-format
8088 #, python-format
8191 msgid ""
8089 msgid ""
8192 " unmatched files in local:\n"
8090 " unmatched files in local:\n"
8193 " %s\n"
8091 " %s\n"
8194 msgstr ""
8092 msgstr ""
8195
8093
8196 #, python-format
8094 #, python-format
8197 msgid ""
8095 msgid ""
8198 " unmatched files in other:\n"
8096 " unmatched files in other:\n"
8199 " %s\n"
8097 " %s\n"
8200 msgstr ""
8098 msgstr ""
8201
8099
8202 msgid " all copies found (* = to merge, ! = divergent):\n"
8100 msgid " all copies found (* = to merge, ! = divergent):\n"
8203 msgstr ""
8101 msgstr ""
8204
8102
8205 msgid " checking for directory renames\n"
8103 msgid " checking for directory renames\n"
8206 msgstr ""
8104 msgstr ""
8207
8105
8208 #, python-format
8106 #, python-format
8209 msgid " dir %s -> %s\n"
8107 msgid " dir %s -> %s\n"
8210 msgstr ""
8108 msgstr ""
8211
8109
8212 #, python-format
8110 #, python-format
8213 msgid " file %s -> %s\n"
8111 msgid " file %s -> %s\n"
8214 msgstr ""
8112 msgstr ""
8215
8113
8216 msgid "working directory state appears damaged!"
8114 msgid "working directory state appears damaged!"
8217 msgstr ""
8115 msgstr ""
8218
8116
8219 #, python-format
8117 #, python-format
8220 msgid "'\\n' and '\\r' disallowed in filenames: %r"
8118 msgid "'\\n' and '\\r' disallowed in filenames: %r"
8221 msgstr ""
8119 msgstr ""
8222
8120
8223 #, python-format
8121 #, python-format
8224 msgid "directory %r already in dirstate"
8122 msgid "directory %r already in dirstate"
8225 msgstr ""
8123 msgstr ""
8226
8124
8227 #, python-format
8125 #, python-format
8228 msgid "file %r in dirstate clashes with %r"
8126 msgid "file %r in dirstate clashes with %r"
8229 msgstr ""
8127 msgstr ""
8230
8128
8231 #, python-format
8129 #, python-format
8232 msgid "not in dirstate: %s\n"
8130 msgid "not in dirstate: %s\n"
8233 msgstr ""
8131 msgstr ""
8234
8132
8235 msgid "unknown"
8133 msgid "unknown"
8236 msgstr ""
8134 msgstr ""
8237
8135
8238 msgid "character device"
8136 msgid "character device"
8239 msgstr ""
8137 msgstr ""
8240
8138
8241 msgid "block device"
8139 msgid "block device"
8242 msgstr ""
8140 msgstr ""
8243
8141
8244 msgid "fifo"
8142 msgid "fifo"
8245 msgstr ""
8143 msgstr ""
8246
8144
8247 msgid "socket"
8145 msgid "socket"
8248 msgstr ""
8146 msgstr ""
8249
8147
8250 msgid "directory"
8148 msgid "directory"
8251 msgstr ""
8149 msgstr ""
8252
8150
8253 #, python-format
8151 #, python-format
8254 msgid "unsupported file type (type is %s)"
8152 msgid "unsupported file type (type is %s)"
8255 msgstr ""
8153 msgstr ""
8256
8154
8257 #, python-format
8155 #, python-format
8258 msgid "abort: %s\n"
8156 msgid "abort: %s\n"
8259 msgstr "中止: %s\n"
8157 msgstr "中止: %s\n"
8260
8158
8261 #, python-format
8159 #, python-format
8262 msgid "hg: %s\n"
8160 msgid "hg: %s\n"
8263 msgstr ""
8161 msgstr ""
8264
8162
8265 #, python-format
8163 #, python-format
8266 msgid ""
8164 msgid ""
8267 "hg: command '%s' is ambiguous:\n"
8165 "hg: command '%s' is ambiguous:\n"
8268 " %s\n"
8166 " %s\n"
8269 msgstr ""
8167 msgstr ""
8270
8168
8271 #, python-format
8169 #, python-format
8272 msgid "timed out waiting for lock held by %s"
8170 msgid "timed out waiting for lock held by %s"
8273 msgstr ""
8171 msgstr ""
8274
8172
8275 #, python-format
8173 #, python-format
8276 msgid "lock held by %s"
8174 msgid "lock held by %s"
8277 msgstr ""
8175 msgstr ""
8278
8176
8279 #, python-format
8177 #, python-format
8280 msgid "abort: %s: %s\n"
8178 msgid "abort: %s: %s\n"
8281 msgstr "中止: %s: %s\n"
8179 msgstr "中止: %s: %s\n"
8282
8180
8283 #, python-format
8181 #, python-format
8284 msgid "abort: could not lock %s: %s\n"
8182 msgid "abort: could not lock %s: %s\n"
8285 msgstr "中止: 不能锁定 %s: %s\n"
8183 msgstr "中止: 不能锁定 %s: %s\n"
8286
8184
8287 #, python-format
8185 #, python-format
8288 msgid "hg %s: %s\n"
8186 msgid "hg %s: %s\n"
8289 msgstr ""
8187 msgstr ""
8290
8188
8291 #, python-format
8189 #, python-format
8292 msgid "abort: %s!\n"
8190 msgid "abort: %s!\n"
8293 msgstr "中止: %s!\n"
8191 msgstr "中止: %s!\n"
8294
8192
8295 #, python-format
8193 #, python-format
8296 msgid "abort: %s"
8194 msgid "abort: %s"
8297 msgstr "中止: %s"
8195 msgstr "中止: %s"
8298
8196
8299 msgid " empty string\n"
8197 msgid " empty string\n"
8300 msgstr ""
8198 msgstr ""
8301
8199
8302 msgid "killed!\n"
8200 msgid "killed!\n"
8303 msgstr ""
8201 msgstr ""
8304
8202
8305 #, python-format
8203 #, python-format
8306 msgid "hg: unknown command '%s'\n"
8204 msgid "hg: unknown command '%s'\n"
8307 msgstr "hg: 未知命令 '%s'\n"
8205 msgstr "hg: 未知命令 '%s'\n"
8308
8206
8309 #, python-format
8207 #, python-format
8310 msgid "abort: could not import module %s!\n"
8208 msgid "abort: could not import module %s!\n"
8311 msgstr "中止: 不能导入模块 %s!\n"
8209 msgstr "中止: 不能导入模块 %s!\n"
8312
8210
8313 msgid "(did you forget to compile extensions?)\n"
8211 msgid "(did you forget to compile extensions?)\n"
8314 msgstr "(你是否忘记了编译扩展?)\n"
8212 msgstr "(你是否忘记了编译扩展?)\n"
8315
8213
8316 msgid "(is your Python install correct?)\n"
8214 msgid "(is your Python install correct?)\n"
8317 msgstr "(你的 Python 安装正确吗?)\n"
8215 msgstr "(你的 Python 安装正确吗?)\n"
8318
8216
8319 #, python-format
8217 #, python-format
8320 msgid "abort: error: %s\n"
8218 msgid "abort: error: %s\n"
8321 msgstr "中止: 失败: %s\n"
8219 msgstr "中止: 失败: %s\n"
8322
8220
8323 msgid "broken pipe\n"
8221 msgid "broken pipe\n"
8324 msgstr "坏掉的管道\n"
8222 msgstr "坏掉的管道\n"
8325
8223
8326 msgid "interrupted!\n"
8224 msgid "interrupted!\n"
8327 msgstr "中断!\n"
8225 msgstr "中断!\n"
8328
8226
8329 msgid ""
8227 msgid ""
8330 "\n"
8228 "\n"
8331 "broken pipe\n"
8229 "broken pipe\n"
8332 msgstr ""
8230 msgstr ""
8333 "\n"
8231 "\n"
8334 "坏掉的管道\n"
8232 "坏掉的管道\n"
8335
8233
8336 msgid "abort: out of memory\n"
8234 msgid "abort: out of memory\n"
8337 msgstr "中止: 内存不足\n"
8235 msgstr "中止: 内存不足\n"
8338
8236
8339 msgid "** unknown exception encountered, details follow\n"
8237 msgid "** unknown exception encountered, details follow\n"
8340 msgstr "** 遇到了未知异常,详细信息如下\n"
8238 msgstr "** 遇到了未知异常,详细信息如下\n"
8341
8239
8342 #, fuzzy
8240 #, fuzzy
8343 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
8241 msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
8344 msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n"
8242 msgstr "** 报告问题详情到 http://www.selenic.com/mercurial/bts\n"
8345
8243
8346 msgid "** or mercurial@selenic.com\n"
8244 msgid "** or mercurial@selenic.com\n"
8347 msgstr "** 或 mercurial@selenic.com\n"
8245 msgstr "** 或 mercurial@selenic.com\n"
8348
8246
8349 #, python-format
8247 #, python-format
8350 msgid "** Mercurial Distributed SCM (version %s)\n"
8248 msgid "** Mercurial Distributed SCM (version %s)\n"
8351 msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n"
8249 msgstr "** 分布式软件配置管理工具 - 水银 (版本 %s)\n"
8352
8250
8353 #, python-format
8251 #, python-format
8354 msgid "** Extensions loaded: %s\n"
8252 msgid "** Extensions loaded: %s\n"
8355 msgstr "** 已加载的扩展: %s\n"
8253 msgstr "** 已加载的扩展: %s\n"
8356
8254
8357 #, python-format
8255 #, python-format
8358 msgid "no definition for alias '%s'\n"
8256 msgid "no definition for alias '%s'\n"
8359 msgstr ""
8257 msgstr ""
8360
8258
8361 #, fuzzy, python-format
8259 #, fuzzy, python-format
8362 msgid "alias '%s' resolves to unknown command '%s'\n"
8260 msgid "alias '%s' resolves to unknown command '%s'\n"
8363 msgstr "hg: 未知命令 '%s'\n"
8261 msgstr "hg: 未知命令 '%s'\n"
8364
8262
8365 #, python-format
8263 #, python-format
8366 msgid "alias '%s' resolves to ambiguous command '%s'\n"
8264 msgid "alias '%s' resolves to ambiguous command '%s'\n"
8367 msgstr ""
8265 msgstr ""
8368
8266
8369 #, fuzzy, python-format
8267 #, fuzzy, python-format
8370 msgid "alias '%s' shadows command\n"
8268 msgid "alias '%s' shadows command\n"
8371 msgstr ""
8269 msgstr ""
8372 "命令列表:\n"
8270 "命令列表:\n"
8373 "\n"
8271 "\n"
8374
8272
8375 #, python-format
8273 #, python-format
8376 msgid "malformed --config option: %s"
8274 msgid "malformed --config option: %s"
8377 msgstr "非法 '--config' 选项: %s"
8275 msgstr "非法 '--config' 选项: %s"
8378
8276
8379 #, python-format
8277 #, python-format
8380 msgid "extension '%s' overrides commands: %s\n"
8278 msgid "extension '%s' overrides commands: %s\n"
8381 msgstr "扩展 '%s' 覆盖了命令: %s\n"
8279 msgstr "扩展 '%s' 覆盖了命令: %s\n"
8382
8280
8383 msgid "Option --config may not be abbreviated!"
8281 msgid "Option --config may not be abbreviated!"
8384 msgstr "选项 '--config' 不能简短!"
8282 msgstr "选项 '--config' 不能简短!"
8385
8283
8386 msgid "Option --cwd may not be abbreviated!"
8284 msgid "Option --cwd may not be abbreviated!"
8387 msgstr "选项 '--cwd' 不能简短!"
8285 msgstr "选项 '--cwd' 不能简短!"
8388
8286
8389 #, fuzzy
8287 #, fuzzy
8390 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
8288 msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
8391 msgstr "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!"
8289 msgstr "选项 -R 必须隔离使用(也就是不能 -qR),并且 --repository 只能简短为 --repo!"
8392
8290
8393 #, python-format
8291 #, python-format
8394 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
8292 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
8395 msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n"
8293 msgstr "时间: 实际 %.3f 秒(用户 %.3f+%.3f 系统 %.3f+%.3f)\n"
8396
8294
8397 #, python-format
8295 #, python-format
8398 msgid "repository '%s' is not local"
8296 msgid "repository '%s' is not local"
8399 msgstr "非本地版本库 '%s'"
8297 msgstr "非本地版本库 '%s'"
8400
8298
8401 msgid "invalid arguments"
8299 msgid "invalid arguments"
8402 msgstr "非法参数"
8300 msgstr "非法参数"
8403
8301
8404 #, python-format
8302 #, python-format
8405 msgid "unrecognized profiling format '%s' - Ignored\n"
8303 msgid "unrecognized profiling format '%s' - Ignored\n"
8406 msgstr ""
8304 msgstr ""
8407
8305
8408 msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
8306 msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
8409 msgstr "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装"
8307 msgstr "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装"
8410
8308
8411 #, python-format
8309 #, python-format
8412 msgid "*** failed to import extension %s from %s: %s\n"
8310 msgid "*** failed to import extension %s from %s: %s\n"
8413 msgstr "*** 加载扩展 '%s',自 '%s': %s\n"
8311 msgstr "*** 加载扩展 '%s',自 '%s': %s\n"
8414
8312
8415 #, python-format
8313 #, python-format
8416 msgid "*** failed to import extension %s: %s\n"
8314 msgid "*** failed to import extension %s: %s\n"
8417 msgstr "*** 加载扩展 '%s' 失败: %s\n"
8315 msgstr "*** 加载扩展 '%s' 失败: %s\n"
8418
8316
8419 #, python-format
8317 #, python-format
8420 msgid "couldn't find merge tool %s\n"
8318 msgid "couldn't find merge tool %s\n"
8421 msgstr "不能找到合并工具 '%s'\n"
8319 msgstr "不能找到合并工具 '%s'\n"
8422
8320
8423 #, python-format
8321 #, python-format
8424 msgid "tool %s can't handle symlinks\n"
8322 msgid "tool %s can't handle symlinks\n"
8425 msgstr "工具 '%s' 不能处理符号链接\n"
8323 msgstr "工具 '%s' 不能处理符号链接\n"
8426
8324
8427 #, python-format
8325 #, python-format
8428 msgid "tool %s can't handle binary\n"
8326 msgid "tool %s can't handle binary\n"
8429 msgstr "工具 '%s' 不能处理二进制\n"
8327 msgstr "工具 '%s' 不能处理二进制\n"
8430
8328
8431 #, python-format
8329 #, python-format
8432 msgid "tool %s requires a GUI\n"
8330 msgid "tool %s requires a GUI\n"
8433 msgstr "工具 '%s' 需要 GUI\n"
8331 msgstr "工具 '%s' 需要 GUI\n"
8434
8332
8435 #, python-format
8333 #, python-format
8436 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
8334 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
8437 msgstr "选择工具 '%s',用于 %s(二进制 %s 符号链接 %s)\n"
8335 msgstr "选择工具 '%s',用于 %s(二进制 %s 符号链接 %s)\n"
8438
8336
8439 #, python-format
8337 #, python-format
8440 msgid ""
8338 msgid ""
8441 " no tool found to merge %s\n"
8339 " no tool found to merge %s\n"
8442 "keep (l)ocal or take (o)ther?"
8340 "keep (l)ocal or take (o)ther?"
8443 msgstr ""
8341 msgstr ""
8444 " 没有找到工具合并 %s\n"
8342 " 没有找到工具合并 %s\n"
8445 "使用本地(l)或者他人(o)的内容?"
8343 "使用本地(l)或者他人(o)的内容?"
8446
8344
8447 msgid "&Local"
8345 msgid "&Local"
8448 msgstr ""
8346 msgstr ""
8449
8347
8450 msgid "&Other"
8348 msgid "&Other"
8451 msgstr ""
8349 msgstr ""
8452
8350
8453 #, python-format
8351 #, python-format
8454 msgid "merging %s and %s to %s\n"
8352 msgid "merging %s and %s to %s\n"
8455 msgstr ""
8353 msgstr ""
8456
8354
8457 #, python-format
8355 #, python-format
8458 msgid "merging %s\n"
8356 msgid "merging %s\n"
8459 msgstr ""
8357 msgstr ""
8460
8358
8461 #, python-format
8359 #, python-format
8462 msgid "my %s other %s ancestor %s\n"
8360 msgid "my %s other %s ancestor %s\n"
8463 msgstr ""
8361 msgstr ""
8464
8362
8465 msgid " premerge successful\n"
8363 msgid " premerge successful\n"
8466 msgstr ""
8364 msgstr ""
8467
8365
8468 #, python-format
8366 #, python-format
8469 msgid ""
8367 msgid ""
8470 " output file %s appears unchanged\n"
8368 " output file %s appears unchanged\n"
8471 "was merge successful (yn)?"
8369 "was merge successful (yn)?"
8472 msgstr ""
8370 msgstr ""
8473
8371
8474 msgid "&No"
8372 msgid "&No"
8475 msgstr ""
8373 msgstr ""
8476
8374
8477 msgid "&Yes"
8375 msgid "&Yes"
8478 msgstr ""
8376 msgstr ""
8479
8377
8480 #, python-format
8378 #, python-format
8481 msgid "merging %s failed!\n"
8379 msgid "merging %s failed!\n"
8482 msgstr ""
8380 msgstr ""
8483
8381
8484 #, python-format
8382 #, python-format
8485 msgid "Inconsistent state, %s:%s is good and bad"
8383 msgid "Inconsistent state, %s:%s is good and bad"
8486 msgstr ""
8384 msgstr ""
8487
8385
8488 #, python-format
8386 #, python-format
8489 msgid "unknown bisect kind %s"
8387 msgid "unknown bisect kind %s"
8490 msgstr ""
8388 msgstr ""
8491
8389
8492 msgid ""
8390 msgid ""
8493 "\n"
8391 "\n"
8494 " Mercurial has the ability to add new features through the use of\n"
8392 " Mercurial has the ability to add new features through the use of\n"
8495 " extensions. Extensions may add new commands, add options to\n"
8393 " extensions. Extensions may add new commands, add options to\n"
8496 " existing commands, change the default behavior of commands, or\n"
8394 " existing commands, change the default behavior of commands, or\n"
8497 " implement hooks."
8395 " implement hooks."
8498 msgstr ""
8396 msgstr ""
8499
8397
8500 msgid ""
8398 msgid ""
8501 " Extensions are not loaded by default for a variety of reasons:\n"
8399 " Extensions are not loaded by default for a variety of reasons:\n"
8502 " they can increase startup overhead; they may be meant for advanced\n"
8400 " they can increase startup overhead; they may be meant for advanced\n"
8503 " usage only; they may provide potentially dangerous abilities (such\n"
8401 " usage only; they may provide potentially dangerous abilities (such\n"
8504 " as letting you destroy or modify history); they might not be ready\n"
8402 " as letting you destroy or modify history); they might not be ready\n"
8505 " for prime time; or they may alter some usual behaviors of stock\n"
8403 " for prime time; or they may alter some usual behaviors of stock\n"
8506 " Mercurial. It is thus up to the user to activate extensions as\n"
8404 " Mercurial. It is thus up to the user to activate extensions as\n"
8507 " needed."
8405 " needed."
8508 msgstr ""
8406 msgstr ""
8509
8407
8510 msgid ""
8408 msgid ""
8511 " To enable the \"foo\" extension, either shipped with Mercurial or in\n"
8409 " To enable the \"foo\" extension, either shipped with Mercurial or in\n"
8512 " the Python search path, create an entry for it in your hgrc, like\n"
8410 " the Python search path, create an entry for it in your hgrc, like\n"
8513 " this::"
8411 " this::"
8514 msgstr ""
8412 msgstr ""
8515
8413
8516 msgid ""
8414 msgid ""
8517 " [extensions]\n"
8415 " [extensions]\n"
8518 " foo ="
8416 " foo ="
8519 msgstr ""
8417 msgstr ""
8520
8418
8521 msgid " You may also specify the full path to an extension::"
8419 msgid " You may also specify the full path to an extension::"
8522 msgstr ""
8420 msgstr ""
8523
8421
8524 msgid ""
8422 msgid ""
8525 " [extensions]\n"
8423 " [extensions]\n"
8526 " myfeature = ~/.hgext/myfeature.py"
8424 " myfeature = ~/.hgext/myfeature.py"
8527 msgstr ""
8425 msgstr ""
8528
8426
8529 msgid ""
8427 msgid ""
8530 " To explicitly disable an extension enabled in an hgrc of broader\n"
8428 " To explicitly disable an extension enabled in an hgrc of broader\n"
8531 " scope, prepend its path with !::"
8429 " scope, prepend its path with !::"
8532 msgstr ""
8430 msgstr ""
8533
8431
8534 msgid ""
8432 msgid ""
8535 " [extensions]\n"
8433 " [extensions]\n"
8536 " # disabling extension bar residing in /path/to/extension/bar.py\n"
8434 " # disabling extension bar residing in /path/to/extension/bar.py\n"
8537 " bar = !/path/to/extension/bar.py\n"
8435 " bar = !/path/to/extension/bar.py\n"
8538 " # ditto, but no path was supplied for extension baz\n"
8436 " # ditto, but no path was supplied for extension baz\n"
8539 " baz = !\n"
8437 " baz = !\n"
8540 " "
8438 " "
8541 msgstr ""
8439 msgstr ""
8542
8440
8543 #, fuzzy
8441 #, fuzzy
8544 msgid "disabled extensions:"
8442 msgid "disabled extensions:"
8545 msgstr ""
8443 msgstr ""
8546 "\n"
8444 "\n"
8547 "启用的扩展:\n"
8445 "启用的扩展:\n"
8548 "\n"
8446 "\n"
8549
8447
8550 msgid "Date Formats"
8448 msgid "Date Formats"
8551 msgstr ""
8449 msgstr ""
8552
8450
8553 msgid ""
8451 msgid ""
8554 "\n"
8452 "\n"
8555 " Some commands allow the user to specify a date, e.g.:"
8453 " Some commands allow the user to specify a date, e.g.:"
8556 msgstr ""
8454 msgstr ""
8557
8455
8558 msgid ""
8456 msgid ""
8559 " - backout, commit, import, tag: Specify the commit date.\n"
8457 " - backout, commit, import, tag: Specify the commit date.\n"
8560 " - log, revert, update: Select revision(s) by date."
8458 " - log, revert, update: Select revision(s) by date."
8561 msgstr ""
8459 msgstr ""
8562
8460
8563 msgid " Many date formats are valid. Here are some examples::"
8461 msgid " Many date formats are valid. Here are some examples::"
8564 msgstr ""
8462 msgstr ""
8565
8463
8566 msgid ""
8464 msgid ""
8567 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
8465 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
8568 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
8466 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
8569 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
8467 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
8570 " \"Dec 6\" (midnight)\n"
8468 " \"Dec 6\" (midnight)\n"
8571 " \"13:18\" (today assumed)\n"
8469 " \"13:18\" (today assumed)\n"
8572 " \"3:39\" (3:39AM assumed)\n"
8470 " \"3:39\" (3:39AM assumed)\n"
8573 " \"3:39pm\" (15:39)\n"
8471 " \"3:39pm\" (15:39)\n"
8574 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
8472 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
8575 " \"2006-12-6 13:18\"\n"
8473 " \"2006-12-6 13:18\"\n"
8576 " \"2006-12-6\"\n"
8474 " \"2006-12-6\"\n"
8577 " \"12-6\"\n"
8475 " \"12-6\"\n"
8578 " \"12/6\"\n"
8476 " \"12/6\"\n"
8579 " \"12/6/6\" (Dec 6 2006)"
8477 " \"12/6/6\" (Dec 6 2006)"
8580 msgstr ""
8478 msgstr ""
8581
8479
8582 msgid " Lastly, there is Mercurial's internal format::"
8480 msgid " Lastly, there is Mercurial's internal format::"
8583 msgstr ""
8481 msgstr ""
8584
8482
8585 msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
8483 msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
8586 msgstr ""
8484 msgstr ""
8587
8485
8588 msgid ""
8486 msgid ""
8589 " This is the internal representation format for dates. unixtime is\n"
8487 " This is the internal representation format for dates. unixtime is\n"
8590 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
8488 " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
8591 " offset is the offset of the local timezone, in seconds west of UTC\n"
8489 " offset is the offset of the local timezone, in seconds west of UTC\n"
8592 " (negative if the timezone is east of UTC)."
8490 " (negative if the timezone is east of UTC)."
8593 msgstr ""
8491 msgstr ""
8594
8492
8595 msgid " The log command also accepts date ranges::"
8493 msgid " The log command also accepts date ranges::"
8596 msgstr ""
8494 msgstr ""
8597
8495
8598 msgid ""
8496 msgid ""
8599 " \"<{datetime}\" - at or before a given date/time\n"
8497 " \"<{datetime}\" - at or before a given date/time\n"
8600 " \">{datetime}\" - on or after a given date/time\n"
8498 " \">{datetime}\" - on or after a given date/time\n"
8601 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
8499 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
8602 " \"-{days}\" - within a given number of days of today\n"
8500 " \"-{days}\" - within a given number of days of today\n"
8603 " "
8501 " "
8604 msgstr ""
8502 msgstr ""
8605
8503
8606 msgid "File Name Patterns"
8504 msgid "File Name Patterns"
8607 msgstr ""
8505 msgstr ""
8608
8506
8609 msgid ""
8507 msgid ""
8610 "\n"
8508 "\n"
8611 " Mercurial accepts several notations for identifying one or more\n"
8509 " Mercurial accepts several notations for identifying one or more\n"
8612 " files at a time."
8510 " files at a time."
8613 msgstr ""
8511 msgstr ""
8614
8512
8615 msgid ""
8513 msgid ""
8616 " By default, Mercurial treats filenames as shell-style extended\n"
8514 " By default, Mercurial treats filenames as shell-style extended\n"
8617 " glob patterns."
8515 " glob patterns."
8618 msgstr ""
8516 msgstr ""
8619
8517
8620 msgid " Alternate pattern notations must be specified explicitly."
8518 msgid " Alternate pattern notations must be specified explicitly."
8621 msgstr ""
8519 msgstr ""
8622
8520
8623 msgid ""
8521 msgid ""
8624 " To use a plain path name without any pattern matching, start it\n"
8522 " To use a plain path name without any pattern matching, start it\n"
8625 " with \"path:\". These path names must completely match starting at\n"
8523 " with \"path:\". These path names must completely match starting at\n"
8626 " the current repository root."
8524 " the current repository root."
8627 msgstr ""
8525 msgstr ""
8628
8526
8629 msgid ""
8527 msgid ""
8630 " To use an extended glob, start a name with \"glob:\". Globs are\n"
8528 " To use an extended glob, start a name with \"glob:\". Globs are\n"
8631 " rooted at the current directory; a glob such as \"``*.c``\" will\n"
8529 " rooted at the current directory; a glob such as \"``*.c``\" will\n"
8632 " only match files in the current directory ending with \".c\"."
8530 " only match files in the current directory ending with \".c\"."
8633 msgstr ""
8531 msgstr ""
8634
8532
8635 msgid ""
8533 msgid ""
8636 " The supported glob syntax extensions are \"``**``\" to match any\n"
8534 " The supported glob syntax extensions are \"``**``\" to match any\n"
8637 " string across path separators and \"{a,b}\" to mean \"a or b\"."
8535 " string across path separators and \"{a,b}\" to mean \"a or b\"."
8638 msgstr ""
8536 msgstr ""
8639
8537
8640 msgid ""
8538 msgid ""
8641 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
8539 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
8642 " Regexp pattern matching is anchored at the root of the repository."
8540 " Regexp pattern matching is anchored at the root of the repository."
8643 msgstr ""
8541 msgstr ""
8644
8542
8645 msgid " Plain examples::"
8543 msgid " Plain examples::"
8646 msgstr ""
8544 msgstr ""
8647
8545
8648 msgid ""
8546 msgid ""
8649 " path:foo/bar a name bar in a directory named foo in the root\n"
8547 " path:foo/bar a name bar in a directory named foo in the root\n"
8650 " of the repository\n"
8548 " of the repository\n"
8651 " path:path:name a file or directory named \"path:name\""
8549 " path:path:name a file or directory named \"path:name\""
8652 msgstr ""
8550 msgstr ""
8653
8551
8654 msgid " Glob examples::"
8552 msgid " Glob examples::"
8655 msgstr ""
8553 msgstr ""
8656
8554
8657 msgid ""
8555 msgid ""
8658 " glob:*.c any name ending in \".c\" in the current directory\n"
8556 " glob:*.c any name ending in \".c\" in the current directory\n"
8659 " *.c any name ending in \".c\" in the current directory\n"
8557 " *.c any name ending in \".c\" in the current directory\n"
8660 " **.c any name ending in \".c\" in any subdirectory of the\n"
8558 " **.c any name ending in \".c\" in any subdirectory of the\n"
8661 " current directory including itself.\n"
8559 " current directory including itself.\n"
8662 " foo/*.c any name ending in \".c\" in the directory foo\n"
8560 " foo/*.c any name ending in \".c\" in the directory foo\n"
8663 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
8561 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
8664 " including itself."
8562 " including itself."
8665 msgstr ""
8563 msgstr ""
8666
8564
8667 msgid " Regexp examples::"
8565 msgid " Regexp examples::"
8668 msgstr ""
8566 msgstr ""
8669
8567
8670 msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository"
8568 msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository"
8671 msgstr ""
8569 msgstr ""
8672
8570
8673 msgid "Environment Variables"
8571 msgid "Environment Variables"
8674 msgstr ""
8572 msgstr ""
8675
8573
8676 msgid ""
8574 msgid ""
8677 "\n"
8575 "\n"
8678 "HG\n"
8576 "HG\n"
8679 " Path to the 'hg' executable, automatically passed when running\n"
8577 " Path to the 'hg' executable, automatically passed when running\n"
8680 " hooks, extensions or external tools. If unset or empty, this is\n"
8578 " hooks, extensions or external tools. If unset or empty, this is\n"
8681 " the hg executable's name if it's frozen, or an executable named\n"
8579 " the hg executable's name if it's frozen, or an executable named\n"
8682 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
8580 " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
8683 " Windows) is searched."
8581 " Windows) is searched."
8684 msgstr ""
8582 msgstr ""
8685
8583
8686 msgid ""
8584 msgid ""
8687 "HGEDITOR\n"
8585 "HGEDITOR\n"
8688 " This is the name of the editor to run when committing. See EDITOR."
8586 " This is the name of the editor to run when committing. See EDITOR."
8689 msgstr ""
8587 msgstr ""
8690
8588
8691 msgid " (deprecated, use .hgrc)"
8589 msgid " (deprecated, use .hgrc)"
8692 msgstr ""
8590 msgstr ""
8693
8591
8694 msgid ""
8592 msgid ""
8695 "HGENCODING\n"
8593 "HGENCODING\n"
8696 " This overrides the default locale setting detected by Mercurial.\n"
8594 " This overrides the default locale setting detected by Mercurial.\n"
8697 " This setting is used to convert data including usernames,\n"
8595 " This setting is used to convert data including usernames,\n"
8698 " changeset descriptions, tag names, and branches. This setting can\n"
8596 " changeset descriptions, tag names, and branches. This setting can\n"
8699 " be overridden with the --encoding command-line option."
8597 " be overridden with the --encoding command-line option."
8700 msgstr ""
8598 msgstr ""
8701
8599
8702 msgid ""
8600 msgid ""
8703 "HGENCODINGMODE\n"
8601 "HGENCODINGMODE\n"
8704 " This sets Mercurial's behavior for handling unknown characters\n"
8602 " This sets Mercurial's behavior for handling unknown characters\n"
8705 " while transcoding user input. The default is \"strict\", which\n"
8603 " while transcoding user input. The default is \"strict\", which\n"
8706 " causes Mercurial to abort if it can't map a character. Other\n"
8604 " causes Mercurial to abort if it can't map a character. Other\n"
8707 " settings include \"replace\", which replaces unknown characters, and\n"
8605 " settings include \"replace\", which replaces unknown characters, and\n"
8708 " \"ignore\", which drops them. This setting can be overridden with\n"
8606 " \"ignore\", which drops them. This setting can be overridden with\n"
8709 " the --encodingmode command-line option."
8607 " the --encodingmode command-line option."
8710 msgstr ""
8608 msgstr ""
8711
8609
8712 msgid ""
8610 msgid ""
8713 "HGMERGE\n"
8611 "HGMERGE\n"
8714 " An executable to use for resolving merge conflicts. The program\n"
8612 " An executable to use for resolving merge conflicts. The program\n"
8715 " will be executed with three arguments: local file, remote file,\n"
8613 " will be executed with three arguments: local file, remote file,\n"
8716 " ancestor file."
8614 " ancestor file."
8717 msgstr ""
8615 msgstr ""
8718
8616
8719 msgid ""
8617 msgid ""
8720 "HGRCPATH\n"
8618 "HGRCPATH\n"
8721 " A list of files or directories to search for hgrc files. Item\n"
8619 " A list of files or directories to search for hgrc files. Item\n"
8722 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
8620 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
8723 " platform default search path is used. If empty, only the .hg/hgrc\n"
8621 " platform default search path is used. If empty, only the .hg/hgrc\n"
8724 " from the current repository is read."
8622 " from the current repository is read."
8725 msgstr ""
8623 msgstr ""
8726
8624
8727 msgid " For each element in HGRCPATH:"
8625 msgid " For each element in HGRCPATH:"
8728 msgstr ""
8626 msgstr ""
8729
8627
8730 msgid ""
8628 msgid ""
8731 " - if it's a directory, all files ending with .rc are added\n"
8629 " - if it's a directory, all files ending with .rc are added\n"
8732 " - otherwise, the file itself will be added"
8630 " - otherwise, the file itself will be added"
8733 msgstr ""
8631 msgstr ""
8734
8632
8735 msgid ""
8633 msgid ""
8736 "HGUSER\n"
8634 "HGUSER\n"
8737 " This is the string used as the author of a commit. If not set,\n"
8635 " This is the string used as the author of a commit. If not set,\n"
8738 " available values will be considered in this order:"
8636 " available values will be considered in this order:"
8739 msgstr ""
8637 msgstr ""
8740
8638
8741 msgid ""
8639 msgid ""
8742 " - HGUSER (deprecated)\n"
8640 " - HGUSER (deprecated)\n"
8743 " - hgrc files from the HGRCPATH\n"
8641 " - hgrc files from the HGRCPATH\n"
8744 " - EMAIL\n"
8642 " - EMAIL\n"
8745 " - interactive prompt\n"
8643 " - interactive prompt\n"
8746 " - LOGNAME (with '@hostname' appended)"
8644 " - LOGNAME (with '@hostname' appended)"
8747 msgstr ""
8645 msgstr ""
8748
8646
8749 msgid ""
8647 msgid ""
8750 "EMAIL\n"
8648 "EMAIL\n"
8751 " May be used as the author of a commit; see HGUSER."
8649 " May be used as the author of a commit; see HGUSER."
8752 msgstr ""
8650 msgstr ""
8753
8651
8754 msgid ""
8652 msgid ""
8755 "LOGNAME\n"
8653 "LOGNAME\n"
8756 " May be used as the author of a commit; see HGUSER."
8654 " May be used as the author of a commit; see HGUSER."
8757 msgstr ""
8655 msgstr ""
8758
8656
8759 msgid ""
8657 msgid ""
8760 "VISUAL\n"
8658 "VISUAL\n"
8761 " This is the name of the editor to use when committing. See EDITOR."
8659 " This is the name of the editor to use when committing. See EDITOR."
8762 msgstr ""
8660 msgstr ""
8763
8661
8764 msgid ""
8662 msgid ""
8765 "EDITOR\n"
8663 "EDITOR\n"
8766 " Sometimes Mercurial needs to open a text file in an editor for a\n"
8664 " Sometimes Mercurial needs to open a text file in an editor for a\n"
8767 " user to modify, for example when writing commit messages. The\n"
8665 " user to modify, for example when writing commit messages. The\n"
8768 " editor it uses is determined by looking at the environment\n"
8666 " editor it uses is determined by looking at the environment\n"
8769 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
8667 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
8770 " non-empty one is chosen. If all of them are empty, the editor\n"
8668 " non-empty one is chosen. If all of them are empty, the editor\n"
8771 " defaults to 'vi'."
8669 " defaults to 'vi'."
8772 msgstr ""
8670 msgstr ""
8773
8671
8774 msgid ""
8672 msgid ""
8775 "PYTHONPATH\n"
8673 "PYTHONPATH\n"
8776 " This is used by Python to find imported modules and may need to be\n"
8674 " This is used by Python to find imported modules and may need to be\n"
8777 " set appropriately if this Mercurial is not installed system-wide.\n"
8675 " set appropriately if this Mercurial is not installed system-wide.\n"
8778 " "
8676 " "
8779 msgstr ""
8677 msgstr ""
8780
8678
8781 msgid "Specifying Single Revisions"
8679 msgid "Specifying Single Revisions"
8782 msgstr ""
8680 msgstr ""
8783
8681
8784 msgid ""
8682 msgid ""
8785 "\n"
8683 "\n"
8786 " Mercurial supports several ways to specify individual revisions."
8684 " Mercurial supports several ways to specify individual revisions."
8787 msgstr ""
8685 msgstr ""
8788
8686
8789 msgid ""
8687 msgid ""
8790 " A plain integer is treated as a revision number. Negative integers\n"
8688 " A plain integer is treated as a revision number. Negative integers\n"
8791 " are treated as sequential offsets from the tip, with -1 denoting\n"
8689 " are treated as sequential offsets from the tip, with -1 denoting\n"
8792 " the tip, -2 denoting the revision prior to the tip, and so forth."
8690 " the tip, -2 denoting the revision prior to the tip, and so forth."
8793 msgstr ""
8691 msgstr ""
8794
8692
8795 msgid ""
8693 msgid ""
8796 " A 40-digit hexadecimal string is treated as a unique revision\n"
8694 " A 40-digit hexadecimal string is treated as a unique revision\n"
8797 " identifier."
8695 " identifier."
8798 msgstr ""
8696 msgstr ""
8799
8697
8800 msgid ""
8698 msgid ""
8801 " A hexadecimal string less than 40 characters long is treated as a\n"
8699 " A hexadecimal string less than 40 characters long is treated as a\n"
8802 " unique revision identifier and is referred to as a short-form\n"
8700 " unique revision identifier and is referred to as a short-form\n"
8803 " identifier. A short-form identifier is only valid if it is the\n"
8701 " identifier. A short-form identifier is only valid if it is the\n"
8804 " prefix of exactly one full-length identifier."
8702 " prefix of exactly one full-length identifier."
8805 msgstr ""
8703 msgstr ""
8806
8704
8807 msgid ""
8705 msgid ""
8808 " Any other string is treated as a tag or branch name. A tag name is\n"
8706 " Any other string is treated as a tag or branch name. A tag name is\n"
8809 " a symbolic name associated with a revision identifier. A branch\n"
8707 " a symbolic name associated with a revision identifier. A branch\n"
8810 " name denotes the tipmost revision of that branch. Tag and branch\n"
8708 " name denotes the tipmost revision of that branch. Tag and branch\n"
8811 " names must not contain the \":\" character."
8709 " names must not contain the \":\" character."
8812 msgstr ""
8710 msgstr ""
8813
8711
8814 msgid ""
8712 msgid ""
8815 " The reserved name \"tip\" is a special tag that always identifies\n"
8713 " The reserved name \"tip\" is a special tag that always identifies\n"
8816 " the most recent revision."
8714 " the most recent revision."
8817 msgstr ""
8715 msgstr ""
8818
8716
8819 msgid ""
8717 msgid ""
8820 " The reserved name \"null\" indicates the null revision. This is the\n"
8718 " The reserved name \"null\" indicates the null revision. This is the\n"
8821 " revision of an empty repository, and the parent of revision 0."
8719 " revision of an empty repository, and the parent of revision 0."
8822 msgstr ""
8720 msgstr ""
8823
8721
8824 msgid ""
8722 msgid ""
8825 " The reserved name \".\" indicates the working directory parent. If\n"
8723 " The reserved name \".\" indicates the working directory parent. If\n"
8826 " no working directory is checked out, it is equivalent to null. If\n"
8724 " no working directory is checked out, it is equivalent to null. If\n"
8827 " an uncommitted merge is in progress, \".\" is the revision of the\n"
8725 " an uncommitted merge is in progress, \".\" is the revision of the\n"
8828 " first parent.\n"
8726 " first parent.\n"
8829 " "
8727 " "
8830 msgstr ""
8728 msgstr ""
8831
8729
8832 msgid "Specifying Multiple Revisions"
8730 msgid "Specifying Multiple Revisions"
8833 msgstr "指定多个版本"
8731 msgstr "指定多个版本"
8834
8732
8835 #, fuzzy
8733 #, fuzzy
8836 msgid ""
8734 msgid ""
8837 "\n"
8735 "\n"
8838 " When Mercurial accepts more than one revision, they may be\n"
8736 " When Mercurial accepts more than one revision, they may be\n"
8839 " specified individually, or provided as a topologically continuous\n"
8737 " specified individually, or provided as a topologically continuous\n"
8840 " range, separated by the \":\" character."
8738 " range, separated by the \":\" character."
8841 msgstr ""
8739 msgstr ""
8842 "\n"
8740 "\n"
8843 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n"
8741 " 当水银接受多个版本时,它们可以单独给出,或者以字符 \":\" 分割的拓扑连续\n"
8844 " 范围格式提供。"
8742 " 范围格式提供。"
8845
8743
8846 #, fuzzy
8744 #, fuzzy
8847 msgid ""
8745 msgid ""
8848 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
8746 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
8849 " are revision identifiers. Both BEGIN and END are optional. If\n"
8747 " are revision identifiers. Both BEGIN and END are optional. If\n"
8850 " BEGIN is not specified, it defaults to revision number 0. If END\n"
8748 " BEGIN is not specified, it defaults to revision number 0. If END\n"
8851 " is not specified, it defaults to the tip. The range \":\" thus means\n"
8749 " is not specified, it defaults to the tip. The range \":\" thus means\n"
8852 " \"all revisions\"."
8750 " \"all revisions\"."
8853 msgstr ""
8751 msgstr ""
8854 " 范围的语法是 '[BEGIN]:[END]',其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n"
8752 " 范围的语法是 '[BEGIN]:[END]',其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n"
8855 " 和 'END' 都是可选的。'BEGIN' 默认是 0,'END' 默认是 'tip'。因此范围 \":\"\n"
8753 " 和 'END' 都是可选的。'BEGIN' 默认是 0,'END' 默认是 'tip'。因此范围 \":\"\n"
8856 " 意味着全部版本。"
8754 " 意味着全部版本。"
8857
8755
8858 #, fuzzy
8756 #, fuzzy
8859 msgid ""
8757 msgid ""
8860 " If BEGIN is greater than END, revisions are treated in reverse\n"
8758 " If BEGIN is greater than END, revisions are treated in reverse\n"
8861 " order."
8759 " order."
8862 msgstr " 如果 'BEGIN' 大于 'END',版本视为反序。"
8760 msgstr " 如果 'BEGIN' 大于 'END',版本视为反序。"
8863
8761
8864 #, fuzzy
8762 #, fuzzy
8865 msgid ""
8763 msgid ""
8866 " A range acts as a closed interval. This means that a range of 3:5\n"
8764 " A range acts as a closed interval. This means that a range of 3:5\n"
8867 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
8765 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
8868 " "
8766 " "
8869 msgstr ""
8767 msgstr ""
8870 " 范围是闭区间。即范围 '3:5' 是 '3','4','5'。同样,范围 '9:6' 是 '9',\n"
8768 " 范围是闭区间。即范围 '3:5' 是 '3','4','5'。同样,范围 '9:6' 是 '9',\n"
8871 " '8','7' 和 '6'。\n"
8769 " '8','7' 和 '6'。\n"
8872 " "
8770 " "
8873
8771
8874 msgid "Diff Formats"
8772 msgid "Diff Formats"
8875 msgstr "差异格式"
8773 msgstr "差异格式"
8876
8774
8877 #, fuzzy
8775 #, fuzzy
8878 msgid ""
8776 msgid ""
8879 "\n"
8777 "\n"
8880 " Mercurial's default format for showing changes between two\n"
8778 " Mercurial's default format for showing changes between two\n"
8881 " versions of a file is compatible with the unified format of GNU\n"
8779 " versions of a file is compatible with the unified format of GNU\n"
8882 " diff, which can be used by GNU patch and many other standard\n"
8780 " diff, which can be used by GNU patch and many other standard\n"
8883 " tools."
8781 " tools."
8884 msgstr ""
8782 msgstr ""
8885 "\n"
8783 "\n"
8886 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n"
8784 " 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容,可用于\n"
8887 " GNU patch 和许多标准工具。"
8785 " GNU patch 和许多标准工具。"
8888
8786
8889 #, fuzzy
8787 #, fuzzy
8890 msgid ""
8788 msgid ""
8891 " While this standard format is often enough, it does not encode the\n"
8789 " While this standard format is often enough, it does not encode the\n"
8892 " following information:"
8790 " following information:"
8893 msgstr " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:"
8791 msgstr " 虽然标准格式在大多数情况下都能满足要求,但是它不包含下述信息:"
8894
8792
8895 #, fuzzy
8793 #, fuzzy
8896 msgid ""
8794 msgid ""
8897 " - executable status and other permission bits\n"
8795 " - executable status and other permission bits\n"
8898 " - copy or rename information\n"
8796 " - copy or rename information\n"
8899 " - changes in binary files\n"
8797 " - changes in binary files\n"
8900 " - creation or deletion of empty files"
8798 " - creation or deletion of empty files"
8901 msgstr ""
8799 msgstr ""
8902 " - 可执行状态和其它权限位\n"
8800 " - 可执行状态和其它权限位\n"
8903 " - 复制或改名信息\n"
8801 " - 复制或改名信息\n"
8904 " - 二进制文件的修改\n"
8802 " - 二进制文件的修改\n"
8905 " - 创建或删除空文件"
8803 " - 创建或删除空文件"
8906
8804
8907 #, fuzzy
8805 #, fuzzy
8908 msgid ""
8806 msgid ""
8909 " Mercurial also supports the extended diff format from the git VCS\n"
8807 " Mercurial also supports the extended diff format from the git VCS\n"
8910 " which addresses these limitations. The git diff format is not\n"
8808 " which addresses these limitations. The git diff format is not\n"
8911 " produced by default because a few widespread tools still do not\n"
8809 " produced by default because a few widespread tools still do not\n"
8912 " understand this format."
8810 " understand this format."
8913 msgstr ""
8811 msgstr ""
8914 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
8812 " 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
8915 " 此格式,所以它不是默认格式。"
8813 " 此格式,所以它不是默认格式。"
8916
8814
8917 #, fuzzy
8815 #, fuzzy
8918 msgid ""
8816 msgid ""
8919 " This means that when generating diffs from a Mercurial repository\n"
8817 " This means that when generating diffs from a Mercurial repository\n"
8920 " (e.g. with \"hg export\"), you should be careful about things like\n"
8818 " (e.g. with \"hg export\"), you should be careful about things like\n"
8921 " file copies and renames or other things mentioned above, because\n"
8819 " file copies and renames or other things mentioned above, because\n"
8922 " when applying a standard diff to a different repository, this\n"
8820 " when applying a standard diff to a different repository, this\n"
8923 " extra information is lost. Mercurial's internal operations (like\n"
8821 " extra information is lost. Mercurial's internal operations (like\n"
8924 " push and pull) are not affected by this, because they use an\n"
8822 " push and pull) are not affected by this, because they use an\n"
8925 " internal binary format for communicating changes."
8823 " internal binary format for communicating changes."
8926 msgstr ""
8824 msgstr ""
8927 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用标\n"
8825 " 这意味着当从水银版本库(例如 \"hg export\")产生差异时,在其它版本库应用标\n"
8928 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n"
8826 " 准差异时,会丢失文件复制或改名等额外信息,所以你要小心处理。水银的内部\n"
8929 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n"
8827 " 操作(例如 push 和 pull)在传达改变时,使用内部的二进制格式,所以不受影\n"
8930 " 响。"
8828 " 响。"
8931
8829
8932 #, fuzzy
8830 #, fuzzy
8933 msgid ""
8831 msgid ""
8934 " To make Mercurial produce the git extended diff format, use the\n"
8832 " To make Mercurial produce the git extended diff format, use the\n"
8935 " --git option available for many commands, or set 'git = True' in\n"
8833 " --git option available for many commands, or set 'git = True' in\n"
8936 " the [diff] section of your hgrc. You do not need to set this\n"
8834 " the [diff] section of your hgrc. You do not need to set this\n"
8937 " option when importing diffs in this format or using them in the mq\n"
8835 " option when importing diffs in this format or using them in the mq\n"
8938 " extension.\n"
8836 " extension.\n"
8939 " "
8837 " "
8940 msgstr ""
8838 msgstr ""
8941 " 要让水银产生 git 扩展差异格式,可以对许多命令使用选项 '--git',或者在\n"
8839 " 要让水银产生 git 扩展差异格式,可以对许多命令使用选项 '--git',或者在\n"
8942 " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时,\n"
8840 " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时,\n"
8943 " 或在 mq 扩展中使用时,不需要设置此选项。\n"
8841 " 或在 mq 扩展中使用时,不需要设置此选项。\n"
8944 " "
8842 " "
8945
8843
8946 msgid "Template Usage"
8844 msgid "Template Usage"
8947 msgstr "模版用法"
8845 msgstr "模版用法"
8948
8846
8949 #, fuzzy
8847 #, fuzzy
8950 msgid ""
8848 msgid ""
8951 "\n"
8849 "\n"
8952 " Mercurial allows you to customize output of commands through\n"
8850 " Mercurial allows you to customize output of commands through\n"
8953 " templates. You can either pass in a template from the command\n"
8851 " templates. You can either pass in a template from the command\n"
8954 " line, via the --template option, or select an existing\n"
8852 " line, via the --template option, or select an existing\n"
8955 " template-style (--style)."
8853 " template-style (--style)."
8956 msgstr ""
8854 msgstr ""
8957 "\n"
8855 "\n"
8958 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n"
8856 " 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n"
8959 " 来使用模版,或者选择已有的模版样式(--style)。"
8857 " 来使用模版,或者选择已有的模版样式(--style)。"
8960
8858
8961 #, fuzzy
8859 #, fuzzy
8962 msgid ""
8860 msgid ""
8963 " You can customize output for any \"log-like\" command: log,\n"
8861 " You can customize output for any \"log-like\" command: log,\n"
8964 " outgoing, incoming, tip, parents, heads and glog."
8862 " outgoing, incoming, tip, parents, heads and glog."
8965 msgstr ""
8863 msgstr ""
8966 " 你可以定制任意输出与日志信息类似的命令,即: log,outgoing,incoming,\n"
8864 " 你可以定制任意输出与日志信息类似的命令,即: log,outgoing,incoming,\n"
8967 " tip,parents,heads 和 glog。"
8865 " tip,parents,heads 和 glog。"
8968
8866
8969 #, fuzzy
8867 #, fuzzy
8970 msgid ""
8868 msgid ""
8971 " Three styles are packaged with Mercurial: default (the style used\n"
8869 " Three styles are packaged with Mercurial: default (the style used\n"
8972 " when no explicit preference is passed), compact and changelog.\n"
8870 " when no explicit preference is passed), compact and changelog.\n"
8973 " Usage::"
8871 " Usage::"
8974 msgstr " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法::"
8872 msgstr " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法::"
8975
8873
8976 #, fuzzy
8874 #, fuzzy
8977 msgid " $ hg log -r1 --style changelog"
8875 msgid " $ hg log -r1 --style changelog"
8978 msgstr " $ hg log -r1 --style changelog"
8876 msgstr " $ hg log -r1 --style changelog"
8979
8877
8980 #, fuzzy
8878 #, fuzzy
8981 msgid ""
8879 msgid ""
8982 " A template is a piece of text, with markup to invoke variable\n"
8880 " A template is a piece of text, with markup to invoke variable\n"
8983 " expansion::"
8881 " expansion::"
8984 msgstr " 模版是文本片断,其中的标记用于变量扩展::"
8882 msgstr " 模版是文本片断,其中的标记用于变量扩展::"
8985
8883
8986 #, fuzzy
8884 #, fuzzy
8987 msgid ""
8885 msgid ""
8988 " $ hg log -r1 --template \"{node}\\n\"\n"
8886 " $ hg log -r1 --template \"{node}\\n\"\n"
8989 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8887 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8990 msgstr ""
8888 msgstr ""
8991 " $ hg log -r1 --template \"{node}\\n\"\n"
8889 " $ hg log -r1 --template \"{node}\\n\"\n"
8992 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8890 " b56ce7b07c52de7d5fd79fb89701ea538af65746"
8993
8891
8994 #, fuzzy
8892 #, fuzzy
8995 msgid ""
8893 msgid ""
8996 " Strings in curly braces are called keywords. The availability of\n"
8894 " Strings in curly braces are called keywords. The availability of\n"
8997 " keywords depends on the exact context of the templater. These\n"
8895 " keywords depends on the exact context of the templater. These\n"
8998 " keywords are usually available for templating a log-like command:"
8896 " keywords are usually available for templating a log-like command:"
8999 msgstr ""
8897 msgstr ""
9000 " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n"
8898 " 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n"
9001 " 可用于输出与日志信息类似的命令:"
8899 " 可用于输出与日志信息类似的命令:"
9002
8900
9003 #, fuzzy
8901 #, fuzzy
9004 msgid ""
8902 msgid ""
9005 " :author: String. The unmodified author of the changeset.\n"
8903 " :author: String. The unmodified author of the changeset.\n"
9006 " :branches: String. The name of the branch on which the changeset\n"
8904 " :branches: String. The name of the branch on which the changeset\n"
9007 " was committed. Will be empty if the branch name was\n"
8905 " was committed. Will be empty if the branch name was\n"
9008 " default.\n"
8906 " default.\n"
9009 " :date: Date information. The date when the changeset was\n"
8907 " :date: Date information. The date when the changeset was\n"
9010 " committed.\n"
8908 " committed.\n"
9011 " :desc: String. The text of the changeset description.\n"
8909 " :desc: String. The text of the changeset description.\n"
9012 " :diffstat: String. Statistics of changes with the following\n"
8910 " :diffstat: String. Statistics of changes with the following\n"
9013 " format: \"modified files: +added/-removed lines\"\n"
8911 " format: \"modified files: +added/-removed lines\"\n"
9014 " :files: List of strings. All files modified, added, or removed\n"
8912 " :files: List of strings. All files modified, added, or removed\n"
9015 " by this changeset.\n"
8913 " by this changeset.\n"
9016 " :file_adds: List of strings. Files added by this changeset.\n"
8914 " :file_adds: List of strings. Files added by this changeset.\n"
9017 " :file_mods: List of strings. Files modified by this changeset.\n"
8915 " :file_mods: List of strings. Files modified by this changeset.\n"
9018 " :file_dels: List of strings. Files removed by this changeset.\n"
8916 " :file_dels: List of strings. Files removed by this changeset.\n"
9019 " :node: String. The changeset identification hash, as a\n"
8917 " :node: String. The changeset identification hash, as a\n"
9020 " 40-character hexadecimal string.\n"
8918 " 40-character hexadecimal string.\n"
9021 " :parents: List of strings. The parents of the changeset.\n"
8919 " :parents: List of strings. The parents of the changeset.\n"
9022 " :rev: Integer. The repository-local changeset revision\n"
8920 " :rev: Integer. The repository-local changeset revision\n"
9023 " number.\n"
8921 " number.\n"
9024 " :tags: List of strings. Any tags associated with the\n"
8922 " :tags: List of strings. Any tags associated with the\n"
9025 " changeset."
8923 " changeset."
9026 msgstr ""
8924 msgstr ""
9027 " - author: 字符串。修改集的作者。\n"
8925 " - author: 字符串。修改集的作者。\n"
9028 " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n"
8926 " - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n"
9029 " - date: 日期信息。修改集的日期。\n"
8927 " - date: 日期信息。修改集的日期。\n"
9030 " - desc: 字符串。修改集的描述。\n"
8928 " - desc: 字符串。修改集的描述。\n"
9031 " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n"
8929 " - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n"
9032 " - file_adds: 字符串列表。修改集中被增加的文件。\n"
8930 " - file_adds: 字符串列表。修改集中被增加的文件。\n"
9033 " - file_mods: 字符串列表。修改集中被修改的文件\n"
8931 " - file_mods: 字符串列表。修改集中被修改的文件\n"
9034 " - file_dels: 字符串列表。修改集中被删除的文件\n"
8932 " - file_dels: 字符串列表。修改集中被删除的文件\n"
9035 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n"
8933 " - node: 字符串。修改集的哈系标识,40 个字符的 16 进制字符串。\n"
9036 " - parents: 字符串列表。修改集的父亲。\n"
8934 " - parents: 字符串列表。修改集的父亲。\n"
9037 " - rev: 整数。本地版本库的修改集的版本号。\n"
8935 " - rev: 整数。本地版本库的修改集的版本号。\n"
9038 " - tags: 字符串列表。修改集的标签。"
8936 " - tags: 字符串列表。修改集的标签。"
9039
8937
9040 #, fuzzy
8938 #, fuzzy
9041 msgid ""
8939 msgid ""
9042 " The \"date\" keyword does not produce human-readable output. If you\n"
8940 " The \"date\" keyword does not produce human-readable output. If you\n"
9043 " want to use a date in your output, you can use a filter to process\n"
8941 " want to use a date in your output, you can use a filter to process\n"
9044 " it. Filters are functions which return a string based on the input\n"
8942 " it. Filters are functions which return a string based on the input\n"
9045 " variable. You can also use a chain of filters to get the desired\n"
8943 " variable. You can also use a chain of filters to get the desired\n"
9046 " output::"
8944 " output::"
9047 msgstr ""
8945 msgstr ""
9048 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使用\n"
8946 " 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期,可以使用\n"
9049 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n"
8947 " 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n"
9050 " 链来产生理想的输出:"
8948 " 链来产生理想的输出:"
9051
8949
9052 #, fuzzy
8950 #, fuzzy
9053 msgid ""
8951 msgid ""
9054 " $ hg tip --template \"{date|isodate}\\n\"\n"
8952 " $ hg tip --template \"{date|isodate}\\n\"\n"
9055 " 2008-08-21 18:22 +0000"
8953 " 2008-08-21 18:22 +0000"
9056 msgstr ""
8954 msgstr ""
9057 " $ hg tip --template \"{date|isodate}\\n\"\n"
8955 " $ hg tip --template \"{date|isodate}\\n\"\n"
9058 " 2008-08-21 18:22 +0000"
8956 " 2008-08-21 18:22 +0000"
9059
8957
9060 #, fuzzy
8958 #, fuzzy
9061 msgid " List of filters:"
8959 msgid " List of filters:"
9062 msgstr " 过滤器列表:"
8960 msgstr " 过滤器列表:"
9063
8961
9064 #, fuzzy
8962 #, fuzzy
9065 msgid ""
8963 msgid ""
9066 " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
8964 " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
9067 " every line except the last.\n"
8965 " every line except the last.\n"
9068 " :age: Date. Returns a human-readable date/time difference\n"
8966 " :age: Date. Returns a human-readable date/time difference\n"
9069 " between the given date/time and the current\n"
8967 " between the given date/time and the current\n"
9070 " date/time.\n"
8968 " date/time.\n"
9071 " :basename: Any text. Treats the text as a path, and returns the\n"
8969 " :basename: Any text. Treats the text as a path, and returns the\n"
9072 " last component of the path after splitting by the\n"
8970 " last component of the path after splitting by the\n"
9073 " path separator (ignoring trailing separators). For\n"
8971 " path separator (ignoring trailing separators). For\n"
9074 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
8972 " example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
9075 " becomes \"bar\".\n"
8973 " becomes \"bar\".\n"
9076 " :stripdir: Treat the text as path and strip a directory level,\n"
8974 " :stripdir: Treat the text as path and strip a directory level,\n"
9077 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
8975 " if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
9078 " \"foo\".\n"
8976 " \"foo\".\n"
9079 " :date: Date. Returns a date in a Unix date format, including\n"
8977 " :date: Date. Returns a date in a Unix date format, including\n"
9080 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
8978 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
9081 " :domain: Any text. Finds the first string that looks like an\n"
8979 " :domain: Any text. Finds the first string that looks like an\n"
9082 " email address, and extracts just the domain\n"
8980 " email address, and extracts just the domain\n"
9083 " component. Example: 'User <user@example.com>' becomes\n"
8981 " component. Example: 'User <user@example.com>' becomes\n"
9084 " 'example.com'.\n"
8982 " 'example.com'.\n"
9085 " :email: Any text. Extracts the first string that looks like\n"
8983 " :email: Any text. Extracts the first string that looks like\n"
9086 " an email address. Example: 'User <user@example.com>'\n"
8984 " an email address. Example: 'User <user@example.com>'\n"
9087 " becomes 'user@example.com'.\n"
8985 " becomes 'user@example.com'.\n"
9088 " :escape: Any text. Replaces the special XML/XHTML characters\n"
8986 " :escape: Any text. Replaces the special XML/XHTML characters\n"
9089 " \"&\", \"<\" and \">\" with XML entities.\n"
8987 " \"&\", \"<\" and \">\" with XML entities.\n"
9090 " :fill68: Any text. Wraps the text to fit in 68 columns.\n"
8988 " :fill68: Any text. Wraps the text to fit in 68 columns.\n"
9091 " :fill76: Any text. Wraps the text to fit in 76 columns.\n"
8989 " :fill76: Any text. Wraps the text to fit in 76 columns.\n"
9092 " :firstline: Any text. Returns the first line of text.\n"
8990 " :firstline: Any text. Returns the first line of text.\n"
9093 " :nonempty: Any text. Returns '(none)' if the string is empty.\n"
8991 " :nonempty: Any text. Returns '(none)' if the string is empty.\n"
9094 " :hgdate: Date. Returns the date as a pair of numbers:\n"
8992 " :hgdate: Date. Returns the date as a pair of numbers:\n"
9095 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
8993 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
9096 " :isodate: Date. Returns the date in ISO 8601 format:\n"
8994 " :isodate: Date. Returns the date in ISO 8601 format:\n"
9097 " \"2009-08-18 13:00 +0200\".\n"
8995 " \"2009-08-18 13:00 +0200\".\n"
9098 " :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
8996 " :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
9099 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
8997 " seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
9100 " rfc3339date filter.\n"
8998 " rfc3339date filter.\n"
9101 " :localdate: Date. Converts a date to local date.\n"
8999 " :localdate: Date. Converts a date to local date.\n"
9102 " :obfuscate: Any text. Returns the input text rendered as a\n"
9000 " :obfuscate: Any text. Returns the input text rendered as a\n"
9103 " sequence of XML entities.\n"
9001 " sequence of XML entities.\n"
9104 " :person: Any text. Returns the text before an email address.\n"
9002 " :person: Any text. Returns the text before an email address.\n"
9105 " :rfc822date: Date. Returns a date using the same format used in\n"
9003 " :rfc822date: Date. Returns a date using the same format used in\n"
9106 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
9004 " email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
9107 " :rfc3339date: Date. Returns a date using the Internet date format\n"
9005 " :rfc3339date: Date. Returns a date using the Internet date format\n"
9108 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
9006 " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
9109 " :short: Changeset hash. Returns the short form of a changeset\n"
9007 " :short: Changeset hash. Returns the short form of a changeset\n"
9110 " hash, i.e. a 12-byte hexadecimal string.\n"
9008 " hash, i.e. a 12-byte hexadecimal string.\n"
9111 " :shortdate: Date. Returns a date like \"2006-09-18\".\n"
9009 " :shortdate: Date. Returns a date like \"2006-09-18\".\n"
9112 " :strip: Any text. Strips all leading and trailing whitespace.\n"
9010 " :strip: Any text. Strips all leading and trailing whitespace.\n"
9113 " :tabindent: Any text. Returns the text, with every line except\n"
9011 " :tabindent: Any text. Returns the text, with every line except\n"
9114 " the first starting with a tab character.\n"
9012 " the first starting with a tab character.\n"
9115 " :urlescape: Any text. Escapes all \"special\" characters. For\n"
9013 " :urlescape: Any text. Escapes all \"special\" characters. For\n"
9116 " example, \"foo bar\" becomes \"foo%20bar\".\n"
9014 " example, \"foo bar\" becomes \"foo%20bar\".\n"
9117 " :user: Any text. Returns the user portion of an email\n"
9015 " :user: Any text. Returns the user portion of an email\n"
9118 " address.\n"
9016 " address.\n"
9119 " "
9017 " "
9120 msgstr ""
9018 msgstr ""
9121 " - addbreaks: 输入任意文本。除了最后一行,在每行的结尾增加 XHTML 标签\n"
9019 " - addbreaks: 输入任意文本。除了最后一行,在每行的结尾增加 XHTML 标签\n"
9122 " \"<br />\"。\n"
9020 " \"<br />\"。\n"
9123 " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n"
9021 " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n"
9124 " - basename: 输入任意文本。将输入视为路径,返回被路径分隔符隔开的最后\n"
9022 " - basename: 输入任意文本。将输入视为路径,返回被路径分隔符隔开的最后\n"
9125 " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz\",\n"
9023 " 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz\",\n"
9126 " \"foo/bar//\" 成为 \"bar\"。\n"
9024 " \"foo/bar//\" 成为 \"bar\"。\n"
9127 " - date: 输入日期。返回指定日期的 Unix 日期格式字符串,包含时区,例如: \n"
9025 " - date: 输入日期。返回指定日期的 Unix 日期格式字符串,包含时区,例如: \n"
9128 " \"Mon Sep 04 15:13:13 2006 0700\"。\n"
9026 " \"Mon Sep 04 15:13:13 2006 0700\"。\n"
9129 " - domain: 输入任意文本。找到第一个 email 地址,返回其域名。例如: \n"
9027 " - domain: 输入任意文本。找到第一个 email 地址,返回其域名。例如: \n"
9130 " 'User <user@example.com>' 成为 'example.com'。\n"
9028 " 'User <user@example.com>' 成为 'example.com'。\n"
9131 " - email: 输入任意文本。返回第一个 email 地址。例如: \n"
9029 " - email: 输入任意文本。返回第一个 email 地址。例如: \n"
9132 " 'User <user@example.com>' 成为 'user@example.com'。\n"
9030 " 'User <user@example.com>' 成为 'user@example.com'。\n"
9133 " - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\",\n"
9031 " - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\",\n"
9134 " \"<\" 和 \">\"。\n"
9032 " \"<\" 和 \">\"。\n"
9135 " - fill68: 输入任意文本。格式化为 68 列文本。\n"
9033 " - fill68: 输入任意文本。格式化为 68 列文本。\n"
9136 " - fill76: 输入任意文本。格式化为 76 列文本。\n"
9034 " - fill76: 输入任意文本。格式化为 76 列文本。\n"
9137 " - firstline: 输入任意文本。返回首行。\n"
9035 " - firstline: 输入任意文本。返回首行。\n"
9138 " - hgdate: 输入日期。返回一对数字:\n"
9036 " - hgdate: 输入日期。返回一对数字:\n"
9139 " \"1157407993 25200\" (Unix 时戳,时区偏移)。\n"
9037 " \"1157407993 25200\" (Unix 时戳,时区偏移)。\n"
9140 " - isodate: 输入日期。返回 ISO 8601 格式的日期。\n"
9038 " - isodate: 输入日期。返回 ISO 8601 格式的日期。\n"
9141 " - obfuscate: 输入任意文本。返回其 XML 实体序列。\n"
9039 " - obfuscate: 输入任意文本。返回其 XML 实体序列。\n"
9142 " - person: 输入任意文本。返回 email 地址前的文本。\n"
9040 " - person: 输入任意文本。返回 email 地址前的文本。\n"
9143 " - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n"
9041 " - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n"
9144 " - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n"
9042 " - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n"
9145 " 字符串。\n"
9043 " 字符串。\n"
9146 " - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n"
9044 " - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n"
9147 " - strip: 输入任意文本。删除全部行首与行尾空白。\n"
9045 " - strip: 输入任意文本。删除全部行首与行尾空白。\n"
9148 " - tabindent: 输入任意文本。除了首行,在每行的开始增加制表符号。\n"
9046 " - tabindent: 输入任意文本。除了首行,在每行的开始增加制表符号。\n"
9149 " - urlescape: 输入任意文本。封装全部特殊字符。例如\n"
9047 " - urlescape: 输入任意文本。封装全部特殊字符。例如\n"
9150 " \"foo bar\" 成为 \"foo%20bar\"。\n"
9048 " \"foo bar\" 成为 \"foo%20bar\"。\n"
9151 " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n"
9049 " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n"
9152 " "
9050 " "
9153
9051
9154 #, fuzzy
9052 #, fuzzy
9155 msgid "URL Paths"
9053 msgid "URL Paths"
9156 msgstr "统一资源定位路径"
9054 msgstr "统一资源定位路径"
9157
9055
9158 #, fuzzy
9056 #, fuzzy
9159 msgid ""
9057 msgid ""
9160 "\n"
9058 "\n"
9161 " Valid URLs are of the form::"
9059 " Valid URLs are of the form::"
9162 msgstr ""
9060 msgstr ""
9163 "\n"
9061 "\n"
9164 " 有效的位置格式:"
9062 " 有效的位置格式:"
9165
9063
9166 #, fuzzy
9064 #, fuzzy
9167 msgid ""
9065 msgid ""
9168 " local/filesystem/path[#revision]\n"
9066 " local/filesystem/path[#revision]\n"
9169 " file://local/filesystem/path[#revision]\n"
9067 " file://local/filesystem/path[#revision]\n"
9170 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
9068 " http://[user[:pass]@]host[:port]/[path][#revision]\n"
9171 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
9069 " https://[user[:pass]@]host[:port]/[path][#revision]\n"
9172 " ssh://[user[:pass]@]host[:port]/[path][#revision]"
9070 " ssh://[user[:pass]@]host[:port]/[path][#revision]"
9173 msgstr ""
9071 msgstr ""
9174 " local/filesystem/path (or file://local/filesystem/path)\n"
9072 " local/filesystem/path (or file://local/filesystem/path)\n"
9175 " http://[user[:pass]@]host[:port]/[path]\n"
9073 " http://[user[:pass]@]host[:port]/[path]\n"
9176 " https://[user[:pass]@]host[:port]/[path]\n"
9074 " https://[user[:pass]@]host[:port]/[path]\n"
9177 " ssh://[user[:pass]@]host[:port]/[path]"
9075 " ssh://[user[:pass]@]host[:port]/[path]"
9178
9076
9179 #, fuzzy
9077 #, fuzzy
9180 msgid ""
9078 msgid ""
9181 " Paths in the local filesystem can either point to Mercurial\n"
9079 " Paths in the local filesystem can either point to Mercurial\n"
9182 " repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
9080 " repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
9183 " incoming --bundle')."
9081 " incoming --bundle')."
9184 msgstr ""
9082 msgstr ""
9185 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9083 " 位于本地文件系统中的路径可以指向版本库,也可以指向打包的文件(被\n"
9186 " 'hg bundle' 或 'hg incoming --bundle' 创建)。"
9084 " 'hg bundle' 或 'hg incoming --bundle' 创建)。"
9187
9085
9188 #, fuzzy
9086 #, fuzzy
9189 msgid ""
9087 msgid ""
9190 " An optional identifier after # indicates a particular branch, tag,\n"
9088 " An optional identifier after # indicates a particular branch, tag,\n"
9191 " or changeset to use from the remote repository. See also 'hg help\n"
9089 " or changeset to use from the remote repository. See also 'hg help\n"
9192 " revisions'."
9090 " revisions'."
9193 msgstr ""
9091 msgstr ""
9194 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9092 " 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支,标签或\n"
9195 " 修改集。"
9093 " 修改集。"
9196
9094
9197 #, fuzzy
9095 #, fuzzy
9198 msgid ""
9096 msgid ""
9199 " Some features, such as pushing to http:// and https:// URLs are\n"
9097 " Some features, such as pushing to http:// and https:// URLs are\n"
9200 " only possible if the feature is explicitly enabled on the remote\n"
9098 " only possible if the feature is explicitly enabled on the remote\n"
9201 " Mercurial server."
9099 " Mercurial server."
9202 msgstr ""
9100 msgstr ""
9203 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。"
9101 " 仅当远程水银服务器显式启用时,才能推到 'http://' 和 'https://'。"
9204
9102
9205 #, fuzzy
9103 #, fuzzy
9206 msgid " Some notes about using SSH with Mercurial:"
9104 msgid " Some notes about using SSH with Mercurial:"
9207 msgstr ""
9105 msgstr ""
9208 " 在水银中使用 SSH 的一些提示::"
9106 " 在水银中使用 SSH 的一些提示::"
9209
9107
9210 #, fuzzy
9108 #, fuzzy
9211 msgid ""
9109 msgid ""
9212 " - SSH requires an accessible shell account on the destination\n"
9110 " - SSH requires an accessible shell account on the destination\n"
9213 " machine and a copy of hg in the remote path or specified with as\n"
9111 " machine and a copy of hg in the remote path or specified with as\n"
9214 " remotecmd.\n"
9112 " remotecmd.\n"
9215 " - path is relative to the remote user's home directory by default.\n"
9113 " - path is relative to the remote user's home directory by default.\n"
9216 " Use an extra slash at the start of a path to specify an absolute\n"
9114 " Use an extra slash at the start of a path to specify an absolute\n"
9217 " path::"
9115 " path::"
9218 msgstr ""
9116 msgstr ""
9219 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9117 " - 使用 SSH 时,需要在远程主机上有可登录帐号,远程路径中还需要有\n"
9220 " hg,或者有指定的远程命令。\n"
9118 " hg,或者有指定的远程命令。\n"
9221 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9119 " - 默认 'path' 是相对于远程主机上的用户家目录。\n"
9222 " 可以在路径前增加一个斜线指定绝对路径:"
9120 " 可以在路径前增加一个斜线指定绝对路径:"
9223
9121
9224 #, fuzzy
9122 #, fuzzy
9225 msgid " ssh://example.com//tmp/repository"
9123 msgid " ssh://example.com//tmp/repository"
9226 msgstr ""
9124 msgstr ""
9227 " ssh://example.com//tmp/repository"
9125 " ssh://example.com//tmp/repository"
9228
9126
9229 #, fuzzy
9127 #, fuzzy
9230 msgid ""
9128 msgid ""
9231 " - Mercurial doesn't use its own compression via SSH; the right\n"
9129 " - Mercurial doesn't use its own compression via SSH; the right\n"
9232 " thing to do is to configure it in your ~/.ssh/config, e.g.::"
9130 " thing to do is to configure it in your ~/.ssh/config, e.g.::"
9233 msgstr ""
9131 msgstr ""
9234 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9132 " - 水银使用 SSH 时不使用压缩,所以你可以在 ~/.ssh/config 中配置\n"
9235 " SSH 执行压缩,例如:"
9133 " SSH 执行压缩,例如:"
9236
9134
9237 #, fuzzy
9135 #, fuzzy
9238 msgid ""
9136 msgid ""
9239 " Host *.mylocalnetwork.example.com\n"
9137 " Host *.mylocalnetwork.example.com\n"
9240 " Compression no\n"
9138 " Compression no\n"
9241 " Host *\n"
9139 " Host *\n"
9242 " Compression yes"
9140 " Compression yes"
9243 msgstr ""
9141 msgstr ""
9244 " Host *.mylocalnetwork.example.com\n"
9142 " Host *.mylocalnetwork.example.com\n"
9245 " Compression no\n"
9143 " Compression no\n"
9246 " Host *\n"
9144 " Host *\n"
9247 " Compression yes"
9145 " Compression yes"
9248
9146
9249 #, fuzzy
9147 #, fuzzy
9250 msgid ""
9148 msgid ""
9251 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
9149 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
9252 " or with the --ssh command line option."
9150 " or with the --ssh command line option."
9253 msgstr ""
9151 msgstr ""
9254 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9152 " 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令,或\n"
9255 " 用于命令行参数 '--ssh' 中。"
9153 " 用于命令行参数 '--ssh' 中。"
9256
9154
9257 #, fuzzy
9155 #, fuzzy
9258 msgid ""
9156 msgid ""
9259 " These URLs can all be stored in your hgrc with path aliases under\n"
9157 " These URLs can all be stored in your hgrc with path aliases under\n"
9260 " the [paths] section like so::"
9158 " the [paths] section like so::"
9261 msgstr ""
9159 msgstr ""
9262 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:"
9160 " 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:"
9263
9161
9264 #, fuzzy
9162 #, fuzzy
9265 msgid ""
9163 msgid ""
9266 " [paths]\n"
9164 " [paths]\n"
9267 " alias1 = URL1\n"
9165 " alias1 = URL1\n"
9268 " alias2 = URL2\n"
9166 " alias2 = URL2\n"
9269 " ..."
9167 " ..."
9270 msgstr ""
9168 msgstr ""
9271 " [paths]\n"
9169 " [paths]\n"
9272 " alias1 = URL1\n"
9170 " alias1 = URL1\n"
9273 " alias2 = URL2\n"
9171 " alias2 = URL2\n"
9274 " ..."
9172 " ..."
9275
9173
9276 #, fuzzy
9174 #, fuzzy
9277 msgid ""
9175 msgid ""
9278 " You can then use the alias for any command that uses a URL (for\n"
9176 " You can then use the alias for any command that uses a URL (for\n"
9279 " example 'hg pull alias1' would pull from the 'alias1' path)."
9177 " example 'hg pull alias1' would pull from the 'alias1' path)."
9280 msgstr ""
9178 msgstr ""
9281 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9179 " 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
9282 " 会从 'alias1' 定义的路径取得指定版本)。"
9180 " 会从 'alias1' 定义的路径取得指定版本)。"
9283
9181
9284 #, fuzzy
9182 #, fuzzy
9285 msgid ""
9183 msgid ""
9286 " Two path aliases are special because they are used as defaults\n"
9184 " Two path aliases are special because they are used as defaults\n"
9287 " when you do not provide the URL to a command:"
9185 " when you do not provide the URL to a command:"
9288 msgstr ""
9186 msgstr ""
9289 " 因为用于默认路径,所以这 2 个路径别名比较特殊:"
9187 " 因为用于默认路径,所以这 2 个路径别名比较特殊:"
9290
9188
9291 #, fuzzy
9189 #, fuzzy
9292 msgid ""
9190 msgid ""
9293 " default:\n"
9191 " default:\n"
9294 " When you create a repository with hg clone, the clone command\n"
9192 " When you create a repository with hg clone, the clone command\n"
9295 " saves the location of the source repository as the new\n"
9193 " saves the location of the source repository as the new\n"
9296 " repository's 'default' path. This is then used when you omit\n"
9194 " repository's 'default' path. This is then used when you omit\n"
9297 " path from push- and pull-like commands (including incoming and\n"
9195 " path from push- and pull-like commands (including incoming and\n"
9298 " outgoing)."
9196 " outgoing)."
9299 msgstr ""
9197 msgstr ""
9300 " default:\n"
9198 " default:\n"
9301 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9199 " 当你使用 'hg clone' 创建版本库时,此命令会将源版本库的位置保存\n"
9302 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9200 " 为新版本库的 'default' 路径,然后你可以对类似 'push' 和 'pull'\n"
9303 " 的命令省略路径(包含进和出)。"
9201 " 的命令省略路径(包含进和出)。"
9304
9202
9305 #, fuzzy
9203 #, fuzzy
9306 msgid ""
9204 msgid ""
9307 " default-push:\n"
9205 " default-push:\n"
9308 " The push command will look for a path named 'default-push', and\n"
9206 " The push command will look for a path named 'default-push', and\n"
9309 " prefer it over 'default' if both are defined.\n"
9207 " prefer it over 'default' if both are defined.\n"
9310 " "
9208 " "
9311 msgstr ""
9209 msgstr ""
9312 " default-push:\n"
9210 " default-push:\n"
9313 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9211 " 命令 'push' 会查找别名是 'default-push' 的路径,它覆盖定义 'default'。\n"
9314 " "
9212 " "
9315
9213
9316 #, fuzzy
9214 #, fuzzy
9317 msgid "Using additional features"
9215 msgid "Using additional features"
9318 msgstr "启用额外的输出"
9216 msgstr "启用额外的输出"
9319
9217
9320 #, fuzzy
9218 #, fuzzy
9321 msgid "can only share local repositories"
9219 msgid "can only share local repositories"
9322 msgstr "为此版本库启动服务 'inotify'"
9220 msgstr "为此版本库启动服务 'inotify'"
9323
9221
9324 #, fuzzy
9222 #, fuzzy
9325 msgid "destination already exists"
9223 msgid "destination already exists"
9326 msgstr "版本库 %s 已存在"
9224 msgstr "版本库 %s 已存在"
9327
9225
9328 msgid "updating working directory\n"
9226 msgid "updating working directory\n"
9329 msgstr "正在更新工作目录\n"
9227 msgstr "正在更新工作目录\n"
9330
9228
9331 #, python-format
9229 #, python-format
9332 msgid "destination directory: %s\n"
9230 msgid "destination directory: %s\n"
9333 msgstr "目标目录: %s\n"
9231 msgstr "目标目录: %s\n"
9334
9232
9335 #, python-format
9233 #, python-format
9336 msgid "destination '%s' already exists"
9234 msgid "destination '%s' already exists"
9337 msgstr ""
9235 msgstr ""
9338
9236
9339 #, fuzzy, python-format
9237 #, fuzzy, python-format
9340 msgid "destination '%s' is not empty"
9238 msgid "destination '%s' is not empty"
9341 msgstr "非本地版本库 '%s'"
9239 msgstr "非本地版本库 '%s'"
9342
9240
9343 msgid "src repository does not support revision lookup and so doesn't support clone by revision"
9241 msgid "src repository does not support revision lookup and so doesn't support clone by revision"
9344 msgstr ""
9242 msgstr ""
9345
9243
9346 msgid "clone from remote to remote not supported"
9244 msgid "clone from remote to remote not supported"
9347 msgstr ""
9245 msgstr ""
9348
9246
9349 msgid "updated"
9247 msgid "updated"
9350 msgstr "已更新"
9248 msgstr "已更新"
9351
9249
9352 msgid "merged"
9250 msgid "merged"
9353 msgstr "已合并"
9251 msgstr "已合并"
9354
9252
9355 msgid "removed"
9253 msgid "removed"
9356 msgstr "已删除"
9254 msgstr "已删除"
9357
9255
9358 msgid "unresolved"
9256 msgid "unresolved"
9359 msgstr "未解决"
9257 msgstr "未解决"
9360
9258
9361 #, python-format
9259 #, python-format
9362 msgid "%d files %s"
9260 msgid "%d files %s"
9363 msgstr "%d 个文件%s"
9261 msgstr "%d 个文件%s"
9364
9262
9365 msgid "use 'hg resolve' to retry unresolved file merges\n"
9263 msgid "use 'hg resolve' to retry unresolved file merges\n"
9366 msgstr ""
9264 msgstr ""
9367
9265
9368 msgid "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon\n"
9266 msgid "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon\n"
9369 msgstr ""
9267 msgstr ""
9370
9268
9371 msgid "(branch merge, don't forget to commit)\n"
9269 msgid "(branch merge, don't forget to commit)\n"
9372 msgstr ""
9270 msgstr ""
9373
9271
9374 #, python-format
9272 #, python-format
9375 msgid "error reading %s/.hg/hgrc: %s\n"
9273 msgid "error reading %s/.hg/hgrc: %s\n"
9376 msgstr ""
9274 msgstr ""
9377
9275
9378 msgid "SSL support is unavailable"
9276 msgid "SSL support is unavailable"
9379 msgstr ""
9277 msgstr ""
9380
9278
9381 msgid "IPv6 is not available on this system"
9279 msgid "IPv6 is not available on this system"
9382 msgstr ""
9280 msgstr ""
9383
9281
9384 #, python-format
9282 #, python-format
9385 msgid "cannot start server at '%s:%d': %s"
9283 msgid "cannot start server at '%s:%d': %s"
9386 msgstr ""
9284 msgstr ""
9387
9285
9388 #, python-format
9286 #, python-format
9389 msgid "calling hook %s: %s\n"
9287 msgid "calling hook %s: %s\n"
9390 msgstr ""
9288 msgstr ""
9391
9289
9392 #, python-format
9290 #, python-format
9393 msgid "%s hook is invalid (\"%s\" not in a module)"
9291 msgid "%s hook is invalid (\"%s\" not in a module)"
9394 msgstr ""
9292 msgstr ""
9395
9293
9396 #, python-format
9294 #, python-format
9397 msgid "%s hook is invalid (import of \"%s\" failed)"
9295 msgid "%s hook is invalid (import of \"%s\" failed)"
9398 msgstr ""
9296 msgstr ""
9399
9297
9400 #, python-format
9298 #, python-format
9401 msgid "%s hook is invalid (\"%s\" is not defined)"
9299 msgid "%s hook is invalid (\"%s\" is not defined)"
9402 msgstr ""
9300 msgstr ""
9403
9301
9404 #, python-format
9302 #, python-format
9405 msgid "%s hook is invalid (\"%s\" is not callable)"
9303 msgid "%s hook is invalid (\"%s\" is not callable)"
9406 msgstr ""
9304 msgstr ""
9407
9305
9408 #, python-format
9306 #, python-format
9409 msgid "error: %s hook failed: %s\n"
9307 msgid "error: %s hook failed: %s\n"
9410 msgstr ""
9308 msgstr ""
9411
9309
9412 #, python-format
9310 #, python-format
9413 msgid "error: %s hook raised an exception: %s\n"
9311 msgid "error: %s hook raised an exception: %s\n"
9414 msgstr ""
9312 msgstr ""
9415
9313
9416 #, python-format
9314 #, python-format
9417 msgid "%s hook failed"
9315 msgid "%s hook failed"
9418 msgstr ""
9316 msgstr ""
9419
9317
9420 #, python-format
9318 #, python-format
9421 msgid "warning: %s hook failed\n"
9319 msgid "warning: %s hook failed\n"
9422 msgstr ""
9320 msgstr ""
9423
9321
9424 #, python-format
9322 #, python-format
9425 msgid "running hook %s: %s\n"
9323 msgid "running hook %s: %s\n"
9426 msgstr ""
9324 msgstr ""
9427
9325
9428 #, python-format
9326 #, python-format
9429 msgid "%s hook %s"
9327 msgid "%s hook %s"
9430 msgstr ""
9328 msgstr ""
9431
9329
9432 #, python-format
9330 #, python-format
9433 msgid "warning: %s hook %s\n"
9331 msgid "warning: %s hook %s\n"
9434 msgstr ""
9332 msgstr ""
9435
9333
9436 msgid "connection ended unexpectedly"
9334 msgid "connection ended unexpectedly"
9437 msgstr ""
9335 msgstr ""
9438
9336
9439 #, python-format
9337 #, python-format
9440 msgid "unsupported URL component: \"%s\""
9338 msgid "unsupported URL component: \"%s\""
9441 msgstr ""
9339 msgstr ""
9442
9340
9443 #, python-format
9341 #, python-format
9444 msgid "using %s\n"
9342 msgid "using %s\n"
9445 msgstr "使用 %s\n"
9343 msgstr "使用 %s\n"
9446
9344
9447 #, python-format
9345 #, python-format
9448 msgid "capabilities: %s\n"
9346 msgid "capabilities: %s\n"
9449 msgstr ""
9347 msgstr ""
9450
9348
9451 msgid "operation not supported over http"
9349 msgid "operation not supported over http"
9452 msgstr ""
9350 msgstr ""
9453
9351
9454 #, python-format
9352 #, python-format
9455 msgid "sending %s command\n"
9353 msgid "sending %s command\n"
9456 msgstr "发送命令 '%s'\n"
9354 msgstr "发送命令 '%s'\n"
9457
9355
9458 #, python-format
9356 #, python-format
9459 msgid "sending %s bytes\n"
9357 msgid "sending %s bytes\n"
9460 msgstr "发送 %s 字节\n"
9358 msgstr "发送 %s 字节\n"
9461
9359
9462 msgid "authorization failed"
9360 msgid "authorization failed"
9463 msgstr "授权失败"
9361 msgstr "授权失败"
9464
9362
9465 #, python-format
9363 #, python-format
9466 msgid "http error while sending %s command\n"
9364 msgid "http error while sending %s command\n"
9467 msgstr ""
9365 msgstr ""
9468
9366
9469 msgid "http error, possibly caused by proxy setting"
9367 msgid "http error, possibly caused by proxy setting"
9470 msgstr ""
9368 msgstr ""
9471
9369
9472 #, python-format
9370 #, python-format
9473 msgid "real URL is %s\n"
9371 msgid "real URL is %s\n"
9474 msgstr "实际 URL 是 '%s'\n"
9372 msgstr "实际 URL 是 '%s'\n"
9475
9373
9476 #, fuzzy, python-format
9374 #, fuzzy, python-format
9477 msgid "requested URL: '%s'\n"
9375 msgid "requested URL: '%s'\n"
9478 msgstr "请求的 URL: '%s'\n"
9376 msgstr "请求的 URL: '%s'\n"
9479
9377
9480 #, python-format
9378 #, python-format
9481 msgid "'%s' does not appear to be an hg repository"
9379 msgid "'%s' does not appear to be an hg repository"
9482 msgstr "'%s' 似乎不是水银版本库"
9380 msgstr "'%s' 似乎不是水银版本库"
9483
9381
9484 #, python-format
9382 #, python-format
9485 msgid "'%s' sent a broken Content-Type header (%s)"
9383 msgid "'%s' sent a broken Content-Type header (%s)"
9486 msgstr ""
9384 msgstr ""
9487
9385
9488 #, python-format
9386 #, python-format
9489 msgid "'%s' uses newer protocol %s"
9387 msgid "'%s' uses newer protocol %s"
9490 msgstr ""
9388 msgstr ""
9491
9389
9492 msgid "look up remote revision"
9390 msgid "look up remote revision"
9493 msgstr ""
9391 msgstr ""
9494
9392
9495 msgid "unexpected response:"
9393 msgid "unexpected response:"
9496 msgstr ""
9394 msgstr ""
9497
9395
9498 msgid "look up remote changes"
9396 msgid "look up remote changes"
9499 msgstr ""
9397 msgstr ""
9500
9398
9501 msgid "push failed (unexpected response):"
9399 msgid "push failed (unexpected response):"
9502 msgstr ""
9400 msgstr ""
9503
9401
9504 #, python-format
9402 #, python-format
9505 msgid "push failed: %s"
9403 msgid "push failed: %s"
9506 msgstr ""
9404 msgstr ""
9507
9405
9508 msgid "Python support for SSL and HTTPS is not installed"
9406 msgid "Python support for SSL and HTTPS is not installed"
9509 msgstr ""
9407 msgstr ""
9510
9408
9511 msgid "cannot create new http repository"
9409 msgid "cannot create new http repository"
9512 msgstr ""
9410 msgstr ""
9513
9411
9514 #, python-format
9412 #, python-format
9515 msgid "ignoring invalid syntax '%s'"
9413 msgid "ignoring invalid syntax '%s'"
9516 msgstr ""
9414 msgstr ""
9517
9415
9518 #, python-format
9416 #, python-format
9519 msgid "skipping unreadable ignore file '%s': %s\n"
9417 msgid "skipping unreadable ignore file '%s': %s\n"
9520 msgstr ""
9418 msgstr ""
9521
9419
9522 #, python-format
9420 #, python-format
9523 msgid "repository %s not found"
9421 msgid "repository %s not found"
9524 msgstr ""
9422 msgstr ""
9525
9423
9526 #, python-format
9424 #, python-format
9527 msgid "repository %s already exists"
9425 msgid "repository %s already exists"
9528 msgstr "版本库 %s 已存在"
9426 msgstr "版本库 %s 已存在"
9529
9427
9530 #, python-format
9428 #, python-format
9531 msgid "requirement '%s' not supported"
9429 msgid "requirement '%s' not supported"
9532 msgstr ""
9430 msgstr ""
9533
9431
9534 #, python-format
9432 #, python-format
9535 msgid ".hg/sharedpath points to nonexistent directory %s"
9433 msgid ".hg/sharedpath points to nonexistent directory %s"
9536 msgstr ""
9434 msgstr ""
9537
9435
9538 #, python-format
9436 #, python-format
9539 msgid "%r cannot be used in a tag name"
9437 msgid "%r cannot be used in a tag name"
9540 msgstr ""
9438 msgstr ""
9541
9439
9542 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
9440 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
9543 msgstr ""
9441 msgstr ""
9544
9442
9545 #, python-format
9443 #, python-format
9546 msgid "working directory has unknown parent '%s'!"
9444 msgid "working directory has unknown parent '%s'!"
9547 msgstr ""
9445 msgstr ""
9548
9446
9549 #, python-format
9447 #, python-format
9550 msgid "unknown revision '%s'"
9448 msgid "unknown revision '%s'"
9551 msgstr ""
9449 msgstr ""
9552
9450
9553 #, python-format
9451 #, python-format
9554 msgid "filtering %s through %s\n"
9452 msgid "filtering %s through %s\n"
9555 msgstr ""
9453 msgstr ""
9556
9454
9557 msgid "journal already exists - run hg recover"
9455 msgid "journal already exists - run hg recover"
9558 msgstr ""
9456 msgstr ""
9559
9457
9560 msgid "rolling back interrupted transaction\n"
9458 msgid "rolling back interrupted transaction\n"
9561 msgstr "回滚中断的事务\n"
9459 msgstr "回滚中断的事务\n"
9562
9460
9563 msgid "no interrupted transaction available\n"
9461 msgid "no interrupted transaction available\n"
9564 msgstr ""
9462 msgstr ""
9565
9463
9566 msgid "rolling back last transaction\n"
9464 msgid "rolling back last transaction\n"
9567 msgstr "回滚最近的事务\n"
9465 msgstr "回滚最近的事务\n"
9568
9466
9569 #, python-format
9467 #, python-format
9570 msgid "Named branch could not be reset, current branch still is: %s\n"
9468 msgid "Named branch could not be reset, current branch still is: %s\n"
9571 msgstr ""
9469 msgstr ""
9572
9470
9573 msgid "no rollback information available\n"
9471 msgid "no rollback information available\n"
9574 msgstr "没有回滚信息可用\n"
9472 msgstr "没有回滚信息可用\n"
9575
9473
9576 #, python-format
9474 #, python-format
9577 msgid "waiting for lock on %s held by %r\n"
9475 msgid "waiting for lock on %s held by %r\n"
9578 msgstr ""
9476 msgstr ""
9579
9477
9580 #, python-format
9478 #, python-format
9581 msgid "repository %s"
9479 msgid "repository %s"
9582 msgstr ""
9480 msgstr ""
9583
9481
9584 #, python-format
9482 #, python-format
9585 msgid "working directory of %s"
9483 msgid "working directory of %s"
9586 msgstr ""
9484 msgstr ""
9587
9485
9588 #, python-format
9486 #, python-format
9589 msgid " %s: searching for copy revision for %s\n"
9487 msgid " %s: searching for copy revision for %s\n"
9590 msgstr ""
9488 msgstr ""
9591
9489
9592 #, python-format
9490 #, python-format
9593 msgid " %s: copy %s:%s\n"
9491 msgid " %s: copy %s:%s\n"
9594 msgstr ""
9492 msgstr ""
9595
9493
9596 msgid "cannot partially commit a merge (do not specify files or patterns)"
9494 msgid "cannot partially commit a merge (do not specify files or patterns)"
9597 msgstr ""
9495 msgstr ""
9598
9496
9599 #, fuzzy
9497 #, fuzzy
9600 msgid "file not found!"
9498 msgid "file not found!"
9601 msgstr "没有找到样式: %s"
9499 msgstr "没有找到样式: %s"
9602
9500
9603 #, fuzzy
9501 #, fuzzy
9604 msgid "no match under directory!"
9502 msgid "no match under directory!"
9605 msgstr "改变工作目录"
9503 msgstr "改变工作目录"
9606
9504
9607 #, fuzzy
9505 #, fuzzy
9608 msgid "file not tracked!"
9506 msgid "file not tracked!"
9609 msgstr "%s 没有被跟踪!\n"
9507 msgstr "%s 没有被跟踪!\n"
9610
9508
9611 msgid "unresolved merge conflicts (see hg resolve)"
9509 msgid "unresolved merge conflicts (see hg resolve)"
9612 msgstr "未解决的合并冲突(参见 'hg resolve')"
9510 msgstr "未解决的合并冲突(参见 'hg resolve')"
9613
9511
9614 #, fuzzy, python-format
9512 #, fuzzy, python-format
9615 msgid "committing subrepository %s\n"
9513 msgid "committing subrepository %s\n"
9616 msgstr "初始化目标版本库 %s\n"
9514 msgstr "初始化目标版本库 %s\n"
9617
9515
9618 #, python-format
9516 #, python-format
9619 msgid "trouble committing %s!\n"
9517 msgid "trouble committing %s!\n"
9620 msgstr "提交 '%s' 出错!\n"
9518 msgstr "提交 '%s' 出错!\n"
9621
9519
9622 #, python-format
9520 #, python-format
9623 msgid "%s does not exist!\n"
9521 msgid "%s does not exist!\n"
9624 msgstr "%s 不存在!\n"
9522 msgstr "%s 不存在!\n"
9625
9523
9626 #, python-format
9524 #, python-format
9627 msgid ""
9525 msgid ""
9628 "%s: files over 10MB may cause memory and performance problems\n"
9526 "%s: files over 10MB may cause memory and performance problems\n"
9629 "(use 'hg revert %s' to unadd the file)\n"
9527 "(use 'hg revert %s' to unadd the file)\n"
9630 msgstr ""
9528 msgstr ""
9631
9529
9632 #, python-format
9530 #, python-format
9633 msgid "%s not added: only files and symlinks supported currently\n"
9531 msgid "%s not added: only files and symlinks supported currently\n"
9634 msgstr ""
9532 msgstr ""
9635
9533
9636 #, python-format
9534 #, python-format
9637 msgid "%s already tracked!\n"
9535 msgid "%s already tracked!\n"
9638 msgstr ""
9536 msgstr ""
9639
9537
9640 #, python-format
9538 #, python-format
9641 msgid "%s not added!\n"
9539 msgid "%s not added!\n"
9642 msgstr ""
9540 msgstr ""
9643
9541
9644 #, python-format
9542 #, python-format
9645 msgid "%s still exists!\n"
9543 msgid "%s still exists!\n"
9646 msgstr ""
9544 msgstr ""
9647
9545
9648 #, python-format
9546 #, python-format
9649 msgid "%s not tracked!\n"
9547 msgid "%s not tracked!\n"
9650 msgstr "%s 没有被跟踪!\n"
9548 msgstr "%s 没有被跟踪!\n"
9651
9549
9652 #, python-format
9550 #, python-format
9653 msgid "%s not removed!\n"
9551 msgid "%s not removed!\n"
9654 msgstr ""
9552 msgstr ""
9655
9553
9656 #, python-format
9554 #, python-format
9657 msgid "copy failed: %s is not a file or a symbolic link\n"
9555 msgid "copy failed: %s is not a file or a symbolic link\n"
9658 msgstr ""
9556 msgstr ""
9659
9557
9660 msgid "searching for changes\n"
9558 msgid "searching for changes\n"
9661 msgstr "正在搜索修改\n"
9559 msgstr "正在搜索修改\n"
9662
9560
9663 #, python-format
9561 #, python-format
9664 msgid "examining %s:%s\n"
9562 msgid "examining %s:%s\n"
9665 msgstr ""
9563 msgstr ""
9666
9564
9667 msgid "branch already found\n"
9565 msgid "branch already found\n"
9668 msgstr ""
9566 msgstr ""
9669
9567
9670 #, python-format
9568 #, python-format
9671 msgid "found incomplete branch %s:%s\n"
9569 msgid "found incomplete branch %s:%s\n"
9672 msgstr ""
9570 msgstr ""
9673
9571
9674 #, python-format
9572 #, python-format
9675 msgid "found new changeset %s\n"
9573 msgid "found new changeset %s\n"
9676 msgstr ""
9574 msgstr ""
9677
9575
9678 #, python-format
9576 #, python-format
9679 msgid "request %d: %s\n"
9577 msgid "request %d: %s\n"
9680 msgstr ""
9578 msgstr ""
9681
9579
9682 #, python-format
9580 #, python-format
9683 msgid "received %s:%s\n"
9581 msgid "received %s:%s\n"
9684 msgstr ""
9582 msgstr ""
9685
9583
9686 #, python-format
9584 #, python-format
9687 msgid "narrowing %d:%d %s\n"
9585 msgid "narrowing %d:%d %s\n"
9688 msgstr ""
9586 msgstr ""
9689
9587
9690 #, python-format
9588 #, python-format
9691 msgid "found new branch changeset %s\n"
9589 msgid "found new branch changeset %s\n"
9692 msgstr ""
9590 msgstr ""
9693
9591
9694 #, python-format
9592 #, python-format
9695 msgid "narrowed branch search to %s:%s\n"
9593 msgid "narrowed branch search to %s:%s\n"
9696 msgstr ""
9594 msgstr ""
9697
9595
9698 msgid "already have changeset "
9596 msgid "already have changeset "
9699 msgstr ""
9597 msgstr ""
9700
9598
9701 msgid "warning: repository is unrelated\n"
9599 msgid "warning: repository is unrelated\n"
9702 msgstr ""
9600 msgstr ""
9703
9601
9704 msgid "repository is unrelated"
9602 msgid "repository is unrelated"
9705 msgstr ""
9603 msgstr ""
9706
9604
9707 msgid "found new changesets starting at "
9605 msgid "found new changesets starting at "
9708 msgstr ""
9606 msgstr ""
9709
9607
9710 #, python-format
9608 #, python-format
9711 msgid "%d total queries\n"
9609 msgid "%d total queries\n"
9712 msgstr ""
9610 msgstr ""
9713
9611
9714 msgid "common changesets up to "
9612 msgid "common changesets up to "
9715 msgstr ""
9613 msgstr ""
9716
9614
9717 msgid "requesting all changes\n"
9615 msgid "requesting all changes\n"
9718 msgstr "正在请求全部修改\n"
9616 msgstr "正在请求全部修改\n"
9719
9617
9720 msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
9618 msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
9721 msgstr ""
9619 msgstr ""
9722
9620
9723 #, python-format
9621 #, python-format
9724 msgid "abort: push creates new remote branch '%s'!\n"
9622 msgid "abort: push creates new remote branch '%s'!\n"
9725 msgstr ""
9623 msgstr ""
9726
9624
9727 msgid "abort: push creates new remote heads!\n"
9625 msgid "abort: push creates new remote heads!\n"
9728 msgstr ""
9626 msgstr ""
9729
9627
9730 msgid "(did you forget to merge? use push -f to force)\n"
9628 msgid "(did you forget to merge? use push -f to force)\n"
9731 msgstr ""
9629 msgstr ""
9732
9630
9733 msgid "note: unsynced remote changes!\n"
9631 msgid "note: unsynced remote changes!\n"
9734 msgstr ""
9632 msgstr ""
9735
9633
9736 #, python-format
9634 #, python-format
9737 msgid "%d changesets found\n"
9635 msgid "%d changesets found\n"
9738 msgstr "已发现 %d 个修改集\n"
9636 msgstr "已发现 %d 个修改集\n"
9739
9637
9740 msgid "list of changesets:\n"
9638 msgid "list of changesets:\n"
9741 msgstr ""
9639 msgstr ""
9742
9640
9743 #, python-format
9641 #, python-format
9744 msgid "empty or missing revlog for %s"
9642 msgid "empty or missing revlog for %s"
9745 msgstr ""
9643 msgstr ""
9746
9644
9747 #, python-format
9645 #, python-format
9748 msgid "add changeset %s\n"
9646 msgid "add changeset %s\n"
9749 msgstr ""
9647 msgstr ""
9750
9648
9751 msgid "adding changesets\n"
9649 msgid "adding changesets\n"
9752 msgstr "正在增加修改集\n"
9650 msgstr "正在增加修改集\n"
9753
9651
9754 msgid "received changelog group is empty"
9652 msgid "received changelog group is empty"
9755 msgstr ""
9653 msgstr ""
9756
9654
9757 msgid "adding manifests\n"
9655 msgid "adding manifests\n"
9758 msgstr "正在增加清单\n"
9656 msgstr "正在增加清单\n"
9759
9657
9760 msgid "adding file changes\n"
9658 msgid "adding file changes\n"
9761 msgstr "正在增加文件改变\n"
9659 msgstr "正在增加文件改变\n"
9762
9660
9763 #, python-format
9661 #, python-format
9764 msgid "adding %s revisions\n"
9662 msgid "adding %s revisions\n"
9765 msgstr ""
9663 msgstr ""
9766
9664
9767 msgid "received file revlog group is empty"
9665 msgid "received file revlog group is empty"
9768 msgstr ""
9666 msgstr ""
9769
9667
9770 #, python-format
9668 #, python-format
9771 msgid " (%+d heads)"
9669 msgid " (%+d heads)"
9772 msgstr ""
9670 msgstr ""
9773
9671
9774 #, python-format
9672 #, python-format
9775 msgid "added %d changesets with %d changes to %d files%s\n"
9673 msgid "added %d changesets with %d changes to %d files%s\n"
9776 msgstr "已增加 %d 个修改集,包含 %d 个改变,修改了 %d 个文件%s\n"
9674 msgstr "已增加 %d 个修改集,包含 %d 个改变,修改了 %d 个文件%s\n"
9777
9675
9778 msgid "updating the branch cache\n"
9676 msgid "updating the branch cache\n"
9779 msgstr ""
9677 msgstr ""
9780
9678
9781 msgid "Unexpected response from remote server:"
9679 msgid "Unexpected response from remote server:"
9782 msgstr ""
9680 msgstr ""
9783
9681
9784 msgid "operation forbidden by server"
9682 msgid "operation forbidden by server"
9785 msgstr ""
9683 msgstr ""
9786
9684
9787 msgid "locking the remote repository failed"
9685 msgid "locking the remote repository failed"
9788 msgstr ""
9686 msgstr ""
9789
9687
9790 msgid "the server sent an unknown error code"
9688 msgid "the server sent an unknown error code"
9791 msgstr ""
9689 msgstr ""
9792
9690
9793 msgid "streaming all changes\n"
9691 msgid "streaming all changes\n"
9794 msgstr ""
9692 msgstr ""
9795
9693
9796 #, python-format
9694 #, python-format
9797 msgid "%d files to transfer, %s of data\n"
9695 msgid "%d files to transfer, %s of data\n"
9798 msgstr ""
9696 msgstr ""
9799
9697
9800 #, python-format
9698 #, python-format
9801 msgid "adding %s (%s)\n"
9699 msgid "adding %s (%s)\n"
9802 msgstr ""
9700 msgstr ""
9803
9701
9804 #, python-format
9702 #, python-format
9805 msgid "transferred %s in %.1f seconds (%s/sec)\n"
9703 msgid "transferred %s in %.1f seconds (%s/sec)\n"
9806 msgstr ""
9704 msgstr ""
9807
9705
9808 msgid "no [smtp]host in hgrc - cannot send mail"
9706 msgid "no [smtp]host in hgrc - cannot send mail"
9809 msgstr ""
9707 msgstr ""
9810
9708
9811 #, python-format
9709 #, python-format
9812 msgid "sending mail: smtp host %s, port %s\n"
9710 msgid "sending mail: smtp host %s, port %s\n"
9813 msgstr ""
9711 msgstr ""
9814
9712
9815 msgid "can't use TLS: Python SSL support not installed"
9713 msgid "can't use TLS: Python SSL support not installed"
9816 msgstr ""
9714 msgstr ""
9817
9715
9818 msgid "(using tls)\n"
9716 msgid "(using tls)\n"
9819 msgstr ""
9717 msgstr ""
9820
9718
9821 #, python-format
9719 #, python-format
9822 msgid "(authenticating to mail server as %s)\n"
9720 msgid "(authenticating to mail server as %s)\n"
9823 msgstr ""
9721 msgstr ""
9824
9722
9825 #, python-format
9723 #, python-format
9826 msgid "sending mail: %s\n"
9724 msgid "sending mail: %s\n"
9827 msgstr ""
9725 msgstr ""
9828
9726
9829 msgid "smtp specified as email transport, but no smtp host configured"
9727 msgid "smtp specified as email transport, but no smtp host configured"
9830 msgstr ""
9728 msgstr ""
9831
9729
9832 #, python-format
9730 #, python-format
9833 msgid "%r specified as email transport, but not in PATH"
9731 msgid "%r specified as email transport, but not in PATH"
9834 msgstr ""
9732 msgstr ""
9835
9733
9836 #, python-format
9734 #, python-format
9837 msgid "ignoring invalid sendcharset: %s\n"
9735 msgid "ignoring invalid sendcharset: %s\n"
9838 msgstr ""
9736 msgstr ""
9839
9737
9840 #, python-format
9738 #, python-format
9841 msgid "invalid email address: %s"
9739 msgid "invalid email address: %s"
9842 msgstr ""
9740 msgstr ""
9843
9741
9844 #, python-format
9742 #, python-format
9845 msgid "invalid local address: %s"
9743 msgid "invalid local address: %s"
9846 msgstr ""
9744 msgstr ""
9847
9745
9848 #, python-format
9746 #, python-format
9849 msgid "failed to remove %s from manifest"
9747 msgid "failed to remove %s from manifest"
9850 msgstr ""
9748 msgstr ""
9851
9749
9852 #, python-format
9750 #, python-format
9853 msgid "diff context lines count must be an integer, not %r"
9751 msgid "diff context lines count must be an integer, not %r"
9854 msgstr ""
9752 msgstr ""
9855
9753
9856 #, python-format
9754 #, python-format
9857 msgid "untracked file in working directory differs from file in requested revision: '%s'"
9755 msgid "untracked file in working directory differs from file in requested revision: '%s'"
9858 msgstr ""
9756 msgstr ""
9859
9757
9860 #, python-format
9758 #, python-format
9861 msgid "case-folding collision between %s and %s"
9759 msgid "case-folding collision between %s and %s"
9862 msgstr ""
9760 msgstr ""
9863
9761
9864 #, python-format
9762 #, python-format
9865 msgid ""
9763 msgid ""
9866 " conflicting flags for %s\n"
9764 " conflicting flags for %s\n"
9867 "(n)one, e(x)ec or sym(l)ink?"
9765 "(n)one, e(x)ec or sym(l)ink?"
9868 msgstr ""
9766 msgstr ""
9869
9767
9870 #, fuzzy
9768 #, fuzzy
9871 msgid "&None"
9769 msgid "&None"
9872 msgstr "完成\n"
9770 msgstr "完成\n"
9873
9771
9874 msgid "E&xec"
9772 msgid "E&xec"
9875 msgstr ""
9773 msgstr ""
9876
9774
9877 msgid "Sym&link"
9775 msgid "Sym&link"
9878 msgstr ""
9776 msgstr ""
9879
9777
9880 msgid "resolving manifests\n"
9778 msgid "resolving manifests\n"
9881 msgstr "正在解析清单\n"
9779 msgstr "正在解析清单\n"
9882
9780
9883 #, python-format
9781 #, python-format
9884 msgid " overwrite %s partial %s\n"
9782 msgid " overwrite %s partial %s\n"
9885 msgstr ""
9783 msgstr ""
9886
9784
9887 #, python-format
9785 #, python-format
9888 msgid " ancestor %s local %s remote %s\n"
9786 msgid " ancestor %s local %s remote %s\n"
9889 msgstr ""
9787 msgstr ""
9890
9788
9891 #, python-format
9789 #, python-format
9892 msgid ""
9790 msgid ""
9893 " local changed %s which remote deleted\n"
9791 " local changed %s which remote deleted\n"
9894 "use (c)hanged version or (d)elete?"
9792 "use (c)hanged version or (d)elete?"
9895 msgstr ""
9793 msgstr ""
9896
9794
9897 msgid "&Changed"
9795 msgid "&Changed"
9898 msgstr ""
9796 msgstr ""
9899
9797
9900 msgid "&Delete"
9798 msgid "&Delete"
9901 msgstr ""
9799 msgstr ""
9902
9800
9903 #, python-format
9801 #, python-format
9904 msgid ""
9802 msgid ""
9905 "remote changed %s which local deleted\n"
9803 "remote changed %s which local deleted\n"
9906 "use (c)hanged version or leave (d)eleted?"
9804 "use (c)hanged version or leave (d)eleted?"
9907 msgstr ""
9805 msgstr ""
9908
9806
9909 msgid "&Deleted"
9807 msgid "&Deleted"
9910 msgstr ""
9808 msgstr ""
9911
9809
9912 #, python-format
9810 #, python-format
9913 msgid "preserving %s for resolve of %s\n"
9811 msgid "preserving %s for resolve of %s\n"
9914 msgstr ""
9812 msgstr ""
9915
9813
9916 #, python-format
9814 #, python-format
9917 msgid "update failed to remove %s: %s!\n"
9815 msgid "update failed to remove %s: %s!\n"
9918 msgstr ""
9816 msgstr ""
9919
9817
9920 #, python-format
9818 #, python-format
9921 msgid "getting %s\n"
9819 msgid "getting %s\n"
9922 msgstr "正在检出 %s\n"
9820 msgstr "正在检出 %s\n"
9923
9821
9924 #, python-format
9822 #, python-format
9925 msgid "getting %s to %s\n"
9823 msgid "getting %s to %s\n"
9926 msgstr ""
9824 msgstr ""
9927
9825
9928 #, python-format
9826 #, python-format
9929 msgid "warning: detected divergent renames of %s to:\n"
9827 msgid "warning: detected divergent renames of %s to:\n"
9930 msgstr ""
9828 msgstr ""
9931
9829
9932 #, python-format
9830 #, python-format
9933 msgid "branch %s not found"
9831 msgid "branch %s not found"
9934 msgstr ""
9832 msgstr ""
9935
9833
9936 msgid "can't merge with ancestor"
9834 msgid "can't merge with ancestor"
9937 msgstr ""
9835 msgstr ""
9938
9836
9939 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
9837 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
9940 msgstr ""
9838 msgstr ""
9941
9839
9942 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
9840 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
9943 msgstr ""
9841 msgstr ""
9944
9842
9945 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
9843 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
9946 msgstr ""
9844 msgstr ""
9947
9845
9948 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
9846 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
9949 msgstr ""
9847 msgstr ""
9950
9848
9951 msgid "crosses named branches (use 'hg update -C' to discard changes)"
9849 msgid "crosses named branches (use 'hg update -C' to discard changes)"
9952 msgstr ""
9850 msgstr ""
9953
9851
9954 #, python-format
9852 #, python-format
9955 msgid "cannot create %s: destination already exists"
9853 msgid "cannot create %s: destination already exists"
9956 msgstr ""
9854 msgstr ""
9957
9855
9958 #, python-format
9856 #, python-format
9959 msgid "cannot create %s: unable to create destination directory"
9857 msgid "cannot create %s: unable to create destination directory"
9960 msgstr ""
9858 msgstr ""
9961
9859
9962 #, python-format
9860 #, python-format
9963 msgid "found patch at byte %d\n"
9861 msgid "found patch at byte %d\n"
9964 msgstr ""
9862 msgstr ""
9965
9863
9966 msgid "patch generated by hg export\n"
9864 msgid "patch generated by hg export\n"
9967 msgstr ""
9865 msgstr ""
9968
9866
9969 #, python-format
9867 #, python-format
9970 msgid "unable to find '%s' for patching\n"
9868 msgid "unable to find '%s' for patching\n"
9971 msgstr ""
9869 msgstr ""
9972
9870
9973 #, python-format
9871 #, python-format
9974 msgid "patching file %s\n"
9872 msgid "patching file %s\n"
9975 msgstr ""
9873 msgstr ""
9976
9874
9977 #, python-format
9875 #, python-format
9978 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
9876 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
9979 msgstr ""
9877 msgstr ""
9980
9878
9981 #, python-format
9879 #, python-format
9982 msgid "bad hunk #%d %s (%d %d %d %d)"
9880 msgid "bad hunk #%d %s (%d %d %d %d)"
9983 msgstr ""
9881 msgstr ""
9984
9882
9985 #, python-format
9883 #, python-format
9986 msgid "file %s already exists\n"
9884 msgid "file %s already exists\n"
9987 msgstr ""
9885 msgstr ""
9988
9886
9989 #, python-format
9887 #, python-format
9990 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
9888 msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
9991 msgstr ""
9889 msgstr ""
9992
9890
9993 #, python-format
9891 #, python-format
9994 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
9892 msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
9995 msgstr ""
9893 msgstr ""
9996
9894
9997 #, python-format
9895 #, python-format
9998 msgid "Hunk #%d FAILED at %d\n"
9896 msgid "Hunk #%d FAILED at %d\n"
9999 msgstr ""
9897 msgstr ""
10000
9898
10001 #, python-format
9899 #, python-format
10002 msgid "bad hunk #%d"
9900 msgid "bad hunk #%d"
10003 msgstr ""
9901 msgstr ""
10004
9902
10005 #, python-format
9903 #, python-format
10006 msgid "bad hunk #%d old text line %d"
9904 msgid "bad hunk #%d old text line %d"
10007 msgstr ""
9905 msgstr ""
10008
9906
10009 msgid "could not extract binary patch"
9907 msgid "could not extract binary patch"
10010 msgstr ""
9908 msgstr ""
10011
9909
10012 #, python-format
9910 #, python-format
10013 msgid "binary patch is %d bytes, not %d"
9911 msgid "binary patch is %d bytes, not %d"
10014 msgstr ""
9912 msgstr ""
10015
9913
10016 #, python-format
9914 #, python-format
10017 msgid "unable to strip away %d dirs from %s"
9915 msgid "unable to strip away %d dirs from %s"
10018 msgstr ""
9916 msgstr ""
10019
9917
10020 msgid "undefined source and destination files"
9918 msgid "undefined source and destination files"
10021 msgstr ""
9919 msgstr ""
10022
9920
10023 #, python-format
9921 #, python-format
10024 msgid "malformed patch %s %s"
9922 msgid "malformed patch %s %s"
10025 msgstr ""
9923 msgstr ""
10026
9924
10027 #, python-format
9925 #, python-format
10028 msgid "unsupported parser state: %s"
9926 msgid "unsupported parser state: %s"
10029 msgstr ""
9927 msgstr ""
10030
9928
10031 #, python-format
9929 #, python-format
10032 msgid "patch command failed: %s"
9930 msgid "patch command failed: %s"
10033 msgstr ""
9931 msgstr ""
10034
9932
10035 #, python-format
9933 #, python-format
10036 msgid "Unsupported line endings type: %s"
9934 msgid "Unsupported line endings type: %s"
10037 msgstr ""
9935 msgstr ""
10038
9936
10039 #, python-format
9937 #, python-format
10040 msgid "no valid hunks found; trying with %r instead\n"
9938 msgid "no valid hunks found; trying with %r instead\n"
10041 msgstr ""
9939 msgstr ""
10042
9940
10043 #, python-format
9941 #, python-format
10044 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
9942 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
10045 msgstr ""
9943 msgstr ""
10046
9944
10047 #, python-format
9945 #, python-format
10048 msgid "exited with status %d"
9946 msgid "exited with status %d"
10049 msgstr ""
9947 msgstr ""
10050
9948
10051 #, python-format
9949 #, python-format
10052 msgid "killed by signal %d"
9950 msgid "killed by signal %d"
10053 msgstr ""
9951 msgstr ""
10054
9952
10055 #, python-format
9953 #, python-format
10056 msgid "stopped by signal %d"
9954 msgid "stopped by signal %d"
10057 msgstr ""
9955 msgstr ""
10058
9956
10059 msgid "invalid exit code"
9957 msgid "invalid exit code"
10060 msgstr ""
9958 msgstr ""
10061
9959
10062 #, python-format
9960 #, python-format
10063 msgid "saving bundle to %s\n"
9961 msgid "saving bundle to %s\n"
10064 msgstr ""
9962 msgstr ""
10065
9963
10066 msgid "adding branch\n"
9964 msgid "adding branch\n"
10067 msgstr ""
9965 msgstr ""
10068
9966
10069 #, python-format
9967 #, python-format
10070 msgid "cannot %s; remote repository does not support the %r capability"
9968 msgid "cannot %s; remote repository does not support the %r capability"
10071 msgstr ""
9969 msgstr ""
10072
9970
10073 #, python-format
9971 #, python-format
10074 msgid "unknown compression type %r"
9972 msgid "unknown compression type %r"
10075 msgstr ""
9973 msgstr ""
10076
9974
10077 #, python-format
9975 #, python-format
10078 msgid "index %s unknown flags %#04x for format v0"
9976 msgid "index %s unknown flags %#04x for format v0"
10079 msgstr ""
9977 msgstr ""
10080
9978
10081 #, python-format
9979 #, python-format
10082 msgid "index %s unknown flags %#04x for revlogng"
9980 msgid "index %s unknown flags %#04x for revlogng"
10083 msgstr ""
9981 msgstr ""
10084
9982
10085 #, python-format
9983 #, python-format
10086 msgid "index %s unknown format %d"
9984 msgid "index %s unknown format %d"
10087 msgstr ""
9985 msgstr ""
10088
9986
10089 #, python-format
9987 #, python-format
10090 msgid "index %s is corrupted"
9988 msgid "index %s is corrupted"
10091 msgstr ""
9989 msgstr ""
10092
9990
10093 msgid "no node"
9991 msgid "no node"
10094 msgstr ""
9992 msgstr ""
10095
9993
10096 msgid "ambiguous identifier"
9994 msgid "ambiguous identifier"
10097 msgstr ""
9995 msgstr ""
10098
9996
10099 msgid "no match found"
9997 msgid "no match found"
10100 msgstr ""
9998 msgstr ""
10101
9999
10102 #, python-format
10000 #, python-format
10103 msgid "incompatible revision flag %x"
10001 msgid "incompatible revision flag %x"
10104 msgstr ""
10002 msgstr ""
10105
10003
10106 #, python-format
10004 #, python-format
10107 msgid "%s not found in the transaction"
10005 msgid "%s not found in the transaction"
10108 msgstr ""
10006 msgstr ""
10109
10007
10110 msgid "unknown base"
10008 msgid "unknown base"
10111 msgstr ""
10009 msgstr ""
10112
10010
10113 msgid "consistency error adding group"
10011 msgid "consistency error adding group"
10114 msgstr ""
10012 msgstr ""
10115
10013
10116 #, python-format
10014 #, python-format
10117 msgid "%s looks like a binary file."
10015 msgid "%s looks like a binary file."
10118 msgstr ""
10016 msgstr ""
10119
10017
10120 msgid "can only specify two labels."
10018 msgid "can only specify two labels."
10121 msgstr ""
10019 msgstr ""
10122
10020
10123 msgid "warning: conflicts during merge.\n"
10021 msgid "warning: conflicts during merge.\n"
10124 msgstr ""
10022 msgstr ""
10125
10023
10126 #, python-format
10024 #, python-format
10127 msgid "couldn't parse location %s"
10025 msgid "couldn't parse location %s"
10128 msgstr ""
10026 msgstr ""
10129
10027
10130 msgid "could not create remote repo"
10028 msgid "could not create remote repo"
10131 msgstr ""
10029 msgstr ""
10132
10030
10133 msgid "remote: "
10031 msgid "remote: "
10134 msgstr ""
10032 msgstr ""
10135
10033
10136 msgid "no suitable response from remote hg"
10034 msgid "no suitable response from remote hg"
10137 msgstr ""
10035 msgstr ""
10138
10036
10139 #, python-format
10037 #, python-format
10140 msgid "push refused: %s"
10038 msgid "push refused: %s"
10141 msgstr ""
10039 msgstr ""
10142
10040
10143 msgid "unsynced changes"
10041 msgid "unsynced changes"
10144 msgstr ""
10042 msgstr ""
10145
10043
10146 msgid "cannot lock static-http repository"
10044 msgid "cannot lock static-http repository"
10147 msgstr ""
10045 msgstr ""
10148
10046
10149 msgid "cannot create new static-http repository"
10047 msgid "cannot create new static-http repository"
10150 msgstr ""
10048 msgstr ""
10151
10049
10152 #, python-format
10050 #, python-format
10153 msgid "invalid entry in fncache, line %s"
10051 msgid "invalid entry in fncache, line %s"
10154 msgstr ""
10052 msgstr ""
10155
10053
10156 msgid "scanning\n"
10054 msgid "scanning\n"
10157 msgstr "正在扫描\n"
10055 msgstr "正在扫描\n"
10158
10056
10159 #, python-format
10057 #, python-format
10160 msgid "%d files, %d bytes to transfer\n"
10058 msgid "%d files, %d bytes to transfer\n"
10161 msgstr "需要传输 %d 个文件,%d 字节\n"
10059 msgstr "需要传输 %d 个文件,%d 字节\n"
10162
10060
10163 #, python-format
10061 #, python-format
10164 msgid "sending %s (%d bytes)\n"
10062 msgid "sending %s (%d bytes)\n"
10165 msgstr "正在发送 %s (%d 字节)\n"
10063 msgstr "正在发送 %s (%d 字节)\n"
10166
10064
10167 #, python-format
10065 #, python-format
10168 msgid ""
10066 msgid ""
10169 " subrepository sources for %s differ\n"
10067 " subrepository sources for %s differ\n"
10170 "use (l)ocal source (%s) or (r)emote source (%s)?"
10068 "use (l)ocal source (%s) or (r)emote source (%s)?"
10171 msgstr ""
10069 msgstr ""
10172
10070
10173 msgid "&Remote"
10071 msgid "&Remote"
10174 msgstr ""
10072 msgstr ""
10175
10073
10176 #, python-format
10074 #, python-format
10177 msgid ""
10075 msgid ""
10178 " local changed subrepository %s which remote removed\n"
10076 " local changed subrepository %s which remote removed\n"
10179 "use (c)hanged version or (d)elete?"
10077 "use (c)hanged version or (d)elete?"
10180 msgstr ""
10078 msgstr ""
10181
10079
10182 #, python-format
10080 #, python-format
10183 msgid ""
10081 msgid ""
10184 " remote changed subrepository %s which local removed\n"
10082 " remote changed subrepository %s which local removed\n"
10185 "use (c)hanged version or (d)elete?"
10083 "use (c)hanged version or (d)elete?"
10186 msgstr ""
10084 msgstr ""
10187
10085
10188 #, fuzzy, python-format
10086 #, fuzzy, python-format
10189 msgid "removing subrepo %s\n"
10087 msgid "removing subrepo %s\n"
10190 msgstr "正在删除 %s\n"
10088 msgstr "正在删除 %s\n"
10191
10089
10192 #, fuzzy, python-format
10090 #, fuzzy, python-format
10193 msgid "pulling subrepo %s\n"
10091 msgid "pulling subrepo %s\n"
10194 msgstr "正在拉自 %s\n"
10092 msgstr "正在拉自 %s\n"
10195
10093
10196 #, fuzzy, python-format
10094 #, fuzzy, python-format
10197 msgid "pushing subrepo %s\n"
10095 msgid "pushing subrepo %s\n"
10198 msgstr "正在推到 %s\n"
10096 msgstr "正在推到 %s\n"
10199
10097
10200 #, python-format
10098 #, python-format
10201 msgid "%s, line %s: %s\n"
10099 msgid "%s, line %s: %s\n"
10202 msgstr ""
10100 msgstr ""
10203
10101
10204 msgid "cannot parse entry"
10102 msgid "cannot parse entry"
10205 msgstr ""
10103 msgstr ""
10206
10104
10207 #, python-format
10105 #, python-format
10208 msgid "node '%s' is not well formed"
10106 msgid "node '%s' is not well formed"
10209 msgstr ""
10107 msgstr ""
10210
10108
10211 msgid "unmatched quotes"
10109 msgid "unmatched quotes"
10212 msgstr "不匹配的引号"
10110 msgstr "不匹配的引号"
10213
10111
10214 #, python-format
10112 #, python-format
10215 msgid "error expanding '%s%%%s'"
10113 msgid "error expanding '%s%%%s'"
10216 msgstr ""
10114 msgstr ""
10217
10115
10218 #, python-format
10116 #, python-format
10219 msgid "unknown filter '%s'"
10117 msgid "unknown filter '%s'"
10220 msgstr ""
10118 msgstr ""
10221
10119
10222 #, python-format
10120 #, python-format
10223 msgid "style not found: %s"
10121 msgid "style not found: %s"
10224 msgstr "没有找到样式: %s"
10122 msgstr "没有找到样式: %s"
10225
10123
10226 #, python-format
10124 #, python-format
10227 msgid "template file %s: %s"
10125 msgid "template file %s: %s"
10228 msgstr "模版文件 %s: %s"
10126 msgstr "模版文件 %s: %s"
10229
10127
10230 msgid "cannot use transaction when it is already committed/aborted"
10128 msgid "cannot use transaction when it is already committed/aborted"
10231 msgstr ""
10129 msgstr ""
10232
10130
10233 #, python-format
10131 #, python-format
10234 msgid "failed to truncate %s\n"
10132 msgid "failed to truncate %s\n"
10235 msgstr "截断 '%s' 失败\n"
10133 msgstr "截断 '%s' 失败\n"
10236
10134
10237 msgid "transaction abort!\n"
10135 msgid "transaction abort!\n"
10238 msgstr "事务中止!\n"
10136 msgstr "事务中止!\n"
10239
10137
10240 msgid "rollback completed\n"
10138 msgid "rollback completed\n"
10241 msgstr "完成回滚\n"
10139 msgstr "完成回滚\n"
10242
10140
10243 msgid "rollback failed - please run hg recover\n"
10141 msgid "rollback failed - please run hg recover\n"
10244 msgstr ""
10142 msgstr ""
10245
10143
10246 #, python-format
10144 #, python-format
10247 msgid "Not trusting file %s from untrusted user %s, group %s\n"
10145 msgid "Not trusting file %s from untrusted user %s, group %s\n"
10248 msgstr ""
10146 msgstr ""
10249
10147
10250 #, python-format
10148 #, python-format
10251 msgid "Ignored: %s\n"
10149 msgid "Ignored: %s\n"
10252 msgstr ""
10150 msgstr ""
10253
10151
10254 #, fuzzy, python-format
10152 #, fuzzy, python-format
10255 msgid "ignoring untrusted configuration option %s.%s = %s\n"
10153 msgid "ignoring untrusted configuration option %s.%s = %s\n"
10256 msgstr "显示不能信赖的配置选项"
10154 msgstr "显示不能信赖的配置选项"
10257
10155
10258 #, python-format
10156 #, python-format
10259 msgid "%s.%s not a boolean ('%s')"
10157 msgid "%s.%s not a boolean ('%s')"
10260 msgstr ""
10158 msgstr ""
10261
10159
10262 msgid "enter a commit username:"
10160 msgid "enter a commit username:"
10263 msgstr ""
10161 msgstr ""
10264
10162
10265 #, python-format
10163 #, python-format
10266 msgid "No username found, using '%s' instead\n"
10164 msgid "No username found, using '%s' instead\n"
10267 msgstr ""
10165 msgstr ""
10268
10166
10269 msgid "Please specify a username."
10167 msgid "Please specify a username."
10270 msgstr ""
10168 msgstr ""
10271
10169
10272 #, python-format
10170 #, python-format
10273 msgid "username %s contains a newline\n"
10171 msgid "username %s contains a newline\n"
10274 msgstr ""
10172 msgstr ""
10275
10173
10276 msgid "response expected"
10174 msgid "response expected"
10277 msgstr ""
10175 msgstr ""
10278
10176
10279 msgid "unrecognized response\n"
10177 msgid "unrecognized response\n"
10280 msgstr ""
10178 msgstr ""
10281
10179
10282 msgid "password: "
10180 msgid "password: "
10283 msgstr "密码: "
10181 msgstr "密码: "
10284
10182
10285 msgid "edit failed"
10183 msgid "edit failed"
10286 msgstr ""
10184 msgstr ""
10287
10185
10288 msgid "http authorization required"
10186 msgid "http authorization required"
10289 msgstr "需要 http 授权"
10187 msgstr "需要 http 授权"
10290
10188
10291 msgid "http authorization required\n"
10189 msgid "http authorization required\n"
10292 msgstr "需要 http 授权\n"
10190 msgstr "需要 http 授权\n"
10293
10191
10294 #, python-format
10192 #, python-format
10295 msgid "realm: %s\n"
10193 msgid "realm: %s\n"
10296 msgstr "领域: %s\n"
10194 msgstr "领域: %s\n"
10297
10195
10298 #, python-format
10196 #, python-format
10299 msgid "user: %s\n"
10197 msgid "user: %s\n"
10300 msgstr "用户: %s\n"
10198 msgstr "用户: %s\n"
10301
10199
10302 msgid "user:"
10200 msgid "user:"
10303 msgstr "用户:"
10201 msgstr "用户:"
10304
10202
10305 #, python-format
10203 #, python-format
10306 msgid "http auth: user %s, password %s\n"
10204 msgid "http auth: user %s, password %s\n"
10307 msgstr ""
10205 msgstr ""
10308
10206
10309 #, python-format
10207 #, python-format
10310 msgid "proxying through http://%s:%s\n"
10208 msgid "proxying through http://%s:%s\n"
10311 msgstr ""
10209 msgstr ""
10312
10210
10313 #, python-format
10211 #, python-format
10314 msgid "command '%s' failed: %s"
10212 msgid "command '%s' failed: %s"
10315 msgstr ""
10213 msgstr ""
10316
10214
10317 #, python-format
10215 #, python-format
10318 msgid "path contains illegal component: %s"
10216 msgid "path contains illegal component: %s"
10319 msgstr ""
10217 msgstr ""
10320
10218
10321 #, python-format
10219 #, python-format
10322 msgid "path %r is inside repo %r"
10220 msgid "path %r is inside repo %r"
10323 msgstr ""
10221 msgstr ""
10324
10222
10325 #, python-format
10223 #, python-format
10326 msgid "path %r traverses symbolic link %r"
10224 msgid "path %r traverses symbolic link %r"
10327 msgstr ""
10225 msgstr ""
10328
10226
10329 msgid "Hardlinks not supported"
10227 msgid "Hardlinks not supported"
10330 msgstr ""
10228 msgstr ""
10331
10229
10332 #, python-format
10230 #, python-format
10333 msgid "could not symlink to %r: %s"
10231 msgid "could not symlink to %r: %s"
10334 msgstr ""
10232 msgstr ""
10335
10233
10336 #, python-format
10234 #, python-format
10337 msgid "invalid date: %r "
10235 msgid "invalid date: %r "
10338 msgstr ""
10236 msgstr ""
10339
10237
10340 #, python-format
10238 #, python-format
10341 msgid "date exceeds 32 bits: %d"
10239 msgid "date exceeds 32 bits: %d"
10342 msgstr ""
10240 msgstr ""
10343
10241
10344 #, python-format
10242 #, python-format
10345 msgid "impossible time zone offset: %d"
10243 msgid "impossible time zone offset: %d"
10346 msgstr ""
10244 msgstr ""
10347
10245
10348 #, python-format
10246 #, python-format
10349 msgid "invalid day spec: %s"
10247 msgid "invalid day spec: %s"
10350 msgstr ""
10248 msgstr ""
10351
10249
10352 #, python-format
10250 #, python-format
10353 msgid "%.0f GB"
10251 msgid "%.0f GB"
10354 msgstr ""
10252 msgstr ""
10355
10253
10356 #, python-format
10254 #, python-format
10357 msgid "%.1f GB"
10255 msgid "%.1f GB"
10358 msgstr ""
10256 msgstr ""
10359
10257
10360 #, python-format
10258 #, python-format
10361 msgid "%.2f GB"
10259 msgid "%.2f GB"
10362 msgstr ""
10260 msgstr ""
10363
10261
10364 #, python-format
10262 #, python-format
10365 msgid "%.0f MB"
10263 msgid "%.0f MB"
10366 msgstr ""
10264 msgstr ""
10367
10265
10368 #, python-format
10266 #, python-format
10369 msgid "%.1f MB"
10267 msgid "%.1f MB"
10370 msgstr ""
10268 msgstr ""
10371
10269
10372 #, python-format
10270 #, python-format
10373 msgid "%.2f MB"
10271 msgid "%.2f MB"
10374 msgstr ""
10272 msgstr ""
10375
10273
10376 #, python-format
10274 #, python-format
10377 msgid "%.0f KB"
10275 msgid "%.0f KB"
10378 msgstr ""
10276 msgstr ""
10379
10277
10380 #, python-format
10278 #, python-format
10381 msgid "%.1f KB"
10279 msgid "%.1f KB"
10382 msgstr ""
10280 msgstr ""
10383
10281
10384 #, python-format
10282 #, python-format
10385 msgid "%.2f KB"
10283 msgid "%.2f KB"
10386 msgstr ""
10284 msgstr ""
10387
10285
10388 #, python-format
10286 #, python-format
10389 msgid "%.0f bytes"
10287 msgid "%.0f bytes"
10390 msgstr ""
10288 msgstr ""
10391
10289
10392 msgid "cannot verify bundle or remote repos"
10290 msgid "cannot verify bundle or remote repos"
10393 msgstr ""
10291 msgstr ""
10394
10292
10395 msgid "interrupted"
10293 msgid "interrupted"
10396 msgstr ""
10294 msgstr ""
10397
10295
10398 #, python-format
10296 #, python-format
10399 msgid "empty or missing %s"
10297 msgid "empty or missing %s"
10400 msgstr ""
10298 msgstr ""
10401
10299
10402 #, python-format
10300 #, python-format
10403 msgid "data length off by %d bytes"
10301 msgid "data length off by %d bytes"
10404 msgstr ""
10302 msgstr ""
10405
10303
10406 #, python-format
10304 #, python-format
10407 msgid "index contains %d extra bytes"
10305 msgid "index contains %d extra bytes"
10408 msgstr ""
10306 msgstr ""
10409
10307
10410 #, python-format
10308 #, python-format
10411 msgid "warning: `%s' uses revlog format 1"
10309 msgid "warning: `%s' uses revlog format 1"
10412 msgstr ""
10310 msgstr ""
10413
10311
10414 #, python-format
10312 #, python-format
10415 msgid "warning: `%s' uses revlog format 0"
10313 msgid "warning: `%s' uses revlog format 0"
10416 msgstr ""
10314 msgstr ""
10417
10315
10418 #, python-format
10316 #, python-format
10419 msgid "rev %d points to nonexistent changeset %d"
10317 msgid "rev %d points to nonexistent changeset %d"
10420 msgstr ""
10318 msgstr ""
10421
10319
10422 #, python-format
10320 #, python-format
10423 msgid "rev %d points to unexpected changeset %d"
10321 msgid "rev %d points to unexpected changeset %d"
10424 msgstr ""
10322 msgstr ""
10425
10323
10426 #, python-format
10324 #, python-format
10427 msgid " (expected %s)"
10325 msgid " (expected %s)"
10428 msgstr ""
10326 msgstr ""
10429
10327
10430 #, python-format
10328 #, python-format
10431 msgid "unknown parent 1 %s of %s"
10329 msgid "unknown parent 1 %s of %s"
10432 msgstr ""
10330 msgstr ""
10433
10331
10434 #, python-format
10332 #, python-format
10435 msgid "unknown parent 2 %s of %s"
10333 msgid "unknown parent 2 %s of %s"
10436 msgstr ""
10334 msgstr ""
10437
10335
10438 #, python-format
10336 #, python-format
10439 msgid "checking parents of %s"
10337 msgid "checking parents of %s"
10440 msgstr ""
10338 msgstr ""
10441
10339
10442 #, python-format
10340 #, python-format
10443 msgid "duplicate revision %d (%d)"
10341 msgid "duplicate revision %d (%d)"
10444 msgstr ""
10342 msgstr ""
10445
10343
10446 #, python-format
10344 #, python-format
10447 msgid "repository uses revlog format %d\n"
10345 msgid "repository uses revlog format %d\n"
10448 msgstr ""
10346 msgstr ""
10449
10347
10450 msgid "checking changesets\n"
10348 msgid "checking changesets\n"
10451 msgstr ""
10349 msgstr ""
10452
10350
10453 #, python-format
10351 #, python-format
10454 msgid "unpacking changeset %s"
10352 msgid "unpacking changeset %s"
10455 msgstr ""
10353 msgstr ""
10456
10354
10457 msgid "checking manifests\n"
10355 msgid "checking manifests\n"
10458 msgstr ""
10356 msgstr ""
10459
10357
10460 #, fuzzy, python-format
10358 #, fuzzy, python-format
10461 msgid "%s not in changesets"
10359 msgid "%s not in changesets"
10462 msgstr "列出修改集"
10360 msgstr "列出修改集"
10463
10361
10464 msgid "file without name in manifest"
10362 msgid "file without name in manifest"
10465 msgstr ""
10363 msgstr ""
10466
10364
10467 #, python-format
10365 #, python-format
10468 msgid "reading manifest delta %s"
10366 msgid "reading manifest delta %s"
10469 msgstr ""
10367 msgstr ""
10470
10368
10471 msgid "crosschecking files in changesets and manifests\n"
10369 msgid "crosschecking files in changesets and manifests\n"
10472 msgstr ""
10370 msgstr ""
10473
10371
10474 #, python-format
10372 #, python-format
10475 msgid "changeset refers to unknown manifest %s"
10373 msgid "changeset refers to unknown manifest %s"
10476 msgstr ""
10374 msgstr ""
10477
10375
10478 msgid "in changeset but not in manifest"
10376 msgid "in changeset but not in manifest"
10479 msgstr ""
10377 msgstr ""
10480
10378
10481 msgid "in manifest but not in changeset"
10379 msgid "in manifest but not in changeset"
10482 msgstr ""
10380 msgstr ""
10483
10381
10484 msgid "checking files\n"
10382 msgid "checking files\n"
10485 msgstr ""
10383 msgstr ""
10486
10384
10487 #, python-format
10385 #, python-format
10488 msgid "cannot decode filename '%s'"
10386 msgid "cannot decode filename '%s'"
10489 msgstr ""
10387 msgstr ""
10490
10388
10491 #, python-format
10389 #, python-format
10492 msgid "broken revlog! (%s)"
10390 msgid "broken revlog! (%s)"
10493 msgstr ""
10391 msgstr ""
10494
10392
10495 msgid "missing revlog!"
10393 msgid "missing revlog!"
10496 msgstr ""
10394 msgstr ""
10497
10395
10498 #, python-format
10396 #, python-format
10499 msgid "%s not in manifests"
10397 msgid "%s not in manifests"
10500 msgstr ""
10398 msgstr ""
10501
10399
10502 #, python-format
10400 #, python-format
10503 msgid "unpacked size is %s, %s expected"
10401 msgid "unpacked size is %s, %s expected"
10504 msgstr ""
10402 msgstr ""
10505
10403
10506 #, python-format
10404 #, python-format
10507 msgid "unpacking %s"
10405 msgid "unpacking %s"
10508 msgstr ""
10406 msgstr ""
10509
10407
10510 #, python-format
10408 #, python-format
10511 msgid "empty or missing copy source revlog %s:%s"
10409 msgid "empty or missing copy source revlog %s:%s"
10512 msgstr ""
10410 msgstr ""
10513
10411
10514 #, python-format
10412 #, python-format
10515 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
10413 msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
10516 msgstr ""
10414 msgstr ""
10517
10415
10518 #, python-format
10416 #, python-format
10519 msgid "checking rename of %s"
10417 msgid "checking rename of %s"
10520 msgstr ""
10418 msgstr ""
10521
10419
10522 #, python-format
10420 #, python-format
10523 msgid "%s in manifests not found"
10421 msgid "%s in manifests not found"
10524 msgstr ""
10422 msgstr ""
10525
10423
10526 #, python-format
10424 #, python-format
10527 msgid "warning: orphan revlog '%s'"
10425 msgid "warning: orphan revlog '%s'"
10528 msgstr ""
10426 msgstr ""
10529
10427
10530 #, python-format
10428 #, python-format
10531 msgid "%d files, %d changesets, %d total revisions\n"
10429 msgid "%d files, %d changesets, %d total revisions\n"
10532 msgstr ""
10430 msgstr ""
10533
10431
10534 #, python-format
10432 #, python-format
10535 msgid "%d warnings encountered!\n"
10433 msgid "%d warnings encountered!\n"
10536 msgstr ""
10434 msgstr ""
10537
10435
10538 #, python-format
10436 #, python-format
10539 msgid "%d integrity errors encountered!\n"
10437 msgid "%d integrity errors encountered!\n"
10540 msgstr ""
10438 msgstr ""
10541
10439
10542 #, python-format
10440 #, python-format
10543 msgid "(first damaged changeset appears to be %d)\n"
10441 msgid "(first damaged changeset appears to be %d)\n"
10544 msgstr ""
10442 msgstr ""
10545
10443
10546 msgid "user name not available - set USERNAME environment variable"
10444 msgid "user name not available - set USERNAME environment variable"
10547 msgstr ""
10445 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now