##// END OF EJS Templates
i18n: update Japanese translation to follow bd8f44638847
FUJIWARA Katsunori -
r7838:c2e962bd default
parent child Browse files
Show More
@@ -1,9779 +1,9850 b''
1 # Japanese translation for Mercurial
1 # Japanese translation for Mercurial
2 # Mercurial 日本語翻訳
2 # Mercurial 日本語翻訳
3 #
3 #
4 # Copyright (C) 2009 the Mercurial team
4 # Copyright (C) 2009 the Mercurial team
5 #
5 #
6 # Translation dictionary:
6 # ========================================
7 # 【翻訳作業手順】
8 #
9 # ※ 必要に応じて crew リポジトリから最新成果を取得 & hg update
10 # # メッセージ DB の更新
11 # $ make update-pot
12 # # '#: filename:line' 情報を残す場合は --no-location を省略
13 # $ msgmerge --update --no-location i18n/ja.po i18n/hg.pot
14 #
15 # ※ 翻訳作業実施(i18n/ja.po の変更)
16 #
17 # # 形式確認(置換指定の間違い等)
18 # $ msgfmt --check i18n/ja.po
19 # # '#: filename:line' 情報が残っている場合は取り除く
20 # $ msgcat --no-location -o i18n/ja.po i18n/ja.po
21 #
22 # ※ 翻訳成果の公開
23 #
24 # ========================================
25 # 【翻訳用語集】
7 #
26 #
8 # Distributed SCM 分散構成管理ツール
27 # Distributed SCM 分散構成管理ツール
9 #
28 #
10 # add (構成管理への)追加登録
29 # add (構成管理への)追加登録
11 # apply 適用
30 # apply 適用
12 # archive アーカイブ
31 # archive アーカイブ
13 # (with no)argument(s) 引数(指定が無い場合)
32 # (with no)argument(s) 引数(指定が無い場合)
14 # author 作成者
33 # author 作成者
15 # backout 打ち消し
34 # backout 打ち消し
16 # basename ベース名
35 # basename ベース名
17 # branch ブランチ
36 # branch ブランチ
18 # bundle( file) バンドルファイル
37 # bundle( file) バンドルファイル
19 # changegroup( file) バンドルファイル
38 # changegroup( file) バンドルファイル
20 # change(set) チェンジセット
39 # change(set) チェンジセット
21 # changeset hash ハッシュ値
40 # changeset hash ハッシュ値
22 # changeset header ヘッダ情報
41 # changeset header ヘッダ情報
23 # checkout/update (作業領域の)更新
42 # checkout/update (作業領域の)更新
24 # (this)command (本)コマンド
43 # (this)command (本)コマンド
25 # commit コミット
44 # commit コミット
26 # commit comment コミットログ
45 # commit comment コミットログ
27 # (by)default 指定が無い場合/通常は
46 # (by)default 指定が無い場合/通常は
28 # delete/remove (構成管理からの)登録除外
47 # delete/remove (構成管理からの)登録除外
29 # diff 差分
48 # diff 差分
30 # dirstate dirstate
49 # dirstate dirstate
31 # extend(ed) 拡張
50 # extend(ed) 拡張
32 # extensiohn (Mercurialの)エクステンション
51 # extensiohn (Mercurialの)エクステンション
33 # hash identifier(s) ハッシュ値
52 # hash identifier(s) ハッシュ値
34 # head ヘッド
53 # head ヘッド
35 # head changeset(s) ヘッド
54 # head changeset(s) ヘッド
36 # (revision)history 変更履歴
55 # (revision)history 変更履歴
37 # import 取り込み
56 # import 取り込み
38 # list of .... 列挙された..../.... の一覧
57 # list of .... 列挙された..../.... の一覧
39 # manifest マニフェスト
58 # manifest マニフェスト
40 # merge マージ
59 # merge マージ
41 # note 備考
60 # note 備考
42 # patch パッチ
61 # patch パッチ
43 # platform 稼働環境
62 # platform 稼働環境
44 # pull (追加リビジョンの)取り込み
63 # pull (追加リビジョンの)取り込み
45 # push (追加リビジョンの)反映
64 # push (追加リビジョンの)反映
46 # remote(repo) 連携先(リポジトリ)
65 # remote(repo) 連携先(リポジトリ)
47 # rename 改名
66 # rename 改名
48 # repo(sitory) リポジトリ
67 # repo(sitory) リポジトリ
49 # revert/undo 取り消し
68 # revert/undo 取り消し
50 # revision リビジョン
69 # revision リビジョン
51 # schedule (add/remove の)予約
70 # schedule (add/remove の)予約
52 # search 探索
71 # search 探索
53 # summary 要約(情報)
72 # summary 要約(情報)
54 # tag タグ
73 # tag タグ
55 # working directory 作業領域
74 # working directory 作業領域
75 # ========================================
56 #
76 #
57 msgid ""
77 msgid ""
58 msgstr ""
78 msgstr ""
59 "Project-Id-Version: Mercurial\n"
79 "Project-Id-Version: Mercurial\n"
60 "Report-Msgid-Bugs-To: \n"
80 "Report-Msgid-Bugs-To: \n"
61 "POT-Creation-Date: 2009-02-21 01:58+0900\n"
81 "POT-Creation-Date: 2009-03-07 21:22+0900\n"
62 "PO-Revision-Date: 2009-02-21 02:00+0900\n"
82 "PO-Revision-Date: 2009-03-07 23:30+0900\n"
63 "Last-Translator: FUJIWARA Katsunori <foozy@lares.dti.ne.jp>\n"
83 "Last-Translator: FUJIWARA Katsunori <foozy@lares.dti.ne.jp>\n"
64 "Language-Team: Japanese\n"
84 "Language-Team: Japanese\n"
65 "MIME-Version: 1.0\n"
85 "MIME-Version: 1.0\n"
66 "Content-Type: text/plain; charset=UTF-8\n"
86 "Content-Type: text/plain; charset=UTF-8\n"
67 "Content-Transfer-Encoding: 8bit\n"
87 "Content-Transfer-Encoding: 8bit\n"
68 "Generated-By: pygettext.py 1.5\n"
88 "Generated-By: pygettext.py 1.5\n"
69 "Plural-Forms: nplurals=1; plural=0;\n"
89 "Plural-Forms: nplurals=1; plural=0;\n"
70
90
71 #, python-format
91 #, python-format
72 msgid " (default: %s)"
92 msgid " (default: %s)"
73 msgstr " (規定値: %s)"
93 msgstr " (規定値: %s)"
74
94
75 msgid "OPTIONS"
95 msgid "OPTIONS"
76 msgstr ""
96 msgstr ""
77
97
78 msgid "COMMANDS"
98 msgid "COMMANDS"
79 msgstr ""
99 msgstr ""
80
100
81 msgid " options:\n"
101 msgid " options:\n"
82 msgstr ""
102 msgstr ""
83
103
84 #, python-format
104 #, python-format
85 msgid ""
105 msgid ""
86 " aliases: %s\n"
106 " aliases: %s\n"
87 "\n"
107 "\n"
88 msgstr ""
108 msgstr ""
89
109
90 msgid "return tuple of (match function, list enabled)."
110 msgid "return tuple of (match function, list enabled)."
91 msgstr ""
111 msgstr ""
92
112
93 #, python-format
113 #, python-format
94 msgid "acl: %s not enabled\n"
114 msgid "acl: %s not enabled\n"
95 msgstr ""
115 msgstr ""
96
116
97 #, python-format
117 #, python-format
98 msgid "acl: %s enabled, %d entries for user %s\n"
118 msgid "acl: %s enabled, %d entries for user %s\n"
99 msgstr ""
119 msgstr ""
100
120
101 #, python-format
121 #, python-format
102 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
122 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
103 msgstr ""
123 msgstr ""
104
124
105 #, python-format
125 #, python-format
106 msgid "acl: changes have source \"%s\" - skipping\n"
126 msgid "acl: changes have source \"%s\" - skipping\n"
107 msgstr ""
127 msgstr ""
108
128
109 #, python-format
129 #, python-format
110 msgid "acl: user %s denied on %s\n"
130 msgid "acl: user %s denied on %s\n"
111 msgstr ""
131 msgstr ""
112
132
113 #, python-format
133 #, python-format
114 msgid "acl: access denied for changeset %s"
134 msgid "acl: access denied for changeset %s"
115 msgstr ""
135 msgstr ""
116
136
117 #, python-format
137 #, python-format
118 msgid "acl: user %s not allowed on %s\n"
138 msgid "acl: user %s not allowed on %s\n"
119 msgstr ""
139 msgstr ""
120
140
121 #, python-format
141 #, python-format
122 msgid "acl: allowing changeset %s\n"
142 msgid "acl: allowing changeset %s\n"
123 msgstr ""
143 msgstr ""
124
144
125 msgid ""
145 msgid ""
126 "allow user-defined command aliases\n"
146 "allow user-defined command aliases\n"
127 "\n"
147 "\n"
128 "To use, create entries in your hgrc of the form\n"
148 "To use, create entries in your hgrc of the form\n"
129 "\n"
149 "\n"
130 "[alias]\n"
150 "[alias]\n"
131 "mycmd = cmd --args\n"
151 "mycmd = cmd --args\n"
132 msgstr ""
152 msgstr ""
133
153
134 msgid ""
154 msgid ""
135 "defer command lookup until needed, so that extensions loaded\n"
155 "defer command lookup until needed, so that extensions loaded\n"
136 " after alias can be aliased"
156 " after alias can be aliased"
137 msgstr ""
157 msgstr ""
138
158
139 #, python-format
159 #, python-format
140 msgid "*** [alias] %s: command %s is unknown"
160 msgid "*** [alias] %s: command %s is unknown"
141 msgstr ""
161 msgstr ""
142
162
143 #, python-format
163 #, python-format
144 msgid "*** [alias] %s: command %s is ambiguous"
164 msgid "*** [alias] %s: command %s is ambiguous"
145 msgstr ""
165 msgstr ""
146
166
147 #, python-format
167 #, python-format
148 msgid "*** [alias] %s: circular dependency on %s"
168 msgid "*** [alias] %s: circular dependency on %s"
149 msgstr ""
169 msgstr ""
150
170
151 #, python-format
171 #, python-format
152 msgid "*** [alias] %s: no definition\n"
172 msgid "*** [alias] %s: no definition\n"
153 msgstr ""
173 msgstr ""
154
174
155 msgid ""
175 msgid ""
156 "mercurial bookmarks\n"
176 "mercurial bookmarks\n"
157 "\n"
177 "\n"
158 "Mercurial bookmarks are local moveable pointers to changesets. Every\n"
178 "Mercurial bookmarks are local moveable pointers to changesets. Every\n"
159 "bookmark points to a changeset identified by its hash. If you commit a\n"
179 "bookmark points to a changeset identified by its hash. If you commit a\n"
160 "changeset that is based on a changeset that has a bookmark on it, the\n"
180 "changeset that is based on a changeset that has a bookmark on it, the\n"
161 "bookmark is forwarded to the new changeset.\n"
181 "bookmark is forwarded to the new changeset.\n"
162 "\n"
182 "\n"
163 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
183 "It is possible to use bookmark names in every revision lookup (e.g. hg\n"
164 "merge, hg update).\n"
184 "merge, hg update).\n"
165 "\n"
185 "\n"
166 "The bookmark extension offers the possiblity to have a more git-like "
186 "The bookmark extension offers the possiblity to have a more git-like "
167 "experience\n"
187 "experience\n"
168 "by adding the following configuration option to your .hgrc:\n"
188 "by adding the following configuration option to your .hgrc:\n"
169 "\n"
189 "\n"
170 "[bookmarks]\n"
190 "[bookmarks]\n"
171 "track.current = True\n"
191 "track.current = True\n"
172 "\n"
192 "\n"
173 "This will cause bookmarks to track the bookmark that you are currently on, "
193 "This will cause bookmarks to track the bookmark that you are currently on, "
174 "and\n"
194 "and\n"
175 "just updates it. This is similar to git's approach of branching.\n"
195 "just updates it. This is similar to git's approach of branching.\n"
176 msgstr ""
196 msgstr ""
177
197
178 msgid ""
198 msgid ""
179 "Parse .hg/bookmarks file and return a dictionary\n"
199 "Parse .hg/bookmarks file and return a dictionary\n"
180 "\n"
200 "\n"
181 " Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n"
201 " Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n"
182 " in the .hg/bookmarks file. They are read by the parse() method and\n"
202 " in the .hg/bookmarks file. They are read by the parse() method and\n"
183 " returned as a dictionary with name => hash values.\n"
203 " returned as a dictionary with name => hash values.\n"
184 "\n"
204 "\n"
185 " The parsed dictionary is cached until a write() operation is done.\n"
205 " The parsed dictionary is cached until a write() operation is done.\n"
186 " "
206 " "
187 msgstr ""
207 msgstr ""
188
208
189 msgid ""
209 msgid ""
190 "Write bookmarks\n"
210 "Write bookmarks\n"
191 "\n"
211 "\n"
192 " Write the given bookmark => hash dictionary to the .hg/bookmarks file\n"
212 " Write the given bookmark => hash dictionary to the .hg/bookmarks file\n"
193 " in a format equal to those of localtags.\n"
213 " in a format equal to those of localtags.\n"
194 "\n"
214 "\n"
195 " We also store a backup of the previous state in undo.bookmarks that\n"
215 " We also store a backup of the previous state in undo.bookmarks that\n"
196 " can be copied back on rollback.\n"
216 " can be copied back on rollback.\n"
197 " "
217 " "
198 msgstr ""
218 msgstr ""
199
219
200 msgid ""
220 msgid ""
201 "Get the current bookmark\n"
221 "Get the current bookmark\n"
202 "\n"
222 "\n"
203 " If we use gittishsh branches we have a current bookmark that\n"
223 " If we use gittishsh branches we have a current bookmark that\n"
204 " we are on. This function returns the name of the bookmark. It\n"
224 " we are on. This function returns the name of the bookmark. It\n"
205 " is stored in .hg/bookmarks.current\n"
225 " is stored in .hg/bookmarks.current\n"
206 " "
226 " "
207 msgstr ""
227 msgstr ""
208
228
209 msgid ""
229 msgid ""
210 "Set the name of the bookmark that we are currently on\n"
230 "Set the name of the bookmark that we are currently on\n"
211 "\n"
231 "\n"
212 " Set the name of the bookmark that we are on (hg update <bookmark>).\n"
232 " Set the name of the bookmark that we are on (hg update <bookmark>).\n"
213 " The name is recoreded in .hg/bookmarks.current\n"
233 " The name is recoreded in .hg/bookmarks.current\n"
214 " "
234 " "
215 msgstr ""
235 msgstr ""
216
236
217 msgid ""
237 msgid ""
218 "mercurial bookmarks\n"
238 "mercurial bookmarks\n"
219 "\n"
239 "\n"
220 " Bookmarks are pointers to certain commits that move when\n"
240 " Bookmarks are pointers to certain commits that move when\n"
221 " commiting. Bookmarks are local. They can be renamed, copied and\n"
241 " commiting. Bookmarks are local. They can be renamed, copied and\n"
222 " deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n"
242 " deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n"
223 " update' to update to a given bookmark.\n"
243 " update' to update to a given bookmark.\n"
224 "\n"
244 "\n"
225 " You can use 'hg bookmark NAME' to set a bookmark on the current\n"
245 " You can use 'hg bookmark NAME' to set a bookmark on the current\n"
226 " tip with the given name. If you specify a revision using -r REV\n"
246 " tip with the given name. If you specify a revision using -r REV\n"
227 " (where REV may be an existing bookmark), the bookmark is set to\n"
247 " (where REV may be an existing bookmark), the bookmark is set to\n"
228 " that revision.\n"
248 " that revision.\n"
229 " "
249 " "
230 msgstr ""
250 msgstr ""
231
251
232 msgid "a bookmark of this name does not exist"
252 msgid "a bookmark of this name does not exist"
233 msgstr ""
253 msgstr ""
234
254
235 msgid "a bookmark of the same name already exists"
255 msgid "a bookmark of the same name already exists"
236 msgstr ""
256 msgstr ""
237
257
238 msgid "new bookmark name required"
258 msgid "new bookmark name required"
239 msgstr ""
259 msgstr ""
240
260
241 msgid "bookmark name required"
261 msgid "bookmark name required"
242 msgstr ""
262 msgstr ""
243
263
244 msgid "bookmark name cannot contain newlines"
264 msgid "bookmark name cannot contain newlines"
245 msgstr ""
265 msgstr ""
246
266
247 msgid "a bookmark cannot have the name of an existing branch"
267 msgid "a bookmark cannot have the name of an existing branch"
248 msgstr ""
268 msgstr ""
249
269
250 msgid ""
270 msgid ""
251 "Strip bookmarks if revisions are stripped using\n"
271 "Strip bookmarks if revisions are stripped using\n"
252 " the mercurial.strip method. This usually happens during\n"
272 " the mercurial.strip method. This usually happens during\n"
253 " qpush and qpop"
273 " qpush and qpop"
254 msgstr ""
274 msgstr ""
255
275
256 msgid ""
276 msgid ""
257 "Add a revision to the repository and\n"
277 "Add a revision to the repository and\n"
258 " move the bookmark"
278 " move the bookmark"
259 msgstr ""
279 msgstr ""
260
280
261 msgid "Merge bookmarks with normal tags"
281 msgid "Merge bookmarks with normal tags"
262 msgstr ""
282 msgstr ""
263
283
264 msgid ""
284 msgid ""
265 "Set the current bookmark\n"
285 "Set the current bookmark\n"
266 "\n"
286 "\n"
267 " If the user updates to a bookmark we update the .hg/bookmarks.current\n"
287 " If the user updates to a bookmark we update the .hg/bookmarks.current\n"
268 " file.\n"
288 " file.\n"
269 " "
289 " "
270 msgstr ""
290 msgstr ""
271
291
272 msgid "force"
292 msgid "force"
273 msgstr ""
293 msgstr ""
274
294
275 msgid "revision"
295 msgid "revision"
276 msgstr "リビジョン"
296 msgstr "リビジョン"
277
297
278 msgid "delete a given bookmark"
298 msgid "delete a given bookmark"
279 msgstr ""
299 msgstr ""
280
300
281 msgid "rename a given bookmark"
301 msgid "rename a given bookmark"
282 msgstr ""
302 msgstr ""
283
303
284 msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]"
304 msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
285 msgstr ""
305 msgstr ""
286
306
287 msgid ""
307 msgid ""
288 "Bugzilla integration\n"
308 "Bugzilla integration\n"
289 "\n"
309 "\n"
290 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
310 "This hook extension adds comments on bugs in Bugzilla when changesets\n"
291 "that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n"
311 "that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n"
292 "status.\n"
312 "status.\n"
293 "\n"
313 "\n"
294 "The hook updates the Bugzilla database directly. Only Bugzilla "
314 "The hook updates the Bugzilla database directly. Only Bugzilla "
295 "installations\n"
315 "installations\n"
296 "using MySQL are supported.\n"
316 "using MySQL are supported.\n"
297 "\n"
317 "\n"
298 "The hook relies on a Bugzilla script to send bug change notification "
318 "The hook relies on a Bugzilla script to send bug change notification "
299 "emails.\n"
319 "emails.\n"
300 "That script changes between Bugzilla versions; the 'processmail' script "
320 "That script changes between Bugzilla versions; the 'processmail' script "
301 "used\n"
321 "used\n"
302 "prior to 2.18 is replaced in 2.18 and subsequent versions by\n"
322 "prior to 2.18 is replaced in 2.18 and subsequent versions by\n"
303 "'config/sendbugmail.pl'. Note that these will be run by Mercurial as the "
323 "'config/sendbugmail.pl'. Note that these will be run by Mercurial as the "
304 "user\n"
324 "user\n"
305 "pushing the change; you will need to ensure the Bugzilla install file\n"
325 "pushing the change; you will need to ensure the Bugzilla install file\n"
306 "permissions are set appropriately.\n"
326 "permissions are set appropriately.\n"
307 "\n"
327 "\n"
308 "Configuring the extension:\n"
328 "Configuring the extension:\n"
309 "\n"
329 "\n"
310 " [bugzilla]\n"
330 " [bugzilla]\n"
311 " host Hostname of the MySQL server holding the Bugzilla database.\n"
331 " host Hostname of the MySQL server holding the Bugzilla database.\n"
312 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
332 " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
313 " user Username to use to access MySQL server. Default 'bugs'.\n"
333 " user Username to use to access MySQL server. Default 'bugs'.\n"
314 " password Password to use to access MySQL server.\n"
334 " password Password to use to access MySQL server.\n"
315 " timeout Database connection timeout (seconds). Default 5.\n"
335 " timeout Database connection timeout (seconds). Default 5.\n"
316 " version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 "
336 " version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 "
317 "and\n"
337 "and\n"
318 " later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n"
338 " later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n"
319 " versions prior to 2.18.\n"
339 " versions prior to 2.18.\n"
320 " bzuser Fallback Bugzilla user name to record comments with, if\n"
340 " bzuser Fallback Bugzilla user name to record comments with, if\n"
321 " changeset committer cannot be found as a Bugzilla user.\n"
341 " changeset committer cannot be found as a Bugzilla user.\n"
322 " bzdir Bugzilla install directory. Used by default notify.\n"
342 " bzdir Bugzilla install directory. Used by default notify.\n"
323 " Default '/var/www/html/bugzilla'.\n"
343 " Default '/var/www/html/bugzilla'.\n"
324 " notify The command to run to get Bugzilla to send bug change\n"
344 " notify The command to run to get Bugzilla to send bug change\n"
325 " notification emails. Substitutes from a map with 3 keys,\n"
345 " notification emails. Substitutes from a map with 3 keys,\n"
326 " 'bzdir', 'id' (bug id) and 'user' (committer bugzilla "
346 " 'bzdir', 'id' (bug id) and 'user' (committer bugzilla "
327 "email).\n"
347 "email).\n"
328 " Default depends on version; from 2.18 it is\n"
348 " Default depends on version; from 2.18 it is\n"
329 " \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %"
349 " \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %"
330 "(user)s\".\n"
350 "(user)s\".\n"
331 " regexp Regular expression to match bug IDs in changeset commit "
351 " regexp Regular expression to match bug IDs in changeset commit "
332 "message.\n"
352 "message.\n"
333 " Must contain one \"()\" group. The default expression "
353 " Must contain one \"()\" group. The default expression "
334 "matches\n"
354 "matches\n"
335 " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n"
355 " 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n"
336 " 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations "
356 " 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations "
337 "thereof.\n"
357 "thereof.\n"
338 " Matching is case insensitive.\n"
358 " Matching is case insensitive.\n"
339 " style The style file to use when formatting comments.\n"
359 " style The style file to use when formatting comments.\n"
340 " template Template to use when formatting comments. Overrides\n"
360 " template Template to use when formatting comments. Overrides\n"
341 " style if specified. In addition to the usual Mercurial\n"
361 " style if specified. In addition to the usual Mercurial\n"
342 " keywords, the extension specifies:\n"
362 " keywords, the extension specifies:\n"
343 " {bug} The Bugzilla bug ID.\n"
363 " {bug} The Bugzilla bug ID.\n"
344 " {root} The full pathname of the Mercurial "
364 " {root} The full pathname of the Mercurial "
345 "repository.\n"
365 "repository.\n"
346 " {webroot} Stripped pathname of the Mercurial "
366 " {webroot} Stripped pathname of the Mercurial "
347 "repository.\n"
367 "repository.\n"
348 " {hgweb} Base URL for browsing Mercurial "
368 " {hgweb} Base URL for browsing Mercurial "
349 "repositories.\n"
369 "repositories.\n"
350 " Default 'changeset {node|short} in repo {root} refers '\n"
370 " Default 'changeset {node|short} in repo {root} refers '\n"
351 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
371 " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
352 " strip The number of slashes to strip from the front of {root}\n"
372 " strip The number of slashes to strip from the front of {root}\n"
353 " to produce {webroot}. Default 0.\n"
373 " to produce {webroot}. Default 0.\n"
354 " usermap Path of file containing Mercurial committer ID to Bugzilla "
374 " usermap Path of file containing Mercurial committer ID to Bugzilla "
355 "user\n"
375 "user\n"
356 " ID mappings. If specified, the file should contain one "
376 " ID mappings. If specified, the file should contain one "
357 "mapping\n"
377 "mapping\n"
358 " per line, \"committer\"=\"Bugzilla user\". See also the\n"
378 " per line, \"committer\"=\"Bugzilla user\". See also the\n"
359 " [usermap] section.\n"
379 " [usermap] section.\n"
360 "\n"
380 "\n"
361 " [usermap]\n"
381 " [usermap]\n"
362 " Any entries in this section specify mappings of Mercurial committer ID\n"
382 " Any entries in this section specify mappings of Mercurial committer ID\n"
363 " to Bugzilla user ID. See also [bugzilla].usermap.\n"
383 " to Bugzilla user ID. See also [bugzilla].usermap.\n"
364 " \"committer\"=\"Bugzilla user\"\n"
384 " \"committer\"=\"Bugzilla user\"\n"
365 "\n"
385 "\n"
366 " [web]\n"
386 " [web]\n"
367 " baseurl Base URL for browsing Mercurial repositories. Reference from\n"
387 " baseurl Base URL for browsing Mercurial repositories. Reference from\n"
368 " templates as {hgweb}.\n"
388 " templates as {hgweb}.\n"
369 "\n"
389 "\n"
370 "Activating the extension:\n"
390 "Activating the extension:\n"
371 "\n"
391 "\n"
372 " [extensions]\n"
392 " [extensions]\n"
373 " hgext.bugzilla =\n"
393 " hgext.bugzilla =\n"
374 "\n"
394 "\n"
375 " [hooks]\n"
395 " [hooks]\n"
376 " # run bugzilla hook on every change pulled or pushed in here\n"
396 " # run bugzilla hook on every change pulled or pushed in here\n"
377 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
397 " incoming.bugzilla = python:hgext.bugzilla.hook\n"
378 "\n"
398 "\n"
379 "Example configuration:\n"
399 "Example configuration:\n"
380 "\n"
400 "\n"
381 "This example configuration is for a collection of Mercurial repositories\n"
401 "This example configuration is for a collection of Mercurial repositories\n"
382 "in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n"
402 "in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n"
383 "/opt/bugzilla-3.2.\n"
403 "/opt/bugzilla-3.2.\n"
384 "\n"
404 "\n"
385 " [bugzilla]\n"
405 " [bugzilla]\n"
386 " host=localhost\n"
406 " host=localhost\n"
387 " password=XYZZY\n"
407 " password=XYZZY\n"
388 " version=3.0\n"
408 " version=3.0\n"
389 " bzuser=unknown@domain.com\n"
409 " bzuser=unknown@domain.com\n"
390 " bzdir=/opt/bugzilla-3.2\n"
410 " bzdir=/opt/bugzilla-3.2\n"
391 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
411 " template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
392 "rev/{node|short}\\n\\n{desc}\\n\n"
412 "rev/{node|short}\\n\\n{desc}\\n\n"
393 " strip=5\n"
413 " strip=5\n"
394 "\n"
414 "\n"
395 " [web]\n"
415 " [web]\n"
396 " baseurl=http://dev.domain.com/hg\n"
416 " baseurl=http://dev.domain.com/hg\n"
397 "\n"
417 "\n"
398 " [usermap]\n"
418 " [usermap]\n"
399 " user@emaildomain.com=user.name@bugzilladomain.com\n"
419 " user@emaildomain.com=user.name@bugzilladomain.com\n"
400 "\n"
420 "\n"
401 "Commits add a comment to the Bugzilla bug record of the form:\n"
421 "Commits add a comment to the Bugzilla bug record of the form:\n"
402 "\n"
422 "\n"
403 " Changeset 3b16791d6642 in repository-name.\n"
423 " Changeset 3b16791d6642 in repository-name.\n"
404 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
424 " http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
405 "\n"
425 "\n"
406 " Changeset commit comment. Bug 1234.\n"
426 " Changeset commit comment. Bug 1234.\n"
407 msgstr ""
427 msgstr ""
408
428
409 msgid "support for bugzilla version 2.16."
429 msgid "support for bugzilla version 2.16."
410 msgstr ""
430 msgstr ""
411
431
412 #, python-format
432 #, python-format
413 msgid "connecting to %s:%s as %s, password %s\n"
433 msgid "connecting to %s:%s as %s, password %s\n"
414 msgstr ""
434 msgstr ""
415
435
416 msgid "run a query."
436 msgid "run a query."
417 msgstr ""
437 msgstr ""
418
438
419 #, python-format
439 #, python-format
420 msgid "query: %s %s\n"
440 msgid "query: %s %s\n"
421 msgstr ""
441 msgstr ""
422
442
423 #, python-format
443 #, python-format
424 msgid "failed query: %s %s\n"
444 msgid "failed query: %s %s\n"
425 msgstr ""
445 msgstr ""
426
446
427 msgid "get identity of longdesc field"
447 msgid "get identity of longdesc field"
428 msgstr ""
448 msgstr ""
429
449
430 msgid "unknown database schema"
450 msgid "unknown database schema"
431 msgstr ""
451 msgstr ""
432
452
433 msgid "filter not-existing bug ids from list."
453 msgid "filter not-existing bug ids from list."
434 msgstr ""
454 msgstr ""
435
455
436 msgid "filter bug ids from list that already refer to this changeset."
456 msgid "filter bug ids from list that already refer to this changeset."
437 msgstr ""
457 msgstr ""
438
458
439 #, python-format
459 #, python-format
440 msgid "bug %d already knows about changeset %s\n"
460 msgid "bug %d already knows about changeset %s\n"
441 msgstr ""
461 msgstr ""
442
462
443 msgid "tell bugzilla to send mail."
463 msgid "tell bugzilla to send mail."
444 msgstr ""
464 msgstr ""
445
465
446 msgid "telling bugzilla to send mail:\n"
466 msgid "telling bugzilla to send mail:\n"
447 msgstr ""
467 msgstr ""
448
468
449 #, python-format
469 #, python-format
450 msgid " bug %s\n"
470 msgid " bug %s\n"
451 msgstr ""
471 msgstr ""
452
472
453 #, python-format
473 #, python-format
454 msgid "running notify command %s\n"
474 msgid "running notify command %s\n"
455 msgstr ""
475 msgstr ""
456
476
457 #, python-format
477 #, python-format
458 msgid "bugzilla notify command %s"
478 msgid "bugzilla notify command %s"
459 msgstr ""
479 msgstr ""
460
480
461 msgid "done\n"
481 msgid "done\n"
462 msgstr ""
482 msgstr ""
463
483
464 msgid "look up numeric bugzilla user id."
484 msgid "look up numeric bugzilla user id."
465 msgstr ""
485 msgstr ""
466
486
467 #, python-format
487 #, python-format
468 msgid "looking up user %s\n"
488 msgid "looking up user %s\n"
469 msgstr ""
489 msgstr ""
470
490
471 msgid "map name of committer to bugzilla user name."
491 msgid "map name of committer to bugzilla user name."
472 msgstr ""
492 msgstr ""
473
493
474 msgid ""
494 msgid ""
475 "see if committer is a registered bugzilla user. Return\n"
495 "see if committer is a registered bugzilla user. Return\n"
476 " bugzilla username and userid if so. If not, return default\n"
496 " bugzilla username and userid if so. If not, return default\n"
477 " bugzilla username and userid."
497 " bugzilla username and userid."
478 msgstr ""
498 msgstr ""
479
499
480 #, python-format
500 #, python-format
481 msgid "cannot find bugzilla user id for %s"
501 msgid "cannot find bugzilla user id for %s"
482 msgstr ""
502 msgstr ""
483
503
484 #, python-format
504 #, python-format
485 msgid "cannot find bugzilla user id for %s or %s"
505 msgid "cannot find bugzilla user id for %s or %s"
486 msgstr ""
506 msgstr ""
487
507
488 msgid ""
508 msgid ""
489 "add comment to bug. try adding comment as committer of\n"
509 "add comment to bug. try adding comment as committer of\n"
490 " changeset, otherwise as default bugzilla user."
510 " changeset, otherwise as default bugzilla user."
491 msgstr ""
511 msgstr ""
492
512
493 msgid "support for bugzilla 2.18 series."
513 msgid "support for bugzilla 2.18 series."
494 msgstr ""
514 msgstr ""
495
515
496 msgid "support for bugzilla 3.0 series."
516 msgid "support for bugzilla 3.0 series."
497 msgstr ""
517 msgstr ""
498
518
499 msgid ""
519 msgid ""
500 "return object that knows how to talk to bugzilla version in\n"
520 "return object that knows how to talk to bugzilla version in\n"
501 " use."
521 " use."
502 msgstr ""
522 msgstr ""
503
523
504 #, python-format
524 #, python-format
505 msgid "bugzilla version %s not supported"
525 msgid "bugzilla version %s not supported"
506 msgstr ""
526 msgstr ""
507
527
508 msgid ""
528 msgid ""
509 "find valid bug ids that are referred to in changeset\n"
529 "find valid bug ids that are referred to in changeset\n"
510 " comments and that do not already have references to this\n"
530 " comments and that do not already have references to this\n"
511 " changeset."
531 " changeset."
512 msgstr ""
532 msgstr ""
513
533
514 msgid "update bugzilla bug with reference to changeset."
534 msgid "update bugzilla bug with reference to changeset."
515 msgstr ""
535 msgstr ""
516
536
517 msgid ""
537 msgid ""
518 "strip leading prefix of repo root and turn into\n"
538 "strip leading prefix of repo root and turn into\n"
519 " url-safe path."
539 " url-safe path."
520 msgstr ""
540 msgstr ""
521
541
522 msgid ""
542 msgid ""
523 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
543 "changeset {node|short} in repo {root} refers to bug {bug}.\n"
524 "details:\n"
544 "details:\n"
525 "\t{desc|tabindent}"
545 "\t{desc|tabindent}"
526 msgstr ""
546 msgstr ""
527
547
528 msgid ""
548 msgid ""
529 "add comment to bugzilla for each changeset that refers to a\n"
549 "add comment to bugzilla for each changeset that refers to a\n"
530 " bugzilla bug id. only add a comment once per bug, so same change\n"
550 " bugzilla bug id. only add a comment once per bug, so same change\n"
531 " seen multiple times does not fill bug with duplicate data."
551 " seen multiple times does not fill bug with duplicate data."
532 msgstr ""
552 msgstr ""
533
553
534 #, python-format
554 #, python-format
535 msgid "python mysql support not available: %s"
555 msgid "python mysql support not available: %s"
536 msgstr ""
556 msgstr ""
537
557
538 #, python-format
558 #, python-format
539 msgid "hook type %s does not pass a changeset id"
559 msgid "hook type %s does not pass a changeset id"
540 msgstr ""
560 msgstr ""
541
561
542 #, python-format
562 #, python-format
543 msgid "database error: %s"
563 msgid "database error: %s"
544 msgstr ""
564 msgstr ""
545
565
546 msgid ""
566 msgid ""
547 "show the children of the given or working dir revision\n"
567 "show the children of the given or working dir revision\n"
548 "\n"
568 "\n"
549 " Print the children of the working directory's revisions.\n"
569 " Print the children of the working directory's revisions.\n"
550 " If a revision is given via --rev, the children of that revision\n"
570 " If a revision is given via --rev, the children of that revision\n"
551 " will be printed. If a file argument is given, revision in\n"
571 " will be printed. If a file argument is given, revision in\n"
552 " which the file was last changed (after the working directory\n"
572 " which the file was last changed (after the working directory\n"
553 " revision or the argument to --rev if given) is printed.\n"
573 " revision or the argument to --rev if given) is printed.\n"
554 " "
574 " "
555 msgstr ""
575 msgstr ""
556
576
557 msgid "show children of the specified rev"
577 msgid "show children of the specified rev"
558 msgstr ""
578 msgstr ""
559
579
560 msgid "hg children [-r REV] [FILE]"
580 msgid "hg children [-r REV] [FILE]"
561 msgstr ""
581 msgstr ""
562
582
563 msgid "command to show certain statistics about revision history"
583 msgid "command to show certain statistics about revision history"
564 msgstr ""
584 msgstr ""
565
585
566 msgid "Calculate stats"
586 msgid "Calculate stats"
567 msgstr ""
587 msgstr ""
568
588
569 #, python-format
589 #, python-format
570 msgid "Revision %d is a merge, ignoring...\n"
590 msgid "Revision %d is a merge, ignoring...\n"
571 msgstr ""
591 msgstr ""
572
592
573 #, python-format
593 #, python-format
574 msgid "\rgenerating stats: %d%%"
594 msgid "\rgenerating stats: %d%%"
575 msgstr ""
595 msgstr ""
576
596
577 msgid ""
597 msgid ""
578 "graph count of revisions grouped by template\n"
598 "graph count of revisions grouped by template\n"
579 "\n"
599 "\n"
580 " Will graph count of changed lines or revisions grouped by template or\n"
600 " Will graph count of changed lines or revisions grouped by template or\n"
581 " alternatively by date, if dateformat is used. In this case it will "
601 " alternatively by date, if dateformat is used. In this case it will "
582 "override\n"
602 "override\n"
583 " template.\n"
603 " template.\n"
584 "\n"
604 "\n"
585 " By default statistics are counted for number of changed lines.\n"
605 " By default statistics are counted for number of changed lines.\n"
586 "\n"
606 "\n"
587 " Examples:\n"
607 " Examples:\n"
588 "\n"
608 "\n"
589 " # display count of changed lines for every committer\n"
609 " # display count of changed lines for every committer\n"
590 " hg churn -t '{author|email}'\n"
610 " hg churn -t '{author|email}'\n"
591 "\n"
611 "\n"
592 " # display daily activity graph\n"
612 " # display daily activity graph\n"
593 " hg churn -f '%H' -s -c\n"
613 " hg churn -f '%H' -s -c\n"
594 "\n"
614 "\n"
595 " # display activity of developers by month\n"
615 " # display activity of developers by month\n"
596 " hg churn -f '%Y-%m' -s -c\n"
616 " hg churn -f '%Y-%m' -s -c\n"
597 "\n"
617 "\n"
598 " # display count of lines changed in every year\n"
618 " # display count of lines changed in every year\n"
599 " hg churn -f '%Y' -s\n"
619 " hg churn -f '%Y' -s\n"
600 "\n"
620 "\n"
601 " The map file format used to specify aliases is fairly simple:\n"
621 " The map file format used to specify aliases is fairly simple:\n"
602 "\n"
622 "\n"
603 " <alias email> <actual email>"
623 " <alias email> <actual email>"
604 msgstr ""
624 msgstr ""
605
625
606 #, python-format
626 #, python-format
607 msgid "assuming %i character terminal\n"
627 msgid "assuming %i character terminal\n"
608 msgstr ""
628 msgstr ""
609
629
610 msgid "count rate for the specified revision or range"
630 msgid "count rate for the specified revision or range"
611 msgstr ""
631 msgstr ""
612
632
613 msgid "count rate for revs matching date spec"
633 msgid "count rate for revs matching date spec"
614 msgstr ""
634 msgstr ""
615
635
616 msgid "template to group changesets"
636 msgid "template to group changesets"
617 msgstr ""
637 msgstr ""
618
638
619 msgid "strftime-compatible format for grouping by date"
639 msgid "strftime-compatible format for grouping by date"
620 msgstr ""
640 msgstr ""
621
641
622 msgid "count rate by number of changesets"
642 msgid "count rate by number of changesets"
623 msgstr ""
643 msgstr ""
624
644
625 msgid "sort by key (default: sort by count)"
645 msgid "sort by key (default: sort by count)"
626 msgstr ""
646 msgstr ""
627
647
628 msgid "file with email aliases"
648 msgid "file with email aliases"
629 msgstr ""
649 msgstr ""
630
650
631 msgid "show progress"
651 msgid "show progress"
632 msgstr ""
652 msgstr ""
633
653
634 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
654 msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
635 msgstr ""
655 msgstr ""
636
656
637 msgid ""
657 msgid ""
638 "add color output to status, qseries, and diff-related commands\n"
658 "add color output to status, qseries, and diff-related commands\n"
639 "\n"
659 "\n"
640 "This extension modifies the status command to add color to its output to\n"
660 "This extension modifies the status command to add color to its output to\n"
641 "reflect file status, the qseries command to add color to reflect patch "
661 "reflect file status, the qseries command to add color to reflect patch "
642 "status\n"
662 "status\n"
643 "(applied, unapplied, missing), and to diff-related commands to highlight\n"
663 "(applied, unapplied, missing), and to diff-related commands to highlight\n"
644 "additions, removals, diff headers, and trailing whitespace.\n"
664 "additions, removals, diff headers, and trailing whitespace.\n"
645 "\n"
665 "\n"
646 "Other effects in addition to color, like bold and underlined text, are also\n"
666 "Other effects in addition to color, like bold and underlined text, are also\n"
647 "available. Effects are rendered with the ECMA-48 SGR control function (aka\n"
667 "available. Effects are rendered with the ECMA-48 SGR control function (aka\n"
648 "ANSI escape codes). This module also provides the render_text function,\n"
668 "ANSI escape codes). This module also provides the render_text function,\n"
649 "which can be used to add effects to any text.\n"
669 "which can be used to add effects to any text.\n"
650 "\n"
670 "\n"
651 "To enable this extension, add this to your .hgrc file:\n"
671 "To enable this extension, add this to your .hgrc file:\n"
652 "[extensions]\n"
672 "[extensions]\n"
653 "color =\n"
673 "color =\n"
654 "\n"
674 "\n"
655 "Default effects my be overriden from the .hgrc file:\n"
675 "Default effects my be overriden from the .hgrc file:\n"
656 "\n"
676 "\n"
657 "[color]\n"
677 "[color]\n"
658 "status.modified = blue bold underline red_background\n"
678 "status.modified = blue bold underline red_background\n"
659 "status.added = green bold\n"
679 "status.added = green bold\n"
660 "status.removed = red bold blue_background\n"
680 "status.removed = red bold blue_background\n"
661 "status.deleted = cyan bold underline\n"
681 "status.deleted = cyan bold underline\n"
662 "status.unknown = magenta bold underline\n"
682 "status.unknown = magenta bold underline\n"
663 "status.ignored = black bold\n"
683 "status.ignored = black bold\n"
664 "\n"
684 "\n"
665 "# 'none' turns off all effects\n"
685 "# 'none' turns off all effects\n"
666 "status.clean = none\n"
686 "status.clean = none\n"
667 "status.copied = none\n"
687 "status.copied = none\n"
668 "\n"
688 "\n"
669 "qseries.applied = blue bold underline\n"
689 "qseries.applied = blue bold underline\n"
670 "qseries.unapplied = black bold\n"
690 "qseries.unapplied = black bold\n"
671 "qseries.missing = red bold\n"
691 "qseries.missing = red bold\n"
672 "\n"
692 "\n"
673 "diff.diffline = bold\n"
693 "diff.diffline = bold\n"
674 "diff.extended = cyan bold\n"
694 "diff.extended = cyan bold\n"
675 "diff.file_a = red bold\n"
695 "diff.file_a = red bold\n"
676 "diff.file_b = green bold\n"
696 "diff.file_b = green bold\n"
677 "diff.hunk = magenta\n"
697 "diff.hunk = magenta\n"
678 "diff.deleted = red\n"
698 "diff.deleted = red\n"
679 "diff.inserted = green\n"
699 "diff.inserted = green\n"
680 "diff.changed = white\n"
700 "diff.changed = white\n"
681 "diff.trailingwhitespace = bold red_background\n"
701 "diff.trailingwhitespace = bold red_background\n"
682 msgstr ""
702 msgstr ""
683
703
684 msgid "Wrap text in commands to turn on each effect."
704 msgid "Wrap text in commands to turn on each effect."
685 msgstr ""
705 msgstr ""
686
706
687 msgid "run the status command with colored output"
707 msgid "run the status command with colored output"
688 msgstr ""
708 msgstr ""
689
709
690 msgid "run the qseries command with colored output"
710 msgid "run the qseries command with colored output"
691 msgstr ""
711 msgstr ""
692
712
693 msgid "wrap ui.write for colored diff output"
713 msgid "wrap ui.write for colored diff output"
694 msgstr ""
714 msgstr ""
695
715
696 msgid "wrap cmdutil.changeset_printer.showpatch with colored output"
716 msgid "wrap cmdutil.changeset_printer.showpatch with colored output"
697 msgstr ""
717 msgstr ""
698
718
699 msgid "run the diff command with colored output"
719 msgid "run the diff command with colored output"
700 msgstr ""
720 msgstr ""
701
721
702 msgid "Initialize the extension."
722 msgid "Initialize the extension."
703 msgstr ""
723 msgstr ""
704
724
705 msgid "patch in command to command table and load effect map"
725 msgid "patch in command to command table and load effect map"
706 msgstr ""
726 msgstr ""
707
727
708 msgid "when to colorize (always, auto, or never)"
728 msgid "when to colorize (always, auto, or never)"
709 msgstr ""
729 msgstr ""
710
730
711 msgid "don't colorize output"
731 msgid "don't colorize output"
712 msgstr ""
732 msgstr ""
713
733
714 msgid "converting foreign VCS repositories to Mercurial"
734 msgid "converting foreign VCS repositories to Mercurial"
715 msgstr ""
735 msgstr ""
716
736
717 msgid ""
737 msgid ""
718 "convert a foreign SCM repository to a Mercurial one.\n"
738 "convert a foreign SCM repository to a Mercurial one.\n"
719 "\n"
739 "\n"
720 " Accepted source formats [identifiers]:\n"
740 " Accepted source formats [identifiers]:\n"
721 " - Mercurial [hg]\n"
741 " - Mercurial [hg]\n"
722 " - CVS [cvs]\n"
742 " - CVS [cvs]\n"
723 " - Darcs [darcs]\n"
743 " - Darcs [darcs]\n"
724 " - git [git]\n"
744 " - git [git]\n"
725 " - Subversion [svn]\n"
745 " - Subversion [svn]\n"
726 " - Monotone [mtn]\n"
746 " - Monotone [mtn]\n"
727 " - GNU Arch [gnuarch]\n"
747 " - GNU Arch [gnuarch]\n"
728 " - Bazaar [bzr]\n"
748 " - Bazaar [bzr]\n"
749 " - Perforce [p4]\n"
729 "\n"
750 "\n"
730 " Accepted destination formats [identifiers]:\n"
751 " Accepted destination formats [identifiers]:\n"
731 " - Mercurial [hg]\n"
752 " - Mercurial [hg]\n"
732 " - Subversion [svn] (history on branches is not preserved)\n"
753 " - Subversion [svn] (history on branches is not preserved)\n"
733 "\n"
754 "\n"
734 " If no revision is given, all revisions will be converted. Otherwise,\n"
755 " If no revision is given, all revisions will be converted. Otherwise,\n"
735 " convert will only import up to the named revision (given in a format\n"
756 " convert will only import up to the named revision (given in a format\n"
736 " understood by the source).\n"
757 " understood by the source).\n"
737 "\n"
758 "\n"
738 " If no destination directory name is specified, it defaults to the\n"
759 " If no destination directory name is specified, it defaults to the\n"
739 " basename of the source with '-hg' appended. If the destination\n"
760 " basename of the source with '-hg' appended. If the destination\n"
740 " repository doesn't exist, it will be created.\n"
761 " repository doesn't exist, it will be created.\n"
741 "\n"
762 "\n"
742 " If <REVMAP> isn't given, it will be put in a default location\n"
763 " If <REVMAP> isn't given, it will be put in a default location\n"
743 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n"
764 " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n"
744 " file that maps each source commit ID to the destination ID for\n"
765 " file that maps each source commit ID to the destination ID for\n"
745 " that revision, like so:\n"
766 " that revision, like so:\n"
746 " <source ID> <destination ID>\n"
767 " <source ID> <destination ID>\n"
747 "\n"
768 "\n"
748 " If the file doesn't exist, it's automatically created. It's updated\n"
769 " If the file doesn't exist, it's automatically created. It's updated\n"
749 " on each commit copied, so convert-repo can be interrupted and can\n"
770 " on each commit copied, so convert-repo can be interrupted and can\n"
750 " be run repeatedly to copy new commits.\n"
771 " be run repeatedly to copy new commits.\n"
751 "\n"
772 "\n"
752 " The [username mapping] file is a simple text file that maps each source\n"
773 " The [username mapping] file is a simple text file that maps each source\n"
753 " commit author to a destination commit author. It is handy for source "
774 " commit author to a destination commit author. It is handy for source "
754 "SCMs\n"
775 "SCMs\n"
755 " that use unix logins to identify authors (eg: CVS). One line per author\n"
776 " that use unix logins to identify authors (eg: CVS). One line per author\n"
756 " mapping and the line format is:\n"
777 " mapping and the line format is:\n"
757 " srcauthor=whatever string you want\n"
778 " srcauthor=whatever string you want\n"
758 "\n"
779 "\n"
759 " The filemap is a file that allows filtering and remapping of files\n"
780 " The filemap is a file that allows filtering and remapping of files\n"
760 " and directories. Comment lines start with '#'. Each line can\n"
781 " and directories. Comment lines start with '#'. Each line can\n"
761 " contain one of the following directives:\n"
782 " contain one of the following directives:\n"
762 "\n"
783 "\n"
763 " include path/to/file\n"
784 " include path/to/file\n"
764 "\n"
785 "\n"
765 " exclude path/to/file\n"
786 " exclude path/to/file\n"
766 "\n"
787 "\n"
767 " rename from/file to/file\n"
788 " rename from/file to/file\n"
768 "\n"
789 "\n"
769 " The 'include' directive causes a file, or all files under a\n"
790 " The 'include' directive causes a file, or all files under a\n"
770 " directory, to be included in the destination repository, and the\n"
791 " directory, to be included in the destination repository, and the\n"
771 " exclusion of all other files and dirs not explicitely included.\n"
792 " exclusion of all other files and dirs not explicitely included.\n"
772 " The 'exclude' directive causes files or directories to be omitted.\n"
793 " The 'exclude' directive causes files or directories to be omitted.\n"
773 " The 'rename' directive renames a file or directory. To rename from a\n"
794 " The 'rename' directive renames a file or directory. To rename from a\n"
774 " subdirectory into the root of the repository, use '.' as the path to\n"
795 " subdirectory into the root of the repository, use '.' as the path to\n"
775 " rename to.\n"
796 " rename to.\n"
776 "\n"
797 "\n"
777 " The splicemap is a file that allows insertion of synthetic\n"
798 " The splicemap is a file that allows insertion of synthetic\n"
778 " history, letting you specify the parents of a revision. This is\n"
799 " history, letting you specify the parents of a revision. This is\n"
779 " useful if you want to e.g. give a Subversion merge two parents, or\n"
800 " useful if you want to e.g. give a Subversion merge two parents, or\n"
780 " graft two disconnected series of history together. Each entry\n"
801 " graft two disconnected series of history together. Each entry\n"
781 " contains a key, followed by a space, followed by one or two\n"
802 " contains a key, followed by a space, followed by one or two\n"
782 " values, separated by spaces. The key is the revision ID in the\n"
803 " values, separated by spaces. The key is the revision ID in the\n"
783 " source revision control system whose parents should be modified\n"
804 " source revision control system whose parents should be modified\n"
784 " (same format as a key in .hg/shamap). The values are the revision\n"
805 " (same format as a key in .hg/shamap). The values are the revision\n"
785 " IDs (in either the source or destination revision control system)\n"
806 " IDs (in either the source or destination revision control system)\n"
786 " that should be used as the new parents for that node.\n"
807 " that should be used as the new parents for that node.\n"
787 "\n"
808 "\n"
788 " Mercurial Source\n"
809 " Mercurial Source\n"
789 " -----------------\n"
810 " -----------------\n"
790 "\n"
811 "\n"
791 " --config convert.hg.ignoreerrors=False (boolean)\n"
812 " --config convert.hg.ignoreerrors=False (boolean)\n"
792 " ignore integrity errors when reading. Use it to fix Mercurial\n"
813 " ignore integrity errors when reading. Use it to fix Mercurial\n"
793 " repositories with missing revlogs, by converting from and to\n"
814 " repositories with missing revlogs, by converting from and to\n"
794 " Mercurial.\n"
815 " Mercurial.\n"
795 " --config convert.hg.saverev=True (boolean)\n"
816 " --config convert.hg.saverev=False (boolean)\n"
796 " allow target to preserve source revision ID\n"
817 " store original revision ID in changeset (forces target IDs to "
818 "change)\n"
797 " --config convert.hg.startrev=0 (hg revision identifier)\n"
819 " --config convert.hg.startrev=0 (hg revision identifier)\n"
798 " convert start revision and its descendants\n"
820 " convert start revision and its descendants\n"
799 "\n"
821 "\n"
800 " CVS Source\n"
822 " CVS Source\n"
801 " ----------\n"
823 " ----------\n"
802 "\n"
824 "\n"
803 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
825 " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
804 " to indicate the starting point of what will be converted. Direct\n"
826 " to indicate the starting point of what will be converted. Direct\n"
805 " access to the repository files is not needed, unless of course\n"
827 " access to the repository files is not needed, unless of course\n"
806 " the repository is :local:. The conversion uses the top level\n"
828 " the repository is :local:. The conversion uses the top level\n"
807 " directory in the sandbox to find the CVS repository, and then uses\n"
829 " directory in the sandbox to find the CVS repository, and then uses\n"
808 " CVS rlog commands to find files to convert. This means that unless\n"
830 " CVS rlog commands to find files to convert. This means that unless\n"
809 " a filemap is given, all files under the starting directory will be\n"
831 " a filemap is given, all files under the starting directory will be\n"
810 " converted, and that any directory reorganisation in the CVS\n"
832 " converted, and that any directory reorganisation in the CVS\n"
811 " sandbox is ignored.\n"
833 " sandbox is ignored.\n"
812 "\n"
834 "\n"
813 " Because CVS does not have changesets, it is necessary to collect\n"
835 " Because CVS does not have changesets, it is necessary to collect\n"
814 " individual commits to CVS and merge them into changesets. CVS\n"
836 " individual commits to CVS and merge them into changesets. CVS\n"
815 " source uses its internal changeset merging code by default but can\n"
837 " source uses its internal changeset merging code by default but can\n"
816 " be configured to call the external 'cvsps' program by setting:\n"
838 " be configured to call the external 'cvsps' program by setting:\n"
817 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
839 " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
818 " This is a legacy option and may be removed in future.\n"
840 " This is a legacy option and may be removed in future.\n"
819 "\n"
841 "\n"
820 " The options shown are the defaults.\n"
842 " The options shown are the defaults.\n"
821 "\n"
843 "\n"
822 " Internal cvsps is selected by setting\n"
844 " Internal cvsps is selected by setting\n"
823 " --config convert.cvsps=builtin\n"
845 " --config convert.cvsps=builtin\n"
824 " and has a few more configurable options:\n"
846 " and has a few more configurable options:\n"
825 " --config convert.cvsps.fuzz=60 (integer)\n"
847 " --config convert.cvsps.fuzz=60 (integer)\n"
826 " Specify the maximum time (in seconds) that is allowed between\n"
848 " Specify the maximum time (in seconds) that is allowed between\n"
827 " commits with identical user and log message in a single\n"
849 " commits with identical user and log message in a single\n"
828 " changeset. When very large files were checked in as part\n"
850 " changeset. When very large files were checked in as part\n"
829 " of a changeset then the default may not be long enough.\n"
851 " of a changeset then the default may not be long enough.\n"
830 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
852 " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
831 " Specify a regular expression to which commit log messages are\n"
853 " Specify a regular expression to which commit log messages are\n"
832 " matched. If a match occurs, then the conversion process will\n"
854 " matched. If a match occurs, then the conversion process will\n"
833 " insert a dummy revision merging the branch on which this log\n"
855 " insert a dummy revision merging the branch on which this log\n"
834 " message occurs to the branch indicated in the regex.\n"
856 " message occurs to the branch indicated in the regex.\n"
835 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
857 " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
836 " Specify a regular expression to which commit log messages are\n"
858 " Specify a regular expression to which commit log messages are\n"
837 " matched. If a match occurs, then the conversion process will\n"
859 " matched. If a match occurs, then the conversion process will\n"
838 " add the most recent revision on the branch indicated in the\n"
860 " add the most recent revision on the branch indicated in the\n"
839 " regex as the second parent of the changeset.\n"
861 " regex as the second parent of the changeset.\n"
840 "\n"
862 "\n"
841 " The hgext/convert/cvsps wrapper script allows the builtin changeset\n"
863 " The hgext/convert/cvsps wrapper script allows the builtin changeset\n"
842 " merging code to be run without doing a conversion. Its parameters and\n"
864 " merging code to be run without doing a conversion. Its parameters and\n"
843 " output are similar to that of cvsps 2.1.\n"
865 " output are similar to that of cvsps 2.1.\n"
844 "\n"
866 "\n"
845 " Subversion Source\n"
867 " Subversion Source\n"
846 " -----------------\n"
868 " -----------------\n"
847 "\n"
869 "\n"
848 " Subversion source detects classical trunk/branches/tags layouts.\n"
870 " Subversion source detects classical trunk/branches/tags layouts.\n"
849 " By default, the supplied \"svn://repo/path/\" source URL is\n"
871 " By default, the supplied \"svn://repo/path/\" source URL is\n"
850 " converted as a single branch. If \"svn://repo/path/trunk\" exists\n"
872 " converted as a single branch. If \"svn://repo/path/trunk\" exists\n"
851 " it replaces the default branch. If \"svn://repo/path/branches\"\n"
873 " it replaces the default branch. If \"svn://repo/path/branches\"\n"
852 " exists, its subdirectories are listed as possible branches. If\n"
874 " exists, its subdirectories are listed as possible branches. If\n"
853 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
875 " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n"
854 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
876 " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n"
855 " can be overriden with following options. Set them to paths\n"
877 " can be overriden with following options. Set them to paths\n"
856 " relative to the source URL, or leave them blank to disable\n"
878 " relative to the source URL, or leave them blank to disable\n"
857 " autodetection.\n"
879 " autodetection.\n"
858 "\n"
880 "\n"
859 " --config convert.svn.branches=branches (directory name)\n"
881 " --config convert.svn.branches=branches (directory name)\n"
860 " specify the directory containing branches\n"
882 " specify the directory containing branches\n"
861 " --config convert.svn.tags=tags (directory name)\n"
883 " --config convert.svn.tags=tags (directory name)\n"
862 " specify the directory containing tags\n"
884 " specify the directory containing tags\n"
863 " --config convert.svn.trunk=trunk (directory name)\n"
885 " --config convert.svn.trunk=trunk (directory name)\n"
864 " specify the name of the trunk branch\n"
886 " specify the name of the trunk branch\n"
865 "\n"
887 "\n"
866 " Source history can be retrieved starting at a specific revision,\n"
888 " Source history can be retrieved starting at a specific revision,\n"
867 " instead of being integrally converted. Only single branch\n"
889 " instead of being integrally converted. Only single branch\n"
868 " conversions are supported.\n"
890 " conversions are supported.\n"
869 "\n"
891 "\n"
870 " --config convert.svn.startrev=0 (svn revision number)\n"
892 " --config convert.svn.startrev=0 (svn revision number)\n"
871 " specify start Subversion revision.\n"
893 " specify start Subversion revision.\n"
872 "\n"
894 "\n"
895 " Perforce Source\n"
896 " ---------------\n"
897 "\n"
898 " The Perforce (P4) importer can be given a p4 depot path or a client\n"
899 " specification as source. It will convert all files in the source to\n"
900 " a flat Mercurial repository, ignoring labels, branches and "
901 "integrations.\n"
902 " Note that when a depot path is given you then usually should specify a\n"
903 " target directory, because otherwise the target may be named ...-hg.\n"
904 "\n"
905 " It is possible to limit the amount of source history to be converted\n"
906 " by specifying an initial Perforce revision.\n"
907 "\n"
908 " --config convert.p4.startrev=0 (perforce changelist number)\n"
909 " specify initial Perforce revision.\n"
910 "\n"
911 "\n"
873 " Mercurial Destination\n"
912 " Mercurial Destination\n"
874 " ---------------------\n"
913 " ---------------------\n"
875 "\n"
914 "\n"
876 " --config convert.hg.clonebranches=False (boolean)\n"
915 " --config convert.hg.clonebranches=False (boolean)\n"
877 " dispatch source branches in separate clones.\n"
916 " dispatch source branches in separate clones.\n"
878 " --config convert.hg.tagsbranch=default (branch name)\n"
917 " --config convert.hg.tagsbranch=default (branch name)\n"
879 " tag revisions branch name\n"
918 " tag revisions branch name\n"
880 " --config convert.hg.usebranchnames=True (boolean)\n"
919 " --config convert.hg.usebranchnames=True (boolean)\n"
881 " preserve branch names\n"
920 " preserve branch names\n"
882 "\n"
921 "\n"
883 " "
922 " "
884 msgstr ""
923 msgstr ""
885
924
886 msgid ""
925 msgid ""
887 "create changeset information from CVS\n"
926 "create changeset information from CVS\n"
888 "\n"
927 "\n"
889 " This command is intended as a debugging tool for the CVS to Mercurial\n"
928 " This command is intended as a debugging tool for the CVS to Mercurial\n"
890 " converter, and can be used as a direct replacement for cvsps.\n"
929 " converter, and can be used as a direct replacement for cvsps.\n"
891 "\n"
930 "\n"
892 " Hg debugcvsps reads the CVS rlog for current directory (or any named\n"
931 " Hg debugcvsps reads the CVS rlog for current directory (or any named\n"
893 " directory) in the CVS repository, and converts the log to a series of\n"
932 " directory) in the CVS repository, and converts the log to a series of\n"
894 " changesets based on matching commit log entries and dates."
933 " changesets based on matching commit log entries and dates."
895 msgstr ""
934 msgstr ""
896
935
897 msgid "username mapping filename"
936 msgid "username mapping filename"
898 msgstr ""
937 msgstr ""
899
938
900 msgid "destination repository type"
939 msgid "destination repository type"
901 msgstr ""
940 msgstr ""
902
941
903 msgid "remap file names using contents of file"
942 msgid "remap file names using contents of file"
904 msgstr ""
943 msgstr ""
905
944
906 msgid "import up to target revision REV"
945 msgid "import up to target revision REV"
907 msgstr ""
946 msgstr ""
908
947
909 msgid "source repository type"
948 msgid "source repository type"
910 msgstr ""
949 msgstr ""
911
950
912 msgid "splice synthesized history into place"
951 msgid "splice synthesized history into place"
913 msgstr ""
952 msgstr ""
914
953
915 msgid "try to sort changesets by date"
954 msgid "try to sort changesets by date"
916 msgstr ""
955 msgstr ""
917
956
918 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
957 msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
919 msgstr ""
958 msgstr ""
920
959
921 msgid "only return changes on specified branches"
960 msgid "only return changes on specified branches"
922 msgstr ""
961 msgstr ""
923
962
924 msgid "prefix to remove from file names"
963 msgid "prefix to remove from file names"
925 msgstr ""
964 msgstr ""
926
965
927 msgid "only return changes after or between specified tags"
966 msgid "only return changes after or between specified tags"
928 msgstr ""
967 msgstr ""
929
968
930 msgid "update cvs log cache"
969 msgid "update cvs log cache"
931 msgstr ""
970 msgstr ""
932
971
933 msgid "create new cvs log cache"
972 msgid "create new cvs log cache"
934 msgstr ""
973 msgstr ""
935
974
936 msgid "set commit time fuzz in seconds"
975 msgid "set commit time fuzz in seconds"
937 msgstr ""
976 msgstr ""
938
977
939 msgid "specify cvsroot"
978 msgid "specify cvsroot"
940 msgstr ""
979 msgstr ""
941
980
942 msgid "show parent changesets"
981 msgid "show parent changesets"
943 msgstr ""
982 msgstr ""
944
983
945 msgid "show current changeset in ancestor branches"
984 msgid "show current changeset in ancestor branches"
946 msgstr ""
985 msgstr ""
947
986
948 msgid "ignored for compatibility"
987 msgid "ignored for compatibility"
949 msgstr ""
988 msgstr ""
950
989
951 msgid "hg debugcvsps [OPTION]... [PATH]..."
990 msgid "hg debugcvsps [OPTION]... [PATH]..."
952 msgstr ""
991 msgstr ""
953
992
954 #, python-format
993 #, python-format
955 msgid "%s is not a valid revision in current branch"
994 msgid "%s is not a valid revision in current branch"
956 msgstr ""
995 msgstr ""
957
996
958 #, python-format
997 #, python-format
959 msgid "%s is not available in %s anymore"
998 msgid "%s is not available in %s anymore"
960 msgstr ""
999 msgstr ""
961
1000
962 #, python-format
1001 #, python-format
963 msgid "cannot find required \"%s\" tool"
1002 msgid "cannot find required \"%s\" tool"
964 msgstr ""
1003 msgstr ""
965
1004
966 #, python-format
1005 #, python-format
967 msgid "running: %s\n"
1006 msgid "running: %s\n"
968 msgstr ""
1007 msgstr ""
969
1008
970 #, python-format
1009 #, python-format
971 msgid "%s error:\n"
1010 msgid "%s error:\n"
972 msgstr ""
1011 msgstr ""
973
1012
974 #, python-format
1013 #, python-format
975 msgid "%s %s"
1014 msgid "%s %s"
976 msgstr ""
1015 msgstr ""
977
1016
978 #, python-format
1017 #, python-format
979 msgid "could not open map file %r: %s"
1018 msgid "could not open map file %r: %s"
980 msgstr ""
1019 msgstr ""
981
1020
982 #, python-format
1021 #, python-format
983 msgid "%s: missing or unsupported repository"
1022 msgid "%s: missing or unsupported repository"
984 msgstr ""
1023 msgstr ""
985
1024
986 #, python-format
1025 #, python-format
987 msgid "convert: %s\n"
1026 msgid "convert: %s\n"
988 msgstr ""
1027 msgstr ""
989
1028
990 #, python-format
1029 #, python-format
991 msgid "%s: unknown repository type"
1030 msgid "%s: unknown repository type"
992 msgstr ""
1031 msgstr ""
993
1032
994 #, python-format
1033 #, python-format
995 msgid "cycle detected between %s and %s"
1034 msgid "cycle detected between %s and %s"
996 msgstr ""
1035 msgstr ""
997
1036
998 msgid "not all revisions were sorted"
1037 msgid "not all revisions were sorted"
999 msgstr ""
1038 msgstr ""
1000
1039
1001 #, python-format
1040 #, python-format
1002 msgid "Writing author map file %s\n"
1041 msgid "Writing author map file %s\n"
1003 msgstr ""
1042 msgstr ""
1004
1043
1005 #, python-format
1044 #, python-format
1006 msgid "Overriding mapping for author %s, was %s, will be %s\n"
1045 msgid "Overriding mapping for author %s, was %s, will be %s\n"
1007 msgstr ""
1046 msgstr ""
1008
1047
1009 #, python-format
1048 #, python-format
1010 msgid "mapping author %s to %s\n"
1049 msgid "mapping author %s to %s\n"
1011 msgstr ""
1050 msgstr ""
1012
1051
1013 #, python-format
1052 #, python-format
1014 msgid "Ignoring bad line in author map file %s: %s\n"
1053 msgid "Ignoring bad line in author map file %s: %s\n"
1015 msgstr ""
1054 msgstr ""
1016
1055
1017 #, python-format
1056 #, python-format
1018 msgid "spliced in %s as parents of %s\n"
1057 msgid "spliced in %s as parents of %s\n"
1019 msgstr ""
1058 msgstr ""
1020
1059
1021 msgid "scanning source...\n"
1060 msgid "scanning source...\n"
1022 msgstr ""
1061 msgstr ""
1023
1062
1024 msgid "sorting...\n"
1063 msgid "sorting...\n"
1025 msgstr ""
1064 msgstr ""
1026
1065
1027 msgid "converting...\n"
1066 msgid "converting...\n"
1028 msgstr ""
1067 msgstr ""
1029
1068
1030 #, python-format
1069 #, python-format
1031 msgid "source: %s\n"
1070 msgid "source: %s\n"
1032 msgstr ""
1071 msgstr ""
1033
1072
1034 #, python-format
1073 #, python-format
1035 msgid "assuming destination %s\n"
1074 msgid "assuming destination %s\n"
1036 msgstr ""
1075 msgstr ""
1037
1076
1038 #, python-format
1077 #, python-format
1039 msgid "revision %s is not a patchset number or date"
1078 msgid "revision %s is not a patchset number or date"
1040 msgstr ""
1079 msgstr ""
1041
1080
1042 msgid "using builtin cvsps\n"
1081 msgid "using builtin cvsps\n"
1043 msgstr ""
1082 msgstr ""
1044
1083
1045 #, python-format
1084 #, python-format
1046 msgid "connecting to %s\n"
1085 msgid "connecting to %s\n"
1047 msgstr ""
1086 msgstr ""
1048
1087
1049 msgid "CVS pserver authentication failed"
1088 msgid "CVS pserver authentication failed"
1050 msgstr ""
1089 msgstr ""
1051
1090
1052 msgid "server sucks"
1091 msgid "server sucks"
1053 msgstr ""
1092 msgstr ""
1054
1093
1055 #, python-format
1094 #, python-format
1056 msgid "%d bytes missing from remote file"
1095 msgid "%d bytes missing from remote file"
1057 msgstr ""
1096 msgstr ""
1058
1097
1059 #, python-format
1098 #, python-format
1060 msgid "cvs server: %s\n"
1099 msgid "cvs server: %s\n"
1061 msgstr ""
1100 msgstr ""
1062
1101
1063 #, python-format
1102 #, python-format
1064 msgid "unknown CVS response: %s"
1103 msgid "unknown CVS response: %s"
1065 msgstr ""
1104 msgstr ""
1066
1105
1067 msgid "collecting CVS rlog\n"
1106 msgid "collecting CVS rlog\n"
1068 msgstr ""
1107 msgstr ""
1069
1108
1070 #, python-format
1109 #, python-format
1071 msgid "reading cvs log cache %s\n"
1110 msgid "reading cvs log cache %s\n"
1072 msgstr ""
1111 msgstr ""
1073
1112
1074 #, python-format
1113 #, python-format
1075 msgid "cache has %d log entries\n"
1114 msgid "cache has %d log entries\n"
1076 msgstr ""
1115 msgstr ""
1077
1116
1078 #, python-format
1117 #, python-format
1079 msgid "error reading cache: %r\n"
1118 msgid "error reading cache: %r\n"
1080 msgstr ""
1119 msgstr ""
1081
1120
1082 #, python-format
1121 #, python-format
1083 msgid "running %s\n"
1122 msgid "running %s\n"
1084 msgstr ""
1123 msgstr ""
1085
1124
1086 #, python-format
1125 #, python-format
1087 msgid "prefix=%r directory=%r root=%r\n"
1126 msgid "prefix=%r directory=%r root=%r\n"
1088 msgstr ""
1127 msgstr ""
1089
1128
1090 msgid "RCS file must be followed by working file"
1129 msgid "RCS file must be followed by working file"
1091 msgstr ""
1130 msgstr ""
1092
1131
1093 msgid "must have at least some revisions"
1132 msgid "must have at least some revisions"
1094 msgstr ""
1133 msgstr ""
1095
1134
1096 msgid "expected revision number"
1135 msgid "expected revision number"
1097 msgstr ""
1136 msgstr ""
1098
1137
1099 msgid "revision must be followed by date line"
1138 msgid "revision must be followed by date line"
1100 msgstr ""
1139 msgstr ""
1101
1140
1102 #, python-format
1141 #, python-format
1103 msgid "writing cvs log cache %s\n"
1142 msgid "writing cvs log cache %s\n"
1104 msgstr ""
1143 msgstr ""
1105
1144
1106 #, python-format
1145 #, python-format
1107 msgid "%d log entries\n"
1146 msgid "%d log entries\n"
1108 msgstr ""
1147 msgstr ""
1109
1148
1110 msgid "creating changesets\n"
1149 msgid "creating changesets\n"
1111 msgstr ""
1150 msgstr ""
1112
1151
1113 #, python-format
1152 #, python-format
1114 msgid "%d changeset entries\n"
1153 msgid "%d changeset entries\n"
1115 msgstr ""
1154 msgstr ""
1116
1155
1117 msgid "Python ElementTree module is not available"
1156 msgid "Python ElementTree module is not available"
1118 msgstr ""
1157 msgstr ""
1119
1158
1120 #, python-format
1159 #, python-format
1121 msgid "cleaning up %s\n"
1160 msgid "cleaning up %s\n"
1122 msgstr ""
1161 msgstr ""
1123
1162
1124 msgid "internal calling inconsistency"
1163 msgid "internal calling inconsistency"
1125 msgstr ""
1164 msgstr ""
1126
1165
1127 msgid "errors in filemap"
1166 msgid "errors in filemap"
1128 msgstr ""
1167 msgstr ""
1129
1168
1130 #, python-format
1169 #, python-format
1131 msgid "%s:%d: %r already in %s list\n"
1170 msgid "%s:%d: %r already in %s list\n"
1132 msgstr ""
1171 msgstr ""
1133
1172
1134 #, python-format
1173 #, python-format
1135 msgid "%s:%d: unknown directive %r\n"
1174 msgid "%s:%d: unknown directive %r\n"
1136 msgstr ""
1175 msgstr ""
1137
1176
1138 msgid "source repository doesn't support --filemap"
1177 msgid "source repository doesn't support --filemap"
1139 msgstr ""
1178 msgstr ""
1140
1179
1141 #, python-format
1180 #, python-format
1142 msgid "%s does not look like a GNU Arch repo"
1181 msgid "%s does not look like a GNU Arch repo"
1143 msgstr ""
1182 msgstr ""
1144
1183
1145 msgid "cannot find a GNU Arch tool"
1184 msgid "cannot find a GNU Arch tool"
1146 msgstr ""
1185 msgstr ""
1147
1186
1148 #, python-format
1187 #, python-format
1149 msgid "analyzing tree version %s...\n"
1188 msgid "analyzing tree version %s...\n"
1150 msgstr ""
1189 msgstr ""
1151
1190
1152 #, python-format
1191 #, python-format
1153 msgid ""
1192 msgid ""
1154 "tree analysis stopped because it points to an unregistered archive %s...\n"
1193 "tree analysis stopped because it points to an unregistered archive %s...\n"
1155 msgstr ""
1194 msgstr ""
1156
1195
1157 #, python-format
1196 #, python-format
1158 msgid "applying revision %s...\n"
1197 msgid "applying revision %s...\n"
1159 msgstr ""
1198 msgstr ""
1160
1199
1161 #, python-format
1200 #, python-format
1162 msgid "computing changeset between %s and %s...\n"
1201 msgid "computing changeset between %s and %s...\n"
1163 msgstr ""
1202 msgstr ""
1164
1203
1165 #, python-format
1204 #, python-format
1166 msgid "obtaining revision %s...\n"
1205 msgid "obtaining revision %s...\n"
1167 msgstr ""
1206 msgstr ""
1168
1207
1169 #, python-format
1208 #, python-format
1170 msgid "analysing revision %s...\n"
1209 msgid "analysing revision %s...\n"
1171 msgstr ""
1210 msgstr ""
1172
1211
1173 #, python-format
1212 #, python-format
1174 msgid "could not parse cat-log of %s"
1213 msgid "could not parse cat-log of %s"
1175 msgstr ""
1214 msgstr ""
1176
1215
1177 #, python-format
1216 #, python-format
1178 msgid "%s is not a local Mercurial repo"
1217 msgid "%s is not a local Mercurial repo"
1179 msgstr ""
1218 msgstr ""
1180
1219
1181 #, python-format
1220 #, python-format
1182 msgid "initializing destination %s repository\n"
1221 msgid "initializing destination %s repository\n"
1183 msgstr ""
1222 msgstr ""
1184
1223
1185 msgid "run hg sink pre-conversion action\n"
1224 msgid "run hg sink pre-conversion action\n"
1186 msgstr ""
1225 msgstr ""
1187
1226
1188 msgid "run hg sink post-conversion action\n"
1227 msgid "run hg sink post-conversion action\n"
1189 msgstr ""
1228 msgstr ""
1190
1229
1191 #, python-format
1230 #, python-format
1192 msgid "pulling from %s into %s\n"
1231 msgid "pulling from %s into %s\n"
1193 msgstr ""
1232 msgstr ""
1194
1233
1195 msgid "updating tags\n"
1234 msgid "updating tags\n"
1196 msgstr ""
1235 msgstr ""
1197
1236
1198 #, python-format
1237 #, python-format
1199 msgid "%s is not a valid start revision"
1238 msgid "%s is not a valid start revision"
1200 msgstr ""
1239 msgstr ""
1201
1240
1202 #, python-format
1241 #, python-format
1203 msgid "ignoring: %s\n"
1242 msgid "ignoring: %s\n"
1204 msgstr ""
1243 msgstr ""
1205
1244
1206 msgid "run hg source pre-conversion action\n"
1245 msgid "run hg source pre-conversion action\n"
1207 msgstr ""
1246 msgstr ""
1208
1247
1209 msgid "run hg source post-conversion action\n"
1248 msgid "run hg source post-conversion action\n"
1210 msgstr ""
1249 msgstr ""
1211
1250
1212 #, python-format
1251 #, python-format
1213 msgid "%s does not look like a monotone repo"
1252 msgid "%s does not look like a monotone repo"
1214 msgstr ""
1253 msgstr ""
1215
1254
1216 #, python-format
1255 #, python-format
1217 msgid "copying file in renamed dir from '%s' to '%s'"
1256 msgid "copying file in renamed dir from '%s' to '%s'"
1218 msgstr ""
1257 msgstr ""
1219
1258
1259 msgid "reading p4 views\n"
1260 msgstr ""
1261
1262 msgid "collecting p4 changelists\n"
1263 msgstr ""
1264
1220 msgid "Subversion python bindings could not be loaded"
1265 msgid "Subversion python bindings could not be loaded"
1221 msgstr ""
1266 msgstr ""
1222
1267
1223 #, python-format
1268 #, python-format
1224 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1269 msgid "Subversion python bindings %d.%d found, 1.4 or later required"
1225 msgstr ""
1270 msgstr ""
1226
1271
1227 msgid "Subversion python bindings are too old, 1.4 or later required"
1272 msgid "Subversion python bindings are too old, 1.4 or later required"
1228 msgstr ""
1273 msgstr ""
1229
1274
1230 #, python-format
1275 #, python-format
1231 msgid "svn: revision %s is not an integer"
1276 msgid "svn: revision %s is not an integer"
1232 msgstr ""
1277 msgstr ""
1233
1278
1234 #, python-format
1279 #, python-format
1235 msgid "svn: start revision %s is not an integer"
1280 msgid "svn: start revision %s is not an integer"
1236 msgstr ""
1281 msgstr ""
1237
1282
1238 #, python-format
1283 #, python-format
1239 msgid "no revision found in module %s"
1284 msgid "no revision found in module %s"
1240 msgstr ""
1285 msgstr ""
1241
1286
1242 #, python-format
1287 #, python-format
1243 msgid "expected %s to be at %r, but not found"
1288 msgid "expected %s to be at %r, but not found"
1244 msgstr ""
1289 msgstr ""
1245
1290
1246 #, python-format
1291 #, python-format
1247 msgid "found %s at %r\n"
1292 msgid "found %s at %r\n"
1248 msgstr ""
1293 msgstr ""
1249
1294
1250 #, python-format
1295 #, python-format
1251 msgid "ignoring empty branch %s\n"
1296 msgid "ignoring empty branch %s\n"
1252 msgstr ""
1297 msgstr ""
1253
1298
1254 #, python-format
1299 #, python-format
1255 msgid "found branch %s at %d\n"
1300 msgid "found branch %s at %d\n"
1256 msgstr ""
1301 msgstr ""
1257
1302
1258 msgid "svn: start revision is not supported with with more than one branch"
1303 msgid "svn: start revision is not supported with with more than one branch"
1259 msgstr ""
1304 msgstr ""
1260
1305
1261 #, python-format
1306 #, python-format
1262 msgid "svn: no revision found after start revision %d"
1307 msgid "svn: no revision found after start revision %d"
1263 msgstr ""
1308 msgstr ""
1264
1309
1265 #, python-format
1310 #, python-format
1266 msgid "no tags found at revision %d\n"
1311 msgid "no tags found at revision %d\n"
1267 msgstr ""
1312 msgstr ""
1268
1313
1269 #, python-format
1314 #, python-format
1270 msgid "ignoring foreign branch %r\n"
1315 msgid "ignoring foreign branch %r\n"
1271 msgstr ""
1316 msgstr ""
1272
1317
1273 #, python-format
1318 #, python-format
1274 msgid "%s not found up to revision %d"
1319 msgid "%s not found up to revision %d"
1275 msgstr ""
1320 msgstr ""
1276
1321
1277 #, python-format
1322 #, python-format
1278 msgid "branch renamed from %s to %s at %d\n"
1323 msgid "branch renamed from %s to %s at %d\n"
1279 msgstr ""
1324 msgstr ""
1280
1325
1281 #, python-format
1326 #, python-format
1282 msgid "reparent to %s\n"
1327 msgid "reparent to %s\n"
1283 msgstr ""
1328 msgstr ""
1284
1329
1285 #, python-format
1330 #, python-format
1286 msgid "copied to %s from %s@%s\n"
1331 msgid "copied to %s from %s@%s\n"
1287 msgstr ""
1332 msgstr ""
1288
1333
1289 #, python-format
1334 #, python-format
1290 msgid "gone from %s\n"
1335 msgid "gone from %s\n"
1291 msgstr ""
1336 msgstr ""
1292
1337
1293 #, python-format
1338 #, python-format
1294 msgid "found parent directory %s\n"
1339 msgid "found parent directory %s\n"
1295 msgstr ""
1340 msgstr ""
1296
1341
1297 #, python-format
1342 #, python-format
1298 msgid "base, entry %s %s\n"
1343 msgid "base, entry %s %s\n"
1299 msgstr ""
1344 msgstr ""
1300
1345
1301 msgid "munge-o-matic\n"
1346 msgid "munge-o-matic\n"
1302 msgstr ""
1347 msgstr ""
1303
1348
1304 #, python-format
1349 #, python-format
1305 msgid "info: %s %s %s %s\n"
1350 msgid "info: %s %s %s %s\n"
1306 msgstr ""
1351 msgstr ""
1307
1352
1308 #, python-format
1353 #, python-format
1309 msgid "unknown path in revision %d: %s\n"
1354 msgid "unknown path in revision %d: %s\n"
1310 msgstr ""
1355 msgstr ""
1311
1356
1312 #, python-format
1357 #, python-format
1313 msgid "mark %s came from %s:%d\n"
1358 msgid "mark %s came from %s:%d\n"
1314 msgstr ""
1359 msgstr ""
1315
1360
1316 #, python-format
1361 #, python-format
1317 msgid "parsing revision %d (%d changes)\n"
1362 msgid "parsing revision %d (%d changes)\n"
1318 msgstr ""
1363 msgstr ""
1319
1364
1320 #, python-format
1365 #, python-format
1321 msgid "found parent of branch %s at %d: %s\n"
1366 msgid "found parent of branch %s at %d: %s\n"
1322 msgstr ""
1367 msgstr ""
1323
1368
1324 msgid "no copyfrom path, don't know what to do.\n"
1369 msgid "no copyfrom path, don't know what to do.\n"
1325 msgstr ""
1370 msgstr ""
1326
1371
1327 #, python-format
1372 #, python-format
1328 msgid "fetching revision log for \"%s\" from %d to %d\n"
1373 msgid "fetching revision log for \"%s\" from %d to %d\n"
1329 msgstr ""
1374 msgstr ""
1330
1375
1331 #, python-format
1376 #, python-format
1332 msgid "skipping blacklisted revision %d\n"
1377 msgid "skipping blacklisted revision %d\n"
1333 msgstr ""
1378 msgstr ""
1334
1379
1335 #, python-format
1380 #, python-format
1336 msgid "revision %d has no entries\n"
1381 msgid "revision %d has no entries\n"
1337 msgstr ""
1382 msgstr ""
1338
1383
1339 #, python-format
1384 #, python-format
1340 msgid "svn: branch has no revision %s"
1385 msgid "svn: branch has no revision %s"
1341 msgstr ""
1386 msgstr ""
1342
1387
1343 #, python-format
1388 #, python-format
1344 msgid "%r is not under %r, ignoring\n"
1389 msgid "%r is not under %r, ignoring\n"
1345 msgstr ""
1390 msgstr ""
1346
1391
1347 #, python-format
1392 #, python-format
1348 msgid "initializing svn repo %r\n"
1393 msgid "initializing svn repo %r\n"
1349 msgstr ""
1394 msgstr ""
1350
1395
1351 #, python-format
1396 #, python-format
1352 msgid "initializing svn wc %r\n"
1397 msgid "initializing svn wc %r\n"
1353 msgstr ""
1398 msgstr ""
1354
1399
1355 msgid "unexpected svn output:\n"
1400 msgid "unexpected svn output:\n"
1356 msgstr ""
1401 msgstr ""
1357
1402
1358 msgid "unable to cope with svn output"
1403 msgid "unable to cope with svn output"
1359 msgstr ""
1404 msgstr ""
1360
1405
1361 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1406 msgid "XXX TAGS NOT IMPLEMENTED YET\n"
1362 msgstr ""
1407 msgstr ""
1363
1408
1364 msgid ""
1409 msgid ""
1365 "\n"
1410 "\n"
1366 "The `extdiff' Mercurial extension allows you to use external programs\n"
1411 "The `extdiff' Mercurial extension allows you to use external programs\n"
1367 "to compare revisions, or revision with working dir. The external diff\n"
1412 "to compare revisions, or revision with working dir. The external diff\n"
1368 "programs are called with a configurable set of options and two\n"
1413 "programs are called with a configurable set of options and two\n"
1369 "non-option arguments: paths to directories containing snapshots of\n"
1414 "non-option arguments: paths to directories containing snapshots of\n"
1370 "files to compare.\n"
1415 "files to compare.\n"
1371 "\n"
1416 "\n"
1372 "To enable this extension:\n"
1417 "To enable this extension:\n"
1373 "\n"
1418 "\n"
1374 " [extensions]\n"
1419 " [extensions]\n"
1375 " hgext.extdiff =\n"
1420 " hgext.extdiff =\n"
1376 "\n"
1421 "\n"
1377 "The `extdiff' extension also allows to configure new diff commands, so\n"
1422 "The `extdiff' extension also allows to configure new diff commands, so\n"
1378 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1423 "you do not need to type \"hg extdiff -p kdiff3\" always.\n"
1379 "\n"
1424 "\n"
1380 " [extdiff]\n"
1425 " [extdiff]\n"
1381 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1426 " # add new command that runs GNU diff(1) in 'context diff' mode\n"
1382 " cdiff = gdiff -Nprc5\n"
1427 " cdiff = gdiff -Nprc5\n"
1383 " ## or the old way:\n"
1428 " ## or the old way:\n"
1384 " #cmd.cdiff = gdiff\n"
1429 " #cmd.cdiff = gdiff\n"
1385 " #opts.cdiff = -Nprc5\n"
1430 " #opts.cdiff = -Nprc5\n"
1386 "\n"
1431 "\n"
1387 " # add new command called vdiff, runs kdiff3\n"
1432 " # add new command called vdiff, runs kdiff3\n"
1388 " vdiff = kdiff3\n"
1433 " vdiff = kdiff3\n"
1389 "\n"
1434 "\n"
1390 " # add new command called meld, runs meld (no need to name twice)\n"
1435 " # add new command called meld, runs meld (no need to name twice)\n"
1391 " meld =\n"
1436 " meld =\n"
1392 "\n"
1437 "\n"
1393 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1438 " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
1394 " #(see http://www.vim.org/scripts/script.php?script_id=102)\n"
1439 " #(see http://www.vim.org/scripts/script.php?script_id=102)\n"
1395 " # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1440 " # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
1396 "in\n"
1441 "in\n"
1397 " # your .vimrc\n"
1442 " # your .vimrc\n"
1398 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1443 " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
1399 "\n"
1444 "\n"
1400 "You can use -I/-X and list of file or directory names like normal\n"
1445 "You can use -I/-X and list of file or directory names like normal\n"
1401 "\"hg diff\" command. The `extdiff' extension makes snapshots of only\n"
1446 "\"hg diff\" command. The `extdiff' extension makes snapshots of only\n"
1402 "needed files, so running the external diff program will actually be\n"
1447 "needed files, so running the external diff program will actually be\n"
1403 "pretty fast (at least faster than having to compare the entire tree).\n"
1448 "pretty fast (at least faster than having to compare the entire tree).\n"
1404 msgstr ""
1449 msgstr ""
1405
1450
1406 msgid "snapshot files as of some revision"
1451 msgid "snapshot files as of some revision"
1407 msgstr ""
1452 msgstr ""
1408
1453
1409 #, python-format
1454 #, python-format
1410 msgid "making snapshot of %d files from rev %s\n"
1455 msgid "making snapshot of %d files from rev %s\n"
1411 msgstr ""
1456 msgstr ""
1412
1457
1413 msgid ""
1458 msgid ""
1414 "snapshot files from working directory.\n"
1459 "snapshot files from working directory.\n"
1415 " if not using snapshot, -I/-X does not work and recursive diff\n"
1460 " if not using snapshot, -I/-X does not work and recursive diff\n"
1416 " in tools like kdiff3 and meld displays too many files."
1461 " in tools like kdiff3 and meld displays too many files."
1417 msgstr ""
1462 msgstr ""
1418
1463
1419 #, python-format
1464 #, python-format
1420 msgid "making snapshot of %d files from working dir\n"
1465 msgid "making snapshot of %d files from working dir\n"
1421 msgstr ""
1466 msgstr ""
1422
1467
1423 msgid ""
1468 msgid ""
1424 "Do the actuall diff:\n"
1469 "Do the actuall diff:\n"
1425 "\n"
1470 "\n"
1426 " - copy to a temp structure if diffing 2 internal revisions\n"
1471 " - copy to a temp structure if diffing 2 internal revisions\n"
1427 " - copy to a temp structure if diffing working revision with\n"
1472 " - copy to a temp structure if diffing working revision with\n"
1428 " another one and more than 1 file is changed\n"
1473 " another one and more than 1 file is changed\n"
1429 " - just invoke the diff for a single file in the working dir\n"
1474 " - just invoke the diff for a single file in the working dir\n"
1430 " "
1475 " "
1431 msgstr ""
1476 msgstr ""
1432
1477
1433 msgid "cannot specify --rev and --change at the same time"
1478 msgid "cannot specify --rev and --change at the same time"
1434 msgstr ""
1479 msgstr ""
1435
1480
1436 #, python-format
1481 #, python-format
1437 msgid "running %r in %s\n"
1482 msgid "running %r in %s\n"
1438 msgstr ""
1483 msgstr ""
1439
1484
1440 #, python-format
1485 #, python-format
1441 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1486 msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
1442 msgstr ""
1487 msgstr ""
1443
1488
1444 msgid "cleaning up temp directory\n"
1489 msgid "cleaning up temp directory\n"
1445 msgstr ""
1490 msgstr ""
1446
1491
1447 msgid ""
1492 msgid ""
1448 "use external program to diff repository (or selected files)\n"
1493 "use external program to diff repository (or selected files)\n"
1449 "\n"
1494 "\n"
1450 " Show differences between revisions for the specified files, using\n"
1495 " Show differences between revisions for the specified files, using\n"
1451 " an external program. The default program used is diff, with\n"
1496 " an external program. The default program used is diff, with\n"
1452 " default options \"-Npru\".\n"
1497 " default options \"-Npru\".\n"
1453 "\n"
1498 "\n"
1454 " To select a different program, use the -p option. The program\n"
1499 " To select a different program, use the -p option. The program\n"
1455 " will be passed the names of two directories to compare. To pass\n"
1500 " will be passed the names of two directories to compare. To pass\n"
1456 " additional options to the program, use the -o option. These will\n"
1501 " additional options to the program, use the -o option. These will\n"
1457 " be passed before the names of the directories to compare.\n"
1502 " be passed before the names of the directories to compare.\n"
1458 "\n"
1503 "\n"
1459 " When two revision arguments are given, then changes are\n"
1504 " When two revision arguments are given, then changes are\n"
1460 " shown between those revisions. If only one revision is\n"
1505 " shown between those revisions. If only one revision is\n"
1461 " specified then that revision is compared to the working\n"
1506 " specified then that revision is compared to the working\n"
1462 " directory, and, when no revisions are specified, the\n"
1507 " directory, and, when no revisions are specified, the\n"
1463 " working directory files are compared to its parent."
1508 " working directory files are compared to its parent."
1464 msgstr ""
1509 msgstr ""
1465
1510
1466 msgid "comparison program to run"
1511 msgid "comparison program to run"
1467 msgstr ""
1512 msgstr ""
1468
1513
1469 msgid "pass option to comparison program"
1514 msgid "pass option to comparison program"
1470 msgstr ""
1515 msgstr ""
1471
1516
1472 msgid "change made by revision"
1517 msgid "change made by revision"
1473 msgstr ""
1518 msgstr ""
1474
1519
1475 msgid "hg extdiff [OPT]... [FILE]..."
1520 msgid "hg extdiff [OPT]... [FILE]..."
1476 msgstr ""
1521 msgstr ""
1477
1522
1478 msgid "use closure to save diff command to use"
1523 msgid "use closure to save diff command to use"
1479 msgstr ""
1524 msgstr ""
1480
1525
1481 #, python-format
1526 #, python-format
1482 msgid "hg %s [OPTION]... [FILE]..."
1527 msgid "hg %s [OPTION]... [FILE]..."
1483 msgstr ""
1528 msgstr ""
1484
1529
1485 msgid "pulling, updating and merging in one command"
1530 msgid "pulling, updating and merging in one command"
1486 msgstr ""
1531 msgstr ""
1487
1532
1488 msgid ""
1533 msgid ""
1489 "pull changes from a remote repository, merge new changes if needed.\n"
1534 "pull changes from a remote repository, merge new changes if needed.\n"
1490 "\n"
1535 "\n"
1491 " This finds all changes from the repository at the specified path\n"
1536 " This finds all changes from the repository at the specified path\n"
1492 " or URL and adds them to the local repository.\n"
1537 " or URL and adds them to the local repository.\n"
1493 "\n"
1538 "\n"
1494 " If the pulled changes add a new branch head, the head is automatically\n"
1539 " If the pulled changes add a new branch head, the head is automatically\n"
1495 " merged, and the result of the merge is committed. Otherwise, the\n"
1540 " merged, and the result of the merge is committed. Otherwise, the\n"
1496 " working directory is updated to include the new changes.\n"
1541 " working directory is updated to include the new changes.\n"
1497 "\n"
1542 "\n"
1498 " When a merge occurs, the newly pulled changes are assumed to be\n"
1543 " When a merge occurs, the newly pulled changes are assumed to be\n"
1499 " \"authoritative\". The head of the new changes is used as the first\n"
1544 " \"authoritative\". The head of the new changes is used as the first\n"
1500 " parent, with local changes as the second. To switch the merge\n"
1545 " parent, with local changes as the second. To switch the merge\n"
1501 " order, use --switch-parent.\n"
1546 " order, use --switch-parent.\n"
1502 "\n"
1547 "\n"
1503 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1548 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1504 " "
1549 " "
1505 msgstr ""
1550 msgstr ""
1506
1551
1507 msgid ""
1552 msgid ""
1508 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1553 "working dir not at branch tip (use \"hg update\" to check out branch tip)"
1509 msgstr ""
1554 msgstr ""
1510
1555
1511 msgid "outstanding uncommitted merge"
1556 msgid "outstanding uncommitted merge"
1512 msgstr ""
1557 msgstr ""
1513
1558
1514 msgid "outstanding uncommitted changes"
1559 msgid "outstanding uncommitted changes"
1515 msgstr ""
1560 msgstr ""
1516
1561
1517 msgid "working directory is missing some files"
1562 msgid "working directory is missing some files"
1518 msgstr ""
1563 msgstr ""
1519
1564
1520 msgid ""
1565 msgid ""
1521 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1566 "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
1522 msgstr ""
1567 msgstr ""
1523
1568
1524 #, python-format
1569 #, python-format
1525 msgid "pulling from %s\n"
1570 msgid "pulling from %s\n"
1526 msgstr "%s から取り込み中\n"
1571 msgstr "%s から取り込み中\n"
1527
1572
1528 msgid "fetch -r doesn't work for remote repositories yet"
1573 msgid "fetch -r doesn't work for remote repositories yet"
1529 msgstr ""
1574 msgstr ""
1530
1575
1531 #, python-format
1576 #, python-format
1532 msgid ""
1577 msgid ""
1533 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1578 "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
1534 "\" to merge them)\n"
1579 "\" to merge them)\n"
1535 msgstr ""
1580 msgstr ""
1536
1581
1537 #, python-format
1582 #, python-format
1538 msgid "updating to %d:%s\n"
1583 msgid "updating to %d:%s\n"
1539 msgstr ""
1584 msgstr ""
1540
1585
1541 #, python-format
1586 #, python-format
1542 msgid "merging with %d:%s\n"
1587 msgid "merging with %d:%s\n"
1543 msgstr ""
1588 msgstr ""
1544
1589
1545 #, python-format
1590 #, python-format
1546 msgid "Automated merge with %s"
1591 msgid "Automated merge with %s"
1547 msgstr ""
1592 msgstr ""
1548
1593
1549 #, python-format
1594 #, python-format
1550 msgid "new changeset %d:%s merges remote changes with local\n"
1595 msgid "new changeset %d:%s merges remote changes with local\n"
1551 msgstr ""
1596 msgstr ""
1552
1597
1553 msgid "a specific revision you would like to pull"
1598 msgid "a specific revision you would like to pull"
1554 msgstr ""
1599 msgstr ""
1555
1600
1556 msgid "edit commit message"
1601 msgid "edit commit message"
1557 msgstr ""
1602 msgstr ""
1558
1603
1559 msgid "edit commit message (DEPRECATED)"
1604 msgid "edit commit message (DEPRECATED)"
1560 msgstr ""
1605 msgstr ""
1561
1606
1562 msgid "switch parents when merging"
1607 msgid "switch parents when merging"
1563 msgstr ""
1608 msgstr ""
1564
1609
1565 msgid "hg fetch [SOURCE]"
1610 msgid "hg fetch [SOURCE]"
1566 msgstr ""
1611 msgstr ""
1567
1612
1568 msgid " returns of the good and bad signatures"
1613 msgid " returns of the good and bad signatures"
1569 msgstr ""
1614 msgstr ""
1570
1615
1571 msgid "error while verifying signature"
1616 msgid "error while verifying signature"
1572 msgstr ""
1617 msgstr ""
1573
1618
1574 msgid "create a new gpg instance"
1619 msgid "create a new gpg instance"
1575 msgstr ""
1620 msgstr ""
1576
1621
1577 msgid ""
1622 msgid ""
1578 "\n"
1623 "\n"
1579 " walk over every sigs, yields a couple\n"
1624 " walk over every sigs, yields a couple\n"
1580 " ((node, version, sig), (filename, linenumber))\n"
1625 " ((node, version, sig), (filename, linenumber))\n"
1581 " "
1626 " "
1582 msgstr ""
1627 msgstr ""
1583
1628
1584 msgid "get the keys who signed a data"
1629 msgid "get the keys who signed a data"
1585 msgstr ""
1630 msgstr ""
1586
1631
1587 #, python-format
1632 #, python-format
1588 msgid "%s Bad signature from \"%s\"\n"
1633 msgid "%s Bad signature from \"%s\"\n"
1589 msgstr ""
1634 msgstr ""
1590
1635
1591 #, python-format
1636 #, python-format
1592 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1637 msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
1593 msgstr ""
1638 msgstr ""
1594
1639
1595 #, python-format
1640 #, python-format
1596 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1641 msgid "%s Note: This key has expired (signed by: \"%s\")\n"
1597 msgstr ""
1642 msgstr ""
1598
1643
1599 msgid "list signed changesets"
1644 msgid "list signed changesets"
1600 msgstr ""
1645 msgstr ""
1601
1646
1602 #, python-format
1647 #, python-format
1603 msgid "%s:%d node does not exist\n"
1648 msgid "%s:%d node does not exist\n"
1604 msgstr ""
1649 msgstr ""
1605
1650
1606 msgid "verify all the signatures there may be for a particular revision"
1651 msgid "verify all the signatures there may be for a particular revision"
1607 msgstr ""
1652 msgstr ""
1608
1653
1609 #, python-format
1654 #, python-format
1610 msgid "No valid signature for %s\n"
1655 msgid "No valid signature for %s\n"
1611 msgstr ""
1656 msgstr ""
1612
1657
1613 msgid "associate a string to a key (username, comment)"
1658 msgid "associate a string to a key (username, comment)"
1614 msgstr ""
1659 msgstr ""
1615
1660
1616 msgid ""
1661 msgid ""
1617 "add a signature for the current or given revision\n"
1662 "add a signature for the current or given revision\n"
1618 "\n"
1663 "\n"
1619 " If no revision is given, the parent of the working directory is used,\n"
1664 " If no revision is given, the parent of the working directory is used,\n"
1620 " or tip if no revision is checked out.\n"
1665 " or tip if no revision is checked out.\n"
1621 "\n"
1666 "\n"
1622 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1667 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
1623 " "
1668 " "
1624 msgstr ""
1669 msgstr ""
1625
1670
1626 msgid "uncommitted merge - please provide a specific revision"
1671 msgid "uncommitted merge - please provide a specific revision"
1627 msgstr "マージが未コミットです - リビジョンを指定してください"
1672 msgstr "マージが未コミットです - リビジョンを指定してください"
1628
1673
1629 msgid "Error while signing"
1674 msgid "Error while signing"
1630 msgstr ""
1675 msgstr ""
1631
1676
1632 msgid ""
1677 msgid ""
1633 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1678 "working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
1634 "force)"
1679 "force)"
1635 msgstr ""
1680 msgstr ""
1636
1681
1637 #, python-format
1682 #, python-format
1638 msgid "Added signature for changeset %s"
1683 msgid "Added signature for changeset %s"
1639 msgstr ""
1684 msgstr ""
1640
1685
1641 msgid "map a manifest into some text"
1686 msgid "map a manifest into some text"
1642 msgstr ""
1687 msgstr ""
1643
1688
1644 msgid "unknown signature version"
1689 msgid "unknown signature version"
1645 msgstr ""
1690 msgstr ""
1646
1691
1647 msgid "make the signature local"
1692 msgid "make the signature local"
1648 msgstr ""
1693 msgstr ""
1649
1694
1650 msgid "sign even if the sigfile is modified"
1695 msgid "sign even if the sigfile is modified"
1651 msgstr ""
1696 msgstr ""
1652
1697
1653 msgid "do not commit the sigfile after signing"
1698 msgid "do not commit the sigfile after signing"
1654 msgstr ""
1699 msgstr ""
1655
1700
1656 msgid "the key id to sign with"
1701 msgid "the key id to sign with"
1657 msgstr ""
1702 msgstr ""
1658
1703
1659 msgid "commit message"
1704 msgid "commit message"
1660 msgstr ""
1705 msgstr ""
1661
1706
1662 msgid "hg sign [OPTION]... [REVISION]..."
1707 msgid "hg sign [OPTION]... [REVISION]..."
1663 msgstr ""
1708 msgstr ""
1664
1709
1665 msgid "hg sigcheck REVISION"
1710 msgid "hg sigcheck REVISION"
1666 msgstr ""
1711 msgstr ""
1667
1712
1668 msgid "hg sigs"
1713 msgid "hg sigs"
1669 msgstr ""
1714 msgstr ""
1670
1715
1671 msgid ""
1716 msgid ""
1672 "show revision graphs in terminal windows\n"
1717 "show revision graphs in terminal windows\n"
1673 "\n"
1718 "\n"
1674 "This extension adds a --graph option to the incoming, outgoing and log\n"
1719 "This extension adds a --graph option to the incoming, outgoing and log\n"
1675 "commands. When this options is given, an ascii representation of the\n"
1720 "commands. When this options is given, an ascii representation of the\n"
1676 "revision graph is also shown.\n"
1721 "revision graph is also shown.\n"
1677 msgstr ""
1722 msgstr ""
1678
1723
1679 msgid ""
1724 msgid ""
1680 "cset DAG generator yielding (rev, node, [parents]) tuples\n"
1725 "cset DAG generator yielding (rev, node, [parents]) tuples\n"
1681 "\n"
1726 "\n"
1682 " This generator function walks through the revision history from "
1727 " This generator function walks through the revision history from "
1683 "revision\n"
1728 "revision\n"
1684 " start to revision stop (which must be less than or equal to start).\n"
1729 " start to revision stop (which must be less than or equal to start).\n"
1685 " "
1730 " "
1686 msgstr ""
1731 msgstr ""
1687
1732
1688 msgid ""
1733 msgid ""
1689 "file cset DAG generator yielding (rev, node, [parents]) tuples\n"
1734 "file cset DAG generator yielding (rev, node, [parents]) tuples\n"
1690 "\n"
1735 "\n"
1691 " This generator function walks through the revision history of a single\n"
1736 " This generator function walks through the revision history of a single\n"
1692 " file from revision start to revision stop (which must be less than or\n"
1737 " file from revision start to revision stop (which must be less than or\n"
1693 " equal to start).\n"
1738 " equal to start).\n"
1694 " "
1739 " "
1695 msgstr ""
1740 msgstr ""
1696
1741
1697 msgid ""
1742 msgid ""
1698 "grapher for asciigraph on a list of nodes and their parents\n"
1743 "grapher for asciigraph on a list of nodes and their parents\n"
1699 "\n"
1744 "\n"
1700 " nodes must generate tuples (node, parents, char, lines) where\n"
1745 " nodes must generate tuples (node, parents, char, lines) where\n"
1701 " - parents must generate the parents of node, in sorted order,\n"
1746 " - parents must generate the parents of node, in sorted order,\n"
1702 " and max length 2,\n"
1747 " and max length 2,\n"
1703 " - char is the char to print as the node symbol, and\n"
1748 " - char is the char to print as the node symbol, and\n"
1704 " - lines are the lines to display next to the node.\n"
1749 " - lines are the lines to display next to the node.\n"
1705 " "
1750 " "
1706 msgstr ""
1751 msgstr ""
1707
1752
1708 msgid ""
1753 msgid ""
1709 "prints an ASCII graph of the DAG returned by the grapher\n"
1754 "prints an ASCII graph of the DAG returned by the grapher\n"
1710 "\n"
1755 "\n"
1711 " grapher is a generator that emits tuples with the following elements:\n"
1756 " grapher is a generator that emits tuples with the following elements:\n"
1712 "\n"
1757 "\n"
1713 " - Character to use as node's symbol.\n"
1758 " - Character to use as node's symbol.\n"
1714 " - List of lines to display as the node's text.\n"
1759 " - List of lines to display as the node's text.\n"
1715 " - Column of the current node in the set of ongoing edges.\n"
1760 " - Column of the current node in the set of ongoing edges.\n"
1716 " - Edges; a list of (col, next_col) indicating the edges between\n"
1761 " - Edges; a list of (col, next_col) indicating the edges between\n"
1717 " the current node and its parents.\n"
1762 " the current node and its parents.\n"
1718 " - Number of columns (ongoing edges) in the current revision.\n"
1763 " - Number of columns (ongoing edges) in the current revision.\n"
1719 " - The difference between the number of columns (ongoing edges)\n"
1764 " - The difference between the number of columns (ongoing edges)\n"
1720 " in the next revision and the number of columns (ongoing edges)\n"
1765 " in the next revision and the number of columns (ongoing edges)\n"
1721 " in the current revision. That is: -1 means one column removed;\n"
1766 " in the current revision. That is: -1 means one column removed;\n"
1722 " 0 means no columns added or removed; 1 means one column added.\n"
1767 " 0 means no columns added or removed; 1 means one column added.\n"
1723 " "
1768 " "
1724 msgstr ""
1769 msgstr ""
1725
1770
1726 #, python-format
1771 #, python-format
1727 msgid "--graph option is incompatible with --%s"
1772 msgid "--graph option is incompatible with --%s"
1728 msgstr ""
1773 msgstr ""
1729
1774
1730 msgid ""
1775 msgid ""
1731 "show revision history alongside an ASCII revision graph\n"
1776 "show revision history alongside an ASCII revision graph\n"
1732 "\n"
1777 "\n"
1733 " Print a revision history alongside a revision graph drawn with\n"
1778 " Print a revision history alongside a revision graph drawn with\n"
1734 " ASCII characters.\n"
1779 " ASCII characters.\n"
1735 "\n"
1780 "\n"
1736 " Nodes printed as an @ character are parents of the working\n"
1781 " Nodes printed as an @ character are parents of the working\n"
1737 " directory.\n"
1782 " directory.\n"
1738 " "
1783 " "
1739 msgstr ""
1784 msgstr ""
1740
1785
1741 msgid ""
1786 msgid ""
1742 "show the outgoing changesets alongside an ASCII revision graph\n"
1787 "show the outgoing changesets alongside an ASCII revision graph\n"
1743 "\n"
1788 "\n"
1744 " Print the outgoing changesets alongside a revision graph drawn with\n"
1789 " Print the outgoing changesets alongside a revision graph drawn with\n"
1745 " ASCII characters.\n"
1790 " ASCII characters.\n"
1746 "\n"
1791 "\n"
1747 " Nodes printed as an @ character are parents of the working\n"
1792 " Nodes printed as an @ character are parents of the working\n"
1748 " directory.\n"
1793 " directory.\n"
1749 " "
1794 " "
1750 msgstr ""
1795 msgstr ""
1751
1796
1752 #, python-format
1797 #, python-format
1753 msgid "comparing with %s\n"
1798 msgid "comparing with %s\n"
1754 msgstr "%s と比較中\n"
1799 msgstr "%s と比較中\n"
1755
1800
1756 msgid "no changes found\n"
1801 msgid "no changes found\n"
1757 msgstr "新たなチェンジセットはありません\n"
1802 msgstr "新たなチェンジセットはありません\n"
1758
1803
1759 msgid ""
1804 msgid ""
1760 "show the incoming changesets alongside an ASCII revision graph\n"
1805 "show the incoming changesets alongside an ASCII revision graph\n"
1761 "\n"
1806 "\n"
1762 " Print the incoming changesets alongside a revision graph drawn with\n"
1807 " Print the incoming changesets alongside a revision graph drawn with\n"
1763 " ASCII characters.\n"
1808 " ASCII characters.\n"
1764 "\n"
1809 "\n"
1765 " Nodes printed as an @ character are parents of the working\n"
1810 " Nodes printed as an @ character are parents of the working\n"
1766 " directory.\n"
1811 " directory.\n"
1767 " "
1812 " "
1768 msgstr ""
1813 msgstr ""
1769
1814
1770 msgid "wrap the command"
1815 msgid "wrap the command"
1771 msgstr ""
1816 msgstr ""
1772
1817
1773 msgid "show the revision DAG"
1818 msgid "show the revision DAG"
1774 msgstr ""
1819 msgstr ""
1775
1820
1776 msgid "limit number of changes displayed"
1821 msgid "limit number of changes displayed"
1777 msgstr "チェンジセット表示数の制限"
1822 msgstr "チェンジセット表示数の制限"
1778
1823
1779 msgid "show patch"
1824 msgid "show patch"
1780 msgstr "パッチ形式での表示"
1825 msgstr "パッチ形式での表示"
1781
1826
1782 msgid "show the specified revision or range"
1827 msgid "show the specified revision or range"
1783 msgstr "指定された単一ないし範囲内のリビジョンの表示"
1828 msgstr "指定された単一ないし範囲内のリビジョンの表示"
1784
1829
1785 msgid "hg glog [OPTION]... [FILE]"
1830 msgid "hg glog [OPTION]... [FILE]"
1786 msgstr ""
1831 msgstr ""
1787
1832
1788 msgid ""
1833 msgid ""
1789 "CIA notification\n"
1834 "CIA notification\n"
1790 "\n"
1835 "\n"
1791 "This is meant to be run as a changegroup or incoming hook.\n"
1836 "This is meant to be run as a changegroup or incoming hook.\n"
1792 "To configure it, set the following options in your hgrc:\n"
1837 "To configure it, set the following options in your hgrc:\n"
1793 "\n"
1838 "\n"
1794 "[cia]\n"
1839 "[cia]\n"
1795 "# your registered CIA user name\n"
1840 "# your registered CIA user name\n"
1796 "user = foo\n"
1841 "user = foo\n"
1797 "# the name of the project in CIA\n"
1842 "# the name of the project in CIA\n"
1798 "project = foo\n"
1843 "project = foo\n"
1799 "# the module (subproject) (optional)\n"
1844 "# the module (subproject) (optional)\n"
1800 "#module = foo\n"
1845 "#module = foo\n"
1801 "# Append a diffstat to the log message (optional)\n"
1846 "# Append a diffstat to the log message (optional)\n"
1802 "#diffstat = False\n"
1847 "#diffstat = False\n"
1803 "# Template to use for log messages (optional)\n"
1848 "# Template to use for log messages (optional)\n"
1804 "#template = {desc}\n"
1849 "#template = {desc}\n"
1805 "{baseurl}/rev/{node}-- {diffstat}\n"
1850 "{baseurl}/rev/{node}-- {diffstat}\n"
1806 "# Style to use (optional)\n"
1851 "# Style to use (optional)\n"
1807 "#style = foo\n"
1852 "#style = foo\n"
1808 "# The URL of the CIA notification service (optional)\n"
1853 "# The URL of the CIA notification service (optional)\n"
1809 "# You can use mailto: URLs to send by email, eg\n"
1854 "# You can use mailto: URLs to send by email, eg\n"
1810 "# mailto:cia@cia.vc\n"
1855 "# mailto:cia@cia.vc\n"
1811 "# Make sure to set email.from if you do this.\n"
1856 "# Make sure to set email.from if you do this.\n"
1812 "#url = http://cia.vc/\n"
1857 "#url = http://cia.vc/\n"
1813 "# print message instead of sending it (optional)\n"
1858 "# print message instead of sending it (optional)\n"
1814 "#test = False\n"
1859 "#test = False\n"
1815 "\n"
1860 "\n"
1816 "[hooks]\n"
1861 "[hooks]\n"
1817 "# one of these:\n"
1862 "# one of these:\n"
1818 "changegroup.cia = python:hgcia.hook\n"
1863 "changegroup.cia = python:hgcia.hook\n"
1819 "#incoming.cia = python:hgcia.hook\n"
1864 "#incoming.cia = python:hgcia.hook\n"
1820 "\n"
1865 "\n"
1821 "[web]\n"
1866 "[web]\n"
1822 "# If you want hyperlinks (optional)\n"
1867 "# If you want hyperlinks (optional)\n"
1823 "baseurl = http://server/path/to/repo\n"
1868 "baseurl = http://server/path/to/repo\n"
1824 msgstr ""
1869 msgstr ""
1825
1870
1826 msgid " A CIA message "
1871 msgid " A CIA message "
1827 msgstr ""
1872 msgstr ""
1828
1873
1829 msgid " CIA notification class "
1874 msgid " CIA notification class "
1830 msgstr ""
1875 msgstr ""
1831
1876
1832 #, python-format
1877 #, python-format
1833 msgid "hgcia: sending update to %s\n"
1878 msgid "hgcia: sending update to %s\n"
1834 msgstr ""
1879 msgstr ""
1835
1880
1836 msgid " send CIA notification "
1881 msgid " send CIA notification "
1837 msgstr ""
1882 msgstr ""
1838
1883
1839 msgid "email.from must be defined when sending by email"
1884 msgid "email.from must be defined when sending by email"
1840 msgstr ""
1885 msgstr ""
1841
1886
1842 msgid "cia: no user specified"
1887 msgid "cia: no user specified"
1843 msgstr ""
1888 msgstr ""
1844
1889
1845 msgid "cia: no project specified"
1890 msgid "cia: no project specified"
1846 msgstr ""
1891 msgstr ""
1847
1892
1848 msgid ""
1893 msgid ""
1849 "browsing the repository in a graphical way\n"
1894 "browsing the repository in a graphical way\n"
1850 "\n"
1895 "\n"
1851 "The hgk extension allows browsing the history of a repository in a\n"
1896 "The hgk extension allows browsing the history of a repository in a\n"
1852 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n"
1897 "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n"
1853 "not distributed with Mercurial.)\n"
1898 "not distributed with Mercurial.)\n"
1854 "\n"
1899 "\n"
1855 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1900 "hgk consists of two parts: a Tcl script that does the displaying and\n"
1856 "querying of information, and an extension to mercurial named hgk.py,\n"
1901 "querying of information, and an extension to mercurial named hgk.py,\n"
1857 "which provides hooks for hgk to get information. hgk can be found in\n"
1902 "which provides hooks for hgk to get information. hgk can be found in\n"
1858 "the contrib directory, and hgk.py can be found in the hgext directory.\n"
1903 "the contrib directory, and hgk.py can be found in the hgext directory.\n"
1859 "\n"
1904 "\n"
1860 "To load the hgext.py extension, add it to your .hgrc file (you have\n"
1905 "To load the hgext.py extension, add it to your .hgrc file (you have\n"
1861 "to use your global $HOME/.hgrc file, not one in a repository). You\n"
1906 "to use your global $HOME/.hgrc file, not one in a repository). You\n"
1862 "can specify an absolute path:\n"
1907 "can specify an absolute path:\n"
1863 "\n"
1908 "\n"
1864 " [extensions]\n"
1909 " [extensions]\n"
1865 " hgk=/usr/local/lib/hgk.py\n"
1910 " hgk=/usr/local/lib/hgk.py\n"
1866 "\n"
1911 "\n"
1867 "Mercurial can also scan the default python library path for a file\n"
1912 "Mercurial can also scan the default python library path for a file\n"
1868 "named 'hgk.py' if you set hgk empty:\n"
1913 "named 'hgk.py' if you set hgk empty:\n"
1869 "\n"
1914 "\n"
1870 " [extensions]\n"
1915 " [extensions]\n"
1871 " hgk=\n"
1916 " hgk=\n"
1872 "\n"
1917 "\n"
1873 "The hg view command will launch the hgk Tcl script. For this command\n"
1918 "The hg view command will launch the hgk Tcl script. For this command\n"
1874 "to work, hgk must be in your search path. Alternately, you can\n"
1919 "to work, hgk must be in your search path. Alternately, you can\n"
1875 "specify the path to hgk in your .hgrc file:\n"
1920 "specify the path to hgk in your .hgrc file:\n"
1876 "\n"
1921 "\n"
1877 " [hgk]\n"
1922 " [hgk]\n"
1878 " path=/location/of/hgk\n"
1923 " path=/location/of/hgk\n"
1879 "\n"
1924 "\n"
1880 "hgk can make use of the extdiff extension to visualize revisions.\n"
1925 "hgk can make use of the extdiff extension to visualize revisions.\n"
1881 "Assuming you had already configured extdiff vdiff command, just add:\n"
1926 "Assuming you had already configured extdiff vdiff command, just add:\n"
1882 "\n"
1927 "\n"
1883 " [hgk]\n"
1928 " [hgk]\n"
1884 " vdiff=vdiff\n"
1929 " vdiff=vdiff\n"
1885 "\n"
1930 "\n"
1886 "Revisions context menu will now display additional entries to fire\n"
1931 "Revisions context menu will now display additional entries to fire\n"
1887 "vdiff on hovered and selected revisions."
1932 "vdiff on hovered and selected revisions."
1888 msgstr ""
1933 msgstr ""
1889
1934
1890 msgid "diff trees from two commits"
1935 msgid "diff trees from two commits"
1891 msgstr ""
1936 msgstr ""
1892
1937
1893 msgid "output common ancestor information"
1938 msgid "output common ancestor information"
1894 msgstr ""
1939 msgstr ""
1895
1940
1896 msgid "cat a specific revision"
1941 msgid "cat a specific revision"
1897 msgstr ""
1942 msgstr ""
1898
1943
1899 msgid "cat-file: type or revision not supplied\n"
1944 msgid "cat-file: type or revision not supplied\n"
1900 msgstr ""
1945 msgstr ""
1901
1946
1902 msgid "aborting hg cat-file only understands commits\n"
1947 msgid "aborting hg cat-file only understands commits\n"
1903 msgstr ""
1948 msgstr ""
1904
1949
1905 msgid "parse given revisions"
1950 msgid "parse given revisions"
1906 msgstr ""
1951 msgstr ""
1907
1952
1908 msgid "print revisions"
1953 msgid "print revisions"
1909 msgstr ""
1954 msgstr ""
1910
1955
1911 msgid "print extension options"
1956 msgid "print extension options"
1912 msgstr ""
1957 msgstr ""
1913
1958
1914 msgid "start interactive history viewer"
1959 msgid "start interactive history viewer"
1915 msgstr ""
1960 msgstr ""
1916
1961
1917 msgid "hg view [-l LIMIT] [REVRANGE]"
1962 msgid "hg view [-l LIMIT] [REVRANGE]"
1918 msgstr ""
1963 msgstr ""
1919
1964
1920 msgid "generate patch"
1965 msgid "generate patch"
1921 msgstr ""
1966 msgstr ""
1922
1967
1923 msgid "recursive"
1968 msgid "recursive"
1924 msgstr ""
1969 msgstr ""
1925
1970
1926 msgid "pretty"
1971 msgid "pretty"
1927 msgstr ""
1972 msgstr ""
1928
1973
1929 msgid "stdin"
1974 msgid "stdin"
1930 msgstr ""
1975 msgstr ""
1931
1976
1932 msgid "detect copies"
1977 msgid "detect copies"
1933 msgstr ""
1978 msgstr ""
1934
1979
1935 msgid "search"
1980 msgid "search"
1936 msgstr ""
1981 msgstr ""
1937
1982
1938 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1983 msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..."
1939 msgstr ""
1984 msgstr ""
1940
1985
1941 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1986 msgid "hg debug-cat-file [OPTION]... TYPE FILE"
1942 msgstr ""
1987 msgstr ""
1943
1988
1944 msgid "hg debug-config"
1989 msgid "hg debug-config"
1945 msgstr ""
1990 msgstr ""
1946
1991
1947 msgid "hg debug-merge-base node node"
1992 msgid "hg debug-merge-base node node"
1948 msgstr ""
1993 msgstr ""
1949
1994
1950 msgid "ignored"
1995 msgid "ignored"
1951 msgstr ""
1996 msgstr ""
1952
1997
1953 msgid "hg debug-rev-parse REV"
1998 msgid "hg debug-rev-parse REV"
1954 msgstr ""
1999 msgstr ""
1955
2000
1956 msgid "header"
2001 msgid "header"
1957 msgstr ""
2002 msgstr ""
1958
2003
1959 msgid "topo-order"
2004 msgid "topo-order"
1960 msgstr ""
2005 msgstr ""
1961
2006
1962 msgid "parents"
2007 msgid "parents"
1963 msgstr ""
2008 msgstr ""
1964
2009
1965 msgid "max-count"
2010 msgid "max-count"
1966 msgstr ""
2011 msgstr ""
1967
2012
1968 msgid "hg debug-rev-list [options] revs"
2013 msgid "hg debug-rev-list [options] revs"
1969 msgstr ""
2014 msgstr ""
1970
2015
1971 msgid ""
2016 msgid ""
1972 "syntax highlighting in hgweb, based on Pygments\n"
2017 "syntax highlighting in hgweb, based on Pygments\n"
1973 "\n"
2018 "\n"
1974 "It depends on the pygments syntax highlighting library:\n"
2019 "It depends on the pygments syntax highlighting library:\n"
1975 "http://pygments.org/\n"
2020 "http://pygments.org/\n"
1976 "\n"
2021 "\n"
1977 "To enable the extension add this to hgrc:\n"
2022 "To enable the extension add this to hgrc:\n"
1978 "\n"
2023 "\n"
1979 "[extensions]\n"
2024 "[extensions]\n"
1980 "hgext.highlight =\n"
2025 "hgext.highlight =\n"
1981 "\n"
2026 "\n"
1982 "There is a single configuration option:\n"
2027 "There is a single configuration option:\n"
1983 "\n"
2028 "\n"
1984 "[web]\n"
2029 "[web]\n"
1985 "pygments_style = <style>\n"
2030 "pygments_style = <style>\n"
1986 "\n"
2031 "\n"
1987 "The default is 'colorful'.\n"
2032 "The default is 'colorful'.\n"
1988 "\n"
2033 "\n"
1989 "-- Adam Hupp <adam@hupp.org>\n"
2034 "-- Adam Hupp <adam@hupp.org>\n"
1990 msgstr ""
2035 msgstr ""
1991
2036
1992 msgid "inotify-based status acceleration for Linux systems\n"
2037 msgid "inotify-based status acceleration for Linux systems\n"
1993 msgstr ""
2038 msgstr ""
1994
2039
1995 msgid "start an inotify server for this repository"
2040 msgid "start an inotify server for this repository"
1996 msgstr ""
2041 msgstr ""
1997
2042
1998 msgid "(found dead inotify server socket; removing it)\n"
2043 msgid "(found dead inotify server socket; removing it)\n"
1999 msgstr ""
2044 msgstr ""
2000
2045
2001 msgid "(starting inotify server)\n"
2046 msgid "(starting inotify server)\n"
2002 msgstr ""
2047 msgstr ""
2003
2048
2004 #, python-format
2049 #, python-format
2005 msgid "could not start inotify server: %s\n"
2050 msgid "could not start inotify server: %s\n"
2006 msgstr ""
2051 msgstr ""
2007
2052
2008 #, python-format
2053 #, python-format
2009 msgid "could not talk to new inotify server: %s\n"
2054 msgid "could not talk to new inotify server: %s\n"
2010 msgstr ""
2055 msgstr ""
2011
2056
2012 msgid "(inotify server not running)\n"
2057 msgid "(inotify server not running)\n"
2013 msgstr ""
2058 msgstr ""
2014
2059
2015 #, python-format
2060 #, python-format
2016 msgid "failed to contact inotify server: %s\n"
2061 msgid "failed to contact inotify server: %s\n"
2017 msgstr ""
2062 msgstr ""
2018
2063
2019 msgid "run server in background"
2064 msgid "run server in background"
2020 msgstr "バックグラウンドでのサーバ実行"
2065 msgstr "バックグラウンドでのサーバ実行"
2021
2066
2022 msgid "used internally by daemon mode"
2067 msgid "used internally by daemon mode"
2023 msgstr "バックグラウンド実行時での内部用途向け"
2068 msgstr "バックグラウンド実行時での内部用途向け"
2024
2069
2025 msgid "minutes to sit idle before exiting"
2070 msgid "minutes to sit idle before exiting"
2026 msgstr ""
2071 msgstr ""
2027
2072
2028 msgid "name of file to write process ID to"
2073 msgid "name of file to write process ID to"
2029 msgstr "プロセスID書き出し先ファイル名"
2074 msgstr "プロセスID書き出し先ファイル名"
2030
2075
2031 msgid "hg inserve [OPT]..."
2076 msgid "hg inserve [OPT]..."
2032 msgstr ""
2077 msgstr ""
2033
2078
2034 #, python-format
2079 #, python-format
2035 msgid "(inotify: received response from incompatible server version %d)\n"
2080 msgid "(inotify: received response from incompatible server version %d)\n"
2036 msgstr ""
2081 msgstr ""
2037
2082
2038 msgid "this system does not seem to support inotify"
2083 msgid "this system does not seem to support inotify"
2039 msgstr ""
2084 msgstr ""
2040
2085
2041 #, python-format
2086 #, python-format
2042 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2087 msgid "*** the current per-user limit on the number of inotify watches is %s\n"
2043 msgstr ""
2088 msgstr ""
2044
2089
2045 msgid "*** this limit is too low to watch every directory in this repository\n"
2090 msgid "*** this limit is too low to watch every directory in this repository\n"
2046 msgstr ""
2091 msgstr ""
2047
2092
2048 msgid "*** counting directories: "
2093 msgid "*** counting directories: "
2049 msgstr ""
2094 msgstr ""
2050
2095
2051 #, python-format
2096 #, python-format
2052 msgid "found %d\n"
2097 msgid "found %d\n"
2053 msgstr ""
2098 msgstr ""
2054
2099
2055 #, python-format
2100 #, python-format
2056 msgid "*** to raise the limit from %d to %d (run as root):\n"
2101 msgid "*** to raise the limit from %d to %d (run as root):\n"
2057 msgstr ""
2102 msgstr ""
2058
2103
2059 #, python-format
2104 #, python-format
2060 msgid "*** echo %d > %s\n"
2105 msgid "*** echo %d > %s\n"
2061 msgstr ""
2106 msgstr ""
2062
2107
2063 #, python-format
2108 #, python-format
2064 msgid "cannot watch %s until inotify watch limit is raised"
2109 msgid "cannot watch %s until inotify watch limit is raised"
2065 msgstr ""
2110 msgstr ""
2066
2111
2067 #, python-format
2112 #, python-format
2068 msgid "inotify service not available: %s"
2113 msgid "inotify service not available: %s"
2069 msgstr ""
2114 msgstr ""
2070
2115
2071 #, python-format
2116 #, python-format
2072 msgid "watching %r\n"
2117 msgid "watching %r\n"
2073 msgstr ""
2118 msgstr ""
2074
2119
2075 #, python-format
2120 #, python-format
2076 msgid "watching directories under %r\n"
2121 msgid "watching directories under %r\n"
2077 msgstr ""
2122 msgstr ""
2078
2123
2079 #, python-format
2124 #, python-format
2080 msgid "status: %r dir(%d) -> %s\n"
2125 msgid "status: %r dir(%d) -> %s\n"
2081 msgstr ""
2126 msgstr ""
2082
2127
2083 #, python-format
2128 #, python-format
2084 msgid "status: %r %s -> %s\n"
2129 msgid "status: %r %s -> %s\n"
2085 msgstr ""
2130 msgstr ""
2086
2131
2087 #, python-format
2132 #, python-format
2088 msgid "%s dirstate reload\n"
2133 msgid "%s dirstate reload\n"
2089 msgstr ""
2134 msgstr ""
2090
2135
2091 #, python-format
2136 #, python-format
2092 msgid "%s end dirstate reload\n"
2137 msgid "%s end dirstate reload\n"
2093 msgstr ""
2138 msgstr ""
2094
2139
2095 msgid "rescanning due to .hgignore change\n"
2140 msgid "rescanning due to .hgignore change\n"
2096 msgstr ""
2141 msgstr ""
2097
2142
2098 #, python-format
2143 #, python-format
2099 msgid "%s event: created %s\n"
2144 msgid "%s event: created %s\n"
2100 msgstr ""
2145 msgstr ""
2101
2146
2102 #, python-format
2147 #, python-format
2103 msgid "%s event: deleted %s\n"
2148 msgid "%s event: deleted %s\n"
2104 msgstr ""
2149 msgstr ""
2105
2150
2106 #, python-format
2151 #, python-format
2107 msgid "%s event: modified %s\n"
2152 msgid "%s event: modified %s\n"
2108 msgstr ""
2153 msgstr ""
2109
2154
2110 #, python-format
2155 #, python-format
2111 msgid "filesystem containing %s was unmounted\n"
2156 msgid "filesystem containing %s was unmounted\n"
2112 msgstr ""
2157 msgstr ""
2113
2158
2114 #, python-format
2159 #, python-format
2115 msgid "%s readable: %d bytes\n"
2160 msgid "%s readable: %d bytes\n"
2116 msgstr ""
2161 msgstr ""
2117
2162
2118 #, python-format
2163 #, python-format
2119 msgid "%s below threshold - unhooking\n"
2164 msgid "%s below threshold - unhooking\n"
2120 msgstr ""
2165 msgstr ""
2121
2166
2122 #, python-format
2167 #, python-format
2123 msgid "%s reading %d events\n"
2168 msgid "%s reading %d events\n"
2124 msgstr ""
2169 msgstr ""
2125
2170
2126 #, python-format
2171 #, python-format
2127 msgid "%s hooking back up with %d bytes readable\n"
2172 msgid "%s hooking back up with %d bytes readable\n"
2128 msgstr ""
2173 msgstr ""
2129
2174
2130 #, python-format
2175 #, python-format
2131 msgid "%s processing %d deferred events as %d\n"
2176 msgid "%s processing %d deferred events as %d\n"
2132 msgstr ""
2177 msgstr ""
2133
2178
2134 #, python-format
2179 #, python-format
2135 msgid "could not start server: %s"
2180 msgid "could not start server: %s"
2136 msgstr ""
2181 msgstr ""
2137
2182
2138 #, python-format
2183 #, python-format
2139 msgid "received query from incompatible client version %d\n"
2184 msgid "received query from incompatible client version %d\n"
2140 msgstr ""
2185 msgstr ""
2141
2186
2142 #, python-format
2187 #, python-format
2143 msgid "answering query for %r\n"
2188 msgid "answering query for %r\n"
2144 msgstr ""
2189 msgstr ""
2145
2190
2146 msgid "finished setup\n"
2191 msgid "finished setup\n"
2147 msgstr ""
2192 msgstr ""
2148
2193
2149 msgid "polling: no timeout\n"
2194 msgid "polling: no timeout\n"
2150 msgstr ""
2195 msgstr ""
2151
2196
2152 #, python-format
2197 #, python-format
2153 msgid "polling: %sms timeout\n"
2198 msgid "polling: %sms timeout\n"
2154 msgstr ""
2199 msgstr ""
2155
2200
2156 #, python-format
2201 #, python-format
2157 msgid "interhg: invalid pattern for %s: %s\n"
2202 msgid "interhg: invalid pattern for %s: %s\n"
2158 msgstr ""
2203 msgstr ""
2159
2204
2160 #, python-format
2205 #, python-format
2161 msgid "interhg: invalid regexp for %s: %s\n"
2206 msgid "interhg: invalid regexp for %s: %s\n"
2162 msgstr ""
2207 msgstr ""
2163
2208
2164 msgid ""
2209 msgid ""
2165 "keyword expansion in local repositories\n"
2210 "keyword expansion in local repositories\n"
2166 "\n"
2211 "\n"
2167 "This extension expands RCS/CVS-like or self-customized $Keywords$\n"
2212 "This extension expands RCS/CVS-like or self-customized $Keywords$\n"
2168 "in tracked text files selected by your configuration.\n"
2213 "in tracked text files selected by your configuration.\n"
2169 "\n"
2214 "\n"
2170 "Keywords are only expanded in local repositories and not stored in\n"
2215 "Keywords are only expanded in local repositories and not stored in\n"
2171 "the change history. The mechanism can be regarded as a convenience\n"
2216 "the change history. The mechanism can be regarded as a convenience\n"
2172 "for the current user or for archive distribution.\n"
2217 "for the current user or for archive distribution.\n"
2173 "\n"
2218 "\n"
2174 "Configuration is done in the [keyword] and [keywordmaps] sections\n"
2219 "Configuration is done in the [keyword] and [keywordmaps] sections\n"
2175 "of hgrc files.\n"
2220 "of hgrc files.\n"
2176 "\n"
2221 "\n"
2177 "Example:\n"
2222 "Example:\n"
2178 "\n"
2223 "\n"
2179 " [keyword]\n"
2224 " [keyword]\n"
2180 " # expand keywords in every python file except those matching \"x*\"\n"
2225 " # expand keywords in every python file except those matching \"x*\"\n"
2181 " **.py =\n"
2226 " **.py =\n"
2182 " x* = ignore\n"
2227 " x* = ignore\n"
2183 "\n"
2228 "\n"
2184 "Note: the more specific you are in your filename patterns\n"
2229 "Note: the more specific you are in your filename patterns\n"
2185 " the less you lose speed in huge repos.\n"
2230 " the less you lose speed in huge repos.\n"
2186 "\n"
2231 "\n"
2187 "For [keywordmaps] template mapping and expansion demonstration and\n"
2232 "For [keywordmaps] template mapping and expansion demonstration and\n"
2188 "control run \"hg kwdemo\".\n"
2233 "control run \"hg kwdemo\".\n"
2189 "\n"
2234 "\n"
2190 "An additional date template filter {date|utcdate} is provided.\n"
2235 "An additional date template filter {date|utcdate} is provided.\n"
2191 "\n"
2236 "\n"
2192 "The default template mappings (view with \"hg kwdemo -d\") can be replaced\n"
2237 "The default template mappings (view with \"hg kwdemo -d\") can be replaced\n"
2193 "with customized keywords and templates.\n"
2238 "with customized keywords and templates.\n"
2194 "Again, run \"hg kwdemo\" to control the results of your config changes.\n"
2239 "Again, run \"hg kwdemo\" to control the results of your config changes.\n"
2195 "\n"
2240 "\n"
2196 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2241 "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
2197 "the risk of inadvertedly storing expanded keywords in the change history.\n"
2242 "the risk of inadvertedly storing expanded keywords in the change history.\n"
2198 "\n"
2243 "\n"
2199 "To force expansion after enabling it, or a configuration change, run\n"
2244 "To force expansion after enabling it, or a configuration change, run\n"
2200 "\"hg kwexpand\".\n"
2245 "\"hg kwexpand\".\n"
2201 "\n"
2246 "\n"
2202 "Also, when committing with the record extension or using mq's qrecord, be "
2247 "Also, when committing with the record extension or using mq's qrecord, be "
2203 "aware\n"
2248 "aware\n"
2204 "that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n"
2249 "that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n"
2205 "question to update keyword expansions after all changes have been checked "
2250 "question to update keyword expansions after all changes have been checked "
2206 "in.\n"
2251 "in.\n"
2207 "\n"
2252 "\n"
2208 "Expansions spanning more than one line and incremental expansions,\n"
2253 "Expansions spanning more than one line and incremental expansions,\n"
2209 "like CVS' $Log$, are not supported. A keyword template map\n"
2254 "like CVS' $Log$, are not supported. A keyword template map\n"
2210 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2255 "\"Log = {desc}\" expands to the first line of the changeset description.\n"
2211 msgstr ""
2256 msgstr ""
2212
2257
2213 msgid "Returns hgdate in cvs-like UTC format."
2258 msgid "Returns hgdate in cvs-like UTC format."
2214 msgstr ""
2259 msgstr ""
2215
2260
2216 msgid ""
2261 msgid ""
2217 "\n"
2262 "\n"
2218 " Sets up keyword templates, corresponding keyword regex, and\n"
2263 " Sets up keyword templates, corresponding keyword regex, and\n"
2219 " provides keyword substitution functions.\n"
2264 " provides keyword substitution functions.\n"
2220 " "
2265 " "
2221 msgstr ""
2266 msgstr ""
2222
2267
2223 msgid "Replaces keywords in data with expanded template."
2268 msgid "Replaces keywords in data with expanded template."
2224 msgstr ""
2269 msgstr ""
2225
2270
2226 msgid "Returns data with keywords expanded."
2271 msgid "Returns data with keywords expanded."
2227 msgstr ""
2272 msgstr ""
2228
2273
2229 msgid ""
2274 msgid ""
2230 "Returns true if path matches [keyword] pattern\n"
2275 "Returns true if path matches [keyword] pattern\n"
2231 " and is not a symbolic link.\n"
2276 " and is not a symbolic link.\n"
2232 " Caveat: localrepository._link fails on Windows."
2277 " Caveat: localrepository._link fails on Windows."
2233 msgstr ""
2278 msgstr ""
2234
2279
2235 msgid "Overwrites selected files expanding/shrinking keywords."
2280 msgid "Overwrites selected files expanding/shrinking keywords."
2236 msgstr ""
2281 msgstr ""
2237
2282
2238 #, python-format
2283 #, python-format
2239 msgid "overwriting %s %s keywords\n"
2284 msgid "overwriting %s %s keywords\n"
2240 msgstr ""
2285 msgstr ""
2241
2286
2242 msgid "Unconditionally removes all keyword substitutions from text."
2287 msgid "Unconditionally removes all keyword substitutions from text."
2243 msgstr ""
2288 msgstr ""
2244
2289
2245 msgid "Returns text with all keyword substitutions removed."
2290 msgid "Returns text with all keyword substitutions removed."
2246 msgstr ""
2291 msgstr ""
2247
2292
2248 msgid "Returns lines with keyword substitutions removed."
2293 msgid "Returns lines with keyword substitutions removed."
2249 msgstr ""
2294 msgstr ""
2250
2295
2251 msgid ""
2296 msgid ""
2252 "If in restricted mode returns data read from wdir with\n"
2297 "If in restricted mode returns data read from wdir with\n"
2253 " keyword substitutions removed."
2298 " keyword substitutions removed."
2254 msgstr ""
2299 msgstr ""
2255
2300
2256 msgid ""
2301 msgid ""
2257 "\n"
2302 "\n"
2258 " Subclass of filelog to hook into its read, add, cmp methods.\n"
2303 " Subclass of filelog to hook into its read, add, cmp methods.\n"
2259 " Keywords are \"stored\" unexpanded, and processed on reading.\n"
2304 " Keywords are \"stored\" unexpanded, and processed on reading.\n"
2260 " "
2305 " "
2261 msgstr ""
2306 msgstr ""
2262
2307
2263 msgid "Expands keywords when reading filelog."
2308 msgid "Expands keywords when reading filelog."
2264 msgstr ""
2309 msgstr ""
2265
2310
2266 msgid "Removes keyword substitutions when adding to filelog."
2311 msgid "Removes keyword substitutions when adding to filelog."
2267 msgstr ""
2312 msgstr ""
2268
2313
2269 msgid "Removes keyword substitutions for comparison."
2314 msgid "Removes keyword substitutions for comparison."
2270 msgstr ""
2315 msgstr ""
2271
2316
2272 msgid ""
2317 msgid ""
2273 "Bails out if [keyword] configuration is not active.\n"
2318 "Bails out if [keyword] configuration is not active.\n"
2274 " Returns status of working directory."
2319 " Returns status of working directory."
2275 msgstr ""
2320 msgstr ""
2276
2321
2277 msgid "[keyword] patterns cannot match"
2322 msgid "[keyword] patterns cannot match"
2278 msgstr ""
2323 msgstr ""
2279
2324
2280 msgid "no [keyword] patterns configured"
2325 msgid "no [keyword] patterns configured"
2281 msgstr ""
2326 msgstr ""
2282
2327
2283 msgid "Selects files and passes them to kwtemplater.overwrite."
2328 msgid "Selects files and passes them to kwtemplater.overwrite."
2284 msgstr ""
2329 msgstr ""
2285
2330
2286 msgid ""
2331 msgid ""
2287 "print [keywordmaps] configuration and an expansion example\n"
2332 "print [keywordmaps] configuration and an expansion example\n"
2288 "\n"
2333 "\n"
2289 " Show current, custom, or default keyword template maps\n"
2334 " Show current, custom, or default keyword template maps\n"
2290 " and their expansion.\n"
2335 " and their expansion.\n"
2291 "\n"
2336 "\n"
2292 " Extend current configuration by specifying maps as arguments\n"
2337 " Extend current configuration by specifying maps as arguments\n"
2293 " and optionally by reading from an additional hgrc file.\n"
2338 " and optionally by reading from an additional hgrc file.\n"
2294 "\n"
2339 "\n"
2295 " Override current keyword template maps with \"default\" option.\n"
2340 " Override current keyword template maps with \"default\" option.\n"
2296 " "
2341 " "
2297 msgstr ""
2342 msgstr ""
2298
2343
2299 #, python-format
2344 #, python-format
2300 msgid ""
2345 msgid ""
2301 "\n"
2346 "\n"
2302 "\t%s\n"
2347 "\t%s\n"
2303 msgstr ""
2348 msgstr ""
2304
2349
2305 #, python-format
2350 #, python-format
2306 msgid "creating temporary repo at %s\n"
2351 msgid "creating temporary repo at %s\n"
2307 msgstr ""
2352 msgstr ""
2308
2353
2309 #, python-format
2354 #, python-format
2310 msgid ""
2355 msgid ""
2311 "\n"
2356 "\n"
2312 "%s keywords written to %s:\n"
2357 "%s keywords written to %s:\n"
2313 msgstr ""
2358 msgstr ""
2314
2359
2315 msgid "unhooked all commit hooks\n"
2360 msgid "unhooked all commit hooks\n"
2316 msgstr ""
2361 msgstr ""
2317
2362
2318 #, python-format
2363 #, python-format
2319 msgid ""
2364 msgid ""
2320 "\n"
2365 "\n"
2321 "removing temporary repo %s\n"
2366 "removing temporary repo %s\n"
2322 msgstr ""
2367 msgstr ""
2323
2368
2324 msgid ""
2369 msgid ""
2325 "expand keywords in working directory\n"
2370 "expand keywords in working directory\n"
2326 "\n"
2371 "\n"
2327 " Run after (re)enabling keyword expansion.\n"
2372 " Run after (re)enabling keyword expansion.\n"
2328 "\n"
2373 "\n"
2329 " kwexpand refuses to run if given files contain local changes.\n"
2374 " kwexpand refuses to run if given files contain local changes.\n"
2330 " "
2375 " "
2331 msgstr ""
2376 msgstr ""
2332
2377
2333 msgid ""
2378 msgid ""
2334 "print files currently configured for keyword expansion\n"
2379 "print files currently configured for keyword expansion\n"
2335 "\n"
2380 "\n"
2336 " Crosscheck which files in working directory are potential targets for\n"
2381 " Crosscheck which files in working directory are potential targets for\n"
2337 " keyword expansion.\n"
2382 " keyword expansion.\n"
2338 " That is, files matched by [keyword] config patterns but not symlinks.\n"
2383 " That is, files matched by [keyword] config patterns but not symlinks.\n"
2339 " "
2384 " "
2340 msgstr ""
2385 msgstr ""
2341
2386
2342 msgid ""
2387 msgid ""
2343 "revert expanded keywords in working directory\n"
2388 "revert expanded keywords in working directory\n"
2344 "\n"
2389 "\n"
2345 " Run before changing/disabling active keywords\n"
2390 " Run before changing/disabling active keywords\n"
2346 " or if you experience problems with \"hg import\" or \"hg merge\".\n"
2391 " or if you experience problems with \"hg import\" or \"hg merge\".\n"
2347 "\n"
2392 "\n"
2348 " kwshrink refuses to run if given files contain local changes.\n"
2393 " kwshrink refuses to run if given files contain local changes.\n"
2349 " "
2394 " "
2350 msgstr ""
2395 msgstr ""
2351
2396
2352 msgid ""
2397 msgid ""
2353 "Collects [keyword] config in kwtools.\n"
2398 "Collects [keyword] config in kwtools.\n"
2354 " Monkeypatches dispatch._parse if needed."
2399 " Monkeypatches dispatch._parse if needed."
2355 msgstr ""
2400 msgstr ""
2356
2401
2357 msgid "Monkeypatch dispatch._parse to obtain running hg command."
2402 msgid "Monkeypatch dispatch._parse to obtain running hg command."
2358 msgstr ""
2403 msgstr ""
2359
2404
2360 msgid ""
2405 msgid ""
2361 "Sets up repo as kwrepo for keyword substitution.\n"
2406 "Sets up repo as kwrepo for keyword substitution.\n"
2362 " Overrides file method to return kwfilelog instead of filelog\n"
2407 " Overrides file method to return kwfilelog instead of filelog\n"
2363 " if file matches user configuration.\n"
2408 " if file matches user configuration.\n"
2364 " Wraps commit to overwrite configured files with updated\n"
2409 " Wraps commit to overwrite configured files with updated\n"
2365 " keyword substitutions.\n"
2410 " keyword substitutions.\n"
2366 " Monkeypatches patch and webcommands."
2411 " Monkeypatches patch and webcommands."
2367 msgstr ""
2412 msgstr ""
2368
2413
2369 msgid ""
2414 msgid ""
2370 "Monkeypatch/wrap patch.patchfile.__init__ to avoid\n"
2415 "Monkeypatch/wrap patch.patchfile.__init__ to avoid\n"
2371 " rejects or conflicts due to expanded keywords in working dir."
2416 " rejects or conflicts due to expanded keywords in working dir."
2372 msgstr ""
2417 msgstr ""
2373
2418
2374 msgid ""
2419 msgid ""
2375 "Monkeypatch patch.diff to avoid expansion except when\n"
2420 "Monkeypatch patch.diff to avoid expansion except when\n"
2376 " comparing against working dir."
2421 " comparing against working dir."
2377 msgstr ""
2422 msgstr ""
2378
2423
2379 msgid "Wraps webcommands.x turning off keyword expansion."
2424 msgid "Wraps webcommands.x turning off keyword expansion."
2380 msgstr ""
2425 msgstr ""
2381
2426
2382 msgid "show default keyword template maps"
2427 msgid "show default keyword template maps"
2383 msgstr ""
2428 msgstr ""
2384
2429
2385 msgid "read maps from rcfile"
2430 msgid "read maps from rcfile"
2386 msgstr ""
2431 msgstr ""
2387
2432
2388 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2433 msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
2389 msgstr ""
2434 msgstr ""
2390
2435
2391 msgid "hg kwexpand [OPTION]... [FILE]..."
2436 msgid "hg kwexpand [OPTION]... [FILE]..."
2392 msgstr ""
2437 msgstr ""
2393
2438
2394 msgid "show keyword status flags of all files"
2439 msgid "show keyword status flags of all files"
2395 msgstr ""
2440 msgstr ""
2396
2441
2397 msgid "show files excluded from expansion"
2442 msgid "show files excluded from expansion"
2398 msgstr ""
2443 msgstr ""
2399
2444
2400 msgid "additionally show untracked files"
2445 msgid "additionally show untracked files"
2401 msgstr ""
2446 msgstr ""
2402
2447
2403 msgid "hg kwfiles [OPTION]... [FILE]..."
2448 msgid "hg kwfiles [OPTION]... [FILE]..."
2404 msgstr ""
2449 msgstr ""
2405
2450
2406 msgid "hg kwshrink [OPTION]... [FILE]..."
2451 msgid "hg kwshrink [OPTION]... [FILE]..."
2407 msgstr ""
2452 msgstr ""
2408
2453
2409 msgid ""
2454 msgid ""
2410 "patch management and development\n"
2455 "patch management and development\n"
2411 "\n"
2456 "\n"
2412 "This extension lets you work with a stack of patches in a Mercurial\n"
2457 "This extension lets you work with a stack of patches in a Mercurial\n"
2413 "repository. It manages two stacks of patches - all known patches, and\n"
2458 "repository. It manages two stacks of patches - all known patches, and\n"
2414 "applied patches (subset of known patches).\n"
2459 "applied patches (subset of known patches).\n"
2415 "\n"
2460 "\n"
2416 "Known patches are represented as patch files in the .hg/patches\n"
2461 "Known patches are represented as patch files in the .hg/patches\n"
2417 "directory. Applied patches are both patch files and changesets.\n"
2462 "directory. Applied patches are both patch files and changesets.\n"
2418 "\n"
2463 "\n"
2419 "Common tasks (use \"hg help command\" for more details):\n"
2464 "Common tasks (use \"hg help command\" for more details):\n"
2420 "\n"
2465 "\n"
2421 "prepare repository to work with patches qinit\n"
2466 "prepare repository to work with patches qinit\n"
2422 "create new patch qnew\n"
2467 "create new patch qnew\n"
2423 "import existing patch qimport\n"
2468 "import existing patch qimport\n"
2424 "\n"
2469 "\n"
2425 "print patch series qseries\n"
2470 "print patch series qseries\n"
2426 "print applied patches qapplied\n"
2471 "print applied patches qapplied\n"
2427 "print name of top applied patch qtop\n"
2472 "print name of top applied patch qtop\n"
2428 "\n"
2473 "\n"
2429 "add known patch to applied stack qpush\n"
2474 "add known patch to applied stack qpush\n"
2430 "remove patch from applied stack qpop\n"
2475 "remove patch from applied stack qpop\n"
2431 "refresh contents of top applied patch qrefresh\n"
2476 "refresh contents of top applied patch qrefresh\n"
2432 msgstr ""
2477 msgstr ""
2433
2478
2434 msgid ""
2479 msgid ""
2435 "Update all references to a field in the patch header.\n"
2480 "Update all references to a field in the patch header.\n"
2436 " If none found, add it email style."
2481 " If none found, add it email style."
2437 msgstr ""
2482 msgstr ""
2438
2483
2439 msgid ""
2484 msgid ""
2440 "Remove existing message, keeping the rest of the comments fields.\n"
2485 "Remove existing message, keeping the rest of the comments fields.\n"
2441 " If comments contains 'subject: ', message will prepend\n"
2486 " If comments contains 'subject: ', message will prepend\n"
2442 " the field and a blank line."
2487 " the field and a blank line."
2443 msgstr ""
2488 msgstr ""
2444
2489
2445 #, python-format
2490 #, python-format
2446 msgid "%s appears more than once in %s"
2491 msgid "%s appears more than once in %s"
2447 msgstr ""
2492 msgstr ""
2448
2493
2449 msgid "guard cannot be an empty string"
2494 msgid "guard cannot be an empty string"
2450 msgstr ""
2495 msgstr ""
2451
2496
2452 #, python-format
2497 #, python-format
2453 msgid "guard %r starts with invalid character: %r"
2498 msgid "guard %r starts with invalid character: %r"
2454 msgstr ""
2499 msgstr ""
2455
2500
2456 #, python-format
2501 #, python-format
2457 msgid "invalid character in guard %r: %r"
2502 msgid "invalid character in guard %r: %r"
2458 msgstr ""
2503 msgstr ""
2459
2504
2460 #, python-format
2505 #, python-format
2461 msgid "active guards: %s\n"
2506 msgid "active guards: %s\n"
2462 msgstr ""
2507 msgstr ""
2463
2508
2464 #, python-format
2509 #, python-format
2465 msgid "guard %r too short"
2510 msgid "guard %r too short"
2466 msgstr ""
2511 msgstr ""
2467
2512
2468 #, python-format
2513 #, python-format
2469 msgid "guard %r starts with invalid char"
2514 msgid "guard %r starts with invalid char"
2470 msgstr ""
2515 msgstr ""
2471
2516
2472 #, python-format
2517 #, python-format
2473 msgid "allowing %s - no guards in effect\n"
2518 msgid "allowing %s - no guards in effect\n"
2474 msgstr ""
2519 msgstr ""
2475
2520
2476 #, python-format
2521 #, python-format
2477 msgid "allowing %s - no matching negative guards\n"
2522 msgid "allowing %s - no matching negative guards\n"
2478 msgstr ""
2523 msgstr ""
2479
2524
2480 #, python-format
2525 #, python-format
2481 msgid "allowing %s - guarded by %r\n"
2526 msgid "allowing %s - guarded by %r\n"
2482 msgstr ""
2527 msgstr ""
2483
2528
2484 #, python-format
2529 #, python-format
2485 msgid "skipping %s - guarded by %r\n"
2530 msgid "skipping %s - guarded by %r\n"
2486 msgstr ""
2531 msgstr ""
2487
2532
2488 #, python-format
2533 #, python-format
2489 msgid "skipping %s - no matching guards\n"
2534 msgid "skipping %s - no matching guards\n"
2490 msgstr ""
2535 msgstr ""
2491
2536
2492 #, python-format
2537 #, python-format
2493 msgid "error removing undo: %s\n"
2538 msgid "error removing undo: %s\n"
2494 msgstr ""
2539 msgstr ""
2495
2540
2496 #, python-format
2541 #, python-format
2497 msgid "apply failed for patch %s"
2542 msgid "apply failed for patch %s"
2498 msgstr ""
2543 msgstr ""
2499
2544
2500 #, python-format
2545 #, python-format
2501 msgid "patch didn't work out, merging %s\n"
2546 msgid "patch didn't work out, merging %s\n"
2502 msgstr ""
2547 msgstr ""
2503
2548
2504 #, python-format
2549 #, python-format
2505 msgid "update returned %d"
2550 msgid "update returned %d"
2506 msgstr ""
2551 msgstr ""
2507
2552
2508 msgid "repo commit failed"
2553 msgid "repo commit failed"
2509 msgstr ""
2554 msgstr ""
2510
2555
2511 #, python-format
2556 #, python-format
2512 msgid "unable to read %s"
2557 msgid "unable to read %s"
2513 msgstr ""
2558 msgstr ""
2514
2559
2515 #, python-format
2560 #, python-format
2516 msgid "patch %s does not exist\n"
2561 msgid "patch %s does not exist\n"
2517 msgstr ""
2562 msgstr ""
2518
2563
2519 #, python-format
2564 #, python-format
2520 msgid "patch %s is not applied\n"
2565 msgid "patch %s is not applied\n"
2521 msgstr ""
2566 msgstr ""
2522
2567
2523 msgid ""
2568 msgid ""
2524 "Apply patchfile to the working directory.\n"
2569 "Apply patchfile to the working directory.\n"
2525 " patchfile: file name of patch"
2570 " patchfile: file name of patch"
2526 msgstr ""
2571 msgstr ""
2527
2572
2528 msgid "patch failed, unable to continue (try -v)\n"
2573 msgid "patch failed, unable to continue (try -v)\n"
2529 msgstr ""
2574 msgstr ""
2530
2575
2531 #, python-format
2576 #, python-format
2532 msgid "applying %s\n"
2577 msgid "applying %s\n"
2533 msgstr "%s を適用中\n"
2578 msgstr "%s を適用中\n"
2534
2579
2535 #, python-format
2580 #, python-format
2536 msgid "Unable to read %s\n"
2581 msgid "Unable to read %s\n"
2537 msgstr ""
2582 msgstr ""
2538
2583
2539 #, python-format
2584 #, python-format
2540 msgid "imported patch %s\n"
2585 msgid "imported patch %s\n"
2541 msgstr ""
2586 msgstr ""
2542
2587
2543 #, python-format
2588 #, python-format
2544 msgid ""
2589 msgid ""
2545 "\n"
2590 "\n"
2546 "imported patch %s"
2591 "imported patch %s"
2547 msgstr ""
2592 msgstr ""
2548
2593
2549 #, python-format
2594 #, python-format
2550 msgid "patch %s is empty\n"
2595 msgid "patch %s is empty\n"
2551 msgstr ""
2596 msgstr ""
2552
2597
2553 msgid "patch failed, rejects left in working dir\n"
2598 msgid "patch failed, rejects left in working dir\n"
2554 msgstr ""
2599 msgstr ""
2555
2600
2556 msgid "fuzz found when applying patch, stopping\n"
2601 msgid "fuzz found when applying patch, stopping\n"
2557 msgstr ""
2602 msgstr ""
2558
2603
2559 #, python-format
2604 #, python-format
2560 msgid "revision %d is not managed"
2605 msgid "revision %d is not managed"
2561 msgstr ""
2606 msgstr ""
2562
2607
2563 #, python-format
2608 #, python-format
2564 msgid "cannot delete revision %d above applied patches"
2609 msgid "cannot delete revision %d above applied patches"
2565 msgstr ""
2610 msgstr ""
2566
2611
2567 msgid "qdelete requires at least one revision or patch name"
2612 msgid "qdelete requires at least one revision or patch name"
2568 msgstr ""
2613 msgstr ""
2569
2614
2570 #, python-format
2615 #, python-format
2571 msgid "cannot delete applied patch %s"
2616 msgid "cannot delete applied patch %s"
2572 msgstr ""
2617 msgstr ""
2573
2618
2574 #, python-format
2619 #, python-format
2575 msgid "patch %s not in series file"
2620 msgid "patch %s not in series file"
2576 msgstr ""
2621 msgstr ""
2577
2622
2578 msgid "no patches applied"
2623 msgid "no patches applied"
2579 msgstr ""
2624 msgstr ""
2580
2625
2581 msgid "working directory revision is not qtip"
2626 msgid "working directory revision is not qtip"
2582 msgstr ""
2627 msgstr ""
2583
2628
2584 msgid "local changes found, refresh first"
2629 msgid "local changes found, refresh first"
2585 msgstr ""
2630 msgstr ""
2586
2631
2587 msgid "local changes found"
2632 msgid "local changes found"
2588 msgstr ""
2633 msgstr ""
2589
2634
2590 #, python-format
2635 #, python-format
2591 msgid "\"%s\" cannot be used as the name of a patch"
2636 msgid "\"%s\" cannot be used as the name of a patch"
2592 msgstr ""
2637 msgstr ""
2593
2638
2594 msgid ""
2639 msgid ""
2595 "options:\n"
2640 "options:\n"
2596 " msg: a string or a no-argument function returning a string\n"
2641 " msg: a string or a no-argument function returning a string\n"
2597 " "
2642 " "
2598 msgstr ""
2643 msgstr ""
2599
2644
2600 #, python-format
2645 #, python-format
2601 msgid "patch \"%s\" already exists"
2646 msgid "patch \"%s\" already exists"
2602 msgstr ""
2647 msgstr ""
2603
2648
2604 #, python-format
2649 #, python-format
2605 msgid "error unlinking %s\n"
2650 msgid "error unlinking %s\n"
2606 msgstr ""
2651 msgstr ""
2607
2652
2608 msgid "returns (index, rev, patch)"
2653 msgid "returns (index, rev, patch)"
2609 msgstr ""
2654 msgstr ""
2610
2655
2611 #, python-format
2656 #, python-format
2612 msgid "patch name \"%s\" is ambiguous:\n"
2657 msgid "patch name \"%s\" is ambiguous:\n"
2613 msgstr ""
2658 msgstr ""
2614
2659
2615 #, python-format
2660 #, python-format
2616 msgid "patch %s not in series"
2661 msgid "patch %s not in series"
2617 msgstr ""
2662 msgstr ""
2618
2663
2619 msgid "(working directory not at tip)\n"
2664 msgid "(working directory not at tip)\n"
2620 msgstr ""
2665 msgstr ""
2621
2666
2622 msgid "no patches in series\n"
2667 msgid "no patches in series\n"
2623 msgstr ""
2668 msgstr ""
2624
2669
2625 #, python-format
2670 #, python-format
2626 msgid "cannot push to a previous patch: %s"
2671 msgid "cannot push to a previous patch: %s"
2627 msgstr ""
2672 msgstr ""
2628
2673
2629 #, python-format
2674 #, python-format
2630 msgid "qpush: %s is already at the top\n"
2675 msgid "qpush: %s is already at the top\n"
2631 msgstr ""
2676 msgstr ""
2632
2677
2633 #, python-format
2678 #, python-format
2634 msgid "guarded by %r"
2679 msgid "guarded by %r"
2635 msgstr ""
2680 msgstr ""
2636
2681
2637 msgid "no matching guards"
2682 msgid "no matching guards"
2638 msgstr ""
2683 msgstr ""
2639
2684
2640 #, python-format
2685 #, python-format
2641 msgid "cannot push '%s' - %s\n"
2686 msgid "cannot push '%s' - %s\n"
2642 msgstr ""
2687 msgstr ""
2643
2688
2644 msgid "all patches are currently applied\n"
2689 msgid "all patches are currently applied\n"
2645 msgstr ""
2690 msgstr ""
2646
2691
2647 msgid "patch series already fully applied\n"
2692 msgid "patch series already fully applied\n"
2648 msgstr ""
2693 msgstr ""
2649
2694
2650 msgid "cleaning up working directory..."
2695 msgid "cleaning up working directory..."
2651 msgstr ""
2696 msgstr ""
2652
2697
2653 #, python-format
2698 #, python-format
2654 msgid "errors during apply, please fix and refresh %s\n"
2699 msgid "errors during apply, please fix and refresh %s\n"
2655 msgstr ""
2700 msgstr ""
2656
2701
2657 #, python-format
2702 #, python-format
2658 msgid "now at: %s\n"
2703 msgid "now at: %s\n"
2659 msgstr ""
2704 msgstr ""
2660
2705
2661 #, python-format
2706 #, python-format
2662 msgid "patch %s is not applied"
2707 msgid "patch %s is not applied"
2663 msgstr ""
2708 msgstr ""
2664
2709
2665 msgid "no patches applied\n"
2710 msgid "no patches applied\n"
2666 msgstr ""
2711 msgstr ""
2667
2712
2668 #, python-format
2713 #, python-format
2669 msgid "qpop: %s is already at the top\n"
2714 msgid "qpop: %s is already at the top\n"
2670 msgstr ""
2715 msgstr ""
2671
2716
2672 msgid "qpop: forcing dirstate update\n"
2717 msgid "qpop: forcing dirstate update\n"
2673 msgstr ""
2718 msgstr ""
2674
2719
2675 #, python-format
2720 #, python-format
2676 msgid "trying to pop unknown node %s"
2721 msgid "trying to pop unknown node %s"
2677 msgstr ""
2722 msgstr ""
2678
2723
2679 msgid "popping would remove a revision not managed by this patch queue"
2724 msgid "popping would remove a revision not managed by this patch queue"
2680 msgstr ""
2725 msgstr ""
2681
2726
2682 msgid "deletions found between repo revs"
2727 msgid "deletions found between repo revs"
2683 msgstr ""
2728 msgstr ""
2684
2729
2685 msgid "patch queue now empty\n"
2730 msgid "patch queue now empty\n"
2686 msgstr ""
2731 msgstr ""
2687
2732
2688 msgid "cannot refresh a revision with children"
2733 msgid "cannot refresh a revision with children"
2689 msgstr ""
2734 msgstr ""
2690
2735
2691 msgid ""
2736 msgid ""
2692 "refresh interrupted while patch was popped! (revert --all, qpush to "
2737 "refresh interrupted while patch was popped! (revert --all, qpush to "
2693 "recover)\n"
2738 "recover)\n"
2694 msgstr ""
2739 msgstr ""
2695
2740
2696 msgid "patch queue directory already exists"
2741 msgid "patch queue directory already exists"
2697 msgstr ""
2742 msgstr ""
2698
2743
2699 #, python-format
2744 #, python-format
2700 msgid "patch %s is not in series file"
2745 msgid "patch %s is not in series file"
2701 msgstr ""
2746 msgstr ""
2702
2747
2703 msgid "No saved patch data found\n"
2748 msgid "No saved patch data found\n"
2704 msgstr ""
2749 msgstr ""
2705
2750
2706 #, python-format
2751 #, python-format
2707 msgid "restoring status: %s\n"
2752 msgid "restoring status: %s\n"
2708 msgstr ""
2753 msgstr ""
2709
2754
2710 msgid "save entry has children, leaving it alone\n"
2755 msgid "save entry has children, leaving it alone\n"
2711 msgstr ""
2756 msgstr ""
2712
2757
2713 #, python-format
2758 #, python-format
2714 msgid "removing save entry %s\n"
2759 msgid "removing save entry %s\n"
2715 msgstr ""
2760 msgstr ""
2716
2761
2717 #, python-format
2762 #, python-format
2718 msgid "saved queue repository parents: %s %s\n"
2763 msgid "saved queue repository parents: %s %s\n"
2719 msgstr ""
2764 msgstr ""
2720
2765
2721 msgid "queue directory updating\n"
2766 msgid "queue directory updating\n"
2722 msgstr ""
2767 msgstr ""
2723
2768
2724 msgid "Unable to load queue repository\n"
2769 msgid "Unable to load queue repository\n"
2725 msgstr ""
2770 msgstr ""
2726
2771
2727 msgid "save: no patches applied, exiting\n"
2772 msgid "save: no patches applied, exiting\n"
2728 msgstr ""
2773 msgstr ""
2729
2774
2730 msgid "status is already saved\n"
2775 msgid "status is already saved\n"
2731 msgstr ""
2776 msgstr ""
2732
2777
2733 msgid "hg patches saved state"
2778 msgid "hg patches saved state"
2734 msgstr ""
2779 msgstr ""
2735
2780
2736 msgid "repo commit failed\n"
2781 msgid "repo commit failed\n"
2737 msgstr ""
2782 msgstr ""
2738
2783
2739 msgid ""
2784 msgid ""
2740 "If all_patches is False, return the index of the next pushable patch\n"
2785 "If all_patches is False, return the index of the next pushable patch\n"
2741 " in the series, or the series length. If all_patches is True, return "
2786 " in the series, or the series length. If all_patches is True, return "
2742 "the\n"
2787 "the\n"
2743 " index of the first patch past the last applied one.\n"
2788 " index of the first patch past the last applied one.\n"
2744 " "
2789 " "
2745 msgstr ""
2790 msgstr ""
2746
2791
2747 #, python-format
2792 #, python-format
2748 msgid "patch %s is already in the series file"
2793 msgid "patch %s is already in the series file"
2749 msgstr ""
2794 msgstr ""
2750
2795
2751 msgid "option \"-r\" not valid when importing files"
2796 msgid "option \"-r\" not valid when importing files"
2752 msgstr ""
2797 msgstr ""
2753
2798
2754 msgid "option \"-n\" not valid when importing multiple patches"
2799 msgid "option \"-n\" not valid when importing multiple patches"
2755 msgstr ""
2800 msgstr ""
2756
2801
2757 #, python-format
2802 #, python-format
2758 msgid "revision %d is the root of more than one branch"
2803 msgid "revision %d is the root of more than one branch"
2759 msgstr ""
2804 msgstr ""
2760
2805
2761 #, python-format
2806 #, python-format
2762 msgid "revision %d is already managed"
2807 msgid "revision %d is already managed"
2763 msgstr ""
2808 msgstr ""
2764
2809
2765 #, python-format
2810 #, python-format
2766 msgid "revision %d is not the parent of the queue"
2811 msgid "revision %d is not the parent of the queue"
2767 msgstr ""
2812 msgstr ""
2768
2813
2769 #, python-format
2814 #, python-format
2770 msgid "revision %d has unmanaged children"
2815 msgid "revision %d has unmanaged children"
2771 msgstr ""
2816 msgstr ""
2772
2817
2773 #, python-format
2818 #, python-format
2774 msgid "cannot import merge revision %d"
2819 msgid "cannot import merge revision %d"
2775 msgstr ""
2820 msgstr ""
2776
2821
2777 #, python-format
2822 #, python-format
2778 msgid "revision %d is not the parent of %d"
2823 msgid "revision %d is not the parent of %d"
2779 msgstr ""
2824 msgstr ""
2780
2825
2781 msgid "-e is incompatible with import from -"
2826 msgid "-e is incompatible with import from -"
2782 msgstr ""
2827 msgstr ""
2783
2828
2784 #, python-format
2829 #, python-format
2785 msgid "patch %s does not exist"
2830 msgid "patch %s does not exist"
2786 msgstr ""
2831 msgstr ""
2787
2832
2788 msgid "need --name to import a patch from -"
2833 msgid "need --name to import a patch from -"
2789 msgstr ""
2834 msgstr ""
2790
2835
2791 #, python-format
2836 #, python-format
2792 msgid "adding %s to series file\n"
2837 msgid "adding %s to series file\n"
2793 msgstr ""
2838 msgstr ""
2794
2839
2795 msgid ""
2840 msgid ""
2796 "remove patches from queue\n"
2841 "remove patches from queue\n"
2797 "\n"
2842 "\n"
2798 " The patches must not be applied, unless they are arguments to\n"
2843 " The patches must not be applied, unless they are arguments to\n"
2799 " the --rev parameter. At least one patch or revision is required.\n"
2844 " the --rev parameter. At least one patch or revision is required.\n"
2800 "\n"
2845 "\n"
2801 " With --rev, mq will stop managing the named revisions (converting\n"
2846 " With --rev, mq will stop managing the named revisions (converting\n"
2802 " them to regular mercurial changesets). The qfinish command should be\n"
2847 " them to regular mercurial changesets). The qfinish command should be\n"
2803 " used as an alternative for qdel -r, as the latter option is deprecated.\n"
2848 " used as an alternative for qdel -r, as the latter option is deprecated.\n"
2804 "\n"
2849 "\n"
2805 " With --keep, the patch files are preserved in the patch directory."
2850 " With --keep, the patch files are preserved in the patch directory."
2806 msgstr ""
2851 msgstr ""
2807
2852
2808 msgid "print the patches already applied"
2853 msgid "print the patches already applied"
2809 msgstr ""
2854 msgstr ""
2810
2855
2811 msgid "print the patches not yet applied"
2856 msgid "print the patches not yet applied"
2812 msgstr ""
2857 msgstr ""
2813
2858
2814 msgid ""
2859 msgid ""
2815 "import a patch\n"
2860 "import a patch\n"
2816 "\n"
2861 "\n"
2817 " The patch is inserted into the series after the last applied patch.\n"
2862 " The patch is inserted into the series after the last applied patch.\n"
2818 " If no patches have been applied, qimport prepends the patch\n"
2863 " If no patches have been applied, qimport prepends the patch\n"
2819 " to the series.\n"
2864 " to the series.\n"
2820 "\n"
2865 "\n"
2821 " The patch will have the same name as its source file unless you\n"
2866 " The patch will have the same name as its source file unless you\n"
2822 " give it a new one with --name.\n"
2867 " give it a new one with --name.\n"
2823 "\n"
2868 "\n"
2824 " You can register an existing patch inside the patch directory\n"
2869 " You can register an existing patch inside the patch directory\n"
2825 " with the --existing flag.\n"
2870 " with the --existing flag.\n"
2826 "\n"
2871 "\n"
2827 " With --force, an existing patch of the same name will be overwritten.\n"
2872 " With --force, an existing patch of the same name will be overwritten.\n"
2828 "\n"
2873 "\n"
2829 " An existing changeset may be placed under mq control with --rev\n"
2874 " An existing changeset may be placed under mq control with --rev\n"
2830 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2875 " (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
2831 " With --git, patches imported with --rev will use the git diff\n"
2876 " With --git, patches imported with --rev will use the git diff\n"
2832 " format. See the diffs help topic for information on why this is\n"
2877 " format. See the diffs help topic for information on why this is\n"
2833 " important for preserving rename/copy information and permission "
2878 " important for preserving rename/copy information and permission "
2834 "changes.\n"
2879 "changes.\n"
2835 " "
2880 " "
2836 msgstr ""
2881 msgstr ""
2837
2882
2838 msgid ""
2883 msgid ""
2839 "init a new queue repository\n"
2884 "init a new queue repository\n"
2840 "\n"
2885 "\n"
2841 " The queue repository is unversioned by default. If -c is\n"
2886 " The queue repository is unversioned by default. If -c is\n"
2842 " specified, qinit will create a separate nested repository\n"
2887 " specified, qinit will create a separate nested repository\n"
2843 " for patches (qinit -c may also be run later to convert\n"
2888 " for patches (qinit -c may also be run later to convert\n"
2844 " an unversioned patch repository into a versioned one).\n"
2889 " an unversioned patch repository into a versioned one).\n"
2845 " You can use qcommit to commit changes to this queue repository."
2890 " You can use qcommit to commit changes to this queue repository."
2846 msgstr ""
2891 msgstr ""
2847
2892
2848 msgid ""
2893 msgid ""
2849 "clone main and patch repository at same time\n"
2894 "clone main and patch repository at same time\n"
2850 "\n"
2895 "\n"
2851 " If source is local, destination will have no patches applied. If\n"
2896 " If source is local, destination will have no patches applied. If\n"
2852 " source is remote, this command can not check if patches are\n"
2897 " source is remote, this command can not check if patches are\n"
2853 " applied in source, so cannot guarantee that patches are not\n"
2898 " applied in source, so cannot guarantee that patches are not\n"
2854 " applied in destination. If you clone remote repository, be sure\n"
2899 " applied in destination. If you clone remote repository, be sure\n"
2855 " before that it has no patches applied.\n"
2900 " before that it has no patches applied.\n"
2856 "\n"
2901 "\n"
2857 " Source patch repository is looked for in <src>/.hg/patches by\n"
2902 " Source patch repository is looked for in <src>/.hg/patches by\n"
2858 " default. Use -p <url> to change.\n"
2903 " default. Use -p <url> to change.\n"
2859 "\n"
2904 "\n"
2860 " The patch directory must be a nested mercurial repository, as\n"
2905 " The patch directory must be a nested mercurial repository, as\n"
2861 " would be created by qinit -c.\n"
2906 " would be created by qinit -c.\n"
2862 " "
2907 " "
2863 msgstr ""
2908 msgstr ""
2864
2909
2865 msgid "versioned patch repository not found (see qinit -c)"
2910 msgid "versioned patch repository not found (see qinit -c)"
2866 msgstr ""
2911 msgstr ""
2867
2912
2868 msgid "cloning main repo\n"
2913 msgid "cloning main repo\n"
2869 msgstr ""
2914 msgstr ""
2870
2915
2871 msgid "cloning patch repo\n"
2916 msgid "cloning patch repo\n"
2872 msgstr ""
2917 msgstr ""
2873
2918
2874 msgid "stripping applied patches from destination repo\n"
2919 msgid "stripping applied patches from destination repo\n"
2875 msgstr ""
2920 msgstr ""
2876
2921
2877 msgid "updating destination repo\n"
2922 msgid "updating destination repo\n"
2878 msgstr ""
2923 msgstr ""
2879
2924
2880 msgid "commit changes in the queue repository"
2925 msgid "commit changes in the queue repository"
2881 msgstr ""
2926 msgstr ""
2882
2927
2883 msgid "print the entire series file"
2928 msgid "print the entire series file"
2884 msgstr ""
2929 msgstr ""
2885
2930
2886 msgid "print the name of the current patch"
2931 msgid "print the name of the current patch"
2887 msgstr ""
2932 msgstr ""
2888
2933
2889 msgid "print the name of the next patch"
2934 msgid "print the name of the next patch"
2890 msgstr ""
2935 msgstr ""
2891
2936
2892 msgid "all patches applied\n"
2937 msgid "all patches applied\n"
2893 msgstr ""
2938 msgstr ""
2894
2939
2895 msgid "print the name of the previous patch"
2940 msgid "print the name of the previous patch"
2896 msgstr ""
2941 msgstr ""
2897
2942
2898 msgid "only one patch applied\n"
2943 msgid "only one patch applied\n"
2899 msgstr ""
2944 msgstr ""
2900
2945
2901 msgid ""
2946 msgid ""
2902 "create a new patch\n"
2947 "create a new patch\n"
2903 "\n"
2948 "\n"
2904 " qnew creates a new patch on top of the currently-applied patch (if "
2949 " qnew creates a new patch on top of the currently-applied patch (if "
2905 "any).\n"
2950 "any).\n"
2906 " It will refuse to run if there are any outstanding changes unless -f is\n"
2951 " It will refuse to run if there are any outstanding changes unless -f is\n"
2907 " specified, in which case the patch will be initialized with them. You\n"
2952 " specified, in which case the patch will be initialized with them. You\n"
2908 " may also use -I, -X, and/or a list of files after the patch name to add\n"
2953 " may also use -I, -X, and/or a list of files after the patch name to add\n"
2909 " only changes to matching files to the new patch, leaving the rest as\n"
2954 " only changes to matching files to the new patch, leaving the rest as\n"
2910 " uncommitted modifications.\n"
2955 " uncommitted modifications.\n"
2911 "\n"
2956 "\n"
2912 " -u and -d can be used to set the (given) user and date, respectively.\n"
2957 " -u and -d can be used to set the (given) user and date, respectively.\n"
2913 " -U and -D set user to current user and date to current date.\n"
2958 " -U and -D set user to current user and date to current date.\n"
2914 "\n"
2959 "\n"
2915 " -e, -m or -l set the patch header as well as the commit message. If "
2960 " -e, -m or -l set the patch header as well as the commit message. If "
2916 "none\n"
2961 "none\n"
2917 " is specified, the header is empty and the commit message is '[mq]: "
2962 " is specified, the header is empty and the commit message is '[mq]: "
2918 "PATCH'.\n"
2963 "PATCH'.\n"
2919 "\n"
2964 "\n"
2920 " Use the --git option to keep the patch in the git extended diff\n"
2965 " Use the --git option to keep the patch in the git extended diff\n"
2921 " format. Read the diffs help topic for more information on why this\n"
2966 " format. Read the diffs help topic for more information on why this\n"
2922 " is important for preserving permission changes and copy/rename\n"
2967 " is important for preserving permission changes and copy/rename\n"
2923 " information.\n"
2968 " information.\n"
2924 " "
2969 " "
2925 msgstr ""
2970 msgstr ""
2926
2971
2927 msgid ""
2972 msgid ""
2928 "update the current patch\n"
2973 "update the current patch\n"
2929 "\n"
2974 "\n"
2930 " If any file patterns are provided, the refreshed patch will contain "
2975 " If any file patterns are provided, the refreshed patch will contain "
2931 "only\n"
2976 "only\n"
2932 " the modifications that match those patterns; the remaining "
2977 " the modifications that match those patterns; the remaining "
2933 "modifications\n"
2978 "modifications\n"
2934 " will remain in the working directory.\n"
2979 " will remain in the working directory.\n"
2935 "\n"
2980 "\n"
2936 " If --short is specified, files currently included in the patch will\n"
2981 " If --short is specified, files currently included in the patch will\n"
2937 " be refreshed just like matched files and remain in the patch.\n"
2982 " be refreshed just like matched files and remain in the patch.\n"
2938 "\n"
2983 "\n"
2939 " hg add/remove/copy/rename work as usual, though you might want to use\n"
2984 " hg add/remove/copy/rename work as usual, though you might want to use\n"
2940 " git-style patches (--git or [diff] git=1) to track copies and renames.\n"
2985 " git-style patches (--git or [diff] git=1) to track copies and renames.\n"
2941 " See the diffs help topic for more information on the git diff format.\n"
2986 " See the diffs help topic for more information on the git diff format.\n"
2942 " "
2987 " "
2943 msgstr ""
2988 msgstr ""
2944
2989
2945 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2990 msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
2946 msgstr ""
2991 msgstr ""
2947
2992
2948 msgid ""
2993 msgid ""
2949 "diff of the current patch and subsequent modifications\n"
2994 "diff of the current patch and subsequent modifications\n"
2950 "\n"
2995 "\n"
2951 " Shows a diff which includes the current patch as well as any changes "
2996 " Shows a diff which includes the current patch as well as any changes "
2952 "which\n"
2997 "which\n"
2953 " have been made in the working directory since the last refresh (thus\n"
2998 " have been made in the working directory since the last refresh (thus\n"
2954 " showing what the current patch would become after a qrefresh).\n"
2999 " showing what the current patch would become after a qrefresh).\n"
2955 "\n"
3000 "\n"
2956 " Use 'hg diff' if you only want to see the changes made since the last\n"
3001 " Use 'hg diff' if you only want to see the changes made since the last\n"
2957 " qrefresh, or 'hg export qtip' if you want to see changes made by the\n"
3002 " qrefresh, or 'hg export qtip' if you want to see changes made by the\n"
2958 " current patch without including changes made since the qrefresh.\n"
3003 " current patch without including changes made since the qrefresh.\n"
2959 " "
3004 " "
2960 msgstr ""
3005 msgstr ""
2961
3006
2962 msgid ""
3007 msgid ""
2963 "fold the named patches into the current patch\n"
3008 "fold the named patches into the current patch\n"
2964 "\n"
3009 "\n"
2965 " Patches must not yet be applied. Each patch will be successively\n"
3010 " Patches must not yet be applied. Each patch will be successively\n"
2966 " applied to the current patch in the order given. If all the\n"
3011 " applied to the current patch in the order given. If all the\n"
2967 " patches apply successfully, the current patch will be refreshed\n"
3012 " patches apply successfully, the current patch will be refreshed\n"
2968 " with the new cumulative patch, and the folded patches will\n"
3013 " with the new cumulative patch, and the folded patches will\n"
2969 " be deleted. With -k/--keep, the folded patch files will not\n"
3014 " be deleted. With -k/--keep, the folded patch files will not\n"
2970 " be removed afterwards.\n"
3015 " be removed afterwards.\n"
2971 "\n"
3016 "\n"
2972 " The header for each folded patch will be concatenated with\n"
3017 " The header for each folded patch will be concatenated with\n"
2973 " the current patch header, separated by a line of '* * *'."
3018 " the current patch header, separated by a line of '* * *'."
2974 msgstr ""
3019 msgstr ""
2975
3020
2976 msgid "qfold requires at least one patch name"
3021 msgid "qfold requires at least one patch name"
2977 msgstr ""
3022 msgstr ""
2978
3023
2979 msgid "No patches applied"
3024 msgid "No patches applied"
2980 msgstr ""
3025 msgstr ""
2981
3026
2982 #, python-format
3027 #, python-format
2983 msgid "Skipping already folded patch %s"
3028 msgid "Skipping already folded patch %s"
2984 msgstr ""
3029 msgstr ""
2985
3030
2986 #, python-format
3031 #, python-format
2987 msgid "qfold cannot fold already applied patch %s"
3032 msgid "qfold cannot fold already applied patch %s"
2988 msgstr ""
3033 msgstr ""
2989
3034
2990 #, python-format
3035 #, python-format
2991 msgid "Error folding patch %s"
3036 msgid "Error folding patch %s"
2992 msgstr ""
3037 msgstr ""
2993
3038
2994 msgid "push or pop patches until named patch is at top of stack"
3039 msgid "push or pop patches until named patch is at top of stack"
2995 msgstr ""
3040 msgstr ""
2996
3041
2997 msgid ""
3042 msgid ""
2998 "set or print guards for a patch\n"
3043 "set or print guards for a patch\n"
2999 "\n"
3044 "\n"
3000 " Guards control whether a patch can be pushed. A patch with no\n"
3045 " Guards control whether a patch can be pushed. A patch with no\n"
3001 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3046 " guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
3002 " pushed only if the qselect command has activated it. A patch with\n"
3047 " pushed only if the qselect command has activated it. A patch with\n"
3003 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3048 " a negative guard (\"-foo\") is never pushed if the qselect command\n"
3004 " has activated it.\n"
3049 " has activated it.\n"
3005 "\n"
3050 "\n"
3006 " With no arguments, print the currently active guards.\n"
3051 " With no arguments, print the currently active guards.\n"
3007 " With arguments, set guards for the named patch.\n"
3052 " With arguments, set guards for the named patch.\n"
3008 " NOTE: Specifying negative guards now requires '--'.\n"
3053 " NOTE: Specifying negative guards now requires '--'.\n"
3009 "\n"
3054 "\n"
3010 " To set guards on another patch:\n"
3055 " To set guards on another patch:\n"
3011 " hg qguard -- other.patch +2.6.17 -stable\n"
3056 " hg qguard -- other.patch +2.6.17 -stable\n"
3012 " "
3057 " "
3013 msgstr ""
3058 msgstr ""
3014
3059
3015 msgid "cannot mix -l/--list with options or arguments"
3060 msgid "cannot mix -l/--list with options or arguments"
3016 msgstr ""
3061 msgstr ""
3017
3062
3018 msgid "no patch to work with"
3063 msgid "no patch to work with"
3019 msgstr ""
3064 msgstr ""
3020
3065
3021 #, python-format
3066 #, python-format
3022 msgid "no patch named %s"
3067 msgid "no patch named %s"
3023 msgstr ""
3068 msgstr ""
3024
3069
3025 msgid "print the header of the topmost or specified patch"
3070 msgid "print the header of the topmost or specified patch"
3026 msgstr ""
3071 msgstr ""
3027
3072
3028 msgid ""
3073 msgid ""
3029 "push the next patch onto the stack\n"
3074 "push the next patch onto the stack\n"
3030 "\n"
3075 "\n"
3031 " When --force is applied, all local changes in patched files will be "
3076 " When --force is applied, all local changes in patched files will be "
3032 "lost.\n"
3077 "lost.\n"
3033 " "
3078 " "
3034 msgstr ""
3079 msgstr ""
3035
3080
3036 msgid "no saved queues found, please use -n\n"
3081 msgid "no saved queues found, please use -n\n"
3037 msgstr ""
3082 msgstr ""
3038
3083
3039 #, python-format
3084 #, python-format
3040 msgid "merging with queue at: %s\n"
3085 msgid "merging with queue at: %s\n"
3041 msgstr ""
3086 msgstr ""
3042
3087
3043 msgid ""
3088 msgid ""
3044 "pop the current patch off the stack\n"
3089 "pop the current patch off the stack\n"
3045 "\n"
3090 "\n"
3046 " By default, pops off the top of the patch stack. If given a patch name,\n"
3091 " By default, pops off the top of the patch stack. If given a patch name,\n"
3047 " keeps popping off patches until the named patch is at the top of the "
3092 " keeps popping off patches until the named patch is at the top of the "
3048 "stack.\n"
3093 "stack.\n"
3049 " "
3094 " "
3050 msgstr ""
3095 msgstr ""
3051
3096
3052 #, python-format
3097 #, python-format
3053 msgid "using patch queue: %s\n"
3098 msgid "using patch queue: %s\n"
3054 msgstr ""
3099 msgstr ""
3055
3100
3056 msgid ""
3101 msgid ""
3057 "rename a patch\n"
3102 "rename a patch\n"
3058 "\n"
3103 "\n"
3059 " With one argument, renames the current patch to PATCH1.\n"
3104 " With one argument, renames the current patch to PATCH1.\n"
3060 " With two arguments, renames PATCH1 to PATCH2."
3105 " With two arguments, renames PATCH1 to PATCH2."
3061 msgstr ""
3106 msgstr ""
3062
3107
3063 #, python-format
3108 #, python-format
3064 msgid "%s already exists"
3109 msgid "%s already exists"
3065 msgstr ""
3110 msgstr ""
3066
3111
3067 #, python-format
3112 #, python-format
3068 msgid "A patch named %s already exists in the series file"
3113 msgid "A patch named %s already exists in the series file"
3069 msgstr ""
3114 msgstr ""
3070
3115
3071 msgid "restore the queue state saved by a rev"
3116 msgid "restore the queue state saved by a rev"
3072 msgstr ""
3117 msgstr ""
3073
3118
3074 msgid "save current queue state"
3119 msgid "save current queue state"
3075 msgstr ""
3120 msgstr ""
3076
3121
3077 #, python-format
3122 #, python-format
3078 msgid "destination %s exists and is not a directory"
3123 msgid "destination %s exists and is not a directory"
3079 msgstr ""
3124 msgstr ""
3080
3125
3081 #, python-format
3126 #, python-format
3082 msgid "destination %s exists, use -f to force"
3127 msgid "destination %s exists, use -f to force"
3083 msgstr ""
3128 msgstr ""
3084
3129
3085 #, python-format
3130 #, python-format
3086 msgid "copy %s to %s\n"
3131 msgid "copy %s to %s\n"
3087 msgstr ""
3132 msgstr ""
3088
3133
3089 msgid ""
3134 msgid ""
3090 "strip a revision and all its descendants from the repository\n"
3135 "strip a revision and all its descendants from the repository\n"
3091 "\n"
3136 "\n"
3092 " If one of the working dir's parent revisions is stripped, the working\n"
3137 " If one of the working dir's parent revisions is stripped, the working\n"
3093 " directory will be updated to the parent of the stripped revision.\n"
3138 " directory will be updated to the parent of the stripped revision.\n"
3094 " "
3139 " "
3095 msgstr ""
3140 msgstr ""
3096
3141
3097 msgid ""
3142 msgid ""
3098 "set or print guarded patches to push\n"
3143 "set or print guarded patches to push\n"
3099 "\n"
3144 "\n"
3100 " Use the qguard command to set or print guards on patch, then use\n"
3145 " Use the qguard command to set or print guards on patch, then use\n"
3101 " qselect to tell mq which guards to use. A patch will be pushed if it\n"
3146 " qselect to tell mq which guards to use. A patch will be pushed if it\n"
3102 " has no guards or any positive guards match the currently selected "
3147 " has no guards or any positive guards match the currently selected "
3103 "guard,\n"
3148 "guard,\n"
3104 " but will not be pushed if any negative guards match the current guard.\n"
3149 " but will not be pushed if any negative guards match the current guard.\n"
3105 " For example:\n"
3150 " For example:\n"
3106 "\n"
3151 "\n"
3107 " qguard foo.patch -stable (negative guard)\n"
3152 " qguard foo.patch -stable (negative guard)\n"
3108 " qguard bar.patch +stable (positive guard)\n"
3153 " qguard bar.patch +stable (positive guard)\n"
3109 " qselect stable\n"
3154 " qselect stable\n"
3110 "\n"
3155 "\n"
3111 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3156 " This activates the \"stable\" guard. mq will skip foo.patch (because\n"
3112 " it has a negative match) but push bar.patch (because it\n"
3157 " it has a negative match) but push bar.patch (because it\n"
3113 " has a positive match).\n"
3158 " has a positive match).\n"
3114 "\n"
3159 "\n"
3115 " With no arguments, prints the currently active guards.\n"
3160 " With no arguments, prints the currently active guards.\n"
3116 " With one argument, sets the active guard.\n"
3161 " With one argument, sets the active guard.\n"
3117 "\n"
3162 "\n"
3118 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3163 " Use -n/--none to deactivate guards (no other arguments needed).\n"
3119 " When no guards are active, patches with positive guards are skipped\n"
3164 " When no guards are active, patches with positive guards are skipped\n"
3120 " and patches with negative guards are pushed.\n"
3165 " and patches with negative guards are pushed.\n"
3121 "\n"
3166 "\n"
3122 " qselect can change the guards on applied patches. It does not pop\n"
3167 " qselect can change the guards on applied patches. It does not pop\n"
3123 " guarded patches by default. Use --pop to pop back to the last applied\n"
3168 " guarded patches by default. Use --pop to pop back to the last applied\n"
3124 " patch that is not guarded. Use --reapply (which implies --pop) to push\n"
3169 " patch that is not guarded. Use --reapply (which implies --pop) to push\n"
3125 " back to the current patch afterwards, but skip guarded patches.\n"
3170 " back to the current patch afterwards, but skip guarded patches.\n"
3126 "\n"
3171 "\n"
3127 " Use -s/--series to print a list of all guards in the series file (no\n"
3172 " Use -s/--series to print a list of all guards in the series file (no\n"
3128 " other arguments needed). Use -v for more information."
3173 " other arguments needed). Use -v for more information."
3129 msgstr ""
3174 msgstr ""
3130
3175
3131 msgid "guards deactivated\n"
3176 msgid "guards deactivated\n"
3132 msgstr ""
3177 msgstr ""
3133
3178
3134 #, python-format
3179 #, python-format
3135 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3180 msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
3136 msgstr ""
3181 msgstr ""
3137
3182
3138 #, python-format
3183 #, python-format
3139 msgid "number of guarded, applied patches has changed from %d to %d\n"
3184 msgid "number of guarded, applied patches has changed from %d to %d\n"
3140 msgstr ""
3185 msgstr ""
3141
3186
3142 msgid "guards in series file:\n"
3187 msgid "guards in series file:\n"
3143 msgstr ""
3188 msgstr ""
3144
3189
3145 msgid "no guards in series file\n"
3190 msgid "no guards in series file\n"
3146 msgstr ""
3191 msgstr ""
3147
3192
3148 msgid "active guards:\n"
3193 msgid "active guards:\n"
3149 msgstr ""
3194 msgstr ""
3150
3195
3151 msgid "no active guards\n"
3196 msgid "no active guards\n"
3152 msgstr ""
3197 msgstr ""
3153
3198
3154 msgid "popping guarded patches\n"
3199 msgid "popping guarded patches\n"
3155 msgstr ""
3200 msgstr ""
3156
3201
3157 msgid "reapplying unguarded patches\n"
3202 msgid "reapplying unguarded patches\n"
3158 msgstr ""
3203 msgstr ""
3159
3204
3160 msgid ""
3205 msgid ""
3161 "move applied patches into repository history\n"
3206 "move applied patches into repository history\n"
3162 "\n"
3207 "\n"
3163 " Finishes the specified revisions (corresponding to applied patches) by\n"
3208 " Finishes the specified revisions (corresponding to applied patches) by\n"
3164 " moving them out of mq control into regular repository history.\n"
3209 " moving them out of mq control into regular repository history.\n"
3165 "\n"
3210 "\n"
3166 " Accepts a revision range or the --applied option. If --applied is\n"
3211 " Accepts a revision range or the --applied option. If --applied is\n"
3167 " specified, all applied mq revisions are removed from mq control.\n"
3212 " specified, all applied mq revisions are removed from mq control.\n"
3168 " Otherwise, the given revisions must be at the base of the stack of\n"
3213 " Otherwise, the given revisions must be at the base of the stack of\n"
3169 " applied patches.\n"
3214 " applied patches.\n"
3170 "\n"
3215 "\n"
3171 " This can be especially useful if your changes have been applied to an\n"
3216 " This can be especially useful if your changes have been applied to an\n"
3172 " upstream repository, or if you are about to push your changes to "
3217 " upstream repository, or if you are about to push your changes to "
3173 "upstream.\n"
3218 "upstream.\n"
3174 " "
3219 " "
3175 msgstr ""
3220 msgstr ""
3176
3221
3177 msgid "no revisions specified"
3222 msgid "no revisions specified"
3178 msgstr ""
3223 msgstr ""
3179
3224
3180 msgid "cannot commit over an applied mq patch"
3225 msgid "cannot commit over an applied mq patch"
3181 msgstr ""
3226 msgstr ""
3182
3227
3183 msgid "source has mq patches applied"
3228 msgid "source has mq patches applied"
3184 msgstr ""
3229 msgstr ""
3185
3230
3186 #, python-format
3231 #, python-format
3187 msgid "mq status file refers to unknown node %s\n"
3232 msgid "mq status file refers to unknown node %s\n"
3188 msgstr ""
3233 msgstr ""
3189
3234
3190 #, python-format
3235 #, python-format
3191 msgid "Tag %s overrides mq patch of the same name\n"
3236 msgid "Tag %s overrides mq patch of the same name\n"
3192 msgstr ""
3237 msgstr ""
3193
3238
3194 msgid "cannot import over an applied patch"
3239 msgid "cannot import over an applied patch"
3195 msgstr ""
3240 msgstr ""
3196
3241
3197 msgid "print first line of patch header"
3242 msgid "print first line of patch header"
3198 msgstr ""
3243 msgstr ""
3199
3244
3200 msgid "hg qapplied [-s] [PATCH]"
3245 msgid "hg qapplied [-s] [PATCH]"
3201 msgstr ""
3246 msgstr ""
3202
3247
3203 msgid "use pull protocol to copy metadata"
3248 msgid "use pull protocol to copy metadata"
3204 msgstr "メタデータ複製に pull プロトコルを使用"
3249 msgstr "メタデータ複製に pull プロトコルを使用"
3205
3250
3206 msgid "do not update the new working directories"
3251 msgid "do not update the new working directories"
3207 msgstr ""
3252 msgstr ""
3208
3253
3209 msgid "use uncompressed transfer (fast over LAN)"
3254 msgid "use uncompressed transfer (fast over LAN)"
3210 msgstr "非圧縮での転送(LAN での高速転送用)"
3255 msgstr "非圧縮での転送(LAN での高速転送用)"
3211
3256
3212 msgid "location of source patch repo"
3257 msgid "location of source patch repo"
3213 msgstr ""
3258 msgstr ""
3214
3259
3215 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3260 msgid "hg qclone [OPTION]... SOURCE [DEST]"
3216 msgstr ""
3261 msgstr ""
3217
3262
3218 msgid "hg qcommit [OPTION]... [FILE]..."
3263 msgid "hg qcommit [OPTION]... [FILE]..."
3219 msgstr ""
3264 msgstr ""
3220
3265
3221 msgid "hg qdiff [OPTION]... [FILE]..."
3266 msgid "hg qdiff [OPTION]... [FILE]..."
3222 msgstr ""
3267 msgstr ""
3223
3268
3224 msgid "keep patch file"
3269 msgid "keep patch file"
3225 msgstr ""
3270 msgstr ""
3226
3271
3227 msgid "stop managing a revision"
3272 msgid "stop managing a revision"
3228 msgstr ""
3273 msgstr ""
3229
3274
3230 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3275 msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
3231 msgstr ""
3276 msgstr ""
3232
3277
3233 msgid "edit patch header"
3278 msgid "edit patch header"
3234 msgstr ""
3279 msgstr ""
3235
3280
3236 msgid "keep folded patch files"
3281 msgid "keep folded patch files"
3237 msgstr ""
3282 msgstr ""
3238
3283
3239 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3284 msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
3240 msgstr ""
3285 msgstr ""
3241
3286
3242 msgid "overwrite any local changes"
3287 msgid "overwrite any local changes"
3243 msgstr ""
3288 msgstr ""
3244
3289
3245 msgid "hg qgoto [OPTION]... PATCH"
3290 msgid "hg qgoto [OPTION]... PATCH"
3246 msgstr ""
3291 msgstr ""
3247
3292
3248 msgid "list all patches and guards"
3293 msgid "list all patches and guards"
3249 msgstr ""
3294 msgstr ""
3250
3295
3251 msgid "drop all guards"
3296 msgid "drop all guards"
3252 msgstr ""
3297 msgstr ""
3253
3298
3254 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3299 msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
3255 msgstr ""
3300 msgstr ""
3256
3301
3257 msgid "hg qheader [PATCH]"
3302 msgid "hg qheader [PATCH]"
3258 msgstr ""
3303 msgstr ""
3259
3304
3260 msgid "import file in patch dir"
3305 msgid "import file in patch dir"
3261 msgstr ""
3306 msgstr ""
3262
3307
3263 msgid "patch file name"
3308 msgid "patch file name"
3264 msgstr ""
3309 msgstr ""
3265
3310
3266 msgid "overwrite existing files"
3311 msgid "overwrite existing files"
3267 msgstr ""
3312 msgstr ""
3268
3313
3269 msgid "place existing revisions under mq control"
3314 msgid "place existing revisions under mq control"
3270 msgstr ""
3315 msgstr ""
3271
3316
3272 msgid "use git extended diff format"
3317 msgid "use git extended diff format"
3273 msgstr "git 拡張差分形式を使用"
3318 msgstr "git 拡張差分形式を使用"
3274
3319
3275 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..."
3320 msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..."
3276 msgstr ""
3321 msgstr ""
3277
3322
3278 msgid "create queue repository"
3323 msgid "create queue repository"
3279 msgstr ""
3324 msgstr ""
3280
3325
3281 msgid "hg qinit [-c]"
3326 msgid "hg qinit [-c]"
3282 msgstr ""
3327 msgstr ""
3283
3328
3284 msgid "import uncommitted changes into patch"
3329 msgid "import uncommitted changes into patch"
3285 msgstr ""
3330 msgstr ""
3286
3331
3287 msgid "add \"From: <current user>\" to patch"
3332 msgid "add \"From: <current user>\" to patch"
3288 msgstr ""
3333 msgstr ""
3289
3334
3290 msgid "add \"From: <given user>\" to patch"
3335 msgid "add \"From: <given user>\" to patch"
3291 msgstr ""
3336 msgstr ""
3292
3337
3293 msgid "add \"Date: <current date>\" to patch"
3338 msgid "add \"Date: <current date>\" to patch"
3294 msgstr ""
3339 msgstr ""
3295
3340
3296 msgid "add \"Date: <given date>\" to patch"
3341 msgid "add \"Date: <given date>\" to patch"
3297 msgstr ""
3342 msgstr ""
3298
3343
3299 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3344 msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
3300 msgstr ""
3345 msgstr ""
3301
3346
3302 msgid "hg qnext [-s]"
3347 msgid "hg qnext [-s]"
3303 msgstr ""
3348 msgstr ""
3304
3349
3305 msgid "hg qprev [-s]"
3350 msgid "hg qprev [-s]"
3306 msgstr ""
3351 msgstr ""
3307
3352
3308 msgid "pop all patches"
3353 msgid "pop all patches"
3309 msgstr ""
3354 msgstr ""
3310
3355
3311 msgid "queue name to pop"
3356 msgid "queue name to pop"
3312 msgstr ""
3357 msgstr ""
3313
3358
3314 msgid "forget any local changes"
3359 msgid "forget any local changes"
3315 msgstr ""
3360 msgstr ""
3316
3361
3317 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3362 msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
3318 msgstr ""
3363 msgstr ""
3319
3364
3320 msgid "apply if the patch has rejects"
3365 msgid "apply if the patch has rejects"
3321 msgstr ""
3366 msgstr ""
3322
3367
3323 msgid "list patch name in commit text"
3368 msgid "list patch name in commit text"
3324 msgstr ""
3369 msgstr ""
3325
3370
3326 msgid "apply all patches"
3371 msgid "apply all patches"
3327 msgstr ""
3372 msgstr ""
3328
3373
3329 msgid "merge from another queue"
3374 msgid "merge from another queue"
3330 msgstr ""
3375 msgstr ""
3331
3376
3332 msgid "merge queue name"
3377 msgid "merge queue name"
3333 msgstr ""
3378 msgstr ""
3334
3379
3335 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3380 msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
3336 msgstr ""
3381 msgstr ""
3337
3382
3338 msgid "refresh only files already in the patch and specified files"
3383 msgid "refresh only files already in the patch and specified files"
3339 msgstr ""
3384 msgstr ""
3340
3385
3341 msgid "add/update \"From: <current user>\" in patch"
3386 msgid "add/update \"From: <current user>\" in patch"
3342 msgstr ""
3387 msgstr ""
3343
3388
3344 msgid "add/update \"From: <given user>\" in patch"
3389 msgid "add/update \"From: <given user>\" in patch"
3345 msgstr ""
3390 msgstr ""
3346
3391
3347 msgid "update \"Date: <current date>\" in patch (if present)"
3392 msgid "update \"Date: <current date>\" in patch (if present)"
3348 msgstr ""
3393 msgstr ""
3349
3394
3350 msgid "update \"Date: <given date>\" in patch (if present)"
3395 msgid "update \"Date: <given date>\" in patch (if present)"
3351 msgstr ""
3396 msgstr ""
3352
3397
3353 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3398 msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
3354 msgstr ""
3399 msgstr ""
3355
3400
3356 msgid "hg qrename PATCH1 [PATCH2]"
3401 msgid "hg qrename PATCH1 [PATCH2]"
3357 msgstr ""
3402 msgstr ""
3358
3403
3359 msgid "delete save entry"
3404 msgid "delete save entry"
3360 msgstr ""
3405 msgstr ""
3361
3406
3362 msgid "update queue working dir"
3407 msgid "update queue working dir"
3363 msgstr ""
3408 msgstr ""
3364
3409
3365 msgid "hg qrestore [-d] [-u] REV"
3410 msgid "hg qrestore [-d] [-u] REV"
3366 msgstr ""
3411 msgstr ""
3367
3412
3368 msgid "copy patch directory"
3413 msgid "copy patch directory"
3369 msgstr ""
3414 msgstr ""
3370
3415
3371 msgid "copy directory name"
3416 msgid "copy directory name"
3372 msgstr ""
3417 msgstr ""
3373
3418
3374 msgid "clear queue status file"
3419 msgid "clear queue status file"
3375 msgstr ""
3420 msgstr ""
3376
3421
3377 msgid "force copy"
3422 msgid "force copy"
3378 msgstr ""
3423 msgstr ""
3379
3424
3380 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3425 msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
3381 msgstr ""
3426 msgstr ""
3382
3427
3383 msgid "disable all guards"
3428 msgid "disable all guards"
3384 msgstr ""
3429 msgstr ""
3385
3430
3386 msgid "list all guards in series file"
3431 msgid "list all guards in series file"
3387 msgstr ""
3432 msgstr ""
3388
3433
3389 msgid "pop to before first guarded applied patch"
3434 msgid "pop to before first guarded applied patch"
3390 msgstr ""
3435 msgstr ""
3391
3436
3392 msgid "pop, then reapply patches"
3437 msgid "pop, then reapply patches"
3393 msgstr ""
3438 msgstr ""
3394
3439
3395 msgid "hg qselect [OPTION]... [GUARD]..."
3440 msgid "hg qselect [OPTION]... [GUARD]..."
3396 msgstr ""
3441 msgstr ""
3397
3442
3398 msgid "print patches not in series"
3443 msgid "print patches not in series"
3399 msgstr ""
3444 msgstr ""
3400
3445
3401 msgid "hg qseries [-ms]"
3446 msgid "hg qseries [-ms]"
3402 msgstr ""
3447 msgstr ""
3403
3448
3404 msgid "force removal with local changes"
3449 msgid "force removal with local changes"
3405 msgstr ""
3450 msgstr ""
3406
3451
3407 msgid "bundle unrelated changesets"
3452 msgid "bundle unrelated changesets"
3408 msgstr ""
3453 msgstr ""
3409
3454
3410 msgid "no backups"
3455 msgid "no backups"
3411 msgstr ""
3456 msgstr ""
3412
3457
3413 msgid "hg strip [-f] [-b] [-n] REV"
3458 msgid "hg strip [-f] [-b] [-n] REV"
3414 msgstr ""
3459 msgstr ""
3415
3460
3416 msgid "hg qtop [-s]"
3461 msgid "hg qtop [-s]"
3417 msgstr ""
3462 msgstr ""
3418
3463
3419 msgid "hg qunapplied [-s] [PATCH]"
3464 msgid "hg qunapplied [-s] [PATCH]"
3420 msgstr ""
3465 msgstr ""
3421
3466
3422 msgid "finish all applied changesets"
3467 msgid "finish all applied changesets"
3423 msgstr ""
3468 msgstr ""
3424
3469
3425 msgid "hg qfinish [-a] [REV...]"
3470 msgid "hg qfinish [-a] [REV...]"
3426 msgstr ""
3471 msgstr ""
3427
3472
3428 msgid ""
3473 msgid ""
3429 "hook extension to email notifications on commits/pushes\n"
3474 "hook extension to email notifications on commits/pushes\n"
3430 "\n"
3475 "\n"
3431 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3476 "Subscriptions can be managed through hgrc. Default mode is to print\n"
3432 "messages to stdout, for testing and configuring.\n"
3477 "messages to stdout, for testing and configuring.\n"
3433 "\n"
3478 "\n"
3434 "To use, configure notify extension and enable in hgrc like this:\n"
3479 "To use, configure notify extension and enable in hgrc like this:\n"
3435 "\n"
3480 "\n"
3436 " [extensions]\n"
3481 " [extensions]\n"
3437 " hgext.notify =\n"
3482 " hgext.notify =\n"
3438 "\n"
3483 "\n"
3439 " [hooks]\n"
3484 " [hooks]\n"
3440 " # one email for each incoming changeset\n"
3485 " # one email for each incoming changeset\n"
3441 " incoming.notify = python:hgext.notify.hook\n"
3486 " incoming.notify = python:hgext.notify.hook\n"
3442 " # batch emails when many changesets incoming at one time\n"
3487 " # batch emails when many changesets incoming at one time\n"
3443 " changegroup.notify = python:hgext.notify.hook\n"
3488 " changegroup.notify = python:hgext.notify.hook\n"
3444 "\n"
3489 "\n"
3445 " [notify]\n"
3490 " [notify]\n"
3446 " # config items go in here\n"
3491 " # config items go in here\n"
3447 "\n"
3492 "\n"
3448 " config items:\n"
3493 " config items:\n"
3449 "\n"
3494 "\n"
3450 " REQUIRED:\n"
3495 " REQUIRED:\n"
3451 " config = /path/to/file # file containing subscriptions\n"
3496 " config = /path/to/file # file containing subscriptions\n"
3452 "\n"
3497 "\n"
3453 " OPTIONAL:\n"
3498 " OPTIONAL:\n"
3454 " test = True # print messages to stdout for testing\n"
3499 " test = True # print messages to stdout for testing\n"
3455 " strip = 3 # number of slashes to strip for url paths\n"
3500 " strip = 3 # number of slashes to strip for url paths\n"
3456 " domain = example.com # domain to use if committer missing domain\n"
3501 " domain = example.com # domain to use if committer missing domain\n"
3457 " style = ... # style file to use when formatting email\n"
3502 " style = ... # style file to use when formatting email\n"
3458 " template = ... # template to use when formatting email\n"
3503 " template = ... # template to use when formatting email\n"
3459 " incoming = ... # template to use when run as incoming hook\n"
3504 " incoming = ... # template to use when run as incoming hook\n"
3460 " changegroup = ... # template when run as changegroup hook\n"
3505 " changegroup = ... # template when run as changegroup hook\n"
3461 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3506 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
3462 " maxsubject = 67 # truncate subject line longer than this\n"
3507 " maxsubject = 67 # truncate subject line longer than this\n"
3463 " diffstat = True # add a diffstat before the diff content\n"
3508 " diffstat = True # add a diffstat before the diff content\n"
3464 " sources = serve # notify if source of incoming changes in this "
3509 " sources = serve # notify if source of incoming changes in this "
3465 "list\n"
3510 "list\n"
3466 " # (serve == ssh or http, push, pull, bundle)\n"
3511 " # (serve == ssh or http, push, pull, bundle)\n"
3467 " [email]\n"
3512 " [email]\n"
3468 " from = user@host.com # email address to send as if none given\n"
3513 " from = user@host.com # email address to send as if none given\n"
3469 " [web]\n"
3514 " [web]\n"
3470 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3515 " baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
3471 "\n"
3516 "\n"
3472 " notify config file has same format as regular hgrc. it has two\n"
3517 " notify config file has same format as regular hgrc. it has two\n"
3473 " sections so you can express subscriptions in whatever way is handier\n"
3518 " sections so you can express subscriptions in whatever way is handier\n"
3474 " for you.\n"
3519 " for you.\n"
3475 "\n"
3520 "\n"
3476 " [usersubs]\n"
3521 " [usersubs]\n"
3477 " # key is subscriber email, value is \",\"-separated list of glob "
3522 " # key is subscriber email, value is \",\"-separated list of glob "
3478 "patterns\n"
3523 "patterns\n"
3479 " user@host = pattern\n"
3524 " user@host = pattern\n"
3480 "\n"
3525 "\n"
3481 " [reposubs]\n"
3526 " [reposubs]\n"
3482 " # key is glob pattern, value is \",\"-separated list of subscriber "
3527 " # key is glob pattern, value is \",\"-separated list of subscriber "
3483 "emails\n"
3528 "emails\n"
3484 " pattern = user@host\n"
3529 " pattern = user@host\n"
3485 "\n"
3530 "\n"
3486 " glob patterns are matched against path to repo root.\n"
3531 " glob patterns are matched against path to repo root.\n"
3487 "\n"
3532 "\n"
3488 " if you like, you can put notify config file in repo that users can\n"
3533 " if you like, you can put notify config file in repo that users can\n"
3489 " push changes to, they can manage their own subscriptions."
3534 " push changes to, they can manage their own subscriptions."
3490 msgstr ""
3535 msgstr ""
3491
3536
3492 msgid "email notification class."
3537 msgid "email notification class."
3493 msgstr ""
3538 msgstr ""
3494
3539
3495 msgid "strip leading slashes from local path, turn into web-safe path."
3540 msgid "strip leading slashes from local path, turn into web-safe path."
3496 msgstr ""
3541 msgstr ""
3497
3542
3498 msgid "try to clean up email addresses."
3543 msgid "try to clean up email addresses."
3499 msgstr ""
3544 msgstr ""
3500
3545
3501 msgid "return list of email addresses of subscribers to this repo."
3546 msgid "return list of email addresses of subscribers to this repo."
3502 msgstr ""
3547 msgstr ""
3503
3548
3504 msgid "format one changeset."
3549 msgid "format one changeset."
3505 msgstr ""
3550 msgstr ""
3506
3551
3507 msgid "true if incoming changes from this source should be skipped."
3552 msgid "true if incoming changes from this source should be skipped."
3508 msgstr ""
3553 msgstr ""
3509
3554
3510 msgid "send message."
3555 msgid "send message."
3511 msgstr ""
3556 msgstr ""
3512
3557
3513 #, python-format
3558 #, python-format
3514 msgid "%s: %d new changesets"
3559 msgid "%s: %d new changesets"
3515 msgstr ""
3560 msgstr ""
3516
3561
3517 #, python-format
3562 #, python-format
3518 msgid "notify: sending %d subscribers %d changes\n"
3563 msgid "notify: sending %d subscribers %d changes\n"
3519 msgstr ""
3564 msgstr ""
3520
3565
3521 #, python-format
3566 #, python-format
3522 msgid ""
3567 msgid ""
3523 "\n"
3568 "\n"
3524 "diffs (truncated from %d to %d lines):\n"
3569 "diffs (truncated from %d to %d lines):\n"
3525 "\n"
3570 "\n"
3526 msgstr ""
3571 msgstr ""
3527
3572
3528 #, python-format
3573 #, python-format
3529 msgid ""
3574 msgid ""
3530 "\n"
3575 "\n"
3531 "diffs (%d lines):\n"
3576 "diffs (%d lines):\n"
3532 "\n"
3577 "\n"
3533 msgstr ""
3578 msgstr ""
3534
3579
3535 msgid ""
3580 msgid ""
3536 "send email notifications to interested subscribers.\n"
3581 "send email notifications to interested subscribers.\n"
3537 "\n"
3582 "\n"
3538 " if used as changegroup hook, send one email for all changesets in\n"
3583 " if used as changegroup hook, send one email for all changesets in\n"
3539 " changegroup. else send one email per changeset."
3584 " changegroup. else send one email per changeset."
3540 msgstr ""
3585 msgstr ""
3541
3586
3542 #, python-format
3587 #, python-format
3543 msgid "notify: no subscribers to repo %s\n"
3588 msgid "notify: no subscribers to repo %s\n"
3544 msgstr ""
3589 msgstr ""
3545
3590
3546 #, python-format
3591 #, python-format
3547 msgid "notify: changes have source \"%s\" - skipping\n"
3592 msgid "notify: changes have source \"%s\" - skipping\n"
3548 msgstr ""
3593 msgstr ""
3549
3594
3550 msgid ""
3595 msgid ""
3551 "browse command output with external pager\n"
3596 "browse command output with external pager\n"
3552 "\n"
3597 "\n"
3553 "To set the pager that should be used, set the application variable:\n"
3598 "To set the pager that should be used, set the application variable:\n"
3554 "\n"
3599 "\n"
3555 " [pager]\n"
3600 " [pager]\n"
3556 " pager = LESS='FSRX' less\n"
3601 " pager = LESS='FSRX' less\n"
3557 "\n"
3602 "\n"
3558 "If no pager is set, the pager extensions uses the environment\n"
3603 "If no pager is set, the pager extensions uses the environment\n"
3559 "variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n"
3604 "variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n"
3560 "is used.\n"
3605 "is used.\n"
3561 "\n"
3606 "\n"
3562 "If you notice \"BROKEN PIPE\" error messages, you can disable them\n"
3607 "If you notice \"BROKEN PIPE\" error messages, you can disable them\n"
3563 "by setting:\n"
3608 "by setting:\n"
3564 "\n"
3609 "\n"
3565 " [pager]\n"
3610 " [pager]\n"
3566 " quiet = True\n"
3611 " quiet = True\n"
3567 "\n"
3612 "\n"
3568 "You can disable the pager for certain commands by adding them to the\n"
3613 "You can disable the pager for certain commands by adding them to the\n"
3569 "pager.ignore list:\n"
3614 "pager.ignore list:\n"
3570 "\n"
3615 "\n"
3571 " [pager]\n"
3616 " [pager]\n"
3572 " ignore = version, help, update\n"
3617 " ignore = version, help, update\n"
3573 "\n"
3618 "\n"
3574 "You can also enable the pager only for certain commands using pager.attend:\n"
3619 "You can also enable the pager only for certain commands using pager.attend:\n"
3575 "\n"
3620 "\n"
3576 " [pager]\n"
3621 " [pager]\n"
3577 " attend = log\n"
3622 " attend = log\n"
3578 "\n"
3623 "\n"
3579 "If pager.attend is present, pager.ignore will be ignored.\n"
3624 "If pager.attend is present, pager.ignore will be ignored.\n"
3580 "\n"
3625 "\n"
3581 "To ignore global commands like \"hg version\" or \"hg help\", you have to "
3626 "To ignore global commands like \"hg version\" or \"hg help\", you have to "
3582 "specify\n"
3627 "specify\n"
3583 "them in the global .hgrc\n"
3628 "them in the global .hgrc\n"
3584 msgstr ""
3629 msgstr ""
3585
3630
3586 msgid ""
3631 msgid ""
3587 "use suffixes to refer to ancestor revisions\n"
3632 "use suffixes to refer to ancestor revisions\n"
3588 "\n"
3633 "\n"
3589 "This extension allows you to use git-style suffixes to refer to\n"
3634 "This extension allows you to use git-style suffixes to refer to\n"
3590 "the ancestors of a specific revision.\n"
3635 "the ancestors of a specific revision.\n"
3591 "\n"
3636 "\n"
3592 "For example, if you can refer to a revision as \"foo\", then:\n"
3637 "For example, if you can refer to a revision as \"foo\", then:\n"
3593 "\n"
3638 "\n"
3594 "- foo^N = Nth parent of foo:\n"
3639 "- foo^N = Nth parent of foo:\n"
3595 " foo^0 = foo\n"
3640 " foo^0 = foo\n"
3596 " foo^1 = first parent of foo\n"
3641 " foo^1 = first parent of foo\n"
3597 " foo^2 = second parent of foo\n"
3642 " foo^2 = second parent of foo\n"
3598 " foo^ = foo^1\n"
3643 " foo^ = foo^1\n"
3599 "\n"
3644 "\n"
3600 "- foo~N = Nth first grandparent of foo\n"
3645 "- foo~N = Nth first grandparent of foo\n"
3601 " foo~0 = foo\n"
3646 " foo~0 = foo\n"
3602 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3647 " foo~1 = foo^1 = foo^ = first parent of foo\n"
3603 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3648 " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
3604 msgstr ""
3649 msgstr ""
3605
3650
3606 msgid ""
3651 msgid ""
3607 "sending Mercurial changesets as a series of patch emails\n"
3652 "sending Mercurial changesets as a series of patch emails\n"
3608 "\n"
3653 "\n"
3609 "The series is started off with a \"[PATCH 0 of N]\" introduction,\n"
3654 "The series is started off with a \"[PATCH 0 of N]\" introduction,\n"
3610 "which describes the series as a whole.\n"
3655 "which describes the series as a whole.\n"
3611 "\n"
3656 "\n"
3612 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3657 "Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3613 "the first line of the changeset description as the subject text.\n"
3658 "the first line of the changeset description as the subject text.\n"
3614 "The message contains two or three body parts:\n"
3659 "The message contains two or three body parts:\n"
3615 "\n"
3660 "\n"
3616 " The remainder of the changeset description.\n"
3661 " The remainder of the changeset description.\n"
3617 "\n"
3662 "\n"
3618 " [Optional] The result of running diffstat on the patch.\n"
3663 " [Optional] The result of running diffstat on the patch.\n"
3619 "\n"
3664 "\n"
3620 " The patch itself, as generated by \"hg export\".\n"
3665 " The patch itself, as generated by \"hg export\".\n"
3621 "\n"
3666 "\n"
3622 "Each message refers to all of its predecessors using the In-Reply-To\n"
3667 "Each message refers to all of its predecessors using the In-Reply-To\n"
3623 "and References headers, so they will show up as a sequence in\n"
3668 "and References headers, so they will show up as a sequence in\n"
3624 "threaded mail and news readers, and in mail archives.\n"
3669 "threaded mail and news readers, and in mail archives.\n"
3625 "\n"
3670 "\n"
3626 "For each changeset, you will be prompted with a diffstat summary and\n"
3671 "For each changeset, you will be prompted with a diffstat summary and\n"
3627 "the changeset summary, so you can be sure you are sending the right "
3672 "the changeset summary, so you can be sure you are sending the right "
3628 "changes.\n"
3673 "changes.\n"
3629 "\n"
3674 "\n"
3630 "To enable this extension:\n"
3675 "To enable this extension:\n"
3631 "\n"
3676 "\n"
3632 " [extensions]\n"
3677 " [extensions]\n"
3633 " hgext.patchbomb =\n"
3678 " hgext.patchbomb =\n"
3634 "\n"
3679 "\n"
3635 "To configure other defaults, add a section like this to your hgrc file:\n"
3680 "To configure other defaults, add a section like this to your hgrc file:\n"
3636 "\n"
3681 "\n"
3637 " [email]\n"
3682 " [email]\n"
3638 " from = My Name <my@email>\n"
3683 " from = My Name <my@email>\n"
3639 " to = recipient1, recipient2, ...\n"
3684 " to = recipient1, recipient2, ...\n"
3640 " cc = cc1, cc2, ...\n"
3685 " cc = cc1, cc2, ...\n"
3641 " bcc = bcc1, bcc2, ...\n"
3686 " bcc = bcc1, bcc2, ...\n"
3642 "\n"
3687 "\n"
3643 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3688 "Then you can use the \"hg email\" command to mail a series of changesets\n"
3644 "as a patchbomb.\n"
3689 "as a patchbomb.\n"
3645 "\n"
3690 "\n"
3646 "To avoid sending patches prematurely, it is a good idea to first run\n"
3691 "To avoid sending patches prematurely, it is a good idea to first run\n"
3647 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3692 "the \"email\" command with the \"-n\" option (test only). You will be\n"
3648 "prompted for an email recipient address, a subject an an introductory\n"
3693 "prompted for an email recipient address, a subject an an introductory\n"
3649 "message describing the patches of your patchbomb. Then when all is\n"
3694 "message describing the patches of your patchbomb. Then when all is\n"
3650 "done, patchbomb messages are displayed. If PAGER environment variable\n"
3695 "done, patchbomb messages are displayed. If PAGER environment variable\n"
3651 "is set, your pager will be fired up once for each patchbomb message, so\n"
3696 "is set, your pager will be fired up once for each patchbomb message, so\n"
3652 "you can verify everything is alright.\n"
3697 "you can verify everything is alright.\n"
3653 "\n"
3698 "\n"
3654 "The \"-m\" (mbox) option is also very useful. Instead of previewing\n"
3699 "The \"-m\" (mbox) option is also very useful. Instead of previewing\n"
3655 "each patchbomb message in a pager or sending the messages directly,\n"
3700 "each patchbomb message in a pager or sending the messages directly,\n"
3656 "it will create a UNIX mailbox file with the patch emails. This\n"
3701 "it will create a UNIX mailbox file with the patch emails. This\n"
3657 "mailbox file can be previewed with any mail user agent which supports\n"
3702 "mailbox file can be previewed with any mail user agent which supports\n"
3658 "UNIX mbox files, i.e. with mutt:\n"
3703 "UNIX mbox files, e.g. with mutt:\n"
3659 "\n"
3704 "\n"
3660 " % mutt -R -f mbox\n"
3705 " % mutt -R -f mbox\n"
3661 "\n"
3706 "\n"
3662 "When you are previewing the patchbomb messages, you can use `formail'\n"
3707 "When you are previewing the patchbomb messages, you can use `formail'\n"
3663 "(a utility that is commonly installed as part of the procmail package),\n"
3708 "(a utility that is commonly installed as part of the procmail package),\n"
3664 "to send each message out:\n"
3709 "to send each message out:\n"
3665 "\n"
3710 "\n"
3666 " % formail -s sendmail -bm -t < mbox\n"
3711 " % formail -s sendmail -bm -t < mbox\n"
3667 "\n"
3712 "\n"
3668 "That should be all. Now your patchbomb is on its way out.\n"
3713 "That should be all. Now your patchbomb is on its way out.\n"
3669 "\n"
3714 "\n"
3670 "You can also either configure the method option in the email section\n"
3715 "You can also either configure the method option in the email section\n"
3671 "to be a sendmail compatable mailer or fill out the [smtp] section so\n"
3716 "to be a sendmail compatable mailer or fill out the [smtp] section so\n"
3672 "that the patchbomb extension can automatically send patchbombs directly\n"
3717 "that the patchbomb extension can automatically send patchbombs directly\n"
3673 "from the commandline. See the [email] and [smtp] sections in hgrc(5)\n"
3718 "from the commandline. See the [email] and [smtp] sections in hgrc(5)\n"
3674 "for details."
3719 "for details."
3675 msgstr ""
3720 msgstr ""
3676
3721
3677 msgid "Please enter a valid value.\n"
3722 msgid "Please enter a valid value.\n"
3678 msgstr ""
3723 msgstr ""
3679
3724
3680 msgid "does the diffstat above look okay? "
3725 msgid "does the diffstat above look okay? "
3681 msgstr ""
3726 msgstr ""
3682
3727
3683 msgid "diffstat rejected"
3728 msgid "diffstat rejected"
3684 msgstr ""
3729 msgstr ""
3685
3730
3686 msgid ""
3731 msgid ""
3687 "send changesets by email\n"
3732 "send changesets by email\n"
3688 "\n"
3733 "\n"
3689 " By default, diffs are sent in the format generated by hg export,\n"
3734 " By default, diffs are sent in the format generated by hg export,\n"
3690 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3735 " one per message. The series starts with a \"[PATCH 0 of N]\"\n"
3691 " introduction, which describes the series as a whole.\n"
3736 " introduction, which describes the series as a whole.\n"
3692 "\n"
3737 "\n"
3693 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3738 " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
3694 " the first line of the changeset description as the subject text.\n"
3739 " the first line of the changeset description as the subject text.\n"
3695 " The message contains two or three body parts. First, the rest of\n"
3740 " The message contains two or three body parts. First, the rest of\n"
3696 " the changeset description. Next, (optionally) if the diffstat\n"
3741 " the changeset description. Next, (optionally) if the diffstat\n"
3697 " program is installed, the result of running diffstat on the patch.\n"
3742 " program is installed, the result of running diffstat on the patch.\n"
3698 " Finally, the patch itself, as generated by \"hg export\".\n"
3743 " Finally, the patch itself, as generated by \"hg export\".\n"
3699 "\n"
3744 "\n"
3700 " With --outgoing, emails will be generated for patches not\n"
3745 " With --outgoing, emails will be generated for patches not\n"
3701 " found in the destination repository (or only those which are\n"
3746 " found in the destination repository (or only those which are\n"
3702 " ancestors of the specified revisions if any are provided)\n"
3747 " ancestors of the specified revisions if any are provided)\n"
3703 "\n"
3748 "\n"
3704 " With --bundle, changesets are selected as for --outgoing,\n"
3749 " With --bundle, changesets are selected as for --outgoing,\n"
3705 " but a single email containing a binary Mercurial bundle as an\n"
3750 " but a single email containing a binary Mercurial bundle as an\n"
3706 " attachment will be sent.\n"
3751 " attachment will be sent.\n"
3707 "\n"
3752 "\n"
3708 " Examples:\n"
3753 " Examples:\n"
3709 "\n"
3754 "\n"
3710 " hg email -r 3000 # send patch 3000 only\n"
3755 " hg email -r 3000 # send patch 3000 only\n"
3711 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3756 " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
3712 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3757 " hg email -r 3000:3005 # send patches 3000 through 3005\n"
3713 " hg email 3000 # send patch 3000 (deprecated)\n"
3758 " hg email 3000 # send patch 3000 (deprecated)\n"
3714 "\n"
3759 "\n"
3715 " hg email -o # send all patches not in default\n"
3760 " hg email -o # send all patches not in default\n"
3716 " hg email -o DEST # send all patches not in DEST\n"
3761 " hg email -o DEST # send all patches not in DEST\n"
3717 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3762 " hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
3718 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3763 " hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
3719 "\n"
3764 "\n"
3720 " hg email -b # send bundle of all patches not in default\n"
3765 " hg email -b # send bundle of all patches not in default\n"
3721 " hg email -b DEST # send bundle of all patches not in DEST\n"
3766 " hg email -b DEST # send bundle of all patches not in DEST\n"
3722 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3767 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
3723 "default\n"
3768 "default\n"
3724 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3769 " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
3725 "\n"
3770 "\n"
3726 " Before using this command, you will need to enable email in your hgrc.\n"
3771 " Before using this command, you will need to enable email in your hgrc.\n"
3727 " See the [email] section in hgrc(5) for details.\n"
3772 " See the [email] section in hgrc(5) for details.\n"
3728 " "
3773 " "
3729 msgstr ""
3774 msgstr ""
3730
3775
3731 msgid "Return the revisions present locally but not in dest"
3776 msgid "Return the revisions present locally but not in dest"
3732 msgstr ""
3777 msgstr ""
3733
3778
3734 msgid "specify at least one changeset with -r or -o"
3779 msgid "specify at least one changeset with -r or -o"
3735 msgstr ""
3780 msgstr ""
3736
3781
3737 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3782 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
3738 msgstr ""
3783 msgstr ""
3739
3784
3740 msgid "too many destinations"
3785 msgid "too many destinations"
3741 msgstr ""
3786 msgstr ""
3742
3787
3743 msgid "use only one form to specify the revision"
3788 msgid "use only one form to specify the revision"
3744 msgstr ""
3789 msgstr ""
3745
3790
3746 msgid ""
3791 msgid ""
3747 "\n"
3792 "\n"
3748 "Write the introductory message for the patch series.\n"
3793 "Write the introductory message for the patch series.\n"
3749 "\n"
3794 "\n"
3750 msgstr ""
3795 msgstr ""
3751
3796
3752 #, python-format
3797 #, python-format
3753 msgid ""
3798 msgid ""
3754 "This patch series consists of %d patches.\n"
3799 "This patch series consists of %d patches.\n"
3755 "\n"
3800 "\n"
3756 msgstr ""
3801 msgstr ""
3757
3802
3758 msgid "Final summary:\n"
3803 msgid "Final summary:\n"
3759 msgstr ""
3804 msgstr ""
3760
3805
3761 msgid "Displaying "
3806 msgid "Displaying "
3762 msgstr ""
3807 msgstr ""
3763
3808
3764 msgid "Writing "
3809 msgid "Writing "
3765 msgstr ""
3810 msgstr ""
3766
3811
3767 msgid "Sending "
3812 msgid "Sending "
3768 msgstr ""
3813 msgstr ""
3769
3814
3770 msgid "send patches as attachments"
3815 msgid "send patches as attachments"
3771 msgstr ""
3816 msgstr ""
3772
3817
3773 msgid "send patches as inline attachments"
3818 msgid "send patches as inline attachments"
3774 msgstr ""
3819 msgstr ""
3775
3820
3776 msgid "email addresses of blind copy recipients"
3821 msgid "email addresses of blind carbon copy recipients"
3777 msgstr ""
3822 msgstr ""
3778
3823
3779 msgid "email addresses of copy recipients"
3824 msgid "email addresses of copy recipients"
3780 msgstr ""
3825 msgstr ""
3781
3826
3782 msgid "add diffstat output to messages"
3827 msgid "add diffstat output to messages"
3783 msgstr ""
3828 msgstr ""
3784
3829
3785 msgid "use the given date as the sending date"
3830 msgid "use the given date as the sending date"
3786 msgstr ""
3831 msgstr ""
3787
3832
3788 msgid "use the given file as the series description"
3833 msgid "use the given file as the series description"
3789 msgstr ""
3834 msgstr ""
3790
3835
3791 msgid "email address of sender"
3836 msgid "email address of sender"
3792 msgstr ""
3837 msgstr ""
3793
3838
3794 msgid "print messages that would be sent"
3839 msgid "print messages that would be sent"
3795 msgstr ""
3840 msgstr ""
3796
3841
3797 msgid "write messages to mbox file instead of sending them"
3842 msgid "write messages to mbox file instead of sending them"
3798 msgstr ""
3843 msgstr ""
3799
3844
3800 msgid "subject of first message (intro or single patch)"
3845 msgid "subject of first message (intro or single patch)"
3801 msgstr ""
3846 msgstr ""
3802
3847
3803 msgid "email addresses of recipients"
3848 msgid "email addresses of recipients"
3804 msgstr ""
3849 msgstr ""
3805
3850
3806 msgid "omit hg patch header"
3851 msgid "omit hg patch header"
3807 msgstr ""
3852 msgstr ""
3808
3853
3809 msgid "send changes not found in the target repository"
3854 msgid "send changes not found in the target repository"
3810 msgstr ""
3855 msgstr ""
3811
3856
3812 msgid "send changes not in target as a binary bundle"
3857 msgid "send changes not in target as a binary bundle"
3813 msgstr ""
3858 msgstr ""
3814
3859
3815 msgid "a revision to send"
3860 msgid "a revision to send"
3816 msgstr ""
3861 msgstr ""
3817
3862
3818 msgid "run even when remote repository is unrelated (with -b)"
3863 msgid "run even when remote repository is unrelated (with -b)"
3819 msgstr ""
3864 msgstr ""
3820
3865
3821 msgid "a base changeset to specify instead of a destination (with -b)"
3866 msgid "a base changeset to specify instead of a destination (with -b)"
3822 msgstr ""
3867 msgstr ""
3823
3868
3824 msgid "send an introduction email for a single patch"
3869 msgid "send an introduction email for a single patch"
3825 msgstr ""
3870 msgstr ""
3826
3871
3827 msgid "hg email [OPTION]... [DEST]..."
3872 msgid "hg email [OPTION]... [DEST]..."
3828 msgstr ""
3873 msgstr ""
3829
3874
3830 msgid ""
3875 msgid ""
3831 "removes files not tracked by Mercurial\n"
3876 "removes files not tracked by Mercurial\n"
3832 "\n"
3877 "\n"
3833 " Delete files not known to Mercurial. This is useful to test local and\n"
3878 " Delete files not known to Mercurial. This is useful to test local and\n"
3834 " uncommitted changes in an otherwise-clean source tree.\n"
3879 " uncommitted changes in an otherwise-clean source tree.\n"
3835 "\n"
3880 "\n"
3836 " This means that purge will delete:\n"
3881 " This means that purge will delete:\n"
3837 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3882 " - Unknown files: files marked with \"?\" by \"hg status\"\n"
3838 " - Empty directories: in fact Mercurial ignores directories unless they\n"
3883 " - Empty directories: in fact Mercurial ignores directories unless they\n"
3839 " contain files under source control managment\n"
3884 " contain files under source control managment\n"
3840 " But it will leave untouched:\n"
3885 " But it will leave untouched:\n"
3841 " - Modified and unmodified tracked files\n"
3886 " - Modified and unmodified tracked files\n"
3842 " - Ignored files (unless --all is specified)\n"
3887 " - Ignored files (unless --all is specified)\n"
3843 " - New files added to the repository (with \"hg add\")\n"
3888 " - New files added to the repository (with \"hg add\")\n"
3844 "\n"
3889 "\n"
3845 " If directories are given on the command line, only files in these\n"
3890 " If directories are given on the command line, only files in these\n"
3846 " directories are considered.\n"
3891 " directories are considered.\n"
3847 "\n"
3892 "\n"
3848 " Be careful with purge, as you could irreversibly delete some files you\n"
3893 " Be careful with purge, as you could irreversibly delete some files you\n"
3849 " forgot to add to the repository. If you only want to print the list of\n"
3894 " forgot to add to the repository. If you only want to print the list of\n"
3850 " files that this program would delete, use the --print option.\n"
3895 " files that this program would delete, use the --print option.\n"
3851 " "
3896 " "
3852 msgstr ""
3897 msgstr ""
3853
3898
3854 #, python-format
3899 #, python-format
3855 msgid "%s cannot be removed"
3900 msgid "%s cannot be removed"
3856 msgstr ""
3901 msgstr ""
3857
3902
3858 #, python-format
3903 #, python-format
3859 msgid "warning: %s\n"
3904 msgid "warning: %s\n"
3860 msgstr ""
3905 msgstr ""
3861
3906
3862 #, python-format
3907 #, python-format
3863 msgid "Removing file %s\n"
3908 msgid "Removing file %s\n"
3864 msgstr ""
3909 msgstr ""
3865
3910
3866 #, python-format
3911 #, python-format
3867 msgid "Removing directory %s\n"
3912 msgid "Removing directory %s\n"
3868 msgstr ""
3913 msgstr ""
3869
3914
3870 msgid "abort if an error occurs"
3915 msgid "abort if an error occurs"
3871 msgstr ""
3916 msgstr ""
3872
3917
3873 msgid "purge ignored files too"
3918 msgid "purge ignored files too"
3874 msgstr ""
3919 msgstr ""
3875
3920
3876 msgid "print the file names instead of deleting them"
3921 msgid "print the file names instead of deleting them"
3877 msgstr ""
3922 msgstr ""
3878
3923
3879 msgid "end filenames with NUL, for use with xargs (implies -p)"
3924 msgid "end filenames with NUL, for use with xargs (implies -p)"
3880 msgstr ""
3925 msgstr ""
3881
3926
3882 msgid "hg purge [OPTION]... [DIR]..."
3927 msgid "hg purge [OPTION]... [DIR]..."
3883 msgstr ""
3928 msgstr ""
3884
3929
3885 msgid ""
3930 msgid ""
3886 "move sets of revisions to a different ancestor\n"
3931 "move sets of revisions to a different ancestor\n"
3887 "\n"
3932 "\n"
3888 "This extension lets you rebase changesets in an existing Mercurial "
3933 "This extension lets you rebase changesets in an existing Mercurial "
3889 "repository.\n"
3934 "repository.\n"
3890 "\n"
3935 "\n"
3891 "For more information:\n"
3936 "For more information:\n"
3892 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3937 "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
3893 msgstr ""
3938 msgstr ""
3894
3939
3895 msgid "return the correct ancestor"
3940 msgid "return the correct ancestor"
3896 msgstr ""
3941 msgstr ""
3897
3942
3898 msgid "first revision, do not change ancestor\n"
3943 msgid "first revision, do not change ancestor\n"
3899 msgstr ""
3944 msgstr ""
3900
3945
3901 msgid ""
3946 msgid ""
3902 "move changeset (and descendants) to a different branch\n"
3947 "move changeset (and descendants) to a different branch\n"
3903 "\n"
3948 "\n"
3904 " Rebase uses repeated merging to graft changesets from one part of "
3949 " Rebase uses repeated merging to graft changesets from one part of "
3905 "history\n"
3950 "history\n"
3906 " onto another. This can be useful for linearizing local changes relative "
3951 " onto another. This can be useful for linearizing local changes relative "
3907 "to\n"
3952 "to\n"
3908 " a master development tree.\n"
3953 " a master development tree.\n"
3909 "\n"
3954 "\n"
3910 " If a rebase is interrupted to manually resolve a merge, it can be "
3955 " If a rebase is interrupted to manually resolve a merge, it can be "
3911 "continued\n"
3956 "continued\n"
3912 " with --continue or aborted with --abort.\n"
3957 " with --continue or aborted with --abort.\n"
3913 " "
3958 " "
3914 msgstr ""
3959 msgstr ""
3915
3960
3916 msgid "cannot use both keepbranches and extrafn"
3961 msgid "cannot use both keepbranches and extrafn"
3917 msgstr ""
3962 msgstr ""
3918
3963
3919 msgid "cannot use both abort and continue"
3964 msgid "cannot use both abort and continue"
3920 msgstr ""
3965 msgstr ""
3921
3966
3922 msgid "cannot use collapse with continue or abort"
3967 msgid "cannot use collapse with continue or abort"
3923 msgstr ""
3968 msgstr ""
3924
3969
3925 msgid "abort and continue do not allow specifying revisions"
3970 msgid "abort and continue do not allow specifying revisions"
3926 msgstr ""
3971 msgstr ""
3927
3972
3928 msgid "cannot specify both a revision and a base"
3973 msgid "cannot specify both a revision and a base"
3929 msgstr ""
3974 msgstr ""
3930
3975
3931 msgid "nothing to rebase\n"
3976 msgid "nothing to rebase\n"
3932 msgstr ""
3977 msgstr ""
3933
3978
3934 msgid "rebase merging completed\n"
3979 msgid "rebase merging completed\n"
3935 msgstr ""
3980 msgstr ""
3936
3981
3937 msgid "warning: new changesets detected on source branch, not stripping\n"
3982 msgid "warning: new changesets detected on source branch, not stripping\n"
3938 msgstr ""
3983 msgstr ""
3939
3984
3940 msgid "rebase completed\n"
3985 msgid "rebase completed\n"
3941 msgstr ""
3986 msgstr ""
3942
3987
3943 #, python-format
3988 #, python-format
3944 msgid "%d revisions have been skipped\n"
3989 msgid "%d revisions have been skipped\n"
3945 msgstr ""
3990 msgstr ""
3946
3991
3947 msgid ""
3992 msgid ""
3948 "Skip commit if collapsing has been required and rev is not the last\n"
3993 "Skip commit if collapsing has been required and rev is not the last\n"
3949 " revision, commit otherwise\n"
3994 " revision, commit otherwise\n"
3950 " "
3995 " "
3951 msgstr ""
3996 msgstr ""
3952
3997
3953 msgid " set parents\n"
3998 msgid " set parents\n"
3954 msgstr ""
3999 msgstr ""
3955
4000
3956 msgid "Rebase a single revision"
4001 msgid "Rebase a single revision"
3957 msgstr ""
4002 msgstr ""
3958
4003
3959 #, python-format
4004 #, python-format
3960 msgid "rebasing %d:%s\n"
4005 msgid "rebasing %d:%s\n"
3961 msgstr ""
4006 msgstr ""
3962
4007
3963 #, python-format
4008 #, python-format
3964 msgid " future parents are %d and %d\n"
4009 msgid " future parents are %d and %d\n"
3965 msgstr ""
4010 msgstr ""
3966
4011
3967 #, python-format
4012 #, python-format
3968 msgid " update to %d:%s\n"
4013 msgid " update to %d:%s\n"
3969 msgstr ""
4014 msgstr ""
3970
4015
3971 msgid " already in target\n"
4016 msgid " already in target\n"
3972 msgstr ""
4017 msgstr ""
3973
4018
3974 #, python-format
4019 #, python-format
3975 msgid " merge against %d:%s\n"
4020 msgid " merge against %d:%s\n"
3976 msgstr ""
4021 msgstr ""
3977
4022
3978 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
4023 msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
3979 msgstr ""
4024 msgstr ""
3980
4025
3981 msgid "resuming interrupted rebase\n"
4026 msgid "resuming interrupted rebase\n"
3982 msgstr ""
4027 msgstr ""
3983
4028
3984 #, python-format
4029 #, python-format
3985 msgid "no changes, revision %d skipped\n"
4030 msgid "no changes, revision %d skipped\n"
3986 msgstr ""
4031 msgstr ""
3987
4032
3988 #, python-format
4033 #, python-format
3989 msgid "next revision set to %s\n"
4034 msgid "next revision set to %s\n"
3990 msgstr ""
4035 msgstr ""
3991
4036
3992 msgid "Return the new parent relationship of the revision that will be rebased"
4037 msgid "Return the new parent relationship of the revision that will be rebased"
3993 msgstr ""
4038 msgstr ""
3994
4039
3995 #, python-format
4040 #, python-format
3996 msgid "cannot use revision %d as base, result would have 3 parents"
4041 msgid "cannot use revision %d as base, result would have 3 parents"
3997 msgstr ""
4042 msgstr ""
3998
4043
3999 msgid "Update rebased mq patches - finalize and then import them"
4044 msgid "Update rebased mq patches - finalize and then import them"
4000 msgstr ""
4045 msgstr ""
4001
4046
4002 #, python-format
4047 #, python-format
4003 msgid "revision %d is an mq patch (%s), finalize it.\n"
4048 msgid "revision %d is an mq patch (%s), finalize it.\n"
4004 msgstr ""
4049 msgstr ""
4005
4050
4006 #, python-format
4051 #, python-format
4007 msgid "import mq patch %d (%s)\n"
4052 msgid "import mq patch %d (%s)\n"
4008 msgstr ""
4053 msgstr ""
4009
4054
4010 msgid "Store the current status to allow recovery"
4055 msgid "Store the current status to allow recovery"
4011 msgstr ""
4056 msgstr ""
4012
4057
4013 msgid "rebase status stored\n"
4058 msgid "rebase status stored\n"
4014 msgstr ""
4059 msgstr ""
4015
4060
4016 msgid "Remove the status files"
4061 msgid "Remove the status files"
4017 msgstr ""
4062 msgstr ""
4018
4063
4019 msgid "Restore a previously stored status"
4064 msgid "Restore a previously stored status"
4020 msgstr ""
4065 msgstr ""
4021
4066
4022 msgid "rebase status resumed\n"
4067 msgid "rebase status resumed\n"
4023 msgstr ""
4068 msgstr ""
4024
4069
4025 msgid "no rebase in progress"
4070 msgid "no rebase in progress"
4026 msgstr ""
4071 msgstr ""
4027
4072
4028 msgid "Restore the repository to its original state"
4073 msgid "Restore the repository to its original state"
4029 msgstr ""
4074 msgstr ""
4030
4075
4031 msgid "warning: new changesets detected on target branch, not stripping\n"
4076 msgid "warning: new changesets detected on target branch, not stripping\n"
4032 msgstr ""
4077 msgstr ""
4033
4078
4034 msgid "rebase aborted\n"
4079 msgid "rebase aborted\n"
4035 msgstr ""
4080 msgstr ""
4036
4081
4037 msgid "Define which revisions are going to be rebased and where"
4082 msgid "Define which revisions are going to be rebased and where"
4038 msgstr ""
4083 msgstr ""
4039
4084
4040 msgid "cannot rebase onto an applied mq patch"
4085 msgid "cannot rebase onto an applied mq patch"
4041 msgstr ""
4086 msgstr ""
4042
4087
4043 msgid "cannot rebase an ancestor"
4088 msgid "cannot rebase an ancestor"
4044 msgstr ""
4089 msgstr ""
4045
4090
4046 msgid "cannot rebase a descendant"
4091 msgid "cannot rebase a descendant"
4047 msgstr ""
4092 msgstr ""
4048
4093
4049 msgid "already working on current\n"
4094 msgid "already working on current\n"
4050 msgstr ""
4095 msgstr ""
4051
4096
4052 msgid "already working on the current branch\n"
4097 msgid "already working on the current branch\n"
4053 msgstr ""
4098 msgstr ""
4054
4099
4055 #, python-format
4100 #, python-format
4056 msgid "rebase onto %d starting from %d\n"
4101 msgid "rebase onto %d starting from %d\n"
4057 msgstr ""
4102 msgstr ""
4058
4103
4059 msgid "unable to collapse, there is more than one external parent"
4104 msgid "unable to collapse, there is more than one external parent"
4060 msgstr ""
4105 msgstr ""
4061
4106
4062 msgid "Call rebase after pull if the latter has been invoked with --rebase"
4107 msgid "Call rebase after pull if the latter has been invoked with --rebase"
4063 msgstr ""
4108 msgstr ""
4064
4109
4065 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4110 msgid "--update and --rebase are not compatible, ignoring the update flag\n"
4066 msgstr ""
4111 msgstr ""
4067
4112
4068 msgid "Replace pull with a decorator to provide --rebase option"
4113 msgid "Replace pull with a decorator to provide --rebase option"
4069 msgstr ""
4114 msgstr ""
4070
4115
4071 msgid "rebase working directory to branch head"
4116 msgid "rebase working directory to branch head"
4072 msgstr ""
4117 msgstr ""
4073
4118
4074 msgid "keep original revisions"
4119 msgid "keep original revisions"
4075 msgstr ""
4120 msgstr ""
4076
4121
4077 msgid "keep original branches"
4122 msgid "keep original branches"
4078 msgstr ""
4123 msgstr ""
4079
4124
4080 msgid "rebase from a given revision"
4125 msgid "rebase from a given revision"
4081 msgstr ""
4126 msgstr ""
4082
4127
4083 msgid "rebase from the base of a given revision"
4128 msgid "rebase from the base of a given revision"
4084 msgstr ""
4129 msgstr ""
4085
4130
4086 msgid "rebase onto a given revision"
4131 msgid "rebase onto a given revision"
4087 msgstr ""
4132 msgstr ""
4088
4133
4089 msgid "collapse the rebased revisions"
4134 msgid "collapse the rebased revisions"
4090 msgstr ""
4135 msgstr ""
4091
4136
4092 msgid "continue an interrupted rebase"
4137 msgid "continue an interrupted rebase"
4093 msgstr ""
4138 msgstr ""
4094
4139
4095 msgid "abort an interrupted rebase"
4140 msgid "abort an interrupted rebase"
4096 msgstr ""
4141 msgstr ""
4097
4142
4098 msgid ""
4143 msgid ""
4099 "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
4144 "hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]"
4100 msgstr ""
4145 msgstr ""
4101
4146
4102 msgid "interactive change selection during commit or qrefresh"
4147 msgid "interactive change selection during commit or qrefresh"
4103 msgstr ""
4148 msgstr ""
4104
4149
4105 msgid ""
4150 msgid ""
4106 "like patch.iterhunks, but yield different events\n"
4151 "like patch.iterhunks, but yield different events\n"
4107 "\n"
4152 "\n"
4108 " - ('file', [header_lines + fromfile + tofile])\n"
4153 " - ('file', [header_lines + fromfile + tofile])\n"
4109 " - ('context', [context_lines])\n"
4154 " - ('context', [context_lines])\n"
4110 " - ('hunk', [hunk_lines])\n"
4155 " - ('hunk', [hunk_lines])\n"
4111 " - ('range', (-start,len, +start,len, diffp))\n"
4156 " - ('range', (-start,len, +start,len, diffp))\n"
4112 " "
4157 " "
4113 msgstr ""
4158 msgstr ""
4114
4159
4115 msgid "scan lr while predicate holds"
4160 msgid "scan lr while predicate holds"
4116 msgstr ""
4161 msgstr ""
4117
4162
4118 msgid ""
4163 msgid ""
4119 "patch header\n"
4164 "patch header\n"
4120 "\n"
4165 "\n"
4121 " XXX shoudn't we move this to mercurial/patch.py ?\n"
4166 " XXX shoudn't we move this to mercurial/patch.py ?\n"
4122 " "
4167 " "
4123 msgstr ""
4168 msgstr ""
4124
4169
4125 msgid "this modifies a binary file (all or nothing)\n"
4170 msgid "this modifies a binary file (all or nothing)\n"
4126 msgstr ""
4171 msgstr ""
4127
4172
4128 msgid "this is a binary file\n"
4173 msgid "this is a binary file\n"
4129 msgstr ""
4174 msgstr ""
4130
4175
4131 #, python-format
4176 #, python-format
4132 msgid "%d hunks, %d lines changed\n"
4177 msgid "%d hunks, %d lines changed\n"
4133 msgstr ""
4178 msgstr ""
4134
4179
4135 msgid "hunk -> (n+,n-)"
4180 msgid "hunk -> (n+,n-)"
4136 msgstr ""
4181 msgstr ""
4137
4182
4138 msgid ""
4183 msgid ""
4139 "patch hunk\n"
4184 "patch hunk\n"
4140 "\n"
4185 "\n"
4141 " XXX shouldn't we merge this with patch.hunk ?\n"
4186 " XXX shouldn't we merge this with patch.hunk ?\n"
4142 " "
4187 " "
4143 msgstr ""
4188 msgstr ""
4144
4189
4145 msgid "patch -> [] of hunks "
4190 msgid "patch -> [] of hunks "
4146 msgstr ""
4191 msgstr ""
4147
4192
4148 msgid "patch parsing state machine"
4193 msgid "patch parsing state machine"
4149 msgstr ""
4194 msgstr ""
4150
4195
4151 msgid "Interactively filter patch chunks into applied-only chunks"
4196 msgid "Interactively filter patch chunks into applied-only chunks"
4152 msgstr ""
4197 msgstr ""
4153
4198
4154 msgid ""
4199 msgid ""
4155 "fetch next portion from chunks until a 'header' is seen\n"
4200 "fetch next portion from chunks until a 'header' is seen\n"
4156 " NB: header == new-file mark\n"
4201 " NB: header == new-file mark\n"
4157 " "
4202 " "
4158 msgstr ""
4203 msgstr ""
4159
4204
4160 msgid ""
4205 msgid ""
4161 "prompt query, and process base inputs\n"
4206 "prompt query, and process base inputs\n"
4162 "\n"
4207 "\n"
4163 " - y/n for the rest of file\n"
4208 " - y/n for the rest of file\n"
4164 " - y/n for the rest\n"
4209 " - y/n for the rest\n"
4165 " - ? (help)\n"
4210 " - ? (help)\n"
4166 " - q (quit)\n"
4211 " - q (quit)\n"
4167 "\n"
4212 "\n"
4168 " else, input is returned to the caller.\n"
4213 " else, input is returned to the caller.\n"
4169 " "
4214 " "
4170 msgstr ""
4215 msgstr ""
4171
4216
4172 msgid "[Ynsfdaq?]"
4217 msgid "[Ynsfdaq?]"
4173 msgstr ""
4218 msgstr ""
4174
4219
4175 msgid "y"
4220 msgid "y"
4176 msgstr ""
4221 msgstr ""
4177
4222
4178 msgid "?"
4223 msgid "?"
4179 msgstr ""
4224 msgstr ""
4180
4225
4181 msgid "y - record this change"
4226 msgid "y - record this change"
4182 msgstr ""
4227 msgstr ""
4183
4228
4184 msgid "s"
4229 msgid "s"
4185 msgstr ""
4230 msgstr ""
4186
4231
4187 msgid "f"
4232 msgid "f"
4188 msgstr ""
4233 msgstr ""
4189
4234
4190 msgid "d"
4235 msgid "d"
4191 msgstr ""
4236 msgstr ""
4192
4237
4193 msgid "a"
4238 msgid "a"
4194 msgstr ""
4239 msgstr ""
4195
4240
4196 msgid "q"
4241 msgid "q"
4197 msgstr ""
4242 msgstr ""
4198
4243
4199 msgid "user quit"
4244 msgid "user quit"
4200 msgstr ""
4245 msgstr ""
4201
4246
4202 #, python-format
4247 #, python-format
4203 msgid "examine changes to %s?"
4248 msgid "examine changes to %s?"
4204 msgstr ""
4249 msgstr ""
4205
4250
4206 msgid " and "
4251 msgid " and "
4207 msgstr ""
4252 msgstr ""
4208
4253
4209 #, python-format
4254 #, python-format
4210 msgid "record this change to %r?"
4255 msgid "record this change to %r?"
4211 msgstr ""
4256 msgstr ""
4212
4257
4213 msgid ""
4258 msgid ""
4214 "interactively select changes to commit\n"
4259 "interactively select changes to commit\n"
4215 "\n"
4260 "\n"
4216 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4261 " If a list of files is omitted, all changes reported by \"hg status\"\n"
4217 " will be candidates for recording.\n"
4262 " will be candidates for recording.\n"
4218 "\n"
4263 "\n"
4219 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4264 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4220 "\n"
4265 "\n"
4221 " You will be prompted for whether to record changes to each\n"
4266 " You will be prompted for whether to record changes to each\n"
4222 " modified file, and for files with multiple changes, for each\n"
4267 " modified file, and for files with multiple changes, for each\n"
4223 " change to use. For each query, the following responses are\n"
4268 " change to use. For each query, the following responses are\n"
4224 " possible:\n"
4269 " possible:\n"
4225 "\n"
4270 "\n"
4226 " y - record this change\n"
4271 " y - record this change\n"
4227 " n - skip this change\n"
4272 " n - skip this change\n"
4228 "\n"
4273 "\n"
4229 " s - skip remaining changes to this file\n"
4274 " s - skip remaining changes to this file\n"
4230 " f - record remaining changes to this file\n"
4275 " f - record remaining changes to this file\n"
4231 "\n"
4276 "\n"
4232 " d - done, skip remaining changes and files\n"
4277 " d - done, skip remaining changes and files\n"
4233 " a - record all changes to all remaining files\n"
4278 " a - record all changes to all remaining files\n"
4234 " q - quit, recording no changes\n"
4279 " q - quit, recording no changes\n"
4235 "\n"
4280 "\n"
4236 " ? - display help"
4281 " ? - display help"
4237 msgstr ""
4282 msgstr ""
4238
4283
4239 msgid ""
4284 msgid ""
4240 "interactively record a new patch\n"
4285 "interactively record a new patch\n"
4241 "\n"
4286 "\n"
4242 " see 'hg help qnew' & 'hg help record' for more information and usage\n"
4287 " see 'hg help qnew' & 'hg help record' for more information and usage\n"
4243 " "
4288 " "
4244 msgstr ""
4289 msgstr ""
4245
4290
4246 msgid "'mq' extension not loaded"
4291 msgid "'mq' extension not loaded"
4247 msgstr ""
4292 msgstr ""
4248
4293
4249 msgid "running non-interactively, use commit instead"
4294 msgid "running non-interactively, use commit instead"
4250 msgstr ""
4295 msgstr ""
4251
4296
4252 msgid ""
4297 msgid ""
4253 "This is generic record driver.\n"
4298 "This is generic record driver.\n"
4254 "\n"
4299 "\n"
4255 " It's job is to interactively filter local changes, and accordingly\n"
4300 " It's job is to interactively filter local changes, and accordingly\n"
4256 " prepare working dir into a state, where the job can be delegated to\n"
4301 " prepare working dir into a state, where the job can be delegated to\n"
4257 " non-interactive commit command such as 'commit' or 'qrefresh'.\n"
4302 " non-interactive commit command such as 'commit' or 'qrefresh'.\n"
4258 "\n"
4303 "\n"
4259 " After the actual job is done by non-interactive command, working "
4304 " After the actual job is done by non-interactive command, working "
4260 "dir\n"
4305 "dir\n"
4261 " state is restored to original.\n"
4306 " state is restored to original.\n"
4262 "\n"
4307 "\n"
4263 " In the end we'll record intresting changes, and everything else will "
4308 " In the end we'll record intresting changes, and everything else will "
4264 "be\n"
4309 "be\n"
4265 " left in place, so the user can continue his work.\n"
4310 " left in place, so the user can continue his work.\n"
4266 " "
4311 " "
4267 msgstr ""
4312 msgstr ""
4268
4313
4269 msgid "no changes to record\n"
4314 msgid "no changes to record\n"
4270 msgstr ""
4315 msgstr ""
4271
4316
4272 #, python-format
4317 #, python-format
4273 msgid "backup %r as %r\n"
4318 msgid "backup %r as %r\n"
4274 msgstr ""
4319 msgstr ""
4275
4320
4276 msgid "applying patch\n"
4321 msgid "applying patch\n"
4277 msgstr ""
4322 msgstr ""
4278
4323
4279 msgid "patch failed to apply"
4324 msgid "patch failed to apply"
4280 msgstr ""
4325 msgstr ""
4281
4326
4282 #, python-format
4327 #, python-format
4283 msgid "restoring %r to %r\n"
4328 msgid "restoring %r to %r\n"
4284 msgstr ""
4329 msgstr ""
4285
4330
4286 msgid "hg record [OPTION]... [FILE]..."
4331 msgid "hg record [OPTION]... [FILE]..."
4287 msgstr ""
4332 msgstr ""
4288
4333
4289 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4334 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
4290 msgstr ""
4335 msgstr ""
4291
4336
4292 msgid ""
4337 msgid ""
4293 "patch transplanting tool\n"
4338 "patch transplanting tool\n"
4294 "\n"
4339 "\n"
4295 "This extension allows you to transplant patches from another branch.\n"
4340 "This extension allows you to transplant patches from another branch.\n"
4296 "\n"
4341 "\n"
4297 "Transplanted patches are recorded in .hg/transplant/transplants, as a map\n"
4342 "Transplanted patches are recorded in .hg/transplant/transplants, as a map\n"
4298 "from a changeset hash to its hash in the source repository.\n"
4343 "from a changeset hash to its hash in the source repository.\n"
4299 msgstr ""
4344 msgstr ""
4300
4345
4301 msgid ""
4346 msgid ""
4302 "returns True if a node is already an ancestor of parent\n"
4347 "returns True if a node is already an ancestor of parent\n"
4303 " or has already been transplanted"
4348 " or has already been transplanted"
4304 msgstr ""
4349 msgstr ""
4305
4350
4306 msgid "apply the revisions in revmap one by one in revision order"
4351 msgid "apply the revisions in revmap one by one in revision order"
4307 msgstr ""
4352 msgstr ""
4308
4353
4309 #, python-format
4354 #, python-format
4310 msgid "skipping already applied revision %s\n"
4355 msgid "skipping already applied revision %s\n"
4311 msgstr ""
4356 msgstr ""
4312
4357
4313 #, python-format
4358 #, python-format
4314 msgid "skipping merge changeset %s:%s\n"
4359 msgid "skipping merge changeset %s:%s\n"
4315 msgstr ""
4360 msgstr ""
4316
4361
4317 #, python-format
4362 #, python-format
4318 msgid "%s merged at %s\n"
4363 msgid "%s merged at %s\n"
4319 msgstr ""
4364 msgstr ""
4320
4365
4321 #, python-format
4366 #, python-format
4322 msgid "%s transplanted to %s\n"
4367 msgid "%s transplanted to %s\n"
4323 msgstr ""
4368 msgstr ""
4324
4369
4325 msgid "arbitrarily rewrite changeset before applying it"
4370 msgid "arbitrarily rewrite changeset before applying it"
4326 msgstr ""
4371 msgstr ""
4327
4372
4328 #, python-format
4373 #, python-format
4329 msgid "filtering %s\n"
4374 msgid "filtering %s\n"
4330 msgstr ""
4375 msgstr ""
4331
4376
4332 msgid "filter failed"
4377 msgid "filter failed"
4333 msgstr ""
4378 msgstr ""
4334
4379
4335 msgid "apply the patch in patchfile to the repository as a transplant"
4380 msgid "apply the patch in patchfile to the repository as a transplant"
4336 msgstr ""
4381 msgstr ""
4337
4382
4338 msgid "can only omit patchfile if merging"
4383 msgid "can only omit patchfile if merging"
4339 msgstr ""
4384 msgstr ""
4340
4385
4341 #, python-format
4386 #, python-format
4342 msgid "%s: empty changeset"
4387 msgid "%s: empty changeset"
4343 msgstr ""
4388 msgstr ""
4344
4389
4345 msgid "Fix up the merge and run hg transplant --continue"
4390 msgid "Fix up the merge and run hg transplant --continue"
4346 msgstr ""
4391 msgstr ""
4347
4392
4348 msgid "recover last transaction and apply remaining changesets"
4393 msgid "recover last transaction and apply remaining changesets"
4349 msgstr ""
4394 msgstr ""
4350
4395
4351 #, python-format
4396 #, python-format
4352 msgid "%s transplanted as %s\n"
4397 msgid "%s transplanted as %s\n"
4353 msgstr ""
4398 msgstr ""
4354
4399
4355 msgid "commit working directory using journal metadata"
4400 msgid "commit working directory using journal metadata"
4356 msgstr ""
4401 msgstr ""
4357
4402
4358 msgid "transplant log file is corrupt"
4403 msgid "transplant log file is corrupt"
4359 msgstr ""
4404 msgstr ""
4360
4405
4361 #, python-format
4406 #, python-format
4362 msgid "working dir not at transplant parent %s"
4407 msgid "working dir not at transplant parent %s"
4363 msgstr ""
4408 msgstr ""
4364
4409
4365 msgid "commit failed"
4410 msgid "commit failed"
4366 msgstr ""
4411 msgstr ""
4367
4412
4368 msgid "journal changelog metadata for later recover"
4413 msgid "journal changelog metadata for later recover"
4369 msgstr ""
4414 msgstr ""
4370
4415
4371 msgid "remove changelog journal"
4416 msgid "remove changelog journal"
4372 msgstr ""
4417 msgstr ""
4373
4418
4374 msgid "interactively transplant changesets"
4419 msgid "interactively transplant changesets"
4375 msgstr ""
4420 msgstr ""
4376
4421
4377 msgid "apply changeset? [ynmpcq?]:"
4422 msgid "apply changeset? [ynmpcq?]:"
4378 msgstr ""
4423 msgstr ""
4379
4424
4380 msgid ""
4425 msgid ""
4381 "transplant changesets from another branch\n"
4426 "transplant changesets from another branch\n"
4382 "\n"
4427 "\n"
4383 " Selected changesets will be applied on top of the current working\n"
4428 " Selected changesets will be applied on top of the current working\n"
4384 " directory with the log of the original changeset. If --log is\n"
4429 " directory with the log of the original changeset. If --log is\n"
4385 " specified, log messages will have a comment appended of the form:\n"
4430 " specified, log messages will have a comment appended of the form:\n"
4386 "\n"
4431 "\n"
4387 " (transplanted from CHANGESETHASH)\n"
4432 " (transplanted from CHANGESETHASH)\n"
4388 "\n"
4433 "\n"
4389 " You can rewrite the changelog message with the --filter option.\n"
4434 " You can rewrite the changelog message with the --filter option.\n"
4390 " Its argument will be invoked with the current changelog message\n"
4435 " Its argument will be invoked with the current changelog message\n"
4391 " as $1 and the patch as $2.\n"
4436 " as $1 and the patch as $2.\n"
4392 "\n"
4437 "\n"
4393 " If --source is specified, selects changesets from the named\n"
4438 " If --source is specified, selects changesets from the named\n"
4394 " repository. If --branch is specified, selects changesets from the\n"
4439 " repository. If --branch is specified, selects changesets from the\n"
4395 " branch holding the named revision, up to that revision. If --all\n"
4440 " branch holding the named revision, up to that revision. If --all\n"
4396 " is specified, all changesets on the branch will be transplanted,\n"
4441 " is specified, all changesets on the branch will be transplanted,\n"
4397 " otherwise you will be prompted to select the changesets you want.\n"
4442 " otherwise you will be prompted to select the changesets you want.\n"
4398 "\n"
4443 "\n"
4399 " hg transplant --branch REVISION --all will rebase the selected branch\n"
4444 " hg transplant --branch REVISION --all will rebase the selected branch\n"
4400 " (up to the named revision) onto your current working directory.\n"
4445 " (up to the named revision) onto your current working directory.\n"
4401 "\n"
4446 "\n"
4402 " You can optionally mark selected transplanted changesets as\n"
4447 " You can optionally mark selected transplanted changesets as\n"
4403 " merge changesets. You will not be prompted to transplant any\n"
4448 " merge changesets. You will not be prompted to transplant any\n"
4404 " ancestors of a merged transplant, and you can merge descendants\n"
4449 " ancestors of a merged transplant, and you can merge descendants\n"
4405 " of them normally instead of transplanting them.\n"
4450 " of them normally instead of transplanting them.\n"
4406 "\n"
4451 "\n"
4407 " If no merges or revisions are provided, hg transplant will start\n"
4452 " If no merges or revisions are provided, hg transplant will start\n"
4408 " an interactive changeset browser.\n"
4453 " an interactive changeset browser.\n"
4409 "\n"
4454 "\n"
4410 " If a changeset application fails, you can fix the merge by hand and\n"
4455 " If a changeset application fails, you can fix the merge by hand and\n"
4411 " then resume where you left off by calling hg transplant --continue.\n"
4456 " then resume where you left off by calling hg transplant --continue.\n"
4412 " "
4457 " "
4413 msgstr ""
4458 msgstr ""
4414
4459
4415 msgid "--continue is incompatible with branch, all or merge"
4460 msgid "--continue is incompatible with branch, all or merge"
4416 msgstr ""
4461 msgstr ""
4417
4462
4418 msgid "no source URL, branch tag or revision list provided"
4463 msgid "no source URL, branch tag or revision list provided"
4419 msgstr ""
4464 msgstr ""
4420
4465
4421 msgid "--all requires a branch revision"
4466 msgid "--all requires a branch revision"
4422 msgstr ""
4467 msgstr ""
4423
4468
4424 msgid "--all is incompatible with a revision list"
4469 msgid "--all is incompatible with a revision list"
4425 msgstr ""
4470 msgstr ""
4426
4471
4427 msgid "no revision checked out"
4472 msgid "no revision checked out"
4428 msgstr ""
4473 msgstr ""
4429
4474
4430 msgid "outstanding uncommitted merges"
4475 msgid "outstanding uncommitted merges"
4431 msgstr ""
4476 msgstr ""
4432
4477
4433 msgid "outstanding local changes"
4478 msgid "outstanding local changes"
4434 msgstr ""
4479 msgstr ""
4435
4480
4436 msgid "pull patches from REPOSITORY"
4481 msgid "pull patches from REPOSITORY"
4437 msgstr ""
4482 msgstr ""
4438
4483
4439 msgid "pull patches from branch BRANCH"
4484 msgid "pull patches from branch BRANCH"
4440 msgstr ""
4485 msgstr ""
4441
4486
4442 msgid "pull all changesets up to BRANCH"
4487 msgid "pull all changesets up to BRANCH"
4443 msgstr ""
4488 msgstr ""
4444
4489
4445 msgid "skip over REV"
4490 msgid "skip over REV"
4446 msgstr ""
4491 msgstr ""
4447
4492
4448 msgid "merge at REV"
4493 msgid "merge at REV"
4449 msgstr ""
4494 msgstr ""
4450
4495
4451 msgid "append transplant info to log message"
4496 msgid "append transplant info to log message"
4452 msgstr ""
4497 msgstr ""
4453
4498
4454 msgid "continue last transplant session after repair"
4499 msgid "continue last transplant session after repair"
4455 msgstr ""
4500 msgstr ""
4456
4501
4457 msgid "filter changesets through FILTER"
4502 msgid "filter changesets through FILTER"
4458 msgstr ""
4503 msgstr ""
4459
4504
4460 msgid ""
4505 msgid ""
4461 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4506 "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
4462 msgstr ""
4507 msgstr ""
4463
4508
4464 msgid ""
4509 msgid ""
4465 "allow to use MBCS path with problematic encoding.\n"
4510 "allow to use MBCS path with problematic encoding.\n"
4466 "\n"
4511 "\n"
4467 "Some MBCS encodings are not good for some path operations\n"
4512 "Some MBCS encodings are not good for some path operations\n"
4468 "(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n"
4513 "(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n"
4469 "We call such a encoding (i.e. shift_jis and big5) as \"problematic\n"
4514 "We call such a encoding (i.e. shift_jis and big5) as \"problematic\n"
4470 "encoding\". This extension can be used to fix the issue with those\n"
4515 "encoding\". This extension can be used to fix the issue with those\n"
4471 "encodings by wrapping some functions to convert to unicode string\n"
4516 "encodings by wrapping some functions to convert to unicode string\n"
4472 "before path operation.\n"
4517 "before path operation.\n"
4473 "\n"
4518 "\n"
4474 "This extension is usefull for:\n"
4519 "This extension is usefull for:\n"
4475 " * Japanese Windows users using shift_jis encoding.\n"
4520 " * Japanese Windows users using shift_jis encoding.\n"
4476 " * Chinese Windows users using big5 encoding.\n"
4521 " * Chinese Windows users using big5 encoding.\n"
4477 " * All users who use a repository with one of problematic encodings\n"
4522 " * All users who use a repository with one of problematic encodings\n"
4478 " on case-insensitive file system.\n"
4523 " on case-insensitive file system.\n"
4479 "\n"
4524 "\n"
4480 "This extension is not needed for:\n"
4525 "This extension is not needed for:\n"
4481 " * Any user who use only ascii chars in path.\n"
4526 " * Any user who use only ascii chars in path.\n"
4482 " * Any user who do not use any of problematic encodings.\n"
4527 " * Any user who do not use any of problematic encodings.\n"
4483 "\n"
4528 "\n"
4484 "Note that there are some limitations on using this extension:\n"
4529 "Note that there are some limitations on using this extension:\n"
4485 " * You should use single encoding in one repository.\n"
4530 " * You should use single encoding in one repository.\n"
4486 " * You should set same encoding for the repository by locale or HGENCODING.\n"
4531 " * You should set same encoding for the repository by locale or HGENCODING.\n"
4487 "\n"
4532 "\n"
4488 "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n"
4533 "To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n"
4489 "\n"
4534 "\n"
4490 " [extensions]\n"
4535 " [extensions]\n"
4491 " hgext.win32mbcs =\n"
4536 " hgext.win32mbcs =\n"
4492 "\n"
4537 "\n"
4493 "Path encoding conversion are done between unicode and util._encoding\n"
4538 "Path encoding conversion are done between unicode and util._encoding\n"
4494 "which is decided by mercurial from current locale setting or HGENCODING.\n"
4539 "which is decided by mercurial from current locale setting or HGENCODING.\n"
4495 "\n"
4540 "\n"
4496 msgstr ""
4541 msgstr ""
4497
4542
4498 #, python-format
4543 #, python-format
4499 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4544 msgid "[win32mbcs] filename conversion fail with %s encoding\n"
4500 msgstr ""
4545 msgstr ""
4501
4546
4502 msgid "[win32mbcs] cannot activate on this platform.\n"
4547 msgid "[win32mbcs] cannot activate on this platform.\n"
4503 msgstr ""
4548 msgstr ""
4504
4549
4505 #, python-format
4550 #, python-format
4506 msgid "[win32mbcs] activated with encoding: %s\n"
4551 msgid "[win32mbcs] activated with encoding: %s\n"
4507 msgstr ""
4552 msgstr ""
4508
4553
4509 #, python-format
4554 #, python-format
4510 msgid ""
4555 msgid ""
4511 "WARNING: %s already has %s line endings\n"
4556 "WARNING: %s already has %s line endings\n"
4512 "and does not need EOL conversion by the win32text plugin.\n"
4557 "and does not need EOL conversion by the win32text plugin.\n"
4513 "Before your next commit, please reconsider your encode/decode settings in \n"
4558 "Before your next commit, please reconsider your encode/decode settings in \n"
4514 "Mercurial.ini or %s.\n"
4559 "Mercurial.ini or %s.\n"
4515 msgstr ""
4560 msgstr ""
4516
4561
4517 #, python-format
4562 #, python-format
4518 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4563 msgid "Attempt to commit or push text file(s) using %s line endings\n"
4519 msgstr ""
4564 msgstr ""
4520
4565
4521 #, python-format
4566 #, python-format
4522 msgid "in %s: %s\n"
4567 msgid "in %s: %s\n"
4523 msgstr ""
4568 msgstr ""
4524
4569
4525 #, python-format
4570 #, python-format
4526 msgid ""
4571 msgid ""
4527 "\n"
4572 "\n"
4528 "To prevent this mistake in your local repository,\n"
4573 "To prevent this mistake in your local repository,\n"
4529 "add to Mercurial.ini or .hg/hgrc:\n"
4574 "add to Mercurial.ini or .hg/hgrc:\n"
4530 "\n"
4575 "\n"
4531 "[hooks]\n"
4576 "[hooks]\n"
4532 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4577 "pretxncommit.%s = python:hgext.win32text.forbid%s\n"
4533 "\n"
4578 "\n"
4534 "and also consider adding:\n"
4579 "and also consider adding:\n"
4535 "\n"
4580 "\n"
4536 "[extensions]\n"
4581 "[extensions]\n"
4537 "hgext.win32text =\n"
4582 "hgext.win32text =\n"
4538 "[encode]\n"
4583 "[encode]\n"
4539 "** = %sencode:\n"
4584 "** = %sencode:\n"
4540 "[decode]\n"
4585 "[decode]\n"
4541 "** = %sdecode:\n"
4586 "** = %sdecode:\n"
4542 msgstr ""
4587 msgstr ""
4543
4588
4544 msgid ""
4589 msgid ""
4545 "zeroconf support for mercurial repositories\n"
4590 "zeroconf support for mercurial repositories\n"
4546 "\n"
4591 "\n"
4547 "Zeroconf enabled repositories will be announced in a network without the "
4592 "Zeroconf enabled repositories will be announced in a network without the "
4548 "need\n"
4593 "need\n"
4549 "to configure a server or a service. They can be discovered without knowing\n"
4594 "to configure a server or a service. They can be discovered without knowing\n"
4550 "their actual IP address.\n"
4595 "their actual IP address.\n"
4551 "\n"
4596 "\n"
4552 "To use the zeroconf extension add the following entry to your hgrc file:\n"
4597 "To use the zeroconf extension add the following entry to your hgrc file:\n"
4553 "\n"
4598 "\n"
4554 "[extensions]\n"
4599 "[extensions]\n"
4555 "hgext.zeroconf =\n"
4600 "hgext.zeroconf =\n"
4556 "\n"
4601 "\n"
4557 "To allow other people to discover your repository using run \"hg serve\" in "
4602 "To allow other people to discover your repository using run \"hg serve\" in "
4558 "your\n"
4603 "your\n"
4559 "repository.\n"
4604 "repository.\n"
4560 "\n"
4605 "\n"
4561 " $ cd test\n"
4606 " $ cd test\n"
4562 " $ hg serve\n"
4607 " $ hg serve\n"
4563 "\n"
4608 "\n"
4564 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4609 "You can discover zeroconf enabled repositories by running \"hg paths\".\n"
4565 "\n"
4610 "\n"
4566 " $ hg paths\n"
4611 " $ hg paths\n"
4567 " zc-test = http://example.com:8000/test\n"
4612 " zc-test = http://example.com:8000/test\n"
4568 msgstr ""
4613 msgstr ""
4569
4614
4570 msgid "archive prefix contains illegal components"
4615 msgid "archive prefix contains illegal components"
4571 msgstr ""
4616 msgstr ""
4572
4617
4573 msgid "cannot give prefix when archiving to files"
4618 msgid "cannot give prefix when archiving to files"
4574 msgstr ""
4619 msgstr ""
4575
4620
4576 #, python-format
4621 #, python-format
4577 msgid "unknown archive type '%s'"
4622 msgid "unknown archive type '%s'"
4578 msgstr ""
4623 msgstr ""
4579
4624
4580 msgid "invalid changegroup"
4625 msgid "invalid changegroup"
4581 msgstr ""
4626 msgstr ""
4582
4627
4583 msgid "unknown parent"
4628 msgid "unknown parent"
4584 msgstr ""
4629 msgstr ""
4585
4630
4586 #, python-format
4631 #, python-format
4587 msgid "integrity check failed on %s:%d"
4632 msgid "integrity check failed on %s:%d"
4588 msgstr ""
4633 msgstr ""
4589
4634
4590 #, python-format
4635 #, python-format
4591 msgid "%s: not a Mercurial bundle file"
4636 msgid "%s: not a Mercurial bundle file"
4592 msgstr ""
4637 msgstr ""
4593
4638
4594 #, python-format
4639 #, python-format
4595 msgid "%s: unknown bundle version"
4640 msgid "%s: unknown bundle version"
4596 msgstr ""
4641 msgstr ""
4597
4642
4598 #, python-format
4643 #, python-format
4599 msgid "%s: unknown bundle compression type"
4644 msgid "%s: unknown bundle compression type"
4600 msgstr ""
4645 msgstr ""
4601
4646
4602 msgid "cannot create new bundle repository"
4647 msgid "cannot create new bundle repository"
4603 msgstr ""
4648 msgstr ""
4604
4649
4605 #, python-format
4650 #, python-format
4606 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4651 msgid "premature EOF reading chunk (got %d bytes, expected %d)"
4607 msgstr ""
4652 msgstr ""
4608
4653
4609 #, python-format
4654 #, python-format
4610 msgid "username %s contains a newline"
4655 msgid "username %s contains a newline"
4611 msgstr ""
4656 msgstr ""
4612
4657
4613 msgid "options --message and --logfile are mutually exclusive"
4658 msgid "options --message and --logfile are mutually exclusive"
4614 msgstr ""
4659 msgstr ""
4615
4660
4616 #, python-format
4661 #, python-format
4617 msgid "can't read commit message '%s': %s"
4662 msgid "can't read commit message '%s': %s"
4618 msgstr ""
4663 msgstr ""
4619
4664
4620 msgid "limit must be a positive integer"
4665 msgid "limit must be a positive integer"
4621 msgstr ""
4666 msgstr ""
4622
4667
4623 msgid "limit must be positive"
4668 msgid "limit must be positive"
4624 msgstr ""
4669 msgstr ""
4625
4670
4626 msgid "too many revisions specified"
4671 msgid "too many revisions specified"
4627 msgstr ""
4672 msgstr ""
4628
4673
4629 #, python-format
4674 #, python-format
4630 msgid "invalid format spec '%%%s' in output file name"
4675 msgid "invalid format spec '%%%s' in output file name"
4631 msgstr ""
4676 msgstr ""
4632
4677
4633 #, python-format
4678 #, python-format
4634 msgid "adding %s\n"
4679 msgid "adding %s\n"
4635 msgstr "%s を追加登録中\n"
4680 msgstr "%s を追加登録中\n"
4636
4681
4637 #, python-format
4682 #, python-format
4638 msgid "removing %s\n"
4683 msgid "removing %s\n"
4639 msgstr "%s を登録解除中\n"
4684 msgstr "%s を登録解除中\n"
4640
4685
4641 #, python-format
4686 #, python-format
4642 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4687 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
4643 msgstr ""
4688 msgstr ""
4644
4689
4645 #, python-format
4690 #, python-format
4646 msgid "%s: not copying - file is not managed\n"
4691 msgid "%s: not copying - file is not managed\n"
4647 msgstr ""
4692 msgstr ""
4648
4693
4649 #, python-format
4694 #, python-format
4650 msgid "%s: not copying - file has been marked for remove\n"
4695 msgid "%s: not copying - file has been marked for remove\n"
4651 msgstr ""
4696 msgstr ""
4652
4697
4653 #, python-format
4698 #, python-format
4654 msgid "%s: not overwriting - %s collides with %s\n"
4699 msgid "%s: not overwriting - %s collides with %s\n"
4655 msgstr ""
4700 msgstr ""
4656
4701
4657 #, python-format
4702 #, python-format
4658 msgid "%s: not overwriting - file exists\n"
4703 msgid "%s: not overwriting - file exists\n"
4659 msgstr ""
4704 msgstr ""
4660
4705
4661 #, python-format
4706 #, python-format
4662 msgid "%s: deleted in working copy\n"
4707 msgid "%s: deleted in working copy\n"
4663 msgstr ""
4708 msgstr ""
4664
4709
4665 #, python-format
4710 #, python-format
4666 msgid "%s: cannot copy - %s\n"
4711 msgid "%s: cannot copy - %s\n"
4667 msgstr ""
4712 msgstr ""
4668
4713
4669 #, python-format
4714 #, python-format
4670 msgid "%s %s to %s\n"
4715 msgid "%s %s to %s\n"
4671 msgstr ""
4716 msgstr ""
4672
4717
4673 #, python-format
4718 #, python-format
4674 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4719 msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
4675 msgstr ""
4720 msgstr ""
4676
4721
4677 msgid "no source or destination specified"
4722 msgid "no source or destination specified"
4678 msgstr ""
4723 msgstr ""
4679
4724
4680 msgid "no destination specified"
4725 msgid "no destination specified"
4681 msgstr ""
4726 msgstr ""
4682
4727
4683 msgid "with multiple sources, destination must be an existing directory"
4728 msgid "with multiple sources, destination must be an existing directory"
4684 msgstr ""
4729 msgstr ""
4685
4730
4686 #, python-format
4731 #, python-format
4687 msgid "destination %s is not a directory"
4732 msgid "destination %s is not a directory"
4688 msgstr ""
4733 msgstr ""
4689
4734
4690 msgid "no files to copy"
4735 msgid "no files to copy"
4691 msgstr ""
4736 msgstr ""
4692
4737
4693 msgid "(consider using --after)\n"
4738 msgid "(consider using --after)\n"
4694 msgstr ""
4739 msgstr ""
4695
4740
4696 #, python-format
4741 #, python-format
4697 msgid "changeset: %d:%s\n"
4742 msgid "changeset: %d:%s\n"
4698 msgstr ""
4743 msgstr ""
4699
4744
4700 #, python-format
4745 #, python-format
4701 msgid "branch: %s\n"
4746 msgid "branch: %s\n"
4702 msgstr ""
4747 msgstr ""
4703
4748
4704 #, python-format
4749 #, python-format
4705 msgid "tag: %s\n"
4750 msgid "tag: %s\n"
4706 msgstr ""
4751 msgstr ""
4707
4752
4708 #, python-format
4753 #, python-format
4709 msgid "parent: %d:%s\n"
4754 msgid "parent: %d:%s\n"
4710 msgstr ""
4755 msgstr ""
4711
4756
4712 #, python-format
4757 #, python-format
4713 msgid "manifest: %d:%s\n"
4758 msgid "manifest: %d:%s\n"
4714 msgstr ""
4759 msgstr ""
4715
4760
4716 #, python-format
4761 #, python-format
4717 msgid "user: %s\n"
4762 msgid "user: %s\n"
4718 msgstr ""
4763 msgstr ""
4719
4764
4720 #, python-format
4765 #, python-format
4721 msgid "date: %s\n"
4766 msgid "date: %s\n"
4722 msgstr ""
4767 msgstr ""
4723
4768
4724 msgid "files+:"
4769 msgid "files+:"
4725 msgstr ""
4770 msgstr ""
4726
4771
4727 msgid "files-:"
4772 msgid "files-:"
4728 msgstr ""
4773 msgstr ""
4729
4774
4730 msgid "files:"
4775 msgid "files:"
4731 msgstr ""
4776 msgstr ""
4732
4777
4733 #, python-format
4778 #, python-format
4734 msgid "files: %s\n"
4779 msgid "files: %s\n"
4735 msgstr ""
4780 msgstr ""
4736
4781
4737 #, python-format
4782 #, python-format
4738 msgid "copies: %s\n"
4783 msgid "copies: %s\n"
4739 msgstr ""
4784 msgstr ""
4740
4785
4741 #, python-format
4786 #, python-format
4742 msgid "extra: %s=%s\n"
4787 msgid "extra: %s=%s\n"
4743 msgstr ""
4788 msgstr ""
4744
4789
4745 msgid "description:\n"
4790 msgid "description:\n"
4746 msgstr ""
4791 msgstr ""
4747
4792
4748 #, python-format
4793 #, python-format
4749 msgid "summary: %s\n"
4794 msgid "summary: %s\n"
4750 msgstr ""
4795 msgstr ""
4751
4796
4752 #, python-format
4797 #, python-format
4753 msgid "%s: no key named '%s'"
4798 msgid "%s: no key named '%s'"
4754 msgstr ""
4799 msgstr ""
4755
4800
4756 #, python-format
4801 #, python-format
4757 msgid "%s: %s"
4802 msgid "%s: %s"
4758 msgstr ""
4803 msgstr ""
4759
4804
4760 #, python-format
4805 #, python-format
4761 msgid "Found revision %s from %s\n"
4806 msgid "Found revision %s from %s\n"
4762 msgstr ""
4807 msgstr ""
4763
4808
4764 msgid "revision matching date not found"
4809 msgid "revision matching date not found"
4765 msgstr ""
4810 msgstr ""
4766
4811
4767 #, python-format
4812 #, python-format
4768 msgid "cannot follow nonexistent file: \"%s\""
4813 msgid "cannot follow nonexistent file: \"%s\""
4769 msgstr ""
4814 msgstr ""
4770
4815
4771 #, python-format
4816 #, python-format
4772 msgid "%s:%s copy source revision cannot be found!\n"
4817 msgid "%s:%s copy source revision cannot be found!\n"
4773 msgstr ""
4818 msgstr ""
4774
4819
4775 msgid "can only follow copies/renames for explicit file names"
4820 msgid "can only follow copies/renames for explicit file names"
4776 msgstr ""
4821 msgstr ""
4777
4822
4778 #, python-format
4823 #, python-format
4779 msgid "file %s not found!"
4824 msgid "file %s not found!"
4780 msgstr ""
4825 msgstr ""
4781
4826
4782 #, python-format
4827 #, python-format
4783 msgid "no match under directory %s!"
4828 msgid "no match under directory %s!"
4784 msgstr ""
4829 msgstr ""
4785
4830
4786 #, python-format
4831 #, python-format
4787 msgid "can't commit %s: unsupported file type!"
4832 msgid "can't commit %s: unsupported file type!"
4788 msgstr ""
4833 msgstr ""
4789
4834
4790 #, python-format
4835 #, python-format
4791 msgid "file %s not tracked!"
4836 msgid "file %s not tracked!"
4792 msgstr ""
4837 msgstr ""
4793
4838
4794 msgid ""
4839 msgid ""
4795 "add the specified files on the next commit\n"
4840 "add the specified files on the next commit\n"
4796 "\n"
4841 "\n"
4797 " Schedule files to be version controlled and added to the repository.\n"
4842 " Schedule files to be version controlled and added to the repository.\n"
4798 "\n"
4843 "\n"
4799 " The files will be added to the repository at the next commit. To\n"
4844 " The files will be added to the repository at the next commit. To\n"
4800 " undo an add before that, see hg revert.\n"
4845 " undo an add before that, see hg revert.\n"
4801 "\n"
4846 "\n"
4802 " If no names are given, add all files in the repository.\n"
4847 " If no names are given, add all files to the repository.\n"
4803 " "
4848 " "
4804 msgstr ""
4849 msgstr ""
4805 "指定されたファイルを次回コミットから構成管理に追加登録\n"
4850 "指定されたファイルを次回コミットから構成管理に追加登録\n"
4806 "\n"
4851 "\n"
4807 " 構成管理へのファイルの追加登録を予約します。\n"
4852 " 構成管理へのファイルの追加登録を予約します。\n"
4808 "\n"
4853 "\n"
4809 " 指定されたファイルは次回のコミットの際にリポジトリに追加されます。\n"
4854 " 指定されたファイルは次回のコミットの際にリポジトリに追加されます。\n"
4810 " コミット前に追加登録を取り消す方法は、hg revert を参照してください。\n"
4855 " コミット前に追加登録を取り消す方法は、hg revert を参照してください。\n"
4811 "\n"
4856 "\n"
4812 " ファイル名指定が無い場合、作業領域中の全てのファイルを追加登録します。\n"
4857 " ファイル名指定が無い場合、作業領域中の全てのファイルを追加登録します。\n"
4813 " "
4858 " "
4814
4859
4815 msgid ""
4860 msgid ""
4816 "add all new files, delete all missing files\n"
4861 "add all new files, delete all missing files\n"
4817 "\n"
4862 "\n"
4818 " Add all new files and remove all missing files from the repository.\n"
4863 " Add all new files and remove all missing files from the repository.\n"
4819 "\n"
4864 "\n"
4820 " New files are ignored if they match any of the patterns in .hgignore. "
4865 " New files are ignored if they match any of the patterns in .hgignore. "
4821 "As\n"
4866 "As\n"
4822 " with add, these changes take effect at the next commit.\n"
4867 " with add, these changes take effect at the next commit.\n"
4823 "\n"
4868 "\n"
4824 " Use the -s option to detect renamed files. With a parameter > 0,\n"
4869 " Use the -s option to detect renamed files. With a parameter > 0,\n"
4825 " this compares every removed file with every added file and records\n"
4870 " this compares every removed file with every added file and records\n"
4826 " those similar enough as renames. This option takes a percentage\n"
4871 " those similar enough as renames. This option takes a percentage\n"
4827 " between 0 (disabled) and 100 (files must be identical) as its\n"
4872 " between 0 (disabled) and 100 (files must be identical) as its\n"
4828 " parameter. Detecting renamed files this way can be expensive.\n"
4873 " parameter. Detecting renamed files this way can be expensive.\n"
4829 " "
4874 " "
4830 msgstr ""
4875 msgstr ""
4831 "新規ファイルの追加登録、および不在ファイルの登録除外\n"
4876 "新規ファイルの追加登録、および不在ファイルの登録除外\n"
4832 "\n"
4877 "\n"
4833 " 作業領域中の新規ファイルの追加登録、および不在ファイルの登録除外を\n"
4878 " 作業領域中の新規ファイルの追加登録、および不在ファイルの登録除外を\n"
4834 " 行ないます。\n"
4879 " 行ないます。\n"
4835 "\n"
4880 "\n"
4836 " .hgignore に記述されたパターンに合致する新規ファイルは無視されます。\n"
4881 " .hgignore に記述されたパターンに合致する新規ファイルは無視されます。\n"
4837 " hg add コマンドと同様に、このコマンドの実行が効果を発揮するのは、\n"
4882 " hg add コマンドと同様に、このコマンドの実行が効果を発揮するのは、\n"
4838 " 次回のコミット実施後です。\n"
4883 " 次回のコミット実施後です。\n"
4839 "\n"
4884 "\n"
4840 " ファイルの改名を検知するには -s オプションを使用します。\n"
4885 " ファイルの改名を検知するには -s オプションを使用します。\n"
4841 " 0 より大きな値が指定された場合、追加・除外ファイルの全てが比較され、\n"
4886 " 0 より大きな値が指定された場合、追加・除外ファイルの全てが比較され、\n"
4842 " 改名とみなせるか否かが判定されます。このオプションには、0(改名比較無効)\n"
4887 " 改名とみなせるか否かが判定されます。このオプションには、0(改名比較無効)\n"
4843 " から 100 (完全一致)までの範囲でパーセンテージを指定します。\n"
4888 " から 100 (完全一致)までの範囲でパーセンテージを指定します。\n"
4844 " 改名判定には実行時間を要する可能性があります。\n"
4889 " 改名判定には実行時間を要する可能性があります。\n"
4845 " "
4890 " "
4846
4891
4847 msgid "similarity must be a number"
4892 msgid "similarity must be a number"
4848 msgstr "類似度は数値でなければなりません"
4893 msgstr "類似度は数値でなければなりません"
4849
4894
4850 msgid "similarity must be between 0 and 100"
4895 msgid "similarity must be between 0 and 100"
4851 msgstr "類似度は0から100の間でなければなりません"
4896 msgstr "類似度は0から100の間でなければなりません"
4852
4897
4853 msgid ""
4898 msgid ""
4854 "show changeset information per file line\n"
4899 "show changeset information per file line\n"
4855 "\n"
4900 "\n"
4856 " List changes in files, showing the revision id responsible for each "
4901 " List changes in files, showing the revision id responsible for each "
4857 "line\n"
4902 "line\n"
4858 "\n"
4903 "\n"
4859 " This command is useful to discover who did a change or when a change "
4904 " This command is useful to discover who did a change or when a change "
4860 "took\n"
4905 "took\n"
4861 " place.\n"
4906 " place.\n"
4862 "\n"
4907 "\n"
4863 " Without the -a option, annotate will avoid processing files it\n"
4908 " Without the -a option, annotate will avoid processing files it\n"
4864 " detects as binary. With -a, annotate will generate an annotation\n"
4909 " detects as binary. With -a, annotate will generate an annotation\n"
4865 " anyway, probably with undesirable results.\n"
4910 " anyway, probably with undesirable results.\n"
4866 " "
4911 " "
4867 msgstr ""
4912 msgstr ""
4868 "ファイル行毎のチェンジセット情報表示\n"
4913 "ファイル行毎のチェンジセット情報表示\n"
4869 "\n"
4914 "\n"
4870 " ファイルの各行毎に、その内容が由来するリビジョンIDを表示します。\n"
4915 " ファイルの各行毎に、その内容が由来するリビジョンIDを表示します。\n"
4871 "\n"
4916 "\n"
4872 " 本コマンドは、変更の実施者ないし実施次期を特定するのに有用です。\n"
4917 " 本コマンドは、変更の実施者ないし実施次期を特定するのに有用です。\n"
4873 "\n"
4918 "\n"
4874 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
4919 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
4875 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
4920 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
4876 " 全てのファイルに処理を実施します。\n"
4921 " 全てのファイルに処理を実施します。\n"
4877 " "
4922 " "
4878
4923
4879 msgid "at least one file name or pattern required"
4924 msgid "at least one file name or pattern required"
4880 msgstr "ファイル名ないしパターンを最低1つ指定してください"
4925 msgstr "ファイル名ないしパターンを最低1つ指定してください"
4881
4926
4882 msgid "at least one of -n/-c is required for -l"
4927 msgid "at least one of -n/-c is required for -l"
4883 msgstr "-l 指定時には -n/-c のうち最低でもいずれか1つの指定が必要です"
4928 msgstr "-l 指定時には -n/-c のうち最低でもいずれか1つの指定が必要です"
4884
4929
4885 #, python-format
4930 #, python-format
4886 msgid "%s: binary file\n"
4931 msgid "%s: binary file\n"
4887 msgstr "%s: バイナリファイルです\n"
4932 msgstr "%s: バイナリファイルです\n"
4888
4933
4889 msgid ""
4934 msgid ""
4890 "create unversioned archive of a repository revision\n"
4935 "create unversioned archive of a repository revision\n"
4891 "\n"
4936 "\n"
4892 " By default, the revision used is the parent of the working\n"
4937 " By default, the revision used is the parent of the working\n"
4893 " directory; use \"-r\" to specify a different revision.\n"
4938 " directory; use \"-r\" to specify a different revision.\n"
4894 "\n"
4939 "\n"
4895 " To specify the type of archive to create, use \"-t\". Valid\n"
4940 " To specify the type of archive to create, use \"-t\". Valid\n"
4896 " types are:\n"
4941 " types are:\n"
4897 "\n"
4942 "\n"
4898 " \"files\" (default): a directory full of files\n"
4943 " \"files\" (default): a directory full of files\n"
4899 " \"tar\": tar archive, uncompressed\n"
4944 " \"tar\": tar archive, uncompressed\n"
4900 " \"tbz2\": tar archive, compressed using bzip2\n"
4945 " \"tbz2\": tar archive, compressed using bzip2\n"
4901 " \"tgz\": tar archive, compressed using gzip\n"
4946 " \"tgz\": tar archive, compressed using gzip\n"
4902 " \"uzip\": zip archive, uncompressed\n"
4947 " \"uzip\": zip archive, uncompressed\n"
4903 " \"zip\": zip archive, compressed using deflate\n"
4948 " \"zip\": zip archive, compressed using deflate\n"
4904 "\n"
4949 "\n"
4905 " The exact name of the destination archive or directory is given\n"
4950 " The exact name of the destination archive or directory is given\n"
4906 " using a format string; see \"hg help export\" for details.\n"
4951 " using a format string; see \"hg help export\" for details.\n"
4907 "\n"
4952 "\n"
4908 " Each member added to an archive file has a directory prefix\n"
4953 " Each member added to an archive file has a directory prefix\n"
4909 " prepended. Use \"-p\" to specify a format string for the prefix.\n"
4954 " prepended. Use \"-p\" to specify a format string for the prefix.\n"
4910 " The default is the basename of the archive, with suffixes removed.\n"
4955 " The default is the basename of the archive, with suffixes removed.\n"
4911 " "
4956 " "
4912 msgstr ""
4957 msgstr ""
4913 "リポジトリ外へのアーカイブの生成\n"
4958 "リポジトリ外へのアーカイブの生成\n"
4914 "\n"
4959 "\n"
4915 " 指定が無い場合、作業領域の親リビジョンが使用されます。\n"
4960 " 指定が無い場合、作業領域の親リビジョンが使用されます。\n"
4916 " 他のリビジョンを指定する場合は \"-r\" を使用します。\n"
4961 " 他のリビジョンを指定する場合は \"-r\" を使用します。\n"
4917 "\n"
4962 "\n"
4918 " 生成するアーカイブの種別を指定する場合は、\"-t\" を使用します。\n"
4963 " 生成するアーカイブの種別を指定する場合は、\"-t\" を使用します。\n"
4919 " 使用可能な種別は:\n"
4964 " 使用可能な種別は:\n"
4920 "\n"
4965 "\n"
4921 " \"files\" (無指定時): a directory full of files\n"
4966 " \"files\" (無指定時): a directory full of files\n"
4922 " \"tar\": 非圧縮の tar アーカイブ形式\n"
4967 " \"tar\": 非圧縮の tar アーカイブ形式\n"
4923 " \"tbz2\": bzip2 圧縮の tar アーカイブ形式\n"
4968 " \"tbz2\": bzip2 圧縮の tar アーカイブ形式\n"
4924 " \"tgz\": gzip 圧縮の tar アーカイブ形式\n"
4969 " \"tgz\": gzip 圧縮の tar アーカイブ形式\n"
4925 " \"uzip\": 非圧縮の zip アーカイブ形式\n"
4970 " \"uzip\": 非圧縮の zip アーカイブ形式\n"
4926 " \"zip\": 圧縮有り zip アーカイブ形式\n"
4971 " \"zip\": 圧縮有り zip アーカイブ形式\n"
4927 "\n"
4972 "\n"
4928 " 最終的なアーカイブ生成先となるファイル名ないしディレクトリ名は、\n"
4973 " 最終的なアーカイブ生成先となるファイル名ないしディレクトリ名は、\n"
4929 " 置換指定を使用して指定することができます。\n"
4974 " 置換指定を使用して指定することができます。\n"
4930 " 置換指定に関する詳細は \"hg help export\" を参照してください。\n"
4975 " 置換指定に関する詳細は \"hg help export\" を参照してください。\n"
4931 "\n"
4976 "\n"
4932 " アーカイブに包含されるファイルには、展開時格納先を指定するための\n"
4977 " アーカイブに包含されるファイルには、展開時格納先を指定するための\n"
4933 " ディレクトリ前置詞が付与されます。 \"-p\" により前置詞を指定可能です。\n"
4978 " ディレクトリ前置詞が付与されます。 \"-p\" により前置詞を指定可能です。\n"
4934 " ディレクトリ前置詞が無指定の時は、アーカイブファイルのファイル名から\n"
4979 " ディレクトリ前置詞が無指定の時は、アーカイブファイルのファイル名から\n"
4935 " 接尾辞を除いたものが使用されます。\n"
4980 " 接尾辞を除いたものが使用されます。\n"
4936 " "
4981 " "
4937
4982
4938 msgid "no working directory: please specify a revision"
4983 msgid "no working directory: please specify a revision"
4939 msgstr "作業領域からリビジョンを特定できません。リビジョンを指定してください。"
4984 msgstr "作業領域からリビジョンを特定できません。リビジョンを指定してください。"
4940
4985
4941 msgid "repository root cannot be destination"
4986 msgid "repository root cannot be destination"
4942 msgstr "リポジトリのルートを作成先に指定することはできません。"
4987 msgstr "リポジトリのルートを作成先に指定することはできません。"
4943
4988
4944 msgid "cannot archive plain files to stdout"
4989 msgid "cannot archive plain files to stdout"
4945 msgstr "通常ファイルのアーカイブを標準出力に出力することはできません。"
4990 msgstr "通常ファイルのアーカイブを標準出力に出力することはできません。"
4946
4991
4947 msgid ""
4992 msgid ""
4948 "reverse effect of earlier changeset\n"
4993 "reverse effect of earlier changeset\n"
4949 "\n"
4994 "\n"
4950 " Commit the backed out changes as a new changeset. The new\n"
4995 " Commit the backed out changes as a new changeset. The new\n"
4951 " changeset is a child of the backed out changeset.\n"
4996 " changeset is a child of the backed out changeset.\n"
4952 "\n"
4997 "\n"
4953 " If you back out a changeset other than the tip, a new head is\n"
4998 " If you back out a changeset other than the tip, a new head is\n"
4954 " created. This head will be the new tip and you should merge this\n"
4999 " created. This head will be the new tip and you should merge this\n"
4955 " backout changeset with another head (current one by default).\n"
5000 " backout changeset with another head (current one by default).\n"
4956 "\n"
5001 "\n"
4957 " The --merge option remembers the parent of the working directory\n"
5002 " The --merge option remembers the parent of the working directory\n"
4958 " before starting the backout, then merges the new head with that\n"
5003 " before starting the backout, then merges the new head with that\n"
4959 " changeset afterwards. This saves you from doing the merge by\n"
5004 " changeset afterwards. This saves you from doing the merge by\n"
4960 " hand. The result of this merge is not committed, as for a normal\n"
5005 " hand. The result of this merge is not committed, as with a normal\n"
4961 " merge.\n"
5006 " merge.\n"
4962 "\n"
5007 "\n"
4963 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5008 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
4964 " "
5009 " "
4965 msgstr ""
5010 msgstr ""
4966 "以前のチェンジセットの効果の打ち消し\n"
5011 "以前のチェンジセットの効果の打ち消し\n"
4967 "\n"
5012 "\n"
4968 " 打ち消し用チェンジセットを新規チェンジセットとしてコミットします。\n"
5013 " 打ち消し用チェンジセットを新規チェンジセットとしてコミットします。\n"
4969 " 新規チェンジセットは、打消し対象チェンジセットの子チェンジセットとして\n"
5014 " 新規チェンジセットは、打消し対象チェンジセットの子チェンジセットとして\n"
4970 " 作成されます。\n"
5015 " 作成されます。\n"
4971 "\n"
5016 "\n"
4972 " tip 以外のチェンジセットを打ち消す場合、新規ヘッドが生成されます。\n"
5017 " tip 以外のチェンジセットを打ち消す場合、新規ヘッドが生成されます。\n"
4973 " このヘッドは新規 tip となりますので、この打ち消しチェンジセットと\n"
5018 " このヘッドは新規 tip となりますので、この打ち消しチェンジセットと\n"
4974 " 他のヘッド(通常は打ち消し実施前のヘッド)をマージしてください。\n"
5019 " 他のヘッド(通常は打ち消し実施前のヘッド)をマージしてください。\n"
4975 "\n"
5020 "\n"
4976 " --merge オプション指定時は、実施前に作業領域の親チェンジセットが\n"
5021 " --merge オプション指定時は、実施前に作業領域の親チェンジセットが\n"
4977 " 記録され、実施後に新たなヘッドとそのチェンジセットがマージされます。\n"
5022 " 記録され、実施後に新たなヘッドとそのチェンジセットがマージされます。\n"
4978 " これにより手動マージの手間が省けます。通常の merge と同様に、\n"
5023 " これにより手動マージの手間が省けます。通常の merge と同様に、\n"
4979 " このマージ結果は自動的には commit されません。\n"
5024 " このマージ結果は自動的には commit されません。\n"
4980 "\n"
5025 "\n"
4981 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
5026 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
4982 " "
5027 " "
4983
5028
4984 msgid "please specify just one revision"
5029 msgid "please specify just one revision"
4985 msgstr "リビジョン指定は1つだけです"
5030 msgstr "リビジョン指定は1つだけです"
4986
5031
4987 msgid "please specify a revision to backout"
5032 msgid "please specify a revision to backout"
4988 msgstr "打ち消し対象リビジョンを指定してください"
5033 msgstr "打ち消し対象リビジョンを指定してください"
4989
5034
4990 msgid "cannot back out change on a different branch"
5035 msgid "cannot back out change on a different branch"
4991 msgstr "異なるブランチのチェンジセットを打ち消すことはできません"
5036 msgstr "異なるブランチのチェンジセットを打ち消すことはできません"
4992
5037
4993 msgid "cannot back out a change with no parents"
5038 msgid "cannot back out a change with no parents"
4994 msgstr "親の無いチェンジセットを打ち消すことはできません"
5039 msgstr "親の無いチェンジセットを打ち消すことはできません"
4995
5040
4996 msgid "cannot back out a merge changeset without --parent"
5041 msgid "cannot back out a merge changeset without --parent"
4997 msgstr "--parent 指定が無いとマージチェンジセットは打ち消せません"
5042 msgstr "--parent 指定が無いとマージチェンジセットは打ち消せません"
4998
5043
4999 #, python-format
5044 #, python-format
5000 msgid "%s is not a parent of %s"
5045 msgid "%s is not a parent of %s"
5001 msgstr "%s は %s の親チェンジセットではありません"
5046 msgstr "%s は %s の親チェンジセットではありません"
5002
5047
5003 msgid "cannot use --parent on non-merge changeset"
5048 msgid "cannot use --parent on non-merge changeset"
5004 msgstr "非マージチェンジセットには --parent を指定できません"
5049 msgstr "非マージチェンジセットには --parent を指定できません"
5005
5050
5006 #, python-format
5051 #, python-format
5007 msgid "Backed out changeset %s"
5052 msgid "Backed out changeset %s"
5008 msgstr "チェンジセット %s の打ち消し"
5053 msgstr "チェンジセット %s の打ち消し"
5009
5054
5010 #, python-format
5055 #, python-format
5011 msgid "changeset %s backs out changeset %s\n"
5056 msgid "changeset %s backs out changeset %s\n"
5012 msgstr "チェンジセット %s はチェンジセット %s を打ち消します\n"
5057 msgstr "チェンジセット %s はチェンジセット %s を打ち消します\n"
5013
5058
5014 #, python-format
5059 #, python-format
5015 msgid "merging with changeset %s\n"
5060 msgid "merging with changeset %s\n"
5016 msgstr "チェンジセット %s とマージ中\n"
5061 msgstr "チェンジセット %s とマージ中\n"
5017
5062
5018 msgid "the backout changeset is a new head - do not forget to merge\n"
5063 msgid "the backout changeset is a new head - do not forget to merge\n"
5019 msgstr "打ち消しチェンジセットによりヘッドが増えます - マージを忘れずに\n"
5064 msgstr "打ち消しチェンジセットによりヘッドが増えます - マージを忘れずに\n"
5020
5065
5021 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5066 msgid "(use \"backout --merge\" if you want to auto-merge)\n"
5022 msgstr "(自動的にマージしたい場合は \"backout --merge\")\n"
5067 msgstr "(自動的にマージしたい場合は \"backout --merge\")\n"
5023
5068
5024 msgid ""
5069 msgid ""
5025 "subdivision search of changesets\n"
5070 "subdivision search of changesets\n"
5026 "\n"
5071 "\n"
5027 " This command helps to find changesets which introduce problems.\n"
5072 " This command helps to find changesets which introduce problems.\n"
5028 " To use, mark the earliest changeset you know exhibits the problem\n"
5073 " To use, mark the earliest changeset you know exhibits the problem\n"
5029 " as bad, then mark the latest changeset which is free from the\n"
5074 " as bad, then mark the latest changeset which is free from the\n"
5030 " problem as good. Bisect will update your working directory to a\n"
5075 " problem as good. Bisect will update your working directory to a\n"
5031 " revision for testing (unless the --noupdate option is specified).\n"
5076 " revision for testing (unless the --noupdate option is specified).\n"
5032 " Once you have performed tests, mark the working directory as bad\n"
5077 " Once you have performed tests, mark the working directory as bad\n"
5033 " or good and bisect will either update to another candidate changeset\n"
5078 " or good and bisect will either update to another candidate changeset\n"
5034 " or announce that it has found the bad revision.\n"
5079 " or announce that it has found the bad revision.\n"
5035 "\n"
5080 "\n"
5036 " As a shortcut, you can also use the revision argument to mark a\n"
5081 " As a shortcut, you can also use the revision argument to mark a\n"
5037 " revision as good or bad without checking it out first.\n"
5082 " revision as good or bad without checking it out first.\n"
5038 "\n"
5083 "\n"
5039 " If you supply a command it will be used for automatic bisection. Its "
5084 " If you supply a command it will be used for automatic bisection. Its "
5040 "exit\n"
5085 "exit\n"
5041 " status will be used as flag to mark revision as bad or good. In case "
5086 " status will be used as flag to mark revision as bad or good. In case "
5042 "exit\n"
5087 "exit\n"
5043 " status is 0 the revision is marked as good, 125 - skipped, 127 (command "
5088 " status is 0 the revision is marked as good, 125 - skipped, 127 (command "
5044 "not\n"
5089 "not\n"
5045 " found) - bisection will be aborted and any other status bigger than 0 "
5090 " found) - bisection will be aborted; any other status bigger than 0 will\n"
5046 "will\n"
5047 " mark revision as bad.\n"
5091 " mark revision as bad.\n"
5048 " "
5092 " "
5049 msgstr ""
5093 msgstr ""
5050 "チェンジセットの分割探索\n"
5094 "チェンジセットの分割探索\n"
5051 "\n"
5095 "\n"
5052 " 問題発生契機となるチェンジセットの特定を補助します。\n"
5096 " 問題発生契機となるチェンジセットの特定を補助します。\n"
5053 " 使用開始の際には、問題が発生するのが既知の最古のチェンジセットを\n"
5097 " 使用開始の際には、問題が発生するのが既知の最古のチェンジセットを\n"
5054 " bad とマークし、問題の発生しない最も新しいチェンジセットを\n"
5098 " bad とマークし、問題の発生しない最も新しいチェンジセットを\n"
5055 " good とマークします。bisect コマンドは作業領域を検証対象チェンジセット\n"
5099 " good とマークします。bisect コマンドは作業領域を検証対象チェンジセット\n"
5056 " へと更新します(--noupdate 指定時除く)。\n"
5100 " へと更新します(--noupdate 指定時除く)。\n"
5057 " 当該チェンジセットを検証したなら、作業領域(のチェンジセット)を bad \n"
5101 " 当該チェンジセットを検証したなら、作業領域(のチェンジセット)を bad \n"
5058 " あるいは good でマークしてください。bisect は作業領域を次の検証候補\n"
5102 " あるいは good でマークしてください。bisect は作業領域を次の検証候補\n"
5059 " チェンジセットで更新するか、bad リビジョンを特定できた旨を出力します。\n"
5103 " チェンジセットで更新するか、bad リビジョンを特定できた旨を出力します。\n"
5060 "\n"
5104 "\n"
5061 " 手短には、リビジョン指定を使用して、作業領域の更新無しでリビジョンを\n"
5105 " 手短には、リビジョン指定を使用して、作業領域の更新無しでリビジョンを\n"
5062 " good ないし bad にマークすることもできます。\n"
5106 " good ないし bad にマークすることもできます。\n"
5063 "\n"
5107 "\n"
5064 " コマンドを指定した場合は、自動的な分割探索に使用されます。\n"
5108 " コマンドを指定した場合は、自動的な分割探索に使用されます。\n"
5065 " コマンドの終了コードはリビジョンに対する bad ないし good のマーク付け\n"
5109 " コマンドの終了コードはリビジョンに対する bad ないし good のマーク付け\n"
5066 " に使用されます。終了コード 0 は good、125 はスキップ、127(コマンドが\n"
5110 " に使用されます。終了コード 0 は good、125 はスキップ、127(コマンドが\n"
5067 " 見つからない場合)は分割検索中断、それ以外の 0 より大きい終了コードは\n"
5111 " 見つからない場合)は分割検索中断、それ以外の 0 より大きい終了コードは\n"
5068 " bad のマーク付けとみなされます。\n"
5112 " bad のマーク付けとみなされます。\n"
5069 " "
5113 " "
5070
5114
5071 #, python-format
5115 #, python-format
5072 msgid "The first %s revision is:\n"
5116 msgid "The first %s revision is:\n"
5073 msgstr ""
5117 msgstr ""
5074
5118
5075 #, python-format
5119 #, python-format
5076 msgid "Due to skipped revisions, the first %s revision could be any of:\n"
5120 msgid "Due to skipped revisions, the first %s revision could be any of:\n"
5077 msgstr ""
5121 msgstr ""
5078
5122
5079 msgid "cannot bisect (no known good revisions)"
5123 msgid "cannot bisect (no known good revisions)"
5080 msgstr ""
5124 msgstr ""
5081
5125
5082 msgid "cannot bisect (no known bad revisions)"
5126 msgid "cannot bisect (no known bad revisions)"
5083 msgstr ""
5127 msgstr ""
5084
5128
5085 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5129 msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
5086 msgstr ""
5130 msgstr ""
5087
5131
5088 msgid "incompatible arguments"
5132 msgid "incompatible arguments"
5089 msgstr ""
5133 msgstr ""
5090
5134
5091 #, python-format
5135 #, python-format
5092 msgid "failed to execute %s"
5136 msgid "failed to execute %s"
5093 msgstr ""
5137 msgstr ""
5094
5138
5095 #, python-format
5139 #, python-format
5096 msgid "%s killed"
5140 msgid "%s killed"
5097 msgstr ""
5141 msgstr ""
5098
5142
5099 #, python-format
5143 #, python-format
5100 msgid "Changeset %s: %s\n"
5144 msgid "Changeset %s: %s\n"
5101 msgstr ""
5145 msgstr ""
5102
5146
5103 #, python-format
5147 #, python-format
5104 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5148 msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
5105 msgstr ""
5149 msgstr ""
5106
5150
5107 msgid ""
5151 msgid ""
5108 "set or show the current branch name\n"
5152 "set or show the current branch name\n"
5109 "\n"
5153 "\n"
5110 " With no argument, show the current branch name. With one argument,\n"
5154 " With no argument, show the current branch name. With one argument,\n"
5111 " set the working directory branch name (the branch does not exist in\n"
5155 " set the working directory branch name (the branch does not exist in\n"
5112 " the repository until the next commit).\n"
5156 " the repository until the next commit).\n"
5113 "\n"
5157 "\n"
5114 " Unless --force is specified, branch will not let you set a\n"
5158 " Unless --force is specified, branch will not let you set a\n"
5115 " branch name that shadows an existing branch.\n"
5159 " branch name that shadows an existing branch.\n"
5116 "\n"
5160 "\n"
5117 " Use --clean to reset the working directory branch to that of the\n"
5161 " Use --clean to reset the working directory branch to that of the\n"
5118 " parent of the working directory, negating a previous branch change.\n"
5162 " parent of the working directory, negating a previous branch change.\n"
5119 "\n"
5163 "\n"
5120 " Use the command 'hg update' to switch to an existing branch.\n"
5164 " Use the command 'hg update' to switch to an existing branch.\n"
5121 " "
5165 " "
5122 msgstr ""
5166 msgstr ""
5123 "現ブランチ名の設定ないし表示\n"
5167 "現ブランチ名の設定ないし表示\n"
5124 "\n"
5168 "\n"
5125 " 引数無しの場合、現ブランチ名を表示します。引数有りの場合、\n"
5169 " 引数無しの場合、現ブランチ名を表示します。引数有りの場合、\n"
5126 " 作業領域のブランチ名を設定します(ブランチ生成は次回コミット時)。\n"
5170 " 作業領域のブランチ名を設定します(ブランチ生成は次回コミット時)。\n"
5127 "\n"
5171 "\n"
5128 " --force 指定が無い場合、既存ブランチを隠すブランチ名は設定できません。\n"
5172 " --force 指定が無い場合、既存ブランチを隠すブランチ名は設定できません。\n"
5129 "\n"
5173 "\n"
5130 " --clean 指定により、以前のブランチ名設定を無効にして、作業領域の\n"
5174 " --clean 指定により、以前のブランチ名設定を無効にして、作業領域の\n"
5131 " 親リビジョンのブランチ名に戻します。\n"
5175 " 親リビジョンのブランチ名に戻します。\n"
5132 "\n"
5176 "\n"
5133 " 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n"
5177 " 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n"
5134 " 使用してください。\n"
5178 " 使用してください。\n"
5135 " "
5179 " "
5136
5180
5137 #, python-format
5181 #, python-format
5138 msgid "reset working directory to branch %s\n"
5182 msgid "reset working directory to branch %s\n"
5139 msgstr ""
5183 msgstr ""
5140
5184
5141 msgid "a branch of the same name already exists (use --force to override)"
5185 msgid "a branch of the same name already exists (use --force to override)"
5142 msgstr ""
5186 msgstr ""
5143
5187
5144 #, python-format
5188 #, python-format
5145 msgid "marked working directory as branch %s\n"
5189 msgid "marked working directory as branch %s\n"
5146 msgstr ""
5190 msgstr ""
5147
5191
5148 msgid ""
5192 msgid ""
5149 "list repository named branches\n"
5193 "list repository named branches\n"
5150 "\n"
5194 "\n"
5151 " List the repository's named branches, indicating which ones are\n"
5195 " List the repository's named branches, indicating which ones are\n"
5152 " inactive. If active is specified, only show active branches.\n"
5196 " inactive. If active is specified, only show active branches.\n"
5153 "\n"
5197 "\n"
5154 " A branch is considered active if it contains repository heads.\n"
5198 " A branch is considered active if it contains repository heads.\n"
5155 "\n"
5199 "\n"
5156 " Use the command 'hg update' to switch to an existing branch.\n"
5200 " Use the command 'hg update' to switch to an existing branch.\n"
5157 " "
5201 " "
5158 msgstr ""
5202 msgstr ""
5159 "リポジトリ中の名前付きブランチの一覧\n"
5203 "リポジトリ中の名前付きブランチの一覧\n"
5160 "\n"
5204 "\n"
5161 " リポジトリ中の名前付きブランチを、非活性(inactive)のものも含め\n"
5205 " リポジトリ中の名前付きブランチを、非活性(inactive)のものも含め\n"
5162 " 一覧表示します。--active 指定時には、活性のもののみ表示されます。\n"
5206 " 一覧表示します。--active 指定時には、活性のもののみ表示されます。\n"
5163 "\n"
5207 "\n"
5164 " リポジトリ中にヘッドを持つブランチは活性とみなされます。\n"
5208 " リポジトリ中にヘッドを持つブランチは活性とみなされます。\n"
5165 "\n"
5209 "\n"
5166 " 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n"
5210 " 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n"
5167 " 使用してください。\n"
5211 " 使用してください。\n"
5168 " "
5212 " "
5169
5213
5170 msgid ""
5214 msgid ""
5171 "create a changegroup file\n"
5215 "create a changegroup file\n"
5172 "\n"
5216 "\n"
5173 " Generate a compressed changegroup file collecting changesets not\n"
5217 " Generate a compressed changegroup file collecting changesets not\n"
5174 " found in the other repository.\n"
5218 " known to be in another repository.\n"
5175 "\n"
5219 "\n"
5176 " If no destination repository is specified the destination is\n"
5220 " If no destination repository is specified the destination is\n"
5177 " assumed to have all the nodes specified by one or more --base\n"
5221 " assumed to have all the nodes specified by one or more --base\n"
5178 " parameters. To create a bundle containing all changesets, use\n"
5222 " parameters. To create a bundle containing all changesets, use\n"
5179 " --all (or --base null). To change the compression method applied,\n"
5223 " --all (or --base null). To change the compression method applied,\n"
5180 " use the -t option (by default, bundles are compressed using bz2).\n"
5224 " use the -t option (by default, bundles are compressed using bz2).\n"
5181 "\n"
5225 "\n"
5182 " The bundle file can then be transferred using conventional means and\n"
5226 " The bundle file can then be transferred using conventional means and\n"
5183 " applied to another repository with the unbundle or pull command.\n"
5227 " applied to another repository with the unbundle or pull command.\n"
5184 " This is useful when direct push and pull are not available or when\n"
5228 " This is useful when direct push and pull are not available or when\n"
5185 " exporting an entire repository is undesirable.\n"
5229 " exporting an entire repository is undesirable.\n"
5186 "\n"
5230 "\n"
5187 " Applying bundles preserves all changeset contents including\n"
5231 " Applying bundles preserves all changeset contents including\n"
5188 " permissions, copy/rename information, and revision history.\n"
5232 " permissions, copy/rename information, and revision history.\n"
5189 " "
5233 " "
5190 msgstr ""
5234 msgstr ""
5191 "バンドルファイルの生成\n"
5235 "バンドルファイルの生成\n"
5192 "\n"
5236 "\n"
5193 " 比較対象リポジトリに存在しないチェンジセットの情報をまとめた、圧縮付き\n"
5237 " 比較対象リポジトリに存在しないチェンジセットの情報をまとめた、圧縮付き\n"
5194 " バンドルファイルを生成します。\n"
5238 " バンドルファイルを生成します。\n"
5195 "\n"
5239 "\n"
5196 " 比較対象リポジトリが指定されない場合、1つ以上の --base で指定された\n"
5240 " 比較対象リポジトリが指定されない場合、1つ以上の --base で指定された\n"
5197 " 全てのチェンジセットを持つリポジトリが想定されます。\n"
5241 " 全てのチェンジセットを持つリポジトリが想定されます。\n"
5198 " 全てのチェンジセットを含むバンドルファイルを生成するには、--all \n"
5242 " 全てのチェンジセットを含むバンドルファイルを生成するには、--all \n"
5199 " (ないし \"--base null\") を指定してください。圧縮方式を変更する場合は\n"
5243 " (ないし \"--base null\") を指定してください。圧縮方式を変更する場合は\n"
5200 " -t オプションを使用します(無指定時は bz2 圧縮)。\n"
5244 " -t オプションを使用します(無指定時は bz2 圧縮)。\n"
5201 "\n"
5245 "\n"
5202 " 生成されたバンドルファイルは、任意の方法で転送し、他のリポジトリ上で\n"
5246 " 生成されたバンドルファイルは、任意の方法で転送し、他のリポジトリ上で\n"
5203 " unbundle ないし pull コマンドにより適用可能です。\n"
5247 " unbundle ないし pull コマンドにより適用可能です。\n"
5204 " push/pull による直接転送ができない場合や、リポジトリ全体の公開が\n"
5248 " push/pull による直接転送ができない場合や、リポジトリ全体の公開が\n"
5205 " 望ましく無い場合に、バンドルファイルは有用です。\n"
5249 " 望ましく無い場合に、バンドルファイルは有用です。\n"
5206 "\n"
5250 "\n"
5207 " バンドルの適用により、権限設定、複製/改名、変更履歴といった情報を含む\n"
5251 " バンドルの適用により、権限設定、複製/改名、変更履歴といった情報を含む\n"
5208 " 全ての更新内容が取り込まれます。\n"
5252 " 全ての更新内容が取り込まれます。\n"
5209 " "
5253 " "
5210
5254
5211 msgid "--base is incompatible with specifiying a destination"
5255 msgid "--base is incompatible with specifiying a destination"
5212 msgstr ""
5256 msgstr ""
5213
5257
5214 msgid "unknown bundle type specified with --type"
5258 msgid "unknown bundle type specified with --type"
5215 msgstr ""
5259 msgstr ""
5216
5260
5217 msgid ""
5261 msgid ""
5218 "output the current or given revision of files\n"
5262 "output the current or given revision of files\n"
5219 "\n"
5263 "\n"
5220 " Print the specified files as they were at the given revision.\n"
5264 " Print the specified files as they were at the given revision.\n"
5221 " If no revision is given, the parent of the working directory is used,\n"
5265 " If no revision is given, the parent of the working directory is used,\n"
5222 " or tip if no revision is checked out.\n"
5266 " or tip if no revision is checked out.\n"
5223 "\n"
5267 "\n"
5224 " Output may be to a file, in which case the name of the file is\n"
5268 " Output may be to a file, in which case the name of the file is\n"
5225 " given using a format string. The formatting rules are the same as\n"
5269 " given using a format string. The formatting rules are the same as\n"
5226 " for the export command, with the following additions:\n"
5270 " for the export command, with the following additions:\n"
5227 "\n"
5271 "\n"
5228 " %s basename of file being printed\n"
5272 " %s basename of file being printed\n"
5229 " %d dirname of file being printed, or '.' if in repo root\n"
5273 " %d dirname of file being printed, or '.' if in repo root\n"
5230 " %p root-relative path name of file being printed\n"
5274 " %p root-relative path name of file being printed\n"
5231 " "
5275 " "
5232 msgstr ""
5276 msgstr ""
5233 "指定されたリビジョンのファイル内容の出力\n"
5277 "指定されたリビジョンのファイル内容の出力\n"
5234 "\n"
5278 "\n"
5235 " 特定のファイルの指定されたリビジョンにおける内容を出力します。\n"
5279 " 特定のファイルの指定されたリビジョンにおける内容を出力します。\n"
5236 " リビジョン指定が無い場合、作業領域の親リビジョンか、\n"
5280 " リビジョン指定が無い場合、作業領域の親リビジョンか、\n"
5237 " 作業領域の更新前なら tip が使用されます。\n"
5281 " 作業領域の更新前なら tip が使用されます。\n"
5238 "\n"
5282 "\n"
5239 " (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n"
5283 " (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n"
5240 " 置換指定は export コマンドで指定可能なものに加え、\n"
5284 " 置換指定は export コマンドで指定可能なものに加え、\n"
5241 " 以下のものが指定可能です。\n"
5285 " 以下のものが指定可能です。\n"
5242 "\n"
5286 "\n"
5243 " %s 対象ファイルのベース名\n"
5287 " %s 対象ファイルのベース名\n"
5244 " %d 対象ファイルの格納ディレクトリ、ないし '.'\n"
5288 " %d 対象ファイルの格納ディレクトリ、ないし '.'\n"
5245 " %p 対象ファイルのリポジトリルートからの相対パス\n"
5289 " %p 対象ファイルのリポジトリルートからの相対パス\n"
5246 " "
5290 " "
5247
5291
5248 msgid ""
5292 msgid ""
5249 "make a copy of an existing repository\n"
5293 "make a copy of an existing repository\n"
5250 "\n"
5294 "\n"
5251 " Create a copy of an existing repository in a new directory.\n"
5295 " Create a copy of an existing repository in a new directory.\n"
5252 "\n"
5296 "\n"
5253 " If no destination directory name is specified, it defaults to the\n"
5297 " If no destination directory name is specified, it defaults to the\n"
5254 " basename of the source.\n"
5298 " basename of the source.\n"
5255 "\n"
5299 "\n"
5256 " The location of the source is added to the new repository's\n"
5300 " The location of the source is added to the new repository's\n"
5257 " .hg/hgrc file, as the default to be used for future pulls.\n"
5301 " .hg/hgrc file, as the default to be used for future pulls.\n"
5258 "\n"
5302 "\n"
5259 " For efficiency, hardlinks are used for cloning whenever the source\n"
5303 " For efficiency, hardlinks are used for cloning whenever the source\n"
5260 " and destination are on the same filesystem (note this applies only\n"
5304 " and destination are on the same filesystem (note this applies only\n"
5261 " to the repository data, not to the checked out files). Some\n"
5305 " to the repository data, not to the checked out files). Some\n"
5262 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5306 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
5263 " do not report errors. In these cases, use the --pull option to\n"
5307 " do not report errors. In these cases, use the --pull option to\n"
5264 " avoid hardlinking.\n"
5308 " avoid hardlinking.\n"
5265 "\n"
5309 "\n"
5266 " In some cases, you can clone repositories and checked out files\n"
5310 " In some cases, you can clone repositories and checked out files\n"
5267 " using full hardlinks with\n"
5311 " using full hardlinks with\n"
5268 "\n"
5312 "\n"
5269 " $ cp -al REPO REPOCLONE\n"
5313 " $ cp -al REPO REPOCLONE\n"
5270 "\n"
5314 "\n"
5271 " This is the fastest way to clone, but it is not always safe. The\n"
5315 " This is the fastest way to clone, but it is not always safe. The\n"
5272 " operation is not atomic (making sure REPO is not modified during\n"
5316 " operation is not atomic (making sure REPO is not modified during\n"
5273 " the operation is up to you) and you have to make sure your editor\n"
5317 " the operation is up to you) and you have to make sure your editor\n"
5274 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5318 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
5275 " this is not compatible with certain extensions that place their\n"
5319 " this is not compatible with certain extensions that place their\n"
5276 " metadata under the .hg directory, such as mq.\n"
5320 " metadata under the .hg directory, such as mq.\n"
5277 "\n"
5321 "\n"
5278 " If you use the -r option to clone up to a specific revision, no\n"
5322 " If you use the -r option to clone up to a specific revision, no\n"
5279 " subsequent revisions will be present in the cloned repository.\n"
5323 " subsequent revisions will be present in the cloned repository.\n"
5280 " This option implies --pull, even on local repositories.\n"
5324 " This option implies --pull, even on local repositories.\n"
5281 "\n"
5325 "\n"
5282 " If the -U option is used, the new clone will contain only a repository\n"
5326 " If the -U option is used, the new clone will contain only a repository\n"
5283 " (.hg) and no working copy (the working copy parent is the null "
5327 " (.hg) and no working copy (the working copy parent is the null "
5284 "revision).\n"
5328 "revision).\n"
5285 "\n"
5329 "\n"
5286 " See 'hg help urls' for valid source format details.\n"
5330 " See 'hg help urls' for valid source format details.\n"
5287 "\n"
5331 "\n"
5288 " It is possible to specify an ssh:// URL as the destination, but no\n"
5332 " It is possible to specify an ssh:// URL as the destination, but no\n"
5289 " .hg/hgrc and working directory will be created on the remote side.\n"
5333 " .hg/hgrc and working directory will be created on the remote side.\n"
5290 " Look at the help text for urls for important details about ssh:// URLs.\n"
5334 " Look at the help text for urls for important details about ssh:// URLs.\n"
5291 " "
5335 " "
5292 msgstr ""
5336 msgstr ""
5293 "既存リポジトリの複製\n"
5337 "既存リポジトリの複製\n"
5294 "\n"
5338 "\n"
5295 " 既存リポジトリを、新規ディレクトリに複製します。\n"
5339 " 既存リポジトリを、新規ディレクトリに複製します。\n"
5296 "\n"
5340 "\n"
5297 " 複製先ディレクトリが指定されない場合、複製元のベース名を使用します。\n"
5341 " 複製先ディレクトリが指定されない場合、複製元のベース名を使用します。\n"
5298 "\n"
5342 "\n"
5299 " 複製元リポジトリ位置は、複製先リポジトリの .hg/hgrc ファイルに対して\n"
5343 " 複製元リポジトリ位置は、複製先リポジトリの .hg/hgrc ファイルに対して\n"
5300 " 将来的な pull 実施に備えて default 名義で記録されます。\n"
5344 " 将来的な pull 実施に備えて default 名義で記録されます。\n"
5301 "\n"
5345 "\n"
5302 " 効率上の理由から、複製元/複製先が同一ファイルシステム上にある場合、\n"
5346 " 効率上の理由から、複製元/複製先が同一ファイルシステム上にある場合、\n"
5303 " (リポジトリの内部データに対してのみ)ハードリンクが使用されます。\n"
5347 " (リポジトリの内部データに対してのみ)ハードリンクが使用されます。\n"
5304 " AFS を含む幾つかのファイルシステムは、ハードリンク実装が不適切である\n"
5348 " AFS を含む幾つかのファイルシステムは、ハードリンク実装が不適切である\n"
5305 " にも関わらず、エラー通知がありません。このような場合にハードリンクを\n"
5349 " にも関わらず、エラー通知がありません。このような場合にハードリンクを\n"
5306 " 抑止するには --pull オプションを使用します。\n"
5350 " 抑止するには --pull オプションを使用します。\n"
5307 "\n"
5351 "\n"
5308 " リポジトリの内部データと作業領域中のファイル全てに対して、ハードリンク\n"
5352 " リポジトリの内部データと作業領域中のファイル全てに対して、ハードリンク\n"
5309 " による複製を作成するには、以下の方法が使えるかも知れません。\n"
5353 " による複製を作成するには、以下の方法が使えるかも知れません。\n"
5310 "\n"
5354 "\n"
5311 " $ cp -al REPO REPOCLONE\n"
5355 " $ cp -al REPO REPOCLONE\n"
5312 "\n"
5356 "\n"
5313 " この方法は最速の複製方法かもしれませんが、常に安全とは限りません。\n"
5357 " この方法は最速の複製方法かもしれませんが、常に安全とは限りません。\n"
5314 " 操作の単一性は保障されません(REPO の複製中改変の防止は利用者の責務)し、\n"
5358 " 操作の単一性は保障されません(REPO の複製中改変の防止は利用者の責務)し、\n"
5315 " 利用するエディタに改変時のハードリンク破棄をさせる必要があります\n"
5359 " 利用するエディタに改変時のハードリンク破棄をさせる必要があります\n"
5316 " (Emacs および多くの Linux Kernel ツールはそのように振舞います)。\n"
5360 " (Emacs および多くの Linux Kernel ツールはそのように振舞います)。\n"
5317 " この制約は、.hg ディレクトリ配下にメタデータを配置する、MQ のような\n"
5361 " この制約は、.hg ディレクトリ配下にメタデータを配置する、MQ のような\n"
5318 " エクステンションとは相容れないものです。\n"
5362 " エクステンションとは相容れないものです。\n"
5319 "\n"
5363 "\n"
5320 " -r オプションによるリビジョン指定複製を行なう場合、複製先リポジトリには\n"
5364 " -r オプションによるリビジョン指定複製を行なう場合、複製先リポジトリには\n"
5321 " 指定リビジョン以後のリビジョンは存在しません。\n"
5365 " 指定リビジョン以後のリビジョンは存在しません。\n"
5322 " このオプションは、同一ファイルシステム上での複製であっても、暗黙的に\n"
5366 " このオプションは、同一ファイルシステム上での複製であっても、暗黙的に\n"
5323 " --pull 指定を伴います。\n"
5367 " --pull 指定を伴います。\n"
5324 "\n"
5368 "\n"
5325 " -U オプション指定時は、管理領域(.hg)の複製は行なわれますが、\n"
5369 " -U オプション指定時は、管理領域(.hg)の複製は行なわれますが、\n"
5326 " 複製後の作業領域更新は行なわれません(親リビジョンが無い状態)。\n"
5370 " 複製後の作業領域更新は行なわれません(親リビジョンが無い状態)。\n"
5327 "\n"
5371 "\n"
5328 " 有効な複製元指定形式は 'hg help urls' を参照してください。\n"
5372 " 有効な複製元指定形式は 'hg help urls' を参照してください。\n"
5329 "\n"
5373 "\n"
5330 " 複製先として ssh:// URL 形式を指定することも可能ですが、\n"
5374 " 複製先として ssh:// URL 形式を指定することも可能ですが、\n"
5331 " .hg/hgrc および作業領域は遠隔ホストに作成されます。\n"
5375 " .hg/hgrc および作業領域は遠隔ホストに作成されます。\n"
5332 " ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n"
5376 " ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n"
5333 " "
5377 " "
5334
5378
5335 msgid ""
5379 msgid ""
5336 "commit the specified files or all outstanding changes\n"
5380 "commit the specified files or all outstanding changes\n"
5337 "\n"
5381 "\n"
5338 " Commit changes to the given files into the repository.\n"
5382 " Commit changes to the given files into the repository.\n"
5339 "\n"
5383 "\n"
5340 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5384 " If a list of files is omitted, all changes reported by \"hg status\"\n"
5341 " will be committed.\n"
5385 " will be committed.\n"
5342 "\n"
5386 "\n"
5343 " If you are committing the result of a merge, do not provide any\n"
5387 " If you are committing the result of a merge, do not provide any\n"
5344 " file names or -I/-X filters.\n"
5388 " file names or -I/-X filters.\n"
5345 "\n"
5389 "\n"
5346 " If no commit message is specified, the configured editor is started to\n"
5390 " If no commit message is specified, the configured editor is started to\n"
5347 " enter a message.\n"
5391 " prompt you for a message.\n"
5348 "\n"
5392 "\n"
5349 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5393 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5350 " "
5394 " "
5351 msgstr ""
5395 msgstr ""
5352 "変更内容のリポジトリへの記録(コミット)\n"
5396 "変更内容のリポジトリへの記録(コミット)\n"
5353 "\n"
5397 "\n"
5354 " 指定されたファイルの変更内容をリポジトリに記録(コミット)します。\n"
5398 " 指定されたファイルの変更内容をリポジトリに記録(コミット)します。\n"
5355 "\n"
5399 "\n"
5356 " ファイル指定が省略された場合、\"hg status\" により検出される全ての\n"
5400 " ファイル指定が省略された場合、\"hg status\" により検出される全ての\n"
5357 " 変更内容がコミットされます。\n"
5401 " 変更内容がコミットされます。\n"
5358 "\n"
5402 "\n"
5359 " \"hg merge\" 結果のコミットの場合、ファイル名ないし -I/-X オプションの\n"
5403 " \"hg merge\" 結果のコミットの場合、ファイル名ないし -I/-X オプションの\n"
5360 " いずれも指定しないでください。\n"
5404 " いずれも指定しないでください。\n"
5361 "\n"
5405 "\n"
5362 " コミットメッセージが指定されない場合、メッセージ入力のためのプログラム"
5406 " コミットメッセージが指定されない場合、設定に従ってメッセージ入力用の\n"
5363 "が\n"
5407 " プログラムが起動されます。\n"
5364 " 設定に従って起動されます。\n"
5365 "\n"
5408 "\n"
5366 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
5409 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
5367 " "
5410 " "
5368
5411
5369 msgid "created new head\n"
5412 msgid "created new head\n"
5370 msgstr ""
5413 msgstr ""
5371
5414
5372 #, python-format
5415 #, python-format
5373 msgid "committed changeset %d:%s\n"
5416 msgid "committed changeset %d:%s\n"
5374 msgstr ""
5417 msgstr ""
5375
5418
5376 msgid ""
5419 msgid ""
5377 "mark files as copied for the next commit\n"
5420 "mark files as copied for the next commit\n"
5378 "\n"
5421 "\n"
5379 " Mark dest as having copies of source files. If dest is a\n"
5422 " Mark dest as having copies of source files. If dest is a\n"
5380 " directory, copies are put in that directory. If dest is a file,\n"
5423 " directory, copies are put in that directory. If dest is a file,\n"
5381 " there can only be one source.\n"
5424 " the source must be a single file.\n"
5382 "\n"
5425 "\n"
5383 " By default, this command copies the contents of files as they\n"
5426 " By default, this command copies the contents of files as they\n"
5384 " stand in the working directory. If invoked with --after, the\n"
5427 " stand in the working directory. If invoked with --after, the\n"
5385 " operation is recorded, but no copying is performed.\n"
5428 " operation is recorded, but no copying is performed.\n"
5386 "\n"
5429 "\n"
5387 " This command takes effect in the next commit. To undo a copy\n"
5430 " This command takes effect with the next commit. To undo a copy\n"
5388 " before that, see hg revert.\n"
5431 " before that, see hg revert.\n"
5389 " "
5432 " "
5390 msgstr ""
5433 msgstr ""
5391 "指定されたファイルの複製\n"
5434 "指定されたファイルの複製\n"
5392 "\n"
5435 "\n"
5393 " 対象ファイルが複製元の複製であることを記録します。複製先指定が\n"
5436 " 対象ファイルが複製元の複製であることを記録します。複製先指定が\n"
5394 " ディレクトリの場合、ディレクトリ内に複製が作成されます。\n"
5437 " ディレクトリの場合、ディレクトリ内に複製が作成されます。\n"
5395 " 複製先指定がファイルの場合、複製元は1つしか指定できません。\n"
5438 " 複製先指定がファイルの場合、複製元は1つしか指定できません。\n"
5396 "\n"
5439 "\n"
5397 " 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n"
5440 " 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n"
5398 " 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n"
5441 " 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n"
5399 " 操作は記録されますが、ファイルの複製は行われません。\n"
5442 " 操作は記録されますが、ファイルの複製は行われません。\n"
5400 "\n"
5443 "\n"
5401 " 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n"
5444 " 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n"
5402 " コミット前に複製操作を取り消す方法は hg revert を参照してください。\n"
5445 " コミット前に複製操作を取り消す方法は hg revert を参照してください。\n"
5403 " "
5446 " "
5404
5447
5405 msgid "find the ancestor revision of two revisions in a given index"
5448 msgid "find the ancestor revision of two revisions in a given index"
5406 msgstr ""
5449 msgstr ""
5407
5450
5408 msgid "There is no Mercurial repository here (.hg not found)"
5451 msgid "There is no Mercurial repository here (.hg not found)"
5409 msgstr ""
5452 msgstr ""
5410
5453
5411 msgid "either two or three arguments required"
5454 msgid "either two or three arguments required"
5412 msgstr ""
5455 msgstr ""
5413
5456
5414 msgid "returns the completion list associated with the given command"
5457 msgid "returns the completion list associated with the given command"
5415 msgstr ""
5458 msgstr ""
5416
5459
5417 msgid "rebuild the dirstate as it would look like for the given revision"
5460 msgid "rebuild the dirstate as it would look like for the given revision"
5418 msgstr ""
5461 msgstr ""
5419
5462
5420 msgid "validate the correctness of the current dirstate"
5463 msgid "validate the correctness of the current dirstate"
5421 msgstr ""
5464 msgstr ""
5422
5465
5423 #, python-format
5466 #, python-format
5424 msgid "%s in state %s, but not in manifest1\n"
5467 msgid "%s in state %s, but not in manifest1\n"
5425 msgstr ""
5468 msgstr ""
5426
5469
5427 #, python-format
5470 #, python-format
5428 msgid "%s in state %s, but also in manifest1\n"
5471 msgid "%s in state %s, but also in manifest1\n"
5429 msgstr ""
5472 msgstr ""
5430
5473
5431 #, python-format
5474 #, python-format
5432 msgid "%s in state %s, but not in either manifest\n"
5475 msgid "%s in state %s, but not in either manifest\n"
5433 msgstr ""
5476 msgstr ""
5434
5477
5435 #, python-format
5478 #, python-format
5436 msgid "%s in manifest1, but listed as state %s"
5479 msgid "%s in manifest1, but listed as state %s"
5437 msgstr ""
5480 msgstr ""
5438
5481
5439 msgid ".hg/dirstate inconsistent with current parent's manifest"
5482 msgid ".hg/dirstate inconsistent with current parent's manifest"
5440 msgstr ""
5483 msgstr ""
5441
5484
5442 msgid ""
5485 msgid ""
5443 "show combined config settings from all hgrc files\n"
5486 "show combined config settings from all hgrc files\n"
5444 "\n"
5487 "\n"
5445 " With no args, print names and values of all config items.\n"
5488 " With no args, print names and values of all config items.\n"
5446 "\n"
5489 "\n"
5447 " With one arg of the form section.name, print just the value of\n"
5490 " With one arg of the form section.name, print just the value of\n"
5448 " that config item.\n"
5491 " that config item.\n"
5449 "\n"
5492 "\n"
5450 " With multiple args, print names and values of all config items\n"
5493 " With multiple args, print names and values of all config items\n"
5451 " with matching section names."
5494 " with matching section names."
5452 msgstr ""
5495 msgstr ""
5453 "全設定ファイルによる最終的な設定内容の表示\n"
5496 "全設定ファイルによる最終的な設定内容の表示\n"
5454 "\n"
5497 "\n"
5455 " 引数指定が無い場合、全ての設定項目に対して、名前と値を表示します。\n"
5498 " 引数指定が無い場合、全ての設定項目に対して、名前と値を表示します。\n"
5456 "\n"
5499 "\n"
5457 " section.name 形式に合致する引数を1つだけ指定した場合、その設定項目の\n"
5500 " section.name 形式に合致する引数を1つだけ指定した場合、その設定項目の\n"
5458 " 値のみを表示します。\n"
5501 " 値のみを表示します。\n"
5459 "\n"
5502 "\n"
5460 " 複数の引数が指定された場合、それらをセクション名とみなし、該当する\n"
5503 " 複数の引数が指定された場合、それらをセクション名とみなし、該当する\n"
5461 " セクションの設定項目を全て表示します。"
5504 " セクションの設定項目を全て表示します。"
5462
5505
5463 msgid "only one config item permitted"
5506 msgid "only one config item permitted"
5464 msgstr ""
5507 msgstr ""
5465
5508
5466 msgid ""
5509 msgid ""
5467 "manually set the parents of the current working directory\n"
5510 "manually set the parents of the current working directory\n"
5468 "\n"
5511 "\n"
5469 " This is useful for writing repository conversion tools, but should\n"
5512 " This is useful for writing repository conversion tools, but should\n"
5470 " be used with care.\n"
5513 " be used with care.\n"
5471 " "
5514 " "
5472 msgstr ""
5515 msgstr ""
5473
5516
5474 msgid "show the contents of the current dirstate"
5517 msgid "show the contents of the current dirstate"
5475 msgstr ""
5518 msgstr ""
5476
5519
5477 #, python-format
5520 #, python-format
5478 msgid "copy: %s -> %s\n"
5521 msgid "copy: %s -> %s\n"
5479 msgstr ""
5522 msgstr ""
5480
5523
5481 msgid "dump the contents of a data file revision"
5524 msgid "dump the contents of a data file revision"
5482 msgstr ""
5525 msgstr ""
5483
5526
5484 #, python-format
5527 #, python-format
5485 msgid "invalid revision identifier %s"
5528 msgid "invalid revision identifier %s"
5486 msgstr ""
5529 msgstr ""
5487
5530
5488 msgid "parse and display a date"
5531 msgid "parse and display a date"
5489 msgstr ""
5532 msgstr ""
5490
5533
5491 msgid "dump the contents of an index file"
5534 msgid "dump the contents of an index file"
5492 msgstr ""
5535 msgstr ""
5493
5536
5494 msgid "dump an index DAG as a .dot file"
5537 msgid "dump an index DAG as a .dot file"
5495 msgstr ""
5538 msgstr ""
5496
5539
5497 msgid "test Mercurial installation"
5540 msgid "test Mercurial installation"
5498 msgstr ""
5541 msgstr ""
5499
5542
5500 #, python-format
5543 #, python-format
5501 msgid "Checking encoding (%s)...\n"
5544 msgid "Checking encoding (%s)...\n"
5502 msgstr ""
5545 msgstr ""
5503
5546
5504 msgid " (check that your locale is properly set)\n"
5547 msgid " (check that your locale is properly set)\n"
5505 msgstr ""
5548 msgstr ""
5506
5549
5507 msgid "Checking extensions...\n"
5550 msgid "Checking extensions...\n"
5508 msgstr ""
5551 msgstr ""
5509
5552
5510 msgid " One or more extensions could not be found"
5553 msgid " One or more extensions could not be found"
5511 msgstr ""
5554 msgstr ""
5512
5555
5513 msgid " (check that you compiled the extensions)\n"
5556 msgid " (check that you compiled the extensions)\n"
5514 msgstr ""
5557 msgstr ""
5515
5558
5516 msgid "Checking templates...\n"
5559 msgid "Checking templates...\n"
5517 msgstr ""
5560 msgstr ""
5518
5561
5519 msgid " (templates seem to have been installed incorrectly)\n"
5562 msgid " (templates seem to have been installed incorrectly)\n"
5520 msgstr ""
5563 msgstr ""
5521
5564
5522 msgid "Checking patch...\n"
5565 msgid "Checking patch...\n"
5523 msgstr ""
5566 msgstr ""
5524
5567
5525 msgid " patch call failed:\n"
5568 msgid " patch call failed:\n"
5526 msgstr ""
5569 msgstr ""
5527
5570
5528 msgid " unexpected patch output!\n"
5571 msgid " unexpected patch output!\n"
5529 msgstr ""
5572 msgstr ""
5530
5573
5531 msgid " patch test failed!\n"
5574 msgid " patch test failed!\n"
5532 msgstr ""
5575 msgstr ""
5533
5576
5534 msgid ""
5577 msgid ""
5535 " (Current patch tool may be incompatible with patch, or misconfigured. "
5578 " (Current patch tool may be incompatible with patch, or misconfigured. "
5536 "Please check your .hgrc file)\n"
5579 "Please check your .hgrc file)\n"
5537 msgstr ""
5580 msgstr ""
5538
5581
5539 msgid ""
5582 msgid ""
5540 " Internal patcher failure, please report this error to http://www.selenic."
5583 " Internal patcher failure, please report this error to http://www.selenic."
5541 "com/mercurial/bts\n"
5584 "com/mercurial/bts\n"
5542 msgstr ""
5585 msgstr ""
5543
5586
5544 msgid "Checking commit editor...\n"
5587 msgid "Checking commit editor...\n"
5545 msgstr ""
5588 msgstr ""
5546
5589
5547 msgid " No commit editor set and can't find vi in PATH\n"
5590 msgid " No commit editor set and can't find vi in PATH\n"
5548 msgstr ""
5591 msgstr ""
5549
5592
5550 msgid " (specify a commit editor in your .hgrc file)\n"
5593 msgid " (specify a commit editor in your .hgrc file)\n"
5551 msgstr ""
5594 msgstr ""
5552
5595
5553 #, python-format
5596 #, python-format
5554 msgid " Can't find editor '%s' in PATH\n"
5597 msgid " Can't find editor '%s' in PATH\n"
5555 msgstr ""
5598 msgstr ""
5556
5599
5557 msgid "Checking username...\n"
5600 msgid "Checking username...\n"
5558 msgstr ""
5601 msgstr ""
5559
5602
5560 msgid " (specify a username in your .hgrc file)\n"
5603 msgid " (specify a username in your .hgrc file)\n"
5561 msgstr ""
5604 msgstr ""
5562
5605
5563 msgid "No problems detected\n"
5606 msgid "No problems detected\n"
5564 msgstr ""
5607 msgstr ""
5565
5608
5566 #, python-format
5609 #, python-format
5567 msgid "%s problems detected, please check your install!\n"
5610 msgid "%s problems detected, please check your install!\n"
5568 msgstr ""
5611 msgstr ""
5569
5612
5570 msgid "dump rename information"
5613 msgid "dump rename information"
5571 msgstr ""
5614 msgstr ""
5572
5615
5573 #, python-format
5616 #, python-format
5574 msgid "%s renamed from %s:%s\n"
5617 msgid "%s renamed from %s:%s\n"
5575 msgstr ""
5618 msgstr ""
5576
5619
5577 #, python-format
5620 #, python-format
5578 msgid "%s not renamed\n"
5621 msgid "%s not renamed\n"
5579 msgstr ""
5622 msgstr ""
5580
5623
5581 msgid "show how files match on given patterns"
5624 msgid "show how files match on given patterns"
5582 msgstr ""
5625 msgstr ""
5583
5626
5584 msgid ""
5627 msgid ""
5585 "diff repository (or selected files)\n"
5628 "diff repository (or selected files)\n"
5586 "\n"
5629 "\n"
5587 " Show differences between revisions for the specified files.\n"
5630 " Show differences between revisions for the specified files.\n"
5588 "\n"
5631 "\n"
5589 " Differences between files are shown using the unified diff format.\n"
5632 " Differences between files are shown using the unified diff format.\n"
5590 "\n"
5633 "\n"
5591 " NOTE: diff may generate unexpected results for merges, as it will\n"
5634 " NOTE: diff may generate unexpected results for merges, as it will\n"
5592 " default to comparing against the working directory's first parent\n"
5635 " default to comparing against the working directory's first parent\n"
5593 " changeset if no revisions are specified.\n"
5636 " changeset if no revisions are specified.\n"
5594 "\n"
5637 "\n"
5595 " When two revision arguments are given, then changes are shown\n"
5638 " When two revision arguments are given, then changes are shown\n"
5596 " between those revisions. If only one revision is specified then\n"
5639 " between those revisions. If only one revision is specified then\n"
5597 " that revision is compared to the working directory, and, when no\n"
5640 " that revision is compared to the working directory, and, when no\n"
5598 " revisions are specified, the working directory files are compared\n"
5641 " revisions are specified, the working directory files are compared\n"
5599 " to its parent.\n"
5642 " to its parent.\n"
5600 "\n"
5643 "\n"
5601 " Without the -a option, diff will avoid generating diffs of files\n"
5644 " Without the -a option, diff will avoid generating diffs of files\n"
5602 " it detects as binary. With -a, diff will generate a diff anyway,\n"
5645 " it detects as binary. With -a, diff will generate a diff anyway,\n"
5603 " probably with undesirable results.\n"
5646 " probably with undesirable results.\n"
5604 "\n"
5647 "\n"
5605 " Use the --git option to generate diffs in the git extended diff\n"
5648 " Use the --git option to generate diffs in the git extended diff\n"
5606 " format. Read the diffs help topic for more information.\n"
5649 " format. For more information, read hg help diffs.\n"
5607 " "
5650 " "
5608 msgstr ""
5651 msgstr ""
5609 "作業領域全体(ないし指定ファイル)の差分抽出\n"
5652 "作業領域全体(ないし指定ファイル)の差分抽出\n"
5610 "\n"
5653 "\n"
5611 " 指定されたファイルに対して、リビジョン間の差分を表示します。\n"
5654 " 指定されたファイルに対して、リビジョン間の差分を表示します。\n"
5612 "\n"
5655 "\n"
5613 " 差分は unified diff 形式で表示されます。\n"
5656 " 差分は unified diff 形式で表示されます。\n"
5614 "\n"
5657 "\n"
5615 " 備考: マージに対する差分表示が期待と異なる場合があるのは、\n"
5658 " 備考: マージに対する差分表示が期待と異なる場合があるのは、\n"
5616 " 無指定時に比較対象となるのが作業領域の第1親リビジョンであるためです。\n"
5659 " 無指定時に比較対象となるのが作業領域の第1親リビジョンであるためです。\n"
5617 "\n"
5660 "\n"
5618 " リビジョンが2つ指定された場合、両リビジョン間の差分が表示されます。\n"
5661 " リビジョンが2つ指定された場合、両リビジョン間の差分が表示されます。\n"
5619 " リビジョンが1つ指定された場合、当該リビジョンと作業領域の内容が比較\n"
5662 " リビジョンが1つ指定された場合、当該リビジョンと作業領域の内容が比較\n"
5620 " され、リビジョンが1つも指定されない場合は、作業領域の内容と\n"
5663 " され、リビジョンが1つも指定されない場合は、作業領域の内容と\n"
5621 " 親リビジョンとが比較されます。\n"
5664 " 親リビジョンとが比較されます。\n"
5622 "\n"
5665 "\n"
5623 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
5666 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
5624 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
5667 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
5625 " 全てのファイルに処理を実施します。\n"
5668 " 全てのファイルに処理を実施します。\n"
5626 "\n"
5669 "\n"
5627 " git 拡張差分形式で表示するには --git オプションを指定します。\n"
5670 " git 拡張差分形式で表示するには --git オプションを指定します。\n"
5628 " 詳細は \"hg help diffs\" を参照してください。\n"
5671 " 詳細は \"hg help diffs\" を参照してください。\n"
5629 " "
5672 " "
5630
5673
5631 msgid ""
5674 msgid ""
5632 "dump the header and diffs for one or more changesets\n"
5675 "dump the header and diffs for one or more changesets\n"
5633 "\n"
5676 "\n"
5634 " Print the changeset header and diffs for one or more revisions.\n"
5677 " Print the changeset header and diffs for one or more revisions.\n"
5635 "\n"
5678 "\n"
5636 " The information shown in the changeset header is: author,\n"
5679 " The information shown in the changeset header is: author,\n"
5637 " changeset hash, parent(s) and commit comment.\n"
5680 " changeset hash, parent(s) and commit comment.\n"
5638 "\n"
5681 "\n"
5639 " NOTE: export may generate unexpected diff output for merge changesets,\n"
5682 " NOTE: export may generate unexpected diff output for merge changesets,\n"
5640 " as it will compare the merge changeset against its first parent only.\n"
5683 " as it will compare the merge changeset against its first parent only.\n"
5641 "\n"
5684 "\n"
5642 " Output may be to a file, in which case the name of the file is\n"
5685 " Output may be to a file, in which case the name of the file is\n"
5643 " given using a format string. The formatting rules are as follows:\n"
5686 " given using a format string. The formatting rules are as follows:\n"
5644 "\n"
5687 "\n"
5645 " %% literal \"%\" character\n"
5688 " %% literal \"%\" character\n"
5646 " %H changeset hash (40 bytes of hexadecimal)\n"
5689 " %H changeset hash (40 bytes of hexadecimal)\n"
5647 " %N number of patches being generated\n"
5690 " %N number of patches being generated\n"
5648 " %R changeset revision number\n"
5691 " %R changeset revision number\n"
5649 " %b basename of the exporting repository\n"
5692 " %b basename of the exporting repository\n"
5650 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5693 " %h short-form changeset hash (12 bytes of hexadecimal)\n"
5651 " %n zero-padded sequence number, starting at 1\n"
5694 " %n zero-padded sequence number, starting at 1\n"
5652 " %r zero-padded changeset revision number\n"
5695 " %r zero-padded changeset revision number\n"
5653 "\n"
5696 "\n"
5654 " Without the -a option, export will avoid generating diffs of files\n"
5697 " Without the -a option, export will avoid generating diffs of files\n"
5655 " it detects as binary. With -a, export will generate a diff anyway,\n"
5698 " it detects as binary. With -a, export will generate a diff anyway,\n"
5656 " probably with undesirable results.\n"
5699 " probably with undesirable results.\n"
5657 "\n"
5700 "\n"
5658 " Use the --git option to generate diffs in the git extended diff\n"
5701 " Use the --git option to generate diffs in the git extended diff\n"
5659 " format. Read the diffs help topic for more information.\n"
5702 " format. Read the diffs help topic for more information.\n"
5660 "\n"
5703 "\n"
5661 " With the --switch-parent option, the diff will be against the second\n"
5704 " With the --switch-parent option, the diff will be against the second\n"
5662 " parent. It can be useful to review a merge.\n"
5705 " parent. It can be useful to review a merge.\n"
5663 " "
5706 " "
5664 msgstr ""
5707 msgstr ""
5665 "1つ以上のチェンジセットに対するヘッダおよび変更内容の出力\n"
5708 "1つ以上のチェンジセットに対するヘッダおよび変更内容の出力\n"
5666 "\n"
5709 "\n"
5667 " 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。\n"
5710 " 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。\n"
5668 "\n"
5711 "\n"
5669 " ヘッダ情報には以下の情報が含まれます: \n"
5712 " ヘッダ情報には以下の情報が含まれます: \n"
5670 " 作成者/ハッシュ値/親リビジョン/コミットログ\n"
5713 " 作成者/ハッシュ値/親リビジョン/コミットログ\n"
5671 "\n"
5714 "\n"
5672 " 備考: 本コマンドがマージ実施チェンジセットに対して、期待と異なる差分を\n"
5715 " 備考: 本コマンドがマージ実施チェンジセットに対して、期待と異なる差分を\n"
5673 " 出力するのは、第1親との差分のみを出力するためです。\n"
5716 " 出力するのは、第1親との差分のみを出力するためです。\n"
5674 "\n"
5717 "\n"
5675 " (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n"
5718 " (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n"
5676 " 置換指定として以下のものが使用可能です:\n"
5719 " 置換指定として以下のものが使用可能です:\n"
5677 "\n"
5720 "\n"
5678 " %% \"%\" 文字そのもの\n"
5721 " %% \"%\" 文字そのもの\n"
5679 " %H ハッシュ値(40 桁 16 進数)\n"
5722 " %H ハッシュ値(40 桁 16 進数)\n"
5680 " %N 生成されるファイルの総数\n"
5723 " %N 生成されるファイルの総数\n"
5681 " %R リビジョン番号\n"
5724 " %R リビジョン番号\n"
5682 " %b 対象リポジトリのベース名\n"
5725 " %b 対象リポジトリのベース名\n"
5683 " %h 短縮形式ハッシュ値(12 桁 16 進数)\n"
5726 " %h 短縮形式ハッシュ値(12 桁 16 進数)\n"
5684 " %n 1から始まるゼロ詰めの通し番号\n"
5727 " %n 1から始まるゼロ詰めの通し番号\n"
5685 " %r ゼロ詰めのリビジョン番号\n"
5728 " %r ゼロ詰めのリビジョン番号\n"
5686 "\n"
5729 "\n"
5687 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
5730 " -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n"
5688 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
5731 " 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n"
5689 " 全てのファイルに処理を実施します。\n"
5732 " 全てのファイルに処理を実施します。\n"
5690 "\n"
5733 "\n"
5691 " git 拡張差分形式で表示するには --git オプションを指定します。\n"
5734 " git 拡張差分形式で表示するには --git オプションを指定します。\n"
5692 " 詳細は \"hg help diffs\" を参照してください。\n"
5735 " 詳細は \"hg help diffs\" を参照してください。\n"
5693 "\n"
5736 "\n"
5694 " --switch-parent オプションを指定することで、比較対象が第2親になります。\n"
5737 " --switch-parent オプションを指定することで、比較対象が第2親になります。\n"
5695 " これはマージのレビューの際などに有効です。\n"
5738 " これはマージのレビューの際などに有効です。\n"
5696 " "
5739 " "
5697
5740
5698 msgid "export requires at least one changeset"
5741 msgid "export requires at least one changeset"
5699 msgstr ""
5742 msgstr ""
5700
5743
5701 msgid "exporting patches:\n"
5744 msgid "exporting patches:\n"
5702 msgstr ""
5745 msgstr ""
5703
5746
5704 msgid "exporting patch:\n"
5747 msgid "exporting patch:\n"
5705 msgstr ""
5748 msgstr ""
5706
5749
5707 msgid ""
5750 msgid ""
5708 "search for a pattern in specified files and revisions\n"
5751 "search for a pattern in specified files and revisions\n"
5709 "\n"
5752 "\n"
5710 " Search revisions of files for a regular expression.\n"
5753 " Search revisions of files for a regular expression.\n"
5711 "\n"
5754 "\n"
5712 " This command behaves differently than Unix grep. It only accepts\n"
5755 " This command behaves differently than Unix grep. It only accepts\n"
5713 " Python/Perl regexps. It searches repository history, not the\n"
5756 " Python/Perl regexps. It searches repository history, not the\n"
5714 " working directory. It always prints the revision number in which\n"
5757 " working directory. It always prints the revision number in which\n"
5715 " a match appears.\n"
5758 " a match appears.\n"
5716 "\n"
5759 "\n"
5717 " By default, grep only prints output for the first revision of a\n"
5760 " By default, grep only prints output for the first revision of a\n"
5718 " file in which it finds a match. To get it to print every revision\n"
5761 " file in which it finds a match. To get it to print every revision\n"
5719 " that contains a change in match status (\"-\" for a match that\n"
5762 " that contains a change in match status (\"-\" for a match that\n"
5720 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5763 " becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
5721 " use the --all flag.\n"
5764 " use the --all flag.\n"
5722 " "
5765 " "
5723 msgstr ""
5766 msgstr ""
5724 "特定のパターンに合致するファイルとリビジョンの検索\n"
5767 "特定のパターンに合致するファイルとリビジョンの検索\n"
5725 "\n"
5768 "\n"
5726 " 正規表現に合致するファイルを含むリビジョンを検索します。\n"
5769 " 正規表現に合致するファイルを含むリビジョンを検索します。\n"
5727 "\n"
5770 "\n"
5728 " 本コマンドの挙動は Unix の grep とは異なります。解釈可能な正規表現は\n"
5771 " 本コマンドの挙動は Unix の grep とは異なります。解釈可能な正規表現は\n"
5729 " Python/Perl 形式のものだけです。検索対象はリポジトリ内のデータのみで、\n"
5772 " Python/Perl 形式のものだけです。検索対象はリポジトリ内のデータのみで、\n"
5730 " 作業領域は検索対象には含まれません。パターンに合致する内容が現れた\n"
5773 " 作業領域は検索対象には含まれません。パターンに合致する内容が現れた\n"
5731 " リビジョンを表示します。\n"
5774 " リビジョンを表示します。\n"
5732 "\n"
5775 "\n"
5733 " 指定が無い場合本コマンドは、パターンに合致する内容が最小に現れた\n"
5776 " 指定が無い場合本コマンドは、パターンに合致する内容が最小に現れた\n"
5734 " リビジョンを各ファイル毎に表示します。パターンに合致する変更のあった\n"
5777 " リビジョンを各ファイル毎に表示します。パターンに合致する変更のあった\n"
5735 " 全てのリビジョンを表示する場合、--all オプションを指定します\n"
5778 " 全てのリビジョンを表示する場合、--all オプションを指定します\n"
5736 " (パターン合致部分の削除は \"-\"、登場は \"+\" を表示することで区別)。\n"
5779 " (パターン合致部分の削除は \"-\"、登場は \"+\" を表示することで区別)。\n"
5737 " "
5780 " "
5738
5781
5739 #, python-format
5782 #, python-format
5740 msgid "grep: invalid match pattern: %s\n"
5783 msgid "grep: invalid match pattern: %s\n"
5741 msgstr ""
5784 msgstr ""
5742
5785
5743 msgid ""
5786 msgid ""
5744 "show current repository heads or show branch heads\n"
5787 "show current repository heads or show branch heads\n"
5745 "\n"
5788 "\n"
5746 " With no arguments, show all repository head changesets.\n"
5789 " With no arguments, show all repository head changesets.\n"
5747 "\n"
5790 "\n"
5748 " If branch or revisions names are given this will show the heads of\n"
5791 " If branch or revisions names are given this will show the heads of\n"
5749 " the specified branches or the branches those revisions are tagged\n"
5792 " the specified branches or the branches those revisions are tagged\n"
5750 " with.\n"
5793 " with.\n"
5751 "\n"
5794 "\n"
5752 " Repository \"heads\" are changesets that don't have child\n"
5795 " Repository \"heads\" are changesets that don't have child\n"
5753 " changesets. They are where development generally takes place and\n"
5796 " changesets. They are where development generally takes place and\n"
5754 " are the usual targets for update and merge operations.\n"
5797 " are the usual targets for update and merge operations.\n"
5755 "\n"
5798 "\n"
5756 " Branch heads are changesets that have a given branch tag, but have\n"
5799 " Branch heads are changesets that have a given branch tag, but have\n"
5757 " no child changesets with that tag. They are usually where\n"
5800 " no child changesets with that tag. They are usually where\n"
5758 " development on the given branch takes place.\n"
5801 " development on the given branch takes place.\n"
5759 " "
5802 " "
5760 msgstr ""
5803 msgstr ""
5761 "現時点でのリポジトリ(ないしブランチ)のヘッド表示\n"
5804 "現時点でのリポジトリ(ないしブランチ)のヘッド表示\n"
5762 "\n"
5805 "\n"
5763 " 引数指定が無い場合、リポジトリ中の全てのヘッドを表示します。\n"
5806 " 引数指定が無い場合、リポジトリ中の全てのヘッドを表示します。\n"
5764 "\n"
5807 "\n"
5765 " ブランチないしリビジョンが指定された場合本コマンドは、指定された\n"
5808 " ブランチないしリビジョンが指定された場合本コマンドは、指定された\n"
5766 " ブランチ、ないし指定リビジョンが属するブランチのヘッドを表示します。\n"
5809 " ブランチ、ないし指定リビジョンが属するブランチのヘッドを表示します。\n"
5767 "\n"
5810 "\n"
5768 " リポジトリの「ヘッド」とは、子チェンジセットを持たないチェンジセットの\n"
5811 " リポジトリの「ヘッド」とは、子チェンジセットを持たないチェンジセットの\n"
5769 " ことを指します。改変作業の実施や、update/merge コマンド実施の際には\n"
5812 " ことを指します。改変作業の実施や、update/merge コマンド実施の際には\n"
5770 " このチェンジセットを対象とするのが一般的です。\n"
5813 " このチェンジセットを対象とするのが一般的です。\n"
5771 "\n"
5814 "\n"
5772 " ブランチのヘッドは、当該ブランチに属しつつ、そのブランチに属する\n"
5815 " ブランチのヘッドは、当該ブランチに属しつつ、そのブランチに属する\n"
5773 " 子チェンジセットを持たないチェンジセットのことを指します。\n"
5816 " 子チェンジセットを持たないチェンジセットのことを指します。\n"
5774 " 当該ブランチでの作業はこのチェンジセットを対象とするのが一般的です。\n"
5817 " 当該ブランチでの作業はこのチェンジセットを対象とするのが一般的です。\n"
5775 " "
5818 " "
5776
5819
5777 #, python-format
5820 #, python-format
5778 msgid "no changes on branch %s containing %s are reachable from %s\n"
5821 msgid "no changes on branch %s containing %s are reachable from %s\n"
5779 msgstr ""
5822 msgstr ""
5780
5823
5781 #, python-format
5824 #, python-format
5782 msgid "no changes on branch %s are reachable from %s\n"
5825 msgid "no changes on branch %s are reachable from %s\n"
5783 msgstr ""
5826 msgstr ""
5784
5827
5785 msgid ""
5828 msgid ""
5786 "show help for a given topic or a help overview\n"
5829 "show help for a given topic or a help overview\n"
5787 "\n"
5830 "\n"
5788 " With no arguments, print a list of commands and short help.\n"
5831 " With no arguments, print a list of commands and short help.\n"
5789 "\n"
5832 "\n"
5790 " Given a topic, extension, or command name, print help for that topic."
5833 " Given a topic, extension, or command name, print help for that topic."
5791 msgstr ""
5834 msgstr ""
5792 "指定されたトピックのヘルプやヘルプ概要の表示\n"
5835 "指定されたトピックのヘルプやヘルプ概要の表示\n"
5793 "\n"
5836 "\n"
5794 " 引数指定が無い場合、コマンドの一覧と概要を表示します。\n"
5837 " 引数指定が無い場合、コマンドの一覧と概要を表示します。\n"
5795 "\n"
5838 "\n"
5796 " トピックやコマンド名が指定された場合、指定対象のヘルプを表示します。"
5839 " トピックやコマンド名が指定された場合、指定対象のヘルプを表示します。"
5797
5840
5798 msgid "global options:"
5841 msgid "global options:"
5799 msgstr "グローバルオプション:"
5842 msgstr "グローバルオプション:"
5800
5843
5801 msgid "use \"hg help\" for the full list of commands"
5844 msgid "use \"hg help\" for the full list of commands"
5802 msgstr "全コマンドの一覧は \"hg help\" で表示されます"
5845 msgstr "全コマンドの一覧は \"hg help\" で表示されます"
5803
5846
5804 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5847 msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
5805 msgstr ""
5848 msgstr ""
5806 "全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます"
5849 "全コマンドの一覧は \"hg help\" で、コマンド詳細は \"hg -v\" で表示されます"
5807
5850
5808 #, python-format
5851 #, python-format
5809 msgid "use \"hg -v help%s\" to show aliases and global options"
5852 msgid "use \"hg -v help%s\" to show aliases and global options"
5810 msgstr "別名およびグローバルオプションは \"hg -v help%s\" で表示されます"
5853 msgstr "別名およびグローバルオプションは \"hg -v help%s\" で表示されます"
5811
5854
5812 #, python-format
5855 #, python-format
5813 msgid "use \"hg -v help %s\" to show global options"
5856 msgid "use \"hg -v help %s\" to show global options"
5814 msgstr "グローバルオプションは \"hg -v help %s\" で表示されます"
5857 msgstr "グローバルオプションは \"hg -v help %s\" で表示されます"
5815
5858
5816 msgid ""
5859 msgid ""
5817 "list of commands:\n"
5860 "list of commands:\n"
5818 "\n"
5861 "\n"
5819 msgstr ""
5862 msgstr ""
5820 "コマンド一覧:\n"
5863 "コマンド一覧:\n"
5821 "\n"
5864 "\n"
5822
5865
5823 #, python-format
5866 #, python-format
5824 msgid ""
5867 msgid ""
5825 "\n"
5868 "\n"
5826 "aliases: %s\n"
5869 "aliases: %s\n"
5827 msgstr ""
5870 msgstr ""
5828 "\n"
5871 "\n"
5829 "別名: %s\n"
5872 "別名: %s\n"
5830
5873
5831 msgid "(no help text available)"
5874 msgid "(no help text available)"
5832 msgstr ""
5875 msgstr ""
5833
5876
5834 msgid "options:\n"
5877 msgid "options:\n"
5835 msgstr "オプション:\n"
5878 msgstr "オプション:\n"
5836
5879
5837 msgid "no commands defined\n"
5880 msgid "no commands defined\n"
5838 msgstr ""
5881 msgstr ""
5839
5882
5840 msgid ""
5883 msgid ""
5841 "\n"
5884 "\n"
5842 "enabled extensions:\n"
5885 "enabled extensions:\n"
5843 "\n"
5886 "\n"
5844 msgstr ""
5887 msgstr ""
5845 "\n"
5888 "\n"
5846 "利用可能な拡張機能:\n"
5889 "利用可能な拡張機能:\n"
5847 "\n"
5890 "\n"
5848
5891
5849 #, python-format
5892 #, python-format
5850 msgid " %s %s\n"
5893 msgid " %s %s\n"
5851 msgstr ""
5894 msgstr ""
5852
5895
5853 msgid "no help text available"
5896 msgid "no help text available"
5854 msgstr ""
5897 msgstr ""
5855
5898
5856 #, python-format
5899 #, python-format
5857 msgid "%s extension - %s\n"
5900 msgid "%s extension - %s\n"
5858 msgstr ""
5901 msgstr ""
5859
5902
5860 msgid "Mercurial Distributed SCM\n"
5903 msgid "Mercurial Distributed SCM\n"
5861 msgstr "Mercurial - 分散構成管理ツール\n"
5904 msgstr "Mercurial - 分散構成管理ツール\n"
5862
5905
5863 msgid ""
5906 msgid ""
5864 "basic commands:\n"
5907 "basic commands:\n"
5865 "\n"
5908 "\n"
5866 msgstr ""
5909 msgstr ""
5867 "基本コマンド:\n"
5910 "基本コマンド:\n"
5868 "\n"
5911 "\n"
5869
5912
5870 msgid ""
5913 msgid ""
5871 "\n"
5914 "\n"
5872 "additional help topics:\n"
5915 "additional help topics:\n"
5873 "\n"
5916 "\n"
5874 msgstr ""
5917 msgstr ""
5875 "\n"
5918 "\n"
5876 "追加のヘルプトピック:\n"
5919 "追加のヘルプトピック:\n"
5877 "\n"
5920 "\n"
5878
5921
5879 msgid ""
5922 msgid ""
5880 "identify the working copy or specified revision\n"
5923 "identify the working copy or specified revision\n"
5881 "\n"
5924 "\n"
5882 " With no revision, print a summary of the current state of the repo.\n"
5925 " With no revision, print a summary of the current state of the repo.\n"
5883 "\n"
5926 "\n"
5884 " With a path, do a lookup in another repository.\n"
5927 " With a path, do a lookup in another repository.\n"
5885 "\n"
5928 "\n"
5886 " This summary identifies the repository state using one or two parent\n"
5929 " This summary identifies the repository state using one or two parent\n"
5887 " hash identifiers, followed by a \"+\" if there are uncommitted changes\n"
5930 " hash identifiers, followed by a \"+\" if there are uncommitted changes\n"
5888 " in the working directory, a list of tags for this revision and a branch\n"
5931 " in the working directory, a list of tags for this revision and a branch\n"
5889 " name for non-default branches.\n"
5932 " name for non-default branches.\n"
5890 " "
5933 " "
5891 msgstr ""
5934 msgstr ""
5892 "作業領域ないし特定リビジョンの識別情報表示\n"
5935 "作業領域ないし特定リビジョンの識別情報表示\n"
5893 "\n"
5936 "\n"
5894 " リビジョン指定無しの起動では、作業領域の状態を表示します。\n"
5937 " リビジョン指定無しの起動では、作業領域の状態を表示します。\n"
5895 "\n"
5938 "\n"
5896 " パス指定有りでの起動の場合は、他のリポジトリを参照します。\n"
5939 " パス指定有りでの起動の場合は、他のリポジトリを参照します。\n"
5897 "\n"
5940 "\n"
5898 " 本コマンドの出力する要約情報は、1つないし2つの親リビジョンハッシュ値"
5941 " 本コマンドの出力する要約情報は、1つないし2つの親リビジョンハッシュ値を\n"
5899 "を\n"
5900 " 使用して、作業領域の状態を識別します。ハッシュ値の後ろには、作業領域に\n"
5942 " 使用して、作業領域の状態を識別します。ハッシュ値の後ろには、作業領域に\n"
5901 " 未コミットの変更がある場合は \"+\"、当該リビジョンに付いているタグの\n"
5943 " 未コミットの変更がある場合は \"+\"、当該リビジョンに付いているタグの\n"
5902 " 一覧、default 以外のブランチの場合にはブランチ名が続きます。\n"
5944 " 一覧、default 以外のブランチの場合にはブランチ名が続きます。\n"
5903 " "
5945 " "
5904
5946
5905 msgid ""
5947 msgid ""
5906 "import an ordered set of patches\n"
5948 "import an ordered set of patches\n"
5907 "\n"
5949 "\n"
5908 " Import a list of patches and commit them individually.\n"
5950 " Import a list of patches and commit them individually.\n"
5909 "\n"
5951 "\n"
5910 " If there are outstanding changes in the working directory, import\n"
5952 " If there are outstanding changes in the working directory, import\n"
5911 " will abort unless given the -f flag.\n"
5953 " will abort unless given the -f flag.\n"
5912 "\n"
5954 "\n"
5913 " You can import a patch straight from a mail message. Even patches\n"
5955 " You can import a patch straight from a mail message. Even patches\n"
5914 " as attachments work (body part must be type text/plain or\n"
5956 " as attachments work (body part must be type text/plain or\n"
5915 " text/x-patch to be used). From and Subject headers of email\n"
5957 " text/x-patch to be used). From and Subject headers of email\n"
5916 " message are used as default committer and commit message. All\n"
5958 " message are used as default committer and commit message. All\n"
5917 " text/plain body parts before first diff are added to commit\n"
5959 " text/plain body parts before first diff are added to commit\n"
5918 " message.\n"
5960 " message.\n"
5919 "\n"
5961 "\n"
5920 " If the imported patch was generated by hg export, user and description\n"
5962 " If the imported patch was generated by hg export, user and description\n"
5921 " from patch override values from message headers and body. Values\n"
5963 " from patch override values from message headers and body. Values\n"
5922 " given on command line with -m and -u override these.\n"
5964 " given on command line with -m and -u override these.\n"
5923 "\n"
5965 "\n"
5924 " If --exact is specified, import will set the working directory\n"
5966 " If --exact is specified, import will set the working directory\n"
5925 " to the parent of each patch before applying it, and will abort\n"
5967 " to the parent of each patch before applying it, and will abort\n"
5926 " if the resulting changeset has a different ID than the one\n"
5968 " if the resulting changeset has a different ID than the one\n"
5927 " recorded in the patch. This may happen due to character set\n"
5969 " recorded in the patch. This may happen due to character set\n"
5928 " problems or other deficiencies in the text patch format.\n"
5970 " problems or other deficiencies in the text patch format.\n"
5929 "\n"
5971 "\n"
5930 " With --similarity, hg will attempt to discover renames and copies\n"
5972 " With --similarity, hg will attempt to discover renames and copies\n"
5931 " in the patch in the same way as 'addremove'.\n"
5973 " in the patch in the same way as 'addremove'.\n"
5932 "\n"
5974 "\n"
5933 " To read a patch from standard input, use patch name \"-\".\n"
5975 " To read a patch from standard input, use patch name \"-\".\n"
5934 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5976 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
5935 " "
5977 " "
5936 msgstr ""
5978 msgstr ""
5937 "パッチの順次取り込み\n"
5979 "パッチの順次取り込み\n"
5938 "\n"
5980 "\n"
5939 " 列挙されたパッチの取り込みおよびコミットを個別に行います。\n"
5981 " 列挙されたパッチの取り込みおよびコミットを個別に行います。\n"
5940 "\n"
5982 "\n"
5941 " 作業領域に未コミットの変更がある場合、-f フラグが指定されない限り\n"
5983 " 作業領域に未コミットの変更がある場合、-f フラグが指定されない限り\n"
5942 " 取り込みは中断されます。\n"
5984 " 取り込みは中断されます。\n"
5943 "\n"
5985 "\n"
5944 " 電子メールから直接パッチを取り込むことも可能です。添付ファイル形式の\n"
5986 " 電子メールから直接パッチを取り込むことも可能です。添付ファイル形式の\n"
5945 " パッチであっても取り込み可能です(text/plain ないし text/x-patch 型\n"
5987 " パッチであっても取り込み可能です(text/plain ないし text/x-patch 型\n"
5946 " でなければなりません)。電子メールの From および Subject ヘッダは\n"
5988 " でなければなりません)。電子メールの From および Subject ヘッダは\n"
5947 " 無指定時の作成者およびコミットログとして使用されます。\n"
5989 " 無指定時の作成者およびコミットログとして使用されます。\n"
5948 " 最初のパッチデータよりも前の text/plain 型ボディの内容は、\n"
5990 " 最初のパッチデータよりも前の text/plain 型ボディの内容は、\n"
5949 " コミットログに対して追加されます。\n"
5991 " コミットログに対して追加されます。\n"
5950 "\n"
5992 "\n"
5951 " hg export により生成されたパッチを取り込む場合、電子メールのヘッダや\n"
5993 " hg export により生成されたパッチを取り込む場合、電子メールのヘッダや\n"
5952 " ボディ部分の情報よりも、パッチに含まれる情報の方が優先します。\n"
5994 " ボディ部分の情報よりも、パッチに含まれる情報の方が優先します。\n"
5953 " コマンドラインでの -m ないし -u 指定は、これらよりも優先します。\n"
5995 " コマンドラインでの -m ないし -u 指定は、これらよりも優先します。\n"
5954 "\n"
5996 "\n"
5955 " --exact が指定された際には、作業領域をそれぞれのパッチの親リビジョンで\n"
5997 " --exact が指定された際には、作業領域をそれぞれのパッチの親リビジョンで\n"
5956 " 更新してからパッチの適用を実施しますが、作成されたチェンジセットのIDが\n"
5998 " 更新してからパッチの適用を実施しますが、作成されたチェンジセットのIDが\n"
5957 " パッチに記録された ID と異なる場合、パッチの適用を中断します。\n"
5999 " パッチに記録された ID と異なる場合、パッチの適用を中断します。\n"
5958 " この中断は、利用する文字符号化の問題や、パッチのテキスト部分の不足\n"
6000 " この中断は、利用する文字符号化の問題や、パッチのテキスト部分の不足\n"
5959 " といったことが原因で発生する可能性もあります。\n"
6001 " といったことが原因で発生する可能性もあります。\n"
5960 "\n"
6002 "\n"
5961 " --similarity が指定された際には、パッチによる変更における改名や複製を\n"
6003 " --similarity が指定された際には、パッチによる変更における改名や複製を\n"
5962 " hg addremove と同様な方針で特定します。\n"
6004 " hg addremove と同様な方針で特定します。\n"
5963 "\n"
6005 "\n"
5964 " 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定してください。\n"
6006 " 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定してください。\n"
5965 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6007 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
5966 " "
6008 " "
5967
6009
5968 msgid "applying patch from stdin\n"
6010 msgid "applying patch from stdin\n"
5969 msgstr ""
6011 msgstr ""
5970
6012
5971 msgid "no diffs found"
6013 msgid "no diffs found"
5972 msgstr ""
6014 msgstr ""
5973
6015
5974 #, python-format
6016 #, python-format
5975 msgid ""
6017 msgid ""
5976 "message:\n"
6018 "message:\n"
5977 "%s\n"
6019 "%s\n"
5978 msgstr ""
6020 msgstr ""
5979
6021
5980 msgid "not a mercurial patch"
6022 msgid "not a mercurial patch"
5981 msgstr ""
6023 msgstr ""
5982
6024
5983 msgid "patch is damaged or loses information"
6025 msgid "patch is damaged or loses information"
5984 msgstr ""
6026 msgstr ""
5985
6027
5986 msgid ""
6028 msgid ""
5987 "show new changesets found in source\n"
6029 "show new changesets found in source\n"
5988 "\n"
6030 "\n"
5989 " Show new changesets found in the specified path/URL or the default\n"
6031 " Show new changesets found in the specified path/URL or the default\n"
5990 " pull location. These are the changesets that would be pulled if a pull\n"
6032 " pull location. These are the changesets that would be pulled if a pull\n"
5991 " was requested.\n"
6033 " was requested.\n"
5992 "\n"
6034 "\n"
5993 " For remote repository, using --bundle avoids downloading the changesets\n"
6035 " For remote repository, using --bundle avoids downloading the changesets\n"
5994 " twice if the incoming is followed by a pull.\n"
6036 " twice if the incoming is followed by a pull.\n"
5995 "\n"
6037 "\n"
5996 " See pull for valid source format details.\n"
6038 " See pull for valid source format details.\n"
5997 " "
6039 " "
5998 msgstr ""
6040 msgstr ""
5999 "指定リポジトリ中の未取り込みチェンジセットの検索\n"
6041 "指定リポジトリ中の未取り込みチェンジセットの検索\n"
6000 "\n"
6042 "\n"
6001 " ファイルパスや URL、hg pull の default 取り込み対象により指定される\n"
6043 " ファイルパスや URL、hg pull の default 取り込み対象により指定される\n"
6002 " リポジトリ中の、未取り込みチェンジセットを検索します。\n"
6044 " リポジトリ中の、未取り込みチェンジセットを検索します。\n"
6003 " これらは、hg pull を実行した際に取り込まれる予定のチェンジセットです。\n"
6045 " これらは、hg pull を実行した際に取り込まれる予定のチェンジセットです。\n"
6004 "\n"
6046 "\n"
6005 " 遠隔ホストのリポジトリの場合、--bundle を使用することで、本コマンド\n"
6047 " 遠隔ホストのリポジトリの場合、--bundle を使用することで、本コマンド\n"
6006 " 実行後の hg pull 実施の際に、再度のチェンジセット検索を抑止できます。\n"
6048 " 実行後の hg pull 実施の際に、再度のチェンジセット検索を抑止できます。\n"
6007 "\n"
6049 "\n"
6008 " 対象リポジトリの指定形式の詳細は hg pull のヘルプを参照してください。\n"
6050 " 対象リポジトリの指定形式の詳細は hg pull のヘルプを参照してください。\n"
6009 " "
6051 " "
6010
6052
6011 msgid ""
6053 msgid ""
6012 "create a new repository in the given directory\n"
6054 "create a new repository in the given directory\n"
6013 "\n"
6055 "\n"
6014 " Initialize a new repository in the given directory. If the given\n"
6056 " Initialize a new repository in the given directory. If the given\n"
6015 " directory does not exist, it is created.\n"
6057 " directory does not exist, it is created.\n"
6016 "\n"
6058 "\n"
6017 " If no directory is given, the current directory is used.\n"
6059 " If no directory is given, the current directory is used.\n"
6018 "\n"
6060 "\n"
6019 " It is possible to specify an ssh:// URL as the destination.\n"
6061 " It is possible to specify an ssh:// URL as the destination.\n"
6020 " See 'hg help urls' for more information.\n"
6062 " See 'hg help urls' for more information.\n"
6021 " "
6063 " "
6022 msgstr ""
6064 msgstr ""
6023 "指定されたディレクトリでの新規リポジトリの作成\n"
6065 "指定されたディレクトリでの新規リポジトリの作成\n"
6024 "\n"
6066 "\n"
6025 " 指定されたリポジトリを新規リポジトリとして初期化します。指定された\n"
6067 " 指定されたリポジトリを新規リポジトリとして初期化します。指定された\n"
6026 " ディレクトリが存在しない場合には、ディレクトリを作成します。\n"
6068 " ディレクトリが存在しない場合には、ディレクトリを作成します。\n"
6027 "\n"
6069 "\n"
6028 " ディレクトリが指定されない場合、現ディレクトリが初期化されます。\n"
6070 " ディレクトリが指定されない場合、現ディレクトリが初期化されます。\n"
6029 "\n"
6071 "\n"
6030 " 複製先として ssh:// URL 形式を指定することも可能です。\n"
6072 " 複製先として ssh:// URL 形式を指定することも可能です。\n"
6031 " 詳細に関しては、'hg help urls' を参照してください。\n"
6073 " 詳細に関しては、'hg help urls' を参照してください。\n"
6032 " "
6074 " "
6033
6075
6034 msgid ""
6076 msgid ""
6035 "locate files matching specific patterns\n"
6077 "locate files matching specific patterns\n"
6036 "\n"
6078 "\n"
6037 " Print all files under Mercurial control whose names match the\n"
6079 " Print all files under Mercurial control whose names match the\n"
6038 " given patterns.\n"
6080 " given patterns.\n"
6039 "\n"
6081 "\n"
6040 " This command searches the entire repository by default. To search\n"
6082 " This command searches the entire repository by default. To search\n"
6041 " just the current directory and its subdirectories, use\n"
6083 " just the current directory and its subdirectories, use\n"
6042 " \"--include .\".\n"
6084 " \"--include .\".\n"
6043 "\n"
6085 "\n"
6044 " If no patterns are given to match, this command prints all file\n"
6086 " If no patterns are given to match, this command prints all file\n"
6045 " names.\n"
6087 " names.\n"
6046 "\n"
6088 "\n"
6047 " If you want to feed the output of this command into the \"xargs\"\n"
6089 " If you want to feed the output of this command into the \"xargs\"\n"
6048 " command, use the \"-0\" option to both this command and \"xargs\".\n"
6090 " command, use the \"-0\" option to both this command and \"xargs\".\n"
6049 " This will avoid the problem of \"xargs\" treating single filenames\n"
6091 " This will avoid the problem of \"xargs\" treating single filenames\n"
6050 " that contain white space as multiple filenames.\n"
6092 " that contain white space as multiple filenames.\n"
6051 " "
6093 " "
6052 msgstr ""
6094 msgstr ""
6053 "指定されたパターンに合致する名前を持つファイルの特定\n"
6095 "指定されたパターンに合致する名前を持つファイルの特定\n"
6054 "\n"
6096 "\n"
6055 " 構成管理対象となるファイルの中から、指定されたパターンに合致する名前を\n"
6097 " 構成管理対象となるファイルの中から、指定されたパターンに合致する名前を\n"
6056 " 持つファイルを特定します。\n"
6098 " 持つファイルを特定します。\n"
6057 "\n"
6099 "\n"
6058 " 特に指定が無い場合、本コマンドは構成管理対象となる作業領域中の\n"
6100 " 特に指定が無い場合、本コマンドは構成管理対象となる作業領域中の\n"
6059 " 全ファイルを検索対象とします。現ディレクトリとそのサブディレクトリのみ"
6101 " 全ファイルを検索対象とします。現ディレクトリとサブディレクトリのみを\n"
6060 "を\n"
6061 " 検索対象とするには、\"--include .\" を使用してください。\n"
6102 " 検索対象とするには、\"--include .\" を使用してください。\n"
6062 "\n"
6103 "\n"
6063 " パターン指定が無い場合、本コマンドは全ファイルのファイル名を表示しま"
6104 " パターン指定が無い場合、本コマンドは全のファイル名を表示します。\n"
6064 "す。\n"
6065 "\n"
6105 "\n"
6066 " 本コマンドの出力を \"xargs\" コマンドへと渡す場合、本コマンドと\n"
6106 " 本コマンドの出力を \"xargs\" コマンドへと渡す場合、本コマンドと\n"
6067 " \"xargs\" コマンドの両方への \"-0\" オプション指定をお勧めします。\n"
6107 " \"xargs\" コマンドの両方への \"-0\" オプション指定をお勧めします。\n"
6068 " 空白文字を含む単一のファイル名が、複数のファイル名に解釈されてしまう\n"
6108 " 空白文字を含む単一のファイル名が、複数のファイル名に解釈されてしまう\n"
6069 " \"xargs\" の問題は、このオプションにより解決することができます。\n"
6109 " \"xargs\" の問題は、このオプションにより解決することができます。\n"
6070 " "
6110 " "
6071
6111
6072 msgid ""
6112 msgid ""
6073 "show revision history of entire repository or files\n"
6113 "show revision history of entire repository or files\n"
6074 "\n"
6114 "\n"
6075 " Print the revision history of the specified files or the entire\n"
6115 " Print the revision history of the specified files or the entire\n"
6076 " project.\n"
6116 " project.\n"
6077 "\n"
6117 "\n"
6078 " File history is shown without following rename or copy history of\n"
6118 " File history is shown without following rename or copy history of\n"
6079 " files. Use -f/--follow with a file name to follow history across\n"
6119 " files. Use -f/--follow with a file name to follow history across\n"
6080 " renames and copies. --follow without a file name will only show\n"
6120 " renames and copies. --follow without a file name will only show\n"
6081 " ancestors or descendants of the starting revision. --follow-first\n"
6121 " ancestors or descendants of the starting revision. --follow-first\n"
6082 " only follows the first parent of merge revisions.\n"
6122 " only follows the first parent of merge revisions.\n"
6083 "\n"
6123 "\n"
6084 " If no revision range is specified, the default is tip:0 unless\n"
6124 " If no revision range is specified, the default is tip:0 unless\n"
6085 " --follow is set, in which case the working directory parent is\n"
6125 " --follow is set, in which case the working directory parent is\n"
6086 " used as the starting revision.\n"
6126 " used as the starting revision.\n"
6087 "\n"
6127 "\n"
6088 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6128 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6089 "\n"
6129 "\n"
6090 " By default this command outputs: changeset id and hash, tags,\n"
6130 " By default this command outputs: changeset id and hash, tags,\n"
6091 " non-trivial parents, user, date and time, and a summary for each\n"
6131 " non-trivial parents, user, date and time, and a summary for each\n"
6092 " commit. When the -v/--verbose switch is used, the list of changed\n"
6132 " commit. When the -v/--verbose switch is used, the list of changed\n"
6093 " files and full commit message is shown.\n"
6133 " files and full commit message is shown.\n"
6094 "\n"
6134 "\n"
6095 " NOTE: log -p may generate unexpected diff output for merge\n"
6135 " NOTE: log -p may generate unexpected diff output for merge\n"
6096 " changesets, as it will compare the merge changeset against its\n"
6136 " changesets, as it will only compare the merge changeset against\n"
6097 " first parent only. Also, the files: list will only reflect files\n"
6137 " its first parent. Also, the files: list will only reflect files\n"
6098 " that are different from BOTH parents.\n"
6138 " that are different from BOTH parents.\n"
6099 "\n"
6139 "\n"
6100 " "
6140 " "
6101 msgstr ""
6141 msgstr ""
6102 "リポジトリ全体ないしファイルの変更履歴の表示\n"
6142 "リポジトリ全体ないしファイルの変更履歴の表示\n"
6103 "\n"
6143 "\n"
6104 " 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n"
6144 " 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n"
6105 "\n"
6145 "\n"
6106 " ファイルの履歴表示では、改名や複製における元ファイルにまでさかのぼった\n"
6146 " ファイルの履歴表示では、改名や複製における元ファイルにまでさかのぼった\n"
6107 " 履歴は表示しません。元ファイルの履歴までさかのぼる場合は、ファイル名"
6147 " 履歴は表示しません。元ファイルの履歴までさかのぼる場合は、ファイル名と\n"
6108 "と\n"
6109 " 一緒に -f/--follow オプションを指定してください。--follow 指定の際に\n"
6148 " 一緒に -f/--follow オプションを指定してください。--follow 指定の際に\n"
6110 " ファイル名を指定しない場合は、開始リビジョンの先祖ないし子孫リビジョ"
6149 " ファイル名を指定しない場合は、開始リビジョンの先祖ないし子孫リビジョン\n"
6111 "ン\n"
6112 " のみを表示します。--follow-first 指定は、マージリビジョンにおいて\n"
6150 " のみを表示します。--follow-first 指定は、マージリビジョンにおいて\n"
6113 " 第1親の履歴のみをさかのぼります。\n"
6151 " 第1親の履歴のみをさかのぼります。\n"
6114 "\n"
6152 "\n"
6115 " 対象リビジョンの範囲が指定されない場合、対象となるリビジョンの範囲は\n"
6153 " 対象リビジョンの範囲が指定されない場合、対象となるリビジョンの範囲は\n"
6116 " tip:0 とみなされますが、--follow が指定された場合は、作業領域の\n"
6154 " tip:0 とみなされますが、--follow が指定された場合は、作業領域の\n"
6117 " 親リビジョンが開始リビジョンとみなされます。\n"
6155 " 親リビジョンが開始リビジョンとみなされます。\n"
6118 "\n"
6156 "\n"
6119 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6157 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6120 "\n"
6158 "\n"
6121 " 特に指定が無い場合、本コマンドは以下の情報を出力します:\n"
6159 " 特に指定が無い場合、本コマンドは以下の情報を出力します:\n"
6122 " リビジョン番号、ハッシュID、タグ、(リビジョン番号の離れた)親リビジョ"
6160 " リビジョン番号、ハッシュID、タグ、(リビジョン番号の離れた),\n"
6123 "ン、\n"
6161 " 親リビジョン、作成者、作成日時およびコミットログの1行目。\n"
6124 " 作成者、作成日時およびコミットログの1行目。\n"
6125 " -v/--verbose が指定された場合、変更対象ファイル一覧と、コミットログの\n"
6162 " -v/--verbose が指定された場合、変更対象ファイル一覧と、コミットログの\n"
6126 " 全文が表示されます。\n"
6163 " 全文が表示されます。\n"
6127 "\n"
6164 "\n"
6128 " 備考: -p オプションがマージチェンジセットに対して予期せぬ差分を出力\n"
6165 " 備考: -p オプションがマージチェンジセットに対して予期せぬ差分を出力\n"
6129 " するのは、常に第1親との差分を表示するためです。ファイル一覧が予期せぬ\n"
6166 " するのは、常に第1親との差分を表示するためです。ファイル一覧が予期せぬ\n"
6130 " 内容となるのは、両方の親と異なるファイルのみが列挙されるためです。\n"
6167 " 内容となるのは、両方の親と異なるファイルのみが列挙されるためです。\n"
6131 "\n"
6168 "\n"
6132 " "
6169 " "
6133
6170
6134 msgid ""
6171 msgid ""
6135 "looks up all renames for a file (up to endrev) the first\n"
6172 "looks up all renames for a file (up to endrev) the first\n"
6136 " time the file is given. It indexes on the changerev and only\n"
6173 " time the file is given. It indexes on the changerev and only\n"
6137 " parses the manifest if linkrev != changerev.\n"
6174 " parses the manifest if linkrev != changerev.\n"
6138 " Returns rename info for fn at changerev rev."
6175 " Returns rename info for fn at changerev rev."
6139 msgstr ""
6176 msgstr ""
6140
6177
6141 msgid ""
6178 msgid ""
6142 "output the current or given revision of the project manifest\n"
6179 "output the current or given revision of the project manifest\n"
6143 "\n"
6180 "\n"
6144 " Print a list of version controlled files for the given revision.\n"
6181 " Print a list of version controlled files for the given revision.\n"
6145 " If no revision is given, the parent of the working directory is used,\n"
6182 " If no revision is given, the parent of the working directory is used,\n"
6146 " or tip if no revision is checked out.\n"
6183 " or tip if no revision is checked out.\n"
6147 "\n"
6184 "\n"
6148 " The manifest is the list of files being version controlled. If no "
6185 " The manifest is the list of files being version controlled. If no "
6149 "revision\n"
6186 "revision\n"
6150 " is given then the first parent of the working directory is used.\n"
6187 " is given then the first parent of the working directory is used.\n"
6151 "\n"
6188 "\n"
6152 " With -v flag, print file permissions, symlink and executable bits. With\n"
6189 " With -v flag, print file permissions, symlink and executable bits. With\n"
6153 " --debug flag, print file revision hashes.\n"
6190 " --debug flag, print file revision hashes.\n"
6154 " "
6191 " "
6155 msgstr ""
6192 msgstr ""
6156 "現時点ないし指定時点でのリポジトリマニフェストの出力\n"
6193 "現時点ないし指定時点でのリポジトリマニフェストの出力\n"
6157 "\n"
6194 "\n"
6158 " 指定リビジョンでの構成管理対象ファイルの一覧を表示します。\n"
6195 " 指定リビジョンでの構成管理対象ファイルの一覧を表示します。\n"
6159 " リビジョン指定が無い場合、作業領域の(第1)親リビジョンか、\n"
6196 " リビジョン指定が無い場合、作業領域の(第1)親リビジョンか、\n"
6160 " 作業領域の更新前なら tip が使用されます。\n"
6197 " 作業領域の更新前なら tip が使用されます。\n"
6161 "\n"
6198 "\n"
6162 " 「マニフェスト」とは、構成管理対象ファイルの一覧を指します。\n"
6199 " 「マニフェスト」とは、構成管理対象ファイルの一覧を指します。\n"
6163 "\n"
6200 "\n"
6164 " -v が指定された場合、ファイルアクセス権やシンボリックリンク、\n"
6201 " -v が指定された場合、ファイルアクセス権やシンボリックリンク、\n"
6165 " 実行可能ビットといったものも表示されます。\n"
6202 " 実行可能ビットといったものも表示されます。\n"
6166 " --debug が指定された場合、リビジョンのハッシュ値が表示されます。\n"
6203 " --debug が指定された場合、リビジョンのハッシュ値が表示されます。\n"
6167 " "
6204 " "
6168
6205
6169 msgid ""
6206 msgid ""
6170 "merge working directory with another revision\n"
6207 "merge working directory with another revision\n"
6171 "\n"
6208 "\n"
6172 " Merge the contents of the current working directory and the\n"
6209 " Merge the contents of the current working directory and the\n"
6173 " requested revision. Files that changed between either parent are\n"
6210 " requested revision. Files that changed between either parent are\n"
6174 " marked as changed for the next commit and a commit must be\n"
6211 " marked as changed for the next commit and a commit must be\n"
6175 " performed before any further updates are allowed.\n"
6212 " performed before any further updates are allowed.\n"
6176 "\n"
6213 "\n"
6177 " If no revision is specified, the working directory's parent is a\n"
6214 " If no revision is specified, the working directory's parent is a\n"
6178 " head revision, and the current branch contains exactly one other head,\n"
6215 " head revision, and the current branch contains exactly one other head,\n"
6179 " the other head is merged with by default. Otherwise, an explicit\n"
6216 " the other head is merged with by default. Otherwise, an explicit\n"
6180 " revision to merge with must be provided.\n"
6217 " revision to merge with must be provided.\n"
6181 " "
6218 " "
6182 msgstr ""
6219 msgstr ""
6183 "作業領域の内容と他のリビジョンのマージ\n"
6220 "作業領域の内容と他のリビジョンのマージ\n"
6184 "\n"
6221 "\n"
6185 " 現時点での作業領域の内容を、指定されたリビジョンとマージします。\n"
6222 " 現時点での作業領域の内容を、指定されたリビジョンとマージします。\n"
6186 " 両方の親リビジョンに対して変更のあるファイルは、次回コミットの際には\n"
6223 " 両方の親リビジョンに対して変更のあるファイルは、次回コミットの際には\n"
6187 " 更新として記録されますので、それ以上の変更が実施される前に\n"
6224 " 更新として記録されますので、それ以上の変更が実施される前に\n"
6188 " コミットを実施してください。\n"
6225 " コミットを実施してください。\n"
6189 "\n"
6226 "\n"
6190 " マージ対象リビジョンの指定が無く、作業領域の親リビジョンがヘッドで、\n"
6227 " マージ対象リビジョンの指定が無く、作業領域の親リビジョンがヘッドで、\n"
6191 " 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ対象\n"
6228 " 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ対象\n"
6192 " となります。それ以外の場合は、明示的なリビジョン指定が必要です。\n"
6229 " となります。それ以外の場合は、明示的なリビジョン指定が必要です。\n"
6193 " "
6230 " "
6194
6231
6195 #, python-format
6232 #, python-format
6196 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6233 msgid "branch '%s' has %d heads - please merge with an explicit rev"
6197 msgstr ""
6234 msgstr ""
6198
6235
6199 #, python-format
6236 #, python-format
6200 msgid "branch '%s' has one head - please merge with an explicit rev"
6237 msgid "branch '%s' has one head - please merge with an explicit rev"
6201 msgstr ""
6238 msgstr ""
6202
6239
6203 msgid "there is nothing to merge"
6240 msgid "there is nothing to merge"
6204 msgstr ""
6241 msgstr ""
6205
6242
6206 #, python-format
6243 #, python-format
6207 msgid "%s - use \"hg update\" instead"
6244 msgid "%s - use \"hg update\" instead"
6208 msgstr ""
6245 msgstr ""
6209
6246
6210 msgid ""
6247 msgid ""
6211 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
6248 "working dir not at a head rev - use \"hg update\" or merge with an explicit "
6212 "rev"
6249 "rev"
6213 msgstr ""
6250 msgstr ""
6214
6251
6215 msgid ""
6252 msgid ""
6216 "show changesets not found in destination\n"
6253 "show changesets not found in destination\n"
6217 "\n"
6254 "\n"
6218 " Show changesets not found in the specified destination repository or\n"
6255 " Show changesets not found in the specified destination repository or\n"
6219 " the default push location. These are the changesets that would be "
6256 " the default push location. These are the changesets that would be "
6220 "pushed\n"
6257 "pushed\n"
6221 " if a push was requested.\n"
6258 " if a push was requested.\n"
6222 "\n"
6259 "\n"
6223 " See pull for valid destination format details.\n"
6260 " See pull for valid destination format details.\n"
6224 " "
6261 " "
6225 msgstr ""
6262 msgstr ""
6226 "連携先リポジトリに含まれないチェンジセットの表示\n"
6263 "連携先リポジトリに含まれないチェンジセットの表示\n"
6227 "\n"
6264 "\n"
6228 " 指定された連携先リポジトリ(ないし、無指定時の hg push 先リポジトリ)に\n"
6265 " 指定された連携先リポジトリ(ないし、無指定時の hg push 先リポジトリ)に\n"
6229 " 含まれないチェンジセットを表示します。ここで表示されるチェンジセットは\n"
6266 " 含まれないチェンジセットを表示します。ここで表示されるチェンジセットは\n"
6230 " hg push 実施の際に、連携先リポジトリへと反映されるチェンジセットです。\n"
6267 " hg push 実施の際に、連携先リポジトリへと反映されるチェンジセットです。\n"
6231 "\n"
6268 "\n"
6232 " 指定可能なリポジトリ指定形式は hg pull のヘルプを参照してください。\n"
6269 " 指定可能なリポジトリ指定形式は hg pull のヘルプを参照してください。\n"
6233 " "
6270 " "
6234
6271
6235 msgid ""
6272 msgid ""
6236 "show the parents of the working dir or revision\n"
6273 "show the parents of the working dir or revision\n"
6237 "\n"
6274 "\n"
6238 " Print the working directory's parent revisions. If a\n"
6275 " Print the working directory's parent revisions. If a\n"
6239 " revision is given via --rev, the parent of that revision\n"
6276 " revision is given via --rev, the parent of that revision\n"
6240 " will be printed. If a file argument is given, revision in\n"
6277 " will be printed. If a file argument is given, revision in\n"
6241 " which the file was last changed (before the working directory\n"
6278 " which the file was last changed (before the working directory\n"
6242 " revision or the argument to --rev if given) is printed.\n"
6279 " revision or the argument to --rev if given) is printed.\n"
6243 " "
6280 " "
6244 msgstr ""
6281 msgstr ""
6245 "作業領域(ないし指定リビジョン)の親リビジョンの表示\n"
6282 "作業領域(ないし指定リビジョン)の親リビジョンの表示\n"
6246 "\n"
6283 "\n"
6247 " 作業領域の親リビジョンを表示します。--rev でのリビジョン指定がある場合\n"
6284 " 作業領域の親リビジョンを表示します。--rev でのリビジョン指定がある場合\n"
6248 " 指定リビジョンの親リビジョンを表示します。ファイルが指定された場合、\n"
6285 " 指定リビジョンの親リビジョンを表示します。ファイルが指定された場合、\n"
6249 " (作業領域の親リビジョン、ないし --rev による指定リビジョン以前のもので)\n"
6286 " (作業領域の親リビジョン、ないし --rev による指定リビジョン以前のもので)\n"
6250 " そのファイルを最後に更新したリビジョンを表示します。\n"
6287 " そのファイルを最後に更新したリビジョンを表示します。\n"
6251 " "
6288 " "
6252
6289
6253 msgid "can only specify an explicit file name"
6290 msgid "can only specify an explicit file name"
6254 msgstr ""
6291 msgstr ""
6255
6292
6256 #, python-format
6293 #, python-format
6257 msgid "'%s' not found in manifest!"
6294 msgid "'%s' not found in manifest!"
6258 msgstr ""
6295 msgstr ""
6259
6296
6260 msgid ""
6297 msgid ""
6261 "show aliases for remote repositories\n"
6298 "show aliases for remote repositories\n"
6262 "\n"
6299 "\n"
6263 " Show definition of symbolic path name NAME. If no name is given, show\n"
6300 " Show definition of symbolic path name NAME. If no name is given, show\n"
6264 " definition of available names.\n"
6301 " definition of available names.\n"
6265 "\n"
6302 "\n"
6266 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6303 " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
6267 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6304 " and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
6268 "\n"
6305 "\n"
6269 " See 'hg help urls' for more information.\n"
6306 " See 'hg help urls' for more information.\n"
6270 " "
6307 " "
6271 msgstr ""
6308 msgstr ""
6272 "連携先リポジトリの別名一覧の表示\n"
6309 "連携先リポジトリの別名一覧の表示\n"
6273 "\n"
6310 "\n"
6274 " 指定されたシンボル名に相当する連携先リポジトリを表示します。\n"
6311 " 指定されたシンボル名に相当する連携先リポジトリを表示します。\n"
6275 " シンボル名が指定されない場合、全ての別名定義が表示されます。\n"
6312 " シンボル名が指定されない場合、全ての別名定義が表示されます。\n"
6276 "\n"
6313 "\n"
6277 " シンボル定義は、/etc/mercurial/hgrc および $HOME/.hgrc 等の [paths]\n"
6314 " シンボル定義は、/etc/mercurial/hgrc および $HOME/.hgrc 等の [paths]\n"
6278 " セクションに記述されます。作業領域での実行の場合は .hg/hgrc にも記述\n"
6315 " セクションに記述されます。作業領域での実行の場合は .hg/hgrc にも記述\n"
6279 " 可能です。\n"
6316 " 可能です。\n"
6280 "\n"
6317 "\n"
6281 " 詳細は 'hg help urls' を参照してください。\n"
6318 " 詳細は 'hg help urls' を参照してください。\n"
6282 " "
6319 " "
6283
6320
6284 msgid "not found!\n"
6321 msgid "not found!\n"
6285 msgstr ""
6322 msgstr ""
6286
6323
6287 msgid "not updating, since new heads added\n"
6324 msgid "not updating, since new heads added\n"
6288 msgstr ""
6325 msgstr ""
6289
6326
6290 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6327 msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
6291 msgstr ""
6328 msgstr ""
6292
6329
6293 msgid "(run 'hg update' to get a working copy)\n"
6330 msgid "(run 'hg update' to get a working copy)\n"
6294 msgstr ""
6331 msgstr ""
6295
6332
6296 msgid ""
6333 msgid ""
6297 "pull changes from the specified source\n"
6334 "pull changes from the specified source\n"
6298 "\n"
6335 "\n"
6299 " Pull changes from a remote repository to a local one.\n"
6336 " Pull changes from a remote repository to a local one.\n"
6300 "\n"
6337 "\n"
6301 " This finds all changes from the repository at the specified path\n"
6338 " This finds all changes from the repository at the specified path\n"
6302 " or URL and adds them to the local repository. By default, this\n"
6339 " or URL and adds them to the local repository. By default, this\n"
6303 " does not update the copy of the project in the working directory.\n"
6340 " does not update the copy of the project in the working directory.\n"
6304 "\n"
6341 "\n"
6305 " If SOURCE is omitted, the 'default' path will be used.\n"
6342 " If SOURCE is omitted, the 'default' path will be used.\n"
6306 " See 'hg help urls' for more information.\n"
6343 " See 'hg help urls' for more information.\n"
6307 " "
6344 " "
6308 msgstr ""
6345 msgstr ""
6309 "指定されたリポジトリからのチェンジセット取り込み\n"
6346 "指定されたリポジトリからのチェンジセット取り込み\n"
6310 "\n"
6347 "\n"
6311 " 連携先リポジトリからローカルリポジトリにチェンジセットを取り込みます。\n"
6348 " 連携先リポジトリからローカルリポジトリにチェンジセットを取り込みます。\n"
6312 "\n"
6349 "\n"
6313 " パスや URL で指定される連携先リポジトリ中の、全てのチェンジセットが\n"
6350 " パスや URL で指定される連携先リポジトリ中の、全てのチェンジセットが\n"
6314 " 取り込み対象となります。指定が無い場合、このコマンドを実行しても\n"
6351 " 取り込み対象となります。指定が無い場合、このコマンドを実行しても\n"
6315 " 作業領域の内容は更新されません。\n"
6352 " 作業領域の内容は更新されません。\n"
6316 "\n"
6353 "\n"
6317 " 連携先が省略された場合、'default' パスが連携先として使用されます。\n"
6354 " 連携先が省略された場合、'default' パスが連携先として使用されます。\n"
6318 " 詳細は 'hg help urls' を参照してください。\n"
6355 " 詳細は 'hg help urls' を参照してください。\n"
6319 " "
6356 " "
6320
6357
6321 msgid ""
6358 msgid ""
6322 "Other repository doesn't support revision lookup, so a rev cannot be "
6359 "Other repository doesn't support revision lookup, so a rev cannot be "
6323 "specified."
6360 "specified."
6324 msgstr ""
6361 msgstr ""
6325
6362
6326 msgid ""
6363 msgid ""
6327 "push changes to the specified destination\n"
6364 "push changes to the specified destination\n"
6328 "\n"
6365 "\n"
6329 " Push changes from the local repository to the given destination.\n"
6366 " Push changes from the local repository to the given destination.\n"
6330 "\n"
6367 "\n"
6331 " This is the symmetrical operation for pull. It helps to move\n"
6368 " This is the symmetrical operation for pull. It helps to move\n"
6332 " changes from the current repository to a different one. If the\n"
6369 " changes from the current repository to a different one. If the\n"
6333 " destination is local this is identical to a pull in that directory\n"
6370 " destination is local this is identical to a pull in that directory\n"
6334 " from the current one.\n"
6371 " from the current one.\n"
6335 "\n"
6372 "\n"
6336 " By default, push will refuse to run if it detects the result would\n"
6373 " By default, push will refuse to run if it detects the result would\n"
6337 " increase the number of remote heads. This generally indicates the\n"
6374 " increase the number of remote heads. This generally indicates the\n"
6338 " the client has forgotten to pull and merge before pushing.\n"
6375 " the client has forgotten to pull and merge before pushing.\n"
6339 "\n"
6376 "\n"
6340 " If -r is used, the named changeset and all its ancestors will be pushed\n"
6377 " If -r is used, the named changeset and all its ancestors will be pushed\n"
6341 " to the remote repository.\n"
6378 " to the remote repository.\n"
6342 "\n"
6379 "\n"
6343 " Look at the help text for urls for important details about ssh:// URLs.\n"
6380 " Look at the help text for urls for important details about ssh:// URLs.\n"
6344 " If DESTINATION is omitted, a default path will be used.\n"
6381 " If DESTINATION is omitted, a default path will be used.\n"
6345 " See 'hg help urls' for more information.\n"
6382 " See 'hg help urls' for more information.\n"
6346 " "
6383 " "
6347 msgstr ""
6384 msgstr ""
6348 "指定されたリポジトリへのチェンジセット反映\n"
6385 "指定されたリポジトリへのチェンジセット反映\n"
6349 "\n"
6386 "\n"
6350 " ローカルリポジトリから連携先リポジトリへとチェンジセットを反映します。\n"
6387 " ローカルリポジトリから連携先リポジトリへとチェンジセットを反映します。\n"
6351 "\n"
6388 "\n"
6352 " これは hg pull と対称的な操作です。現在のリポジトリから連携先へと、\n"
6389 " これは hg pull と対称的な操作です。現在のリポジトリから連携先へと、\n"
6353 " チェンジセットを簡単に移動させることができます。連携先リポジトリが\n"
6390 " チェンジセットを簡単に移動させることができます。連携先リポジトリが\n"
6354 " 同一ホスト上にある場合は、現リポジトリに対する連携先リポジトリでの\n"
6391 " 同一ホスト上にある場合は、現リポジトリに対する連携先リポジトリでの\n"
6355 " hg pull 実行と同一の効果を持ちます。\n"
6392 " hg pull 実行と同一の効果を持ちます。\n"
6356 "\n"
6393 "\n"
6357 " 通常は、連携先リポジトリにヘッドが増える実行は拒絶されます。\n"
6394 " 通常は、連携先リポジトリにヘッドが増える実行は拒絶されます。\n"
6358 " このような場合、大概は hg push 前の hg pull および hg merge 実行を\n"
6395 " このような場合、大概は hg push 前の hg pull および hg merge 実行を\n"
6359 " 忘れていることが殆どです。\n"
6396 " 忘れていることが殆どです。\n"
6360 "\n"
6397 "\n"
6361 " -r が指定された場合、指定されたチェンジセットとその祖先が連携先\n"
6398 " -r が指定された場合、指定されたチェンジセットとその祖先が連携先\n"
6362 " リポジトリへと反映されます。\n"
6399 " リポジトリへと反映されます。\n"
6363 "\n"
6400 "\n"
6364 " ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n"
6401 " ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n"
6365 " 連携先が省略された場合、'default' パスが連携先として使用されます。\n"
6402 " 連携先が省略された場合、'default' パスが連携先として使用されます。\n"
6366 " 詳細に関しては、'hg help urls' を参照してください。\n"
6403 " 詳細に関しては、'hg help urls' を参照してください。\n"
6367 " "
6404 " "
6368
6405
6369 #, python-format
6406 #, python-format
6370 msgid "pushing to %s\n"
6407 msgid "pushing to %s\n"
6371 msgstr ""
6408 msgstr ""
6372
6409
6373 msgid ""
6410 msgid ""
6374 "raw commit interface (DEPRECATED)\n"
6411 "raw commit interface (DEPRECATED)\n"
6375 "\n"
6412 "\n"
6376 " (DEPRECATED)\n"
6413 " (DEPRECATED)\n"
6377 " Lowlevel commit, for use in helper scripts.\n"
6414 " Lowlevel commit, for use in helper scripts.\n"
6378 "\n"
6415 "\n"
6379 " This command is not intended to be used by normal users, as it is\n"
6416 " This command is not intended to be used by normal users, as it is\n"
6380 " primarily useful for importing from other SCMs.\n"
6417 " primarily useful for importing from other SCMs.\n"
6381 "\n"
6418 "\n"
6382 " This command is now deprecated and will be removed in a future\n"
6419 " This command is now deprecated and will be removed in a future\n"
6383 " release, please use debugsetparents and commit instead.\n"
6420 " release, please use debugsetparents and commit instead.\n"
6384 " "
6421 " "
6385 msgstr ""
6422 msgstr ""
6386
6423
6387 msgid "(the rawcommit command is deprecated)\n"
6424 msgid "(the rawcommit command is deprecated)\n"
6388 msgstr ""
6425 msgstr ""
6389
6426
6390 msgid ""
6427 msgid ""
6391 "roll back an interrupted transaction\n"
6428 "roll back an interrupted transaction\n"
6392 "\n"
6429 "\n"
6393 " Recover from an interrupted commit or pull.\n"
6430 " Recover from an interrupted commit or pull.\n"
6394 "\n"
6431 "\n"
6395 " This command tries to fix the repository status after an interrupted\n"
6432 " This command tries to fix the repository status after an interrupted\n"
6396 " operation. It should only be necessary when Mercurial suggests it.\n"
6433 " operation. It should only be necessary when Mercurial suggests it.\n"
6397 " "
6434 " "
6398 msgstr ""
6435 msgstr ""
6399 "中断されたトランザクションの取り消し\n"
6436 "中断されたトランザクションの取り消し\n"
6400 "\n"
6437 "\n"
6401 " commit や pull が中断された場合の復旧を行います。\n"
6438 " commit や pull が中断された場合の復旧を行います。\n"
6402 "\n"
6439 "\n"
6403 " 本コマンドは、操作が中断された際のリポジトリ状態の修復を行います。\n"
6440 " 本コマンドは、操作が中断された際のリポジトリ状態の修復を行います。\n"
6404 " 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n"
6441 " 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n"
6405 " "
6442 " "
6406
6443
6407 msgid ""
6444 msgid ""
6408 "remove the specified files on the next commit\n"
6445 "remove the specified files on the next commit\n"
6409 "\n"
6446 "\n"
6410 " Schedule the indicated files for removal from the repository.\n"
6447 " Schedule the indicated files for removal from the repository.\n"
6411 "\n"
6448 "\n"
6412 " This only removes files from the current branch, not from the entire\n"
6449 " This only removes files from the current branch, not from the entire\n"
6413 " project history. -A can be used to remove only files that have already\n"
6450 " project history. -A can be used to remove only files that have already\n"
6414 " been deleted, -f can be used to force deletion, and -Af can be used\n"
6451 " been deleted, -f can be used to force deletion, and -Af can be used\n"
6415 " to remove files from the next revision without deleting them.\n"
6452 " to remove files from the next revision without deleting them.\n"
6416 "\n"
6453 "\n"
6417 " The following table details the behavior of remove for different file\n"
6454 " The following table details the behavior of remove for different file\n"
6418 " states (columns) and option combinations (rows). The file states are\n"
6455 " states (columns) and option combinations (rows). The file states are\n"
6419 " Added, Clean, Modified and Missing (as reported by hg status). The\n"
6456 " Added, Clean, Modified and Missing (as reported by hg status). The\n"
6420 " actions are Warn, Remove (from branch) and Delete (from disk).\n"
6457 " actions are Warn, Remove (from branch) and Delete (from disk).\n"
6421 "\n"
6458 "\n"
6422 " A C M !\n"
6459 " A C M !\n"
6423 " none W RD W R\n"
6460 " none W RD W R\n"
6424 " -f R RD RD R\n"
6461 " -f R RD RD R\n"
6425 " -A W W W R\n"
6462 " -A W W W R\n"
6426 " -Af R R R R\n"
6463 " -Af R R R R\n"
6427 "\n"
6464 "\n"
6428 " This command schedules the files to be removed at the next commit.\n"
6465 " This command schedules the files to be removed at the next commit.\n"
6429 " To undo a remove before that, see hg revert.\n"
6466 " To undo a remove before that, see hg revert.\n"
6430 " "
6467 " "
6431 msgstr ""
6468 msgstr ""
6432 "次回コミットにおける指定されたファイルの登録除外\n"
6469 "次回コミットにおける指定されたファイルの登録除外\n"
6433 "\n"
6470 "\n"
6434 " 構成管理対象からの除外を予約します。\n"
6471 " 構成管理対象からの除外を予約します。\n"
6435 "\n"
6472 "\n"
6436 " この操作による登録除外の対称は現行ブランチのみで、他ブランチにおいては\n"
6473 " この操作による登録除外の対称は現行ブランチのみで、他ブランチにおいては\n"
6437 " ファイルは存続し続けます。手動で削除したファイルの登録除外には -A、\n"
6474 " ファイルは存続し続けます。手動で削除したファイルの登録除外には -A、\n"
6438 " 強制的な登録除外には -f、作業領域中のファイルを削除することなく登録解除\n"
6475 " 強制的な登録除外には -f、作業領域中のファイルを削除することなく登録解除\n"
6439 " するには -Af 指定が有効です。\n"
6476 " するには -Af 指定が有効です。\n"
6440 "\n"
6477 "\n"
6441 " ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動の一覧を\n"
6478 " ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動の一覧を\n"
6442 " 以下に示します。ファイルの状態は、hg status が表示する A(Add:追加)、\n"
6479 " 以下に示します。ファイルの状態は、hg status が表示する A(Add:追加)、\n"
6443 " C(Clean:改変無し)、M(Modified:改変有り)および !(不明)で表します。\n"
6480 " C(Clean:改変無し)、M(Modified:改変有り)および !(不明)で表します。\n"
6444 " 挙動は W(Warn:警告)、R(Remove:構成管理からの登録除外)および\n"
6481 " 挙動は W(Warn:警告)、R(Remove:構成管理からの登録除外)および\n"
6445 " D(Delete:作業領域からの削除)で表します。\n"
6482 " D(Delete:作業領域からの削除)で表します。\n"
6446 "\n"
6483 "\n"
6447 " A C M !\n"
6484 " A C M !\n"
6448 " 無指定 W RD W R\n"
6485 " 無指定 W RD W R\n"
6449 " -f R RD RD R\n"
6486 " -f R RD RD R\n"
6450 " -A W W W R\n"
6487 " -A W W W R\n"
6451 " -Af R R R R\n"
6488 " -Af R R R R\n"
6452 "\n"
6489 "\n"
6453 " 指定されたファイルは次回のコミットの際に登録が除外されます。\n"
6490 " 指定されたファイルは次回のコミットの際に登録が除外されます。\n"
6454 " コミット前に登録解除を取り消す方法は、hg revert を参照してください。\n"
6491 " コミット前に登録解除を取り消す方法は、hg revert を参照してください。\n"
6455 " "
6492 " "
6456
6493
6457 msgid "no files specified"
6494 msgid "no files specified"
6458 msgstr ""
6495 msgstr ""
6459
6496
6460 #, python-format
6497 #, python-format
6461 msgid "not removing %s: file %s (use -f to force removal)\n"
6498 msgid "not removing %s: file %s (use -f to force removal)\n"
6462 msgstr ""
6499 msgstr ""
6463
6500
6464 msgid "still exists"
6501 msgid "still exists"
6465 msgstr ""
6502 msgstr ""
6466
6503
6467 msgid "is modified"
6504 msgid "is modified"
6468 msgstr ""
6505 msgstr ""
6469
6506
6470 msgid "has been marked for add"
6507 msgid "has been marked for add"
6471 msgstr ""
6508 msgstr ""
6472
6509
6473 msgid ""
6510 msgid ""
6474 "rename files; equivalent of copy + remove\n"
6511 "rename files; equivalent of copy + remove\n"
6475 "\n"
6512 "\n"
6476 " Mark dest as copies of sources; mark sources for deletion. If\n"
6513 " Mark dest as copies of sources; mark sources for deletion. If\n"
6477 " dest is a directory, copies are put in that directory. If dest is\n"
6514 " dest is a directory, copies are put in that directory. If dest is\n"
6478 " a file, there can only be one source.\n"
6515 " a file, there can only be one source.\n"
6479 "\n"
6516 "\n"
6480 " By default, this command copies the contents of files as they\n"
6517 " By default, this command copies the contents of files as they\n"
6481 " stand in the working directory. If invoked with --after, the\n"
6518 " exist in the working directory. If invoked with --after, the\n"
6482 " operation is recorded, but no copying is performed.\n"
6519 " operation is recorded, but no copying is performed.\n"
6483 "\n"
6520 "\n"
6484 " This command takes effect in the next commit. To undo a rename\n"
6521 " This command takes effect at the next commit. To undo a rename\n"
6485 " before that, see hg revert.\n"
6522 " before that, see hg revert.\n"
6486 " "
6523 " "
6487 msgstr ""
6524 msgstr ""
6488 "ファイルの改名(copy + remove と等価)\n"
6525 "ファイルの改名(copy + remove と等価)\n"
6489 "\n"
6526 "\n"
6490 " 複製先ファイルを、複製元の複製であると記録し、複製元を登録解除します。\n"
6527 " 複製先ファイルを、複製元の複製であると記録し、複製元を登録解除します。\n"
6491 " 複製先指定がディレクトリの場合、ディレクトリ内に複製が作成されます。\n"
6528 " 複製先指定がディレクトリの場合、ディレクトリ内に複製が作成されます。\n"
6492 " 複製先指定がファイルの場合、複製元は1つしか指定できません。\n"
6529 " 複製先指定がファイルの場合、複製元は1つしか指定できません。\n"
6493 "\n"
6530 "\n"
6494 " 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n"
6531 " 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n"
6495 " 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n"
6532 " 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n"
6496 " 操作は記録されますが、ファイルの複製は行われません。\n"
6533 " 操作は記録されますが、ファイルの複製は行われません。\n"
6497 "\n"
6534 "\n"
6498 " 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n"
6535 " 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n"
6499 " コミット前に改名操作を取り消す方法は hg revert を参照してください。\n"
6536 " コミット前に改名操作を取り消す方法は hg revert を参照してください。\n"
6500 " "
6537 " "
6501
6538
6502 msgid ""
6539 msgid ""
6503 "retry file merges from a merge or update\n"
6540 "retry file merges from a merge or update\n"
6504 "\n"
6541 "\n"
6505 " This command will cleanly retry unresolved file merges using file\n"
6542 " This command will cleanly retry unresolved file merges using file\n"
6506 " revisions preserved from the last update or merge. To attempt to\n"
6543 " revisions preserved from the last update or merge. To attempt to\n"
6507 " resolve all unresolved files, use the -a switch.\n"
6544 " resolve all unresolved files, use the -a switch.\n"
6508 "\n"
6545 "\n"
6509 " This command will also allow listing resolved files and manually\n"
6546 " This command will also allow listing resolved files and manually\n"
6510 " marking and unmarking files as resolved.\n"
6547 " marking and unmarking files as resolved.\n"
6511 "\n"
6548 "\n"
6512 " The codes used to show the status of files are:\n"
6549 " The codes used to show the status of files are:\n"
6513 " U = unresolved\n"
6550 " U = unresolved\n"
6514 " R = resolved\n"
6551 " R = resolved\n"
6515 " "
6552 " "
6516 msgstr ""
6553 msgstr ""
6517 "hg merge や hg update におけるファイルマージの再実施\n"
6554 "hg merge や hg update におけるファイルマージの再実施\n"
6518 "\n"
6555 "\n"
6519 " 直前の hg merge や hg update の際に保存されたファイルの内容を用いた\n"
6556 " 直前の hg merge や hg update の際に保存されたファイルの内容を用いた\n"
6520 " 綺麗な状態でのマージを、衝突未解消のファイルに対して実施します。\n"
6557 " 綺麗な状態でのマージを、衝突未解消のファイルに対して実施します。\n"
6521 " 全ての衝突未解消ファイルを実施対象にする場合は、-a オプションを指定\n"
6558 " 全ての衝突未解消ファイルを実施対象にする場合は、-a オプションを指定\n"
6522 " してください。\n"
6559 " してください。\n"
6523 "\n"
6560 "\n"
6524 " 本コマンドは、ファイルの衝突解消状態の一覧表示や、解消済み・未解消の\n"
6561 " 本コマンドは、ファイルの衝突解消状態の一覧表示や、解消済み・未解消の\n"
6525 " 状態区分の手動指定をすることもできます。\n"
6562 " 状態区分の手動指定をすることもできます。\n"
6526 "\n"
6563 "\n"
6527 " ファイルの衝突解消状態表示には以下の記号が使用されます:\n"
6564 " ファイルの衝突解消状態表示には以下の記号が使用されます:\n"
6528 " U = 未解消\n"
6565 " U = 未解消\n"
6529 " R = 解消済み\n"
6566 " R = 解消済み\n"
6530 " "
6567 " "
6531
6568
6532 msgid "too many options specified"
6569 msgid "too many options specified"
6533 msgstr ""
6570 msgstr ""
6534
6571
6535 msgid "can't specify --all and patterns"
6572 msgid "can't specify --all and patterns"
6536 msgstr ""
6573 msgstr ""
6537
6574
6538 msgid "no files or directories specified; use --all to remerge all files"
6575 msgid "no files or directories specified; use --all to remerge all files"
6539 msgstr ""
6576 msgstr ""
6540
6577
6541 msgid ""
6578 msgid ""
6542 "restore individual files or dirs to an earlier state\n"
6579 "restore individual files or dirs to an earlier state\n"
6543 "\n"
6580 "\n"
6544 " (use update -r to check out earlier revisions, revert does not\n"
6581 " (use update -r to check out earlier revisions, revert does not\n"
6545 " change the working dir parents)\n"
6582 " change the working dir parents)\n"
6546 "\n"
6583 "\n"
6547 " With no revision specified, revert the named files or directories\n"
6584 " With no revision specified, revert the named files or directories\n"
6548 " to the contents they had in the parent of the working directory.\n"
6585 " to the contents they had in the parent of the working directory.\n"
6549 " This restores the contents of the affected files to an unmodified\n"
6586 " This restores the contents of the affected files to an unmodified\n"
6550 " state and unschedules adds, removes, copies, and renames. If the\n"
6587 " state and unschedules adds, removes, copies, and renames. If the\n"
6551 " working directory has two parents, you must explicitly specify the\n"
6588 " working directory has two parents, you must explicitly specify the\n"
6552 " revision to revert to.\n"
6589 " revision to revert to.\n"
6553 "\n"
6590 "\n"
6554 " Using the -r option, revert the given files or directories to their\n"
6591 " Using the -r option, revert the given files or directories to their\n"
6555 " contents as of a specific revision. This can be helpful to \"roll\n"
6592 " contents as of a specific revision. This can be helpful to \"roll\n"
6556 " back\" some or all of an earlier change.\n"
6593 " back\" some or all of an earlier change.\n"
6557 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6594 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6558 "\n"
6595 "\n"
6559 " Revert modifies the working directory. It does not commit any\n"
6596 " Revert modifies the working directory. It does not commit any\n"
6560 " changes, or change the parent of the working directory. If you\n"
6597 " changes, or change the parent of the working directory. If you\n"
6561 " revert to a revision other than the parent of the working\n"
6598 " revert to a revision other than the parent of the working\n"
6562 " directory, the reverted files will thus appear modified\n"
6599 " directory, the reverted files will thus appear modified\n"
6563 " afterwards.\n"
6600 " afterwards.\n"
6564 "\n"
6601 "\n"
6565 " If a file has been deleted, it is restored. If the executable\n"
6602 " If a file has been deleted, it is restored. If the executable\n"
6566 " mode of a file was changed, it is reset.\n"
6603 " mode of a file was changed, it is reset.\n"
6567 "\n"
6604 "\n"
6568 " If names are given, all files matching the names are reverted.\n"
6605 " If names are given, all files matching the names are reverted.\n"
6569 " If no arguments are given, no files are reverted.\n"
6606 " If no arguments are given, no files are reverted.\n"
6570 "\n"
6607 "\n"
6571 " Modified files are saved with a .orig suffix before reverting.\n"
6608 " Modified files are saved with a .orig suffix before reverting.\n"
6572 " To disable these backups, use --no-backup.\n"
6609 " To disable these backups, use --no-backup.\n"
6573 " "
6610 " "
6574 msgstr ""
6611 msgstr ""
6575 "各ファイル/ディレクトリ状態の復旧\n"
6612 "各ファイル/ディレクトリ状態の復旧\n"
6576 "\n"
6613 "\n"
6577 " (hg revert は作業領域の親リビジョンを変更しないので、作業領域の状態を\n"
6614 " (hg revert は作業領域の親リビジョンを変更しないので、作業領域の状態を\n"
6578 " 以前の版に戻す場合は、hg update を使用してください)\n"
6615 " 以前の版に戻す場合は、hg update を使用してください)\n"
6579 "\n"
6616 "\n"
6580 " リビジョン指定が無い場合、指定されたファイル/ディレクトリを作業領域の\n"
6617 " リビジョン指定が無い場合、指定されたファイル/ディレクトリを作業領域の\n"
6581 " 親リビジョン時点の内容へと復旧します。\n"
6618 " 親リビジョン時点の内容へと復旧します。\n"
6582 " 本コマンドは対象となるファイルに対して、状態を「改変無し」とし、\n"
6619 " 本コマンドは対象となるファイルに対して、状態を「改変無し」とし、\n"
6583 " add/remove/copy/rename による次回コミット向けの操作予約を取り消します。\n"
6620 " add/remove/copy/rename による次回コミット向けの操作予約を取り消します。\n"
6584 " 作業領域の親リビジョンが2つある場合、どちらの内容で復旧するのかを\n"
6621 " 作業領域の親リビジョンが2つある場合、どちらの内容で復旧するのかを\n"
6585 " 明示的に指定する必要があります。\n"
6622 " 明示的に指定する必要があります。\n"
6586 "\n"
6623 "\n"
6587 " -r オプションが指定された場合、指定されたファイル/ディレクトリを、\n"
6624 " -r オプションが指定された場合、指定されたファイル/ディレクトリを、\n"
6588 " 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部、\n"
6625 " 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部、\n"
6589 " ないし全部を取り消す用途にも使用できます。\n"
6626 " ないし全部を取り消す用途にも使用できます。\n"
6590 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6627 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6591 "\n"
6628 "\n"
6592 " 本コマンドは作業領域の内容を変更しますが、変更のコミットや、作業領域の\n"
6629 " 本コマンドは作業領域の内容を変更しますが、変更のコミットや、作業領域の\n"
6593 " 親リビジョンの変更は行いません。そのため、作業領域の親リビジョン以外の\n"
6630 " 親リビジョンの変更は行いません。そのため、作業領域の親リビジョン以外の\n"
6594 " リビジョンを指定して復旧した場合、復旧後のファイルの状態は「改変有り」\n"
6631 " リビジョンを指定して復旧した場合、復旧後のファイルの状態は「改変有り」\n"
6595 " となります。\n"
6632 " となります。\n"
6596 "\n"
6633 "\n"
6597 " ファイルが削除されていた場合、ファイルは復旧されます。実行権限ビットが\n"
6634 " ファイルが削除されていた場合、ファイルは復旧されます。実行権限ビットが\n"
6598 " 変更されていた場合、変更前の状態に復旧されます。\n"
6635 " 変更されていた場合、変更前の状態に復旧されます。\n"
6599 "\n"
6636 "\n"
6600 " 復旧対象が指定された場合、指定された名前に合致する全てのファイルが復旧\n"
6637 " 復旧対象が指定された場合、指定された名前に合致する全てのファイルが復旧\n"
6601 " 対象となります。復旧対象が指定されなかった場合は、いずれのファイルも\n"
6638 " 対象となります。復旧対象が指定されなかった場合は、いずれのファイルも\n"
6602 " 復旧されません。\n"
6639 " 復旧されません。\n"
6603 "\n"
6640 "\n"
6604 " 改変されたファイルの復旧の際には、復旧前の内容が .orig 拡張子が付いた\n"
6641 " 改変されたファイルの復旧の際には、復旧前の内容が .orig 拡張子が付いた\n"
6605 " ファイルに保存されます。この保存は --no-backup 指定で無効化可能です。\n"
6642 " ファイルに保存されます。この保存は --no-backup 指定で無効化可能です。\n"
6606 " "
6643 " "
6607
6644
6608 msgid "you can't specify a revision and a date"
6645 msgid "you can't specify a revision and a date"
6609 msgstr ""
6646 msgstr ""
6610
6647
6611 msgid "no files or directories specified; use --all to revert the whole repo"
6648 msgid "no files or directories specified; use --all to revert the whole repo"
6612 msgstr ""
6649 msgstr ""
6613
6650
6614 #, python-format
6651 #, python-format
6615 msgid "forgetting %s\n"
6652 msgid "forgetting %s\n"
6616 msgstr ""
6653 msgstr ""
6617
6654
6618 #, python-format
6655 #, python-format
6619 msgid "reverting %s\n"
6656 msgid "reverting %s\n"
6620 msgstr ""
6657 msgstr ""
6621
6658
6622 #, python-format
6659 #, python-format
6623 msgid "undeleting %s\n"
6660 msgid "undeleting %s\n"
6624 msgstr ""
6661 msgstr ""
6625
6662
6626 #, python-format
6663 #, python-format
6627 msgid "saving current version of %s as %s\n"
6664 msgid "saving current version of %s as %s\n"
6628 msgstr ""
6665 msgstr ""
6629
6666
6630 #, python-format
6667 #, python-format
6631 msgid "file not managed: %s\n"
6668 msgid "file not managed: %s\n"
6632 msgstr ""
6669 msgstr ""
6633
6670
6634 #, python-format
6671 #, python-format
6635 msgid "no changes needed to %s\n"
6672 msgid "no changes needed to %s\n"
6636 msgstr ""
6673 msgstr ""
6637
6674
6638 msgid ""
6675 msgid ""
6639 "roll back the last transaction\n"
6676 "roll back the last transaction\n"
6640 "\n"
6677 "\n"
6641 " This command should be used with care. There is only one level of\n"
6678 " This command should be used with care. There is only one level of\n"
6642 " rollback, and there is no way to undo a rollback. It will also\n"
6679 " rollback, and there is no way to undo a rollback. It will also\n"
6643 " restore the dirstate at the time of the last transaction, losing\n"
6680 " restore the dirstate at the time of the last transaction, losing\n"
6644 " any dirstate changes since that time.\n"
6681 " any dirstate changes since that time.\n"
6645 "\n"
6682 "\n"
6646 " Transactions are used to encapsulate the effects of all commands\n"
6683 " Transactions are used to encapsulate the effects of all commands\n"
6647 " that create new changesets or propagate existing changesets into a\n"
6684 " that create new changesets or propagate existing changesets into a\n"
6648 " repository. For example, the following commands are transactional,\n"
6685 " repository. For example, the following commands are transactional,\n"
6649 " and their effects can be rolled back:\n"
6686 " and their effects can be rolled back:\n"
6650 "\n"
6687 "\n"
6651 " commit\n"
6688 " commit\n"
6652 " import\n"
6689 " import\n"
6653 " pull\n"
6690 " pull\n"
6654 " push (with this repository as destination)\n"
6691 " push (with this repository as destination)\n"
6655 " unbundle\n"
6692 " unbundle\n"
6656 "\n"
6693 "\n"
6657 " This command is not intended for use on public repositories. Once\n"
6694 " This command is not intended for use on public repositories. Once\n"
6658 " changes are visible for pull by other users, rolling a transaction\n"
6695 " changes are visible for pull by other users, rolling a transaction\n"
6659 " back locally is ineffective (someone else may already have pulled\n"
6696 " back locally is ineffective (someone else may already have pulled\n"
6660 " the changes). Furthermore, a race is possible with readers of the\n"
6697 " the changes). Furthermore, a race is possible with readers of the\n"
6661 " repository; for example an in-progress pull from the repository\n"
6698 " repository; for example an in-progress pull from the repository\n"
6662 " may fail if a rollback is performed.\n"
6699 " may fail if a rollback is performed.\n"
6663 " "
6700 " "
6664 msgstr ""
6701 msgstr ""
6665 "直前のトランザクションの巻き戻し\n"
6702 "直前のトランザクションの巻き戻し\n"
6666 "\n"
6703 "\n"
6667 " 本コマンドの使用に当たっては注意が必要です。巻き戻しは1段階限りで、\n"
6704 " 本コマンドの使用に当たっては注意が必要です。巻き戻しは1段階限りで、\n"
6668 " 巻き戻したトランザクションの再実施はできません。本コマンドは、\n"
6705 " 巻き戻したトランザクションの再実施はできません。本コマンドは、\n"
6669 " 直前のトランザクション実施時点の dirstate を復元し、その時点以後の\n"
6706 " 直前のトランザクション実施時点の dirstate を復元し、その時点以後の\n"
6670 " 変更は全て失われます。\n"
6707 " 変更は全て失われます。\n"
6671 "\n"
6708 "\n"
6672 " トランザクションとは、新規チェンジセットの作成、ないし外部からの既存\n"
6709 " トランザクションとは、新規チェンジセットの作成、ないし外部からの既存\n"
6673 " チェンジセットの取り込みに要するコマンドの効果を一括化するものです。\n"
6710 " チェンジセットの取り込みに要するコマンドの効果を一括化するものです。\n"
6674 " 例えば、以下のコマンドはいずれもトランザクションを形成するもので、\n"
6711 " 例えば、以下のコマンドはいずれもトランザクションを形成するもので、\n"
6675 " その効果は巻き戻し可能です。\n"
6712 " その効果は巻き戻し可能です。\n"
6676 "\n"
6713 "\n"
6677 " commit\n"
6714 " commit\n"
6678 " import\n"
6715 " import\n"
6679 " pull\n"
6716 " pull\n"
6680 " push (rollback 可能なのは反映先リポジトリ側)\n"
6717 " push (rollback 可能なのは反映先リポジトリ側)\n"
6681 " unbundle\n"
6718 " unbundle\n"
6682 "\n"
6719 "\n"
6683 " 本コマンドは、公開リポジトリでの実行を想定していません。\n"
6720 " 本コマンドは、公開リポジトリでの実行を想定していません。\n"
6684 " 他のユーザに対して一旦 pull 可能な状態になってしまったなら、\n"
6721 " 他のユーザに対して一旦 pull 可能な状態になってしまったなら、\n"
6685 " 公開リポジトリでの rollback は(既に他のユーザによって取り込まれている\n"
6722 " 公開リポジトリでの rollback は(既に他のユーザによって取り込まれている\n"
6686 " 可能性があるので)効果を持ちません。\n"
6723 " 可能性があるので)効果を持ちません。\n"
6687 " その上、リポジトリからの情報読み取りに際して、競合が発生し得ます。\n"
6724 " その上、リポジトリからの情報読み取りに際して、競合が発生し得ます。\n"
6688 " 例えば、巻き戻し操作によって、進行中のリポジトリからの取り込みが\n"
6725 " 例えば、巻き戻し操作によって、進行中のリポジトリからの取り込みが\n"
6689 " 失敗してしまう可能性があります。\n"
6726 " 失敗してしまう可能性があります。\n"
6690 " "
6727 " "
6691
6728
6692 msgid ""
6729 msgid ""
6693 "print the root (top) of the current working dir\n"
6730 "print the root (top) of the current working dir\n"
6694 "\n"
6731 "\n"
6695 " Print the root directory of the current repository.\n"
6732 " Print the root directory of the current repository.\n"
6696 " "
6733 " "
6697 msgstr ""
6734 msgstr ""
6698 "作業領域のルート(最上位)ディレクトリ位置の表示\n"
6735 "作業領域のルート(最上位)ディレクトリ位置の表示\n"
6699 "\n"
6736 "\n"
6700 " 作業領域のルートディレクトリ位置を表示します。\n"
6737 " 作業領域のルートディレクトリ位置を表示します。\n"
6701 " "
6738 " "
6702
6739
6703 msgid ""
6740 msgid ""
6704 "export the repository via HTTP\n"
6741 "export the repository via HTTP\n"
6705 "\n"
6742 "\n"
6706 " Start a local HTTP repository browser and pull server.\n"
6743 " Start a local HTTP repository browser and pull server.\n"
6707 "\n"
6744 "\n"
6708 " By default, the server logs accesses to stdout and errors to\n"
6745 " By default, the server logs accesses to stdout and errors to\n"
6709 " stderr. Use the \"-A\" and \"-E\" options to log to files.\n"
6746 " stderr. Use the \"-A\" and \"-E\" options to log to files.\n"
6710 " "
6747 " "
6711 msgstr ""
6748 msgstr ""
6712 "HTTP 経由でのリポジトリの公開\n"
6749 "HTTP 経由でのリポジトリの公開\n"
6713 "\n"
6750 "\n"
6714 " HTTP 経由でのリポジトリ参照と hg pull を可能にするサーバを起動します。\n"
6751 " HTTP 経由でのリポジトリ参照と hg pull を可能にするサーバを起動します。\n"
6715 "\n"
6752 "\n"
6716 " 特に指定が無い場合、サーバはアクセスログを標準出力へ、エラーは標準\n"
6753 " 特に指定が無い場合、サーバはアクセスログを標準出力へ、エラーは標準\n"
6717 " エラー出力に出力します。ログをファイルに記録する場合は、\"-A\" や \n"
6754 " エラー出力に出力します。ログをファイルに記録する場合は、\"-A\" や \n"
6718 " \"-E\" オプションを使用してください。\n"
6755 " \"-E\" オプションを使用してください。\n"
6719 " "
6756 " "
6720
6757
6721 #, python-format
6758 #, python-format
6722 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6759 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
6723 msgstr ""
6760 msgstr ""
6724
6761
6725 msgid ""
6762 msgid ""
6726 "show changed files in the working directory\n"
6763 "show changed files in the working directory\n"
6727 "\n"
6764 "\n"
6728 " Show status of files in the repository. If names are given, only\n"
6765 " Show status of files in the repository. If names are given, only\n"
6729 " files that match are shown. Files that are clean or ignored or\n"
6766 " files that match are shown. Files that are clean or ignored or\n"
6730 " source of a copy/move operation, are not listed unless -c (clean),\n"
6767 " source of a copy/move operation, are not listed unless -c (clean),\n"
6731 " -i (ignored), -C (copies) or -A is given. Unless options described\n"
6768 " -i (ignored), -C (copies) or -A is given. Unless options described\n"
6732 " with \"show only ...\" are given, the options -mardu are used.\n"
6769 " with \"show only ...\" are given, the options -mardu are used.\n"
6733 "\n"
6770 "\n"
6734 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6771 " Option -q/--quiet hides untracked (unknown and ignored) files\n"
6735 " unless explicitly requested with -u/--unknown or -i/-ignored.\n"
6772 " unless explicitly requested with -u/--unknown or -i/-ignored.\n"
6736 "\n"
6773 "\n"
6737 " NOTE: status may appear to disagree with diff if permissions have\n"
6774 " NOTE: status may appear to disagree with diff if permissions have\n"
6738 " changed or a merge has occurred. The standard diff format does not\n"
6775 " changed or a merge has occurred. The standard diff format does not\n"
6739 " report permission changes and diff only reports changes relative\n"
6776 " report permission changes and diff only reports changes relative\n"
6740 " to one merge parent.\n"
6777 " to one merge parent.\n"
6741 "\n"
6778 "\n"
6742 " If one revision is given, it is used as the base revision.\n"
6779 " If one revision is given, it is used as the base revision.\n"
6743 " If two revisions are given, the difference between them is shown.\n"
6780 " If two revisions are given, the difference between them is shown.\n"
6744 "\n"
6781 "\n"
6745 " The codes used to show the status of files are:\n"
6782 " The codes used to show the status of files are:\n"
6746 " M = modified\n"
6783 " M = modified\n"
6747 " A = added\n"
6784 " A = added\n"
6748 " R = removed\n"
6785 " R = removed\n"
6749 " C = clean\n"
6786 " C = clean\n"
6750 " ! = deleted, but still tracked\n"
6787 " ! = deleted, but still tracked\n"
6751 " ? = not tracked\n"
6788 " ? = not tracked\n"
6752 " I = ignored\n"
6789 " I = ignored\n"
6753 " = the previous added file was copied from here\n"
6790 " = the previous added file was copied from here\n"
6754 " "
6791 " "
6755 msgstr ""
6792 msgstr ""
6756 "作業領域のファイル操作状況の表示\n"
6793 "作業領域のファイル操作状況の表示\n"
6757 "\n"
6794 "\n"
6758 " 作業領域のファイル状態を表示します。名前(パターン)が指定された場合、\n"
6795 " 作業領域のファイル状態を表示します。名前(パターン)が指定された場合、\n"
6759 " その名前に合致するファイルのみが表示されます。改変無し(clean)、\n"
6796 " その名前に合致するファイルのみが表示されます。改変無し(clean)、\n"
6760 " 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、\n"
6797 " 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、\n"
6761 " それぞれ -c (clean)、-i (ignored) ないし -C (copy) が指定されるか、\n"
6798 " それぞれ -c (clean)、-i (ignored) ないし -C (copy) が指定されるか、\n"
6762 " -A(all) が指定されない限り表示されません。表示対象選択のオプションが\n"
6799 " -A(all) が指定されない限り表示されません。表示対象選択のオプションが\n"
6763 " 何も指定されない場合、-m -a -r -d -u が指定されたものとして動作します。\n"
6800 " 何も指定されない場合、-m -a -r -d -u が指定されたものとして動作します。\n"
6764 "\n"
6801 "\n"
6765 " -q/--quiet オプション指定がある場合、明示的に -u/--unknown ないし\n"
6802 " -q/--quiet オプション指定がある場合、明示的に -u/--unknown ないし\n"
6766 " -i/-ignored が指定されない限り、構成管理対象外(unknown と ignored)\n"
6803 " -i/-ignored が指定されない限り、構成管理対象外(unknown と ignored)\n"
6767 " のファイルを表示対象外とします。\n"
6804 " のファイルを表示対象外とします。\n"
6768 "\n"
6805 "\n"
6769 " 備考:権限設定の変更やマージが行われた場合、差分表示から期待される結果\n"
6806 " 備考:権限設定の変更やマージが行われた場合、差分表示から期待される結果\n"
6770 " とは異なる状態が表示される可能性があります。標準的な差分出力形式は、\n"
6807 " とは異なる状態が表示される可能性があります。標準的な差分出力形式は、\n"
6771 " 権限変更の情報を含みませんし、マージにおける一方の親リビジョンとの\n"
6808 " 権限変更の情報を含みませんし、マージにおける一方の親リビジョンとの\n"
6772 " 差分しか表示しません。\n"
6809 " 差分しか表示しません。\n"
6773 "\n"
6810 "\n"
6774 " 1つのリビジョンが指定された場合、比較元リビジョンとして扱われます。\n"
6811 " 1つのリビジョンが指定された場合、比較元リビジョンとして扱われます。\n"
6775 " 2つのリビジョンが指定された場合、両リビジョンの間で状態が比較されます。\n"
6812 " 2つのリビジョンが指定された場合、両リビジョンの間で状態が比較されます。\n"
6776 "\n"
6813 "\n"
6777 " ファイルの状態を表す記号は以下の通り:\n"
6814 " ファイルの状態を表す記号は以下の通り:\n"
6778 " M = 改変有り(modified)\n"
6815 " M = 改変有り(modified)\n"
6779 " A = 新規登録(added)\n"
6816 " A = 新規登録(added)\n"
6780 " R = 登録解除(removed)\n"
6817 " R = 登録解除(removed)\n"
6781 " C = 改変無し(clean)\n"
6818 " C = 改変無し(clean)\n"
6782 " ! = 作業領域にファイルが無い(missing)\n"
6819 " ! = 作業領域にファイルが無い(missing)\n"
6783 " ? = 構成管理対象外(unknown)\n"
6820 " ? = 構成管理対象外(unknown)\n"
6784 " I = 無視(ignored)\n"
6821 " I = 無視(ignored)\n"
6785 " = 直前に表示される新規登録ファイルの複製元\n"
6822 " = 直前に表示される新規登録ファイルの複製元\n"
6786 " "
6823 " "
6787
6824
6788 msgid ""
6825 msgid ""
6789 "add one or more tags for the current or given revision\n"
6826 "add one or more tags for the current or given revision\n"
6790 "\n"
6827 "\n"
6791 " Name a particular revision using <name>.\n"
6828 " Name a particular revision using <name>.\n"
6792 "\n"
6829 "\n"
6793 " Tags are used to name particular revisions of the repository and are\n"
6830 " Tags are used to name particular revisions of the repository and are\n"
6794 " very useful to compare different revisions, to go back to significant\n"
6831 " very useful to compare different revisions, to go back to significant\n"
6795 " earlier versions or to mark branch points as releases, etc.\n"
6832 " earlier versions or to mark branch points as releases, etc.\n"
6796 "\n"
6833 "\n"
6797 " If no revision is given, the parent of the working directory is used,\n"
6834 " If no revision is given, the parent of the working directory is used,\n"
6798 " or tip if no revision is checked out.\n"
6835 " or tip if no revision is checked out.\n"
6799 "\n"
6836 "\n"
6800 " To facilitate version control, distribution, and merging of tags,\n"
6837 " To facilitate version control, distribution, and merging of tags,\n"
6801 " they are stored as a file named \".hgtags\" which is managed\n"
6838 " they are stored as a file named \".hgtags\" which is managed\n"
6802 " similarly to other project files and can be hand-edited if\n"
6839 " similarly to other project files and can be hand-edited if\n"
6803 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6840 " necessary. The file '.hg/localtags' is used for local tags (not\n"
6804 " shared among repositories).\n"
6841 " shared among repositories).\n"
6805 "\n"
6842 "\n"
6806 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6843 " See 'hg help dates' for a list of formats valid for -d/--date.\n"
6807 " "
6844 " "
6808 msgstr ""
6845 msgstr ""
6809 "現リビジョンないし指定リビジョンへのタグの付与\n"
6846 "現リビジョンないし指定リビジョンへのタグの付与\n"
6810 "\n"
6847 "\n"
6811 " 特定のリビジョンに、指定された名前を付けます。\n"
6848 " 特定のリビジョンに、指定された名前を付けます。\n"
6812 "\n"
6849 "\n"
6813 " リポジトリ中の特定のリビジョンに付けられた名前であるタグは、リビジョン\n"
6850 " リポジトリ中の特定のリビジョンに付けられた名前であるタグは、リビジョン\n"
6814 " 間での比較や、重要なリビジョンの参照、又はリリースの際の分岐点に対する\n"
6851 " 間での比較や、重要なリビジョンの参照、又はリリースの際の分岐点に対する\n"
6815 " 目印といった用途などに使用することが出来ます。\n"
6852 " 目印といった用途などに使用することが出来ます。\n"
6816 "\n"
6853 "\n"
6817 " リビジョンが指定されない場合、作業領域の親リビジョンか、作業領域更新前\n"
6854 " リビジョンが指定されない場合、作業領域の親リビジョンか、作業領域更新前\n"
6818 " なら tip がタグ付けの対象となります。\n"
6855 " なら tip がタグ付けの対象となります。\n"
6819 "\n"
6856 "\n"
6820 " 分散構成管理におけるタグ付けの集約を容易にするために、構成管理下にある\n"
6857 " 分散構成管理におけるタグ付けの集約を容易にするために、構成管理下にある\n"
6821 " 他のファイルと同様に、タグの情報は \".hgtags\" ファイルで管理され、\n"
6858 " 他のファイルと同様に、タグの情報は \".hgtags\" ファイルで管理され、\n"
6822 " 必要であれば手動での編集も可能です。ローカルタグは '.hg/localtags' で\n"
6859 " 必要であれば手動での編集も可能です。ローカルタグは '.hg/localtags' で\n"
6823 " 管理されます(リポジトリ間で共有されることはありません)\n"
6860 " 管理されます(リポジトリ間で共有されることはありません)\n"
6824 "\n"
6861 "\n"
6825 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6862 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6826 " "
6863 " "
6827
6864
6828 msgid "tag names must be unique"
6865 msgid "tag names must be unique"
6829 msgstr ""
6866 msgstr ""
6830
6867
6831 #, python-format
6868 #, python-format
6832 msgid "the name '%s' is reserved"
6869 msgid "the name '%s' is reserved"
6833 msgstr ""
6870 msgstr ""
6834
6871
6835 msgid "--rev and --remove are incompatible"
6872 msgid "--rev and --remove are incompatible"
6836 msgstr ""
6873 msgstr ""
6837
6874
6838 #, python-format
6875 #, python-format
6839 msgid "tag '%s' does not exist"
6876 msgid "tag '%s' does not exist"
6840 msgstr ""
6877 msgstr ""
6841
6878
6842 #, python-format
6879 #, python-format
6843 msgid "tag '%s' is not a %s tag"
6880 msgid "tag '%s' is not a %s tag"
6844 msgstr ""
6881 msgstr ""
6845
6882
6846 #, python-format
6883 #, python-format
6847 msgid "Removed tag %s"
6884 msgid "Removed tag %s"
6848 msgstr ""
6885 msgstr ""
6849
6886
6850 #, python-format
6887 #, python-format
6851 msgid "tag '%s' already exists (use -f to force)"
6888 msgid "tag '%s' already exists (use -f to force)"
6852 msgstr ""
6889 msgstr ""
6853
6890
6854 #, python-format
6891 #, python-format
6855 msgid "Added tag %s for changeset %s"
6892 msgid "Added tag %s for changeset %s"
6856 msgstr ""
6893 msgstr ""
6857
6894
6858 msgid ""
6895 msgid ""
6859 "list repository tags\n"
6896 "list repository tags\n"
6860 "\n"
6897 "\n"
6861 " This lists both regular and local tags. When the -v/--verbose switch\n"
6898 " This lists both regular and local tags. When the -v/--verbose switch\n"
6862 " is used, a third column \"local\" is printed for local tags.\n"
6899 " is used, a third column \"local\" is printed for local tags.\n"
6863 " "
6900 " "
6864 msgstr ""
6901 msgstr ""
6865 "リポジトリ中のタグ一覧の表示\n"
6902 "リポジトリ中のタグ一覧の表示\n"
6866 "\n"
6903 "\n"
6867 " 本コマンドは、通常のタグおよびローカルタグの両方を一覧表示します。\n"
6904 " 本コマンドは、通常のタグおよびローカルタグの両方を一覧表示します。\n"
6868 " -v/--verbose オプションが指定された場合、ローカルタグの識別情報用に、\n"
6905 " -v/--verbose オプションが指定された場合、ローカルタグの識別情報用に、\n"
6869 " \"local\" カラムが追加表示されます。\n"
6906 " \"local\" カラムが追加表示されます。\n"
6870 " "
6907 " "
6871
6908
6872 msgid ""
6909 msgid ""
6873 "show the tip revision\n"
6910 "show the tip revision\n"
6874 "\n"
6911 "\n"
6875 " The tip revision (usually just called the tip) is the most\n"
6912 " The tip revision (usually just called the tip) is the most\n"
6876 " recently added changeset in the repository, the most recently\n"
6913 " recently added changeset in the repository, the most recently\n"
6877 " changed head.\n"
6914 " changed head.\n"
6878 "\n"
6915 "\n"
6879 " If you have just made a commit, that commit will be the tip. If\n"
6916 " If you have just made a commit, that commit will be the tip. If\n"
6880 " you have just pulled changes from another repository, the tip of\n"
6917 " you have just pulled changes from another repository, the tip of\n"
6881 " that repository becomes the current tip. The \"tip\" tag is special\n"
6918 " that repository becomes the current tip. The \"tip\" tag is special\n"
6882 " and cannot be renamed or assigned to a different changeset.\n"
6919 " and cannot be renamed or assigned to a different changeset.\n"
6883 " "
6920 " "
6884 msgstr ""
6921 msgstr ""
6885 "tip リビジョンの表示\n"
6922 "tip リビジョンの表示\n"
6886 "\n"
6923 "\n"
6887 " tip リビジョン(一般に tip と表記)とは、リポジトリおいて最も新しく追加\n"
6924 " tip リビジョン(一般に tip と表記)とは、リポジトリおいて最も新しく追加\n"
6888 " されたチェンジセットによるリビジョンであると同時に、最も新しく変更\n"
6925 " されたチェンジセットによるリビジョンであると同時に、最も新しく変更\n"
6889 " されたヘッドのことでもあります。\n"
6926 " されたヘッドのことでもあります。\n"
6890 "\n"
6927 "\n"
6891 " コミットした直後であれば、生成されたチェンジセットが tip となります。\n"
6928 " コミットした直後であれば、生成されたチェンジセットが tip となります。\n"
6892 " 他のリポジトリからチェンジセットの取り込みをした直後であれば、取り込み\n"
6929 " 他のリポジトリからチェンジセットの取り込みをした直後であれば、取り込み\n"
6893 " 対象リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n"
6930 " 対象リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n"
6894 " 特別なタグで、改名や、他のリビジョンへの付け替えはできません。\n"
6931 " 特別なタグで、改名や、他のリビジョンへの付け替えはできません。\n"
6895 " "
6932 " "
6896
6933
6897 msgid ""
6934 msgid ""
6898 "apply one or more changegroup files\n"
6935 "apply one or more changegroup files\n"
6899 "\n"
6936 "\n"
6900 " Apply one or more compressed changegroup files generated by the\n"
6937 " Apply one or more compressed changegroup files generated by the\n"
6901 " bundle command.\n"
6938 " bundle command.\n"
6902 " "
6939 " "
6903 msgstr ""
6940 msgstr ""
6904 "バンドルファイルの適用\n"
6941 "バンドルファイルの適用\n"
6905 "\n"
6942 "\n"
6906 " hg bundle コマンドで生成されたバンドルファイルを適用します。\n"
6943 " hg bundle コマンドで生成されたバンドルファイルを適用します。\n"
6907 " "
6944 " "
6908
6945
6909 msgid ""
6946 msgid ""
6910 "update working directory\n"
6947 "update working directory\n"
6911 "\n"
6948 "\n"
6912 " Update the repository's working directory to the specified revision,\n"
6949 " Update the repository's working directory to the specified revision,\n"
6913 " or the tip of the current branch if none is specified. Use null as\n"
6950 " or the tip of the current branch if none is specified. Use null as\n"
6914 " the revision to remove the working copy (like 'hg clone -U').\n"
6951 " the revision to remove the working copy (like 'hg clone -U').\n"
6915 "\n"
6952 "\n"
6916 " When the working dir contains no uncommitted changes, it will be\n"
6953 " When the working dir contains no uncommitted changes, it will be\n"
6917 " replaced by the state of the requested revision from the repo. When\n"
6954 " replaced by the state of the requested revision from the repo. When\n"
6918 " the requested revision is on a different branch, the working dir\n"
6955 " the requested revision is on a different branch, the working dir\n"
6919 " will additionally be switched to that branch.\n"
6956 " will additionally be switched to that branch.\n"
6920 "\n"
6957 "\n"
6921 " When there are uncommitted changes, use option -C to discard them,\n"
6958 " When there are uncommitted changes, use option -C to discard them,\n"
6922 " forcibly replacing the state of the working dir with the requested\n"
6959 " forcibly replacing the state of the working dir with the requested\n"
6923 " revision.\n"
6960 " revision.\n"
6924 "\n"
6961 "\n"
6925 " When there are uncommitted changes and option -C is not used, and\n"
6962 " When there are uncommitted changes and option -C is not used, and\n"
6926 " the parent revision and requested revision are on the same branch,\n"
6963 " the parent revision and requested revision are on the same branch,\n"
6927 " and one of them is an ancestor of the other, then the new working\n"
6964 " and one of them is an ancestor of the other, then the new working\n"
6928 " directory will contain the requested revision merged with the\n"
6965 " directory will contain the requested revision merged with the\n"
6929 " uncommitted changes. Otherwise, the update will fail with a\n"
6966 " uncommitted changes. Otherwise, the update will fail with a\n"
6930 " suggestion to use 'merge' or 'update -C' instead.\n"
6967 " suggestion to use 'merge' or 'update -C' instead.\n"
6931 "\n"
6968 "\n"
6932 " If you want to update just one file to an older revision, use revert.\n"
6969 " If you want to update just one file to an older revision, use revert.\n"
6933 "\n"
6970 "\n"
6934 " See 'hg help dates' for a list of formats valid for --date.\n"
6971 " See 'hg help dates' for a list of formats valid for --date.\n"
6935 " "
6972 " "
6936 msgstr ""
6973 msgstr ""
6937 "作業領域の更新\n"
6974 "作業領域の更新\n"
6938 "\n"
6975 "\n"
6939 " 指定されたリビジョン時点の内容で、作業領域を更新します。\n"
6976 " 指定されたリビジョン時点の内容で、作業領域を更新します。\n"
6940 " リビジョン指定が無い場合は、現ブランチの最新リビジョンで更新します。\n"
6977 " リビジョン指定が無い場合は、現ブランチの最新リビジョンで更新します。\n"
6941 " 作業領域中のファイルを削除する場合は、リビジョンに null を指定します\n"
6978 " 作業領域中のファイルを削除する場合は、リビジョンに null を指定します\n"
6942 " ('hg clone -U' と同様の状態になります)。\n"
6979 " ('hg clone -U' と同様の状態になります)。\n"
6943 "\n"
6980 "\n"
6944 " 作業領域中に未コミットの変更が無い場合は、リポジトリに記録されている\n"
6981 " 作業領域中に未コミットの変更が無い場合は、リポジトリに記録されている\n"
6945 " 指定リビジョン時点の内容で、作業領域が更新されます。指定リビジョンが\n"
6982 " 指定リビジョン時点の内容で、作業領域が更新されます。指定リビジョンが\n"
6946 " 作業領域の親リビジョンと異なるブランチのものである場合、作業領域は\n"
6983 " 作業領域の親リビジョンと異なるブランチのものである場合、作業領域は\n"
6947 " 別ブランチへと移行します。\n"
6984 " 別ブランチへと移行します。\n"
6948 "\n"
6985 "\n"
6949 " 未コミットの変更が有る場合、-C オプションを指定することで、変更内容を\n"
6986 " 未コミットの変更が有る場合、-C オプションを指定することで、変更内容を\n"
6950 " 破棄し、指定リビジョン時点の内容で作業領域を強制的に更新します。\n"
6987 " 破棄し、指定リビジョン時点の内容で作業領域を強制的に更新します。\n"
6951 "\n"
6988 "\n"
6952 " 未コミットの変更が有り、且つ -C オプションが指定されなかった場合は、\n"
6989 " 未コミットの変更が有り、且つ -C オプションが指定されなかった場合は、\n"
6953 " 親リビジョンと指定リビジョンが同一ブランチに属し、且つお互いが直系の\n"
6990 " 親リビジョンと指定リビジョンが同一ブランチに属し、且つお互いが直系の\n"
6954 " 関係にある時に限り、未コミットの変更内容と指定リビジョンをマージした\n"
6991 " 関係にある時に限り、未コミットの変更内容と指定リビジョンをマージした\n"
6955 " 結果で作業領域が更新されます。それ以外の場合は、'merge' ないし \n"
6992 " 結果で作業領域が更新されます。それ以外の場合は、'merge' ないし \n"
6956 " 'update -C' の使用を促した上で、コマンド実行は中断されます。\n"
6993 " 'update -C' の使用を促した上で、コマンド実行は中断されます。\n"
6957 "\n"
6994 "\n"
6958 " 1つのファイルだけを以前の状態に戻す場合は revert を使用してください。\n"
6995 " 1つのファイルだけを以前の状態に戻す場合は revert を使用してください。\n"
6959 "\n"
6996 "\n"
6960 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6997 " -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
6961 " "
6998 " "
6962
6999
6963 msgid ""
7000 msgid ""
6964 "verify the integrity of the repository\n"
7001 "verify the integrity of the repository\n"
6965 "\n"
7002 "\n"
6966 " Verify the integrity of the current repository.\n"
7003 " Verify the integrity of the current repository.\n"
6967 "\n"
7004 "\n"
6968 " This will perform an extensive check of the repository's\n"
7005 " This will perform an extensive check of the repository's\n"
6969 " integrity, validating the hashes and checksums of each entry in\n"
7006 " integrity, validating the hashes and checksums of each entry in\n"
6970 " the changelog, manifest, and tracked files, as well as the\n"
7007 " the changelog, manifest, and tracked files, as well as the\n"
6971 " integrity of their crosslinks and indices.\n"
7008 " integrity of their crosslinks and indices.\n"
6972 " "
7009 " "
6973 msgstr ""
7010 msgstr ""
6974 "リポジトリの整合性検証\n"
7011 "リポジトリの整合性検証\n"
6975 "\n"
7012 "\n"
6976 " 現リポジトリの整合性を検証します。\n"
7013 " 現リポジトリの整合性を検証します。\n"
6977 "\n"
7014 "\n"
6978 " 本コマンドは、リポジトリの整合性に関する広範な検証を行います。\n"
7015 " 本コマンドは、リポジトリの整合性に関する広範な検証を行います。\n"
6979 " 変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値および\n"
7016 " 変更記録・マニフェスト・各構成管理対象ファイルにおけるハッシュ値および\n"
6980 " チェックサム、相互関連付けおよびインデックス等の整合性が検証されます。\n"
7017 " チェックサム、相互関連付けおよびインデックス等の整合性が検証されます。\n"
6981 " "
7018 " "
6982
7019
6983 msgid "output version and copyright information"
7020 msgid "output version and copyright information"
6984 msgstr "バージョンおよび著作権情報の表示"
7021 msgstr "バージョンおよび著作権情報の表示"
6985
7022
6986 #, python-format
7023 #, python-format
6987 msgid "Mercurial Distributed SCM (version %s)\n"
7024 msgid "Mercurial Distributed SCM (version %s)\n"
6988 msgstr "Mercurial - 分散構成管理ツール(バージョン %s)\n"
7025 msgstr "Mercurial - 分散構成管理ツール(バージョン %s)\n"
6989
7026
6990 msgid ""
7027 msgid ""
6991 "\n"
7028 "\n"
6992 "Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others\n"
7029 "Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
6993 "This is free software; see the source for copying conditions. There is NO\n"
7030 "This is free software; see the source for copying conditions. There is NO\n"
6994 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7031 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6995 msgstr ""
7032 msgstr ""
6996
7033
6997 msgid "repository root directory or symbolic path name"
7034 msgid "repository root directory or symbolic path name"
6998 msgstr ""
7035 msgstr ""
6999
7036
7000 msgid "change working directory"
7037 msgid "change working directory"
7001 msgstr ""
7038 msgstr ""
7002
7039
7003 msgid "do not prompt, assume 'yes' for any required answers"
7040 msgid "do not prompt, assume 'yes' for any required answers"
7004 msgstr ""
7041 msgstr ""
7005
7042
7006 msgid "suppress output"
7043 msgid "suppress output"
7007 msgstr ""
7044 msgstr ""
7008
7045
7009 msgid "enable additional output"
7046 msgid "enable additional output"
7010 msgstr ""
7047 msgstr ""
7011
7048
7012 msgid "set/override config option"
7049 msgid "set/override config option"
7013 msgstr ""
7050 msgstr ""
7014
7051
7015 msgid "enable debugging output"
7052 msgid "enable debugging output"
7016 msgstr ""
7053 msgstr ""
7017
7054
7018 msgid "start debugger"
7055 msgid "start debugger"
7019 msgstr ""
7056 msgstr ""
7020
7057
7021 msgid "set the charset encoding"
7058 msgid "set the charset encoding"
7022 msgstr ""
7059 msgstr ""
7023
7060
7024 msgid "set the charset encoding mode"
7061 msgid "set the charset encoding mode"
7025 msgstr ""
7062 msgstr ""
7026
7063
7027 msgid "print improved command execution profile"
7064 msgid "print improved command execution profile"
7028 msgstr ""
7065 msgstr ""
7029
7066
7030 msgid "print traceback on exception"
7067 msgid "print traceback on exception"
7031 msgstr ""
7068 msgstr ""
7032
7069
7033 msgid "time how long the command takes"
7070 msgid "time how long the command takes"
7034 msgstr ""
7071 msgstr ""
7035
7072
7036 msgid "print command execution profile"
7073 msgid "print command execution profile"
7037 msgstr ""
7074 msgstr ""
7038
7075
7039 msgid "output version information and exit"
7076 msgid "output version information and exit"
7040 msgstr ""
7077 msgstr ""
7041
7078
7042 msgid "display help and exit"
7079 msgid "display help and exit"
7043 msgstr ""
7080 msgstr ""
7044
7081
7045 msgid "do not perform actions, just print output"
7082 msgid "do not perform actions, just print output"
7046 msgstr ""
7083 msgstr ""
7047
7084
7048 msgid "specify ssh command to use"
7085 msgid "specify ssh command to use"
7049 msgstr ""
7086 msgstr ""
7050
7087
7051 msgid "specify hg command to run on the remote side"
7088 msgid "specify hg command to run on the remote side"
7052 msgstr ""
7089 msgstr ""
7053
7090
7054 msgid "include names matching the given patterns"
7091 msgid "include names matching the given patterns"
7055 msgstr ""
7092 msgstr ""
7056
7093
7057 msgid "exclude names matching the given patterns"
7094 msgid "exclude names matching the given patterns"
7058 msgstr ""
7095 msgstr ""
7059
7096
7060 msgid "use <text> as commit message"
7097 msgid "use <text> as commit message"
7061 msgstr ""
7098 msgstr ""
7062
7099
7063 msgid "read commit message from <file>"
7100 msgid "read commit message from <file>"
7064 msgstr ""
7101 msgstr ""
7065
7102
7066 msgid "record datecode as commit date"
7103 msgid "record datecode as commit date"
7067 msgstr ""
7104 msgstr ""
7068
7105
7069 msgid "record user as committer"
7106 msgid "record user as committer"
7070 msgstr ""
7107 msgstr ""
7071
7108
7072 msgid "display using template map file"
7109 msgid "display using template map file"
7073 msgstr ""
7110 msgstr ""
7074
7111
7075 msgid "display with template"
7112 msgid "display with template"
7076 msgstr ""
7113 msgstr ""
7077
7114
7078 msgid "do not show merges"
7115 msgid "do not show merges"
7079 msgstr ""
7116 msgstr ""
7080
7117
7081 msgid "treat all files as text"
7118 msgid "treat all files as text"
7082 msgstr ""
7119 msgstr ""
7083
7120
7084 msgid "don't include dates in diff headers"
7121 msgid "don't include dates in diff headers"
7085 msgstr ""
7122 msgstr ""
7086
7123
7087 msgid "show which function each change is in"
7124 msgid "show which function each change is in"
7088 msgstr ""
7125 msgstr ""
7089
7126
7090 msgid "ignore white space when comparing lines"
7127 msgid "ignore white space when comparing lines"
7091 msgstr ""
7128 msgstr ""
7092
7129
7093 msgid "ignore changes in the amount of white space"
7130 msgid "ignore changes in the amount of white space"
7094 msgstr ""
7131 msgstr ""
7095
7132
7096 msgid "ignore changes whose lines are all blank"
7133 msgid "ignore changes whose lines are all blank"
7097 msgstr ""
7134 msgstr ""
7098
7135
7099 msgid "number of lines of context to show"
7136 msgid "number of lines of context to show"
7100 msgstr ""
7137 msgstr ""
7101
7138
7102 msgid "guess renamed files by similarity (0<=s<=100)"
7139 msgid "guess renamed files by similarity (0<=s<=100)"
7103 msgstr ""
7140 msgstr ""
7104
7141
7105 msgid "[OPTION]... [FILE]..."
7142 msgid "[OPTION]... [FILE]..."
7106 msgstr ""
7143 msgstr ""
7107
7144
7108 msgid "annotate the specified revision"
7145 msgid "annotate the specified revision"
7109 msgstr ""
7146 msgstr ""
7110
7147
7111 msgid "follow file copies and renames"
7148 msgid "follow file copies and renames"
7112 msgstr ""
7149 msgstr ""
7113
7150
7114 msgid "list the author (long with -v)"
7151 msgid "list the author (long with -v)"
7115 msgstr ""
7152 msgstr ""
7116
7153
7117 msgid "list the date (short with -q)"
7154 msgid "list the date (short with -q)"
7118 msgstr ""
7155 msgstr ""
7119
7156
7120 msgid "list the revision number (default)"
7157 msgid "list the revision number (default)"
7121 msgstr ""
7158 msgstr ""
7122
7159
7123 msgid "list the changeset"
7160 msgid "list the changeset"
7124 msgstr ""
7161 msgstr ""
7125
7162
7126 msgid "show line number at the first appearance"
7163 msgid "show line number at the first appearance"
7127 msgstr ""
7164 msgstr ""
7128
7165
7129 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
7166 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
7130 msgstr ""
7167 msgstr ""
7131
7168
7132 msgid "do not pass files through decoders"
7169 msgid "do not pass files through decoders"
7133 msgstr ""
7170 msgstr ""
7134
7171
7135 msgid "directory prefix for files in archive"
7172 msgid "directory prefix for files in archive"
7136 msgstr ""
7173 msgstr ""
7137
7174
7138 msgid "revision to distribute"
7175 msgid "revision to distribute"
7139 msgstr ""
7176 msgstr ""
7140
7177
7141 msgid "type of distribution to create"
7178 msgid "type of distribution to create"
7142 msgstr ""
7179 msgstr ""
7143
7180
7144 msgid "[OPTION]... DEST"
7181 msgid "[OPTION]... DEST"
7145 msgstr ""
7182 msgstr ""
7146
7183
7147 msgid "merge with old dirstate parent after backout"
7184 msgid "merge with old dirstate parent after backout"
7148 msgstr ""
7185 msgstr ""
7149
7186
7150 msgid "parent to choose when backing out merge"
7187 msgid "parent to choose when backing out merge"
7151 msgstr ""
7188 msgstr ""
7152
7189
7153 msgid "revision to backout"
7190 msgid "revision to backout"
7154 msgstr ""
7191 msgstr ""
7155
7192
7156 msgid "[OPTION]... [-r] REV"
7193 msgid "[OPTION]... [-r] REV"
7157 msgstr ""
7194 msgstr ""
7158
7195
7159 msgid "reset bisect state"
7196 msgid "reset bisect state"
7160 msgstr ""
7197 msgstr ""
7161
7198
7162 msgid "mark changeset good"
7199 msgid "mark changeset good"
7163 msgstr ""
7200 msgstr ""
7164
7201
7165 msgid "mark changeset bad"
7202 msgid "mark changeset bad"
7166 msgstr ""
7203 msgstr ""
7167
7204
7168 msgid "skip testing changeset"
7205 msgid "skip testing changeset"
7169 msgstr ""
7206 msgstr ""
7170
7207
7171 msgid "use command to check changeset state"
7208 msgid "use command to check changeset state"
7172 msgstr ""
7209 msgstr ""
7173
7210
7174 msgid "do not update to target"
7211 msgid "do not update to target"
7175 msgstr ""
7212 msgstr ""
7176
7213
7177 msgid "[-gbsr] [-c CMD] [REV]"
7214 msgid "[-gbsr] [-c CMD] [REV]"
7178 msgstr ""
7215 msgstr ""
7179
7216
7180 msgid "set branch name even if it shadows an existing branch"
7217 msgid "set branch name even if it shadows an existing branch"
7181 msgstr ""
7218 msgstr ""
7182
7219
7183 msgid "reset branch name to parent branch name"
7220 msgid "reset branch name to parent branch name"
7184 msgstr ""
7221 msgstr ""
7185
7222
7186 msgid "[-fC] [NAME]"
7223 msgid "[-fC] [NAME]"
7187 msgstr ""
7224 msgstr ""
7188
7225
7189 msgid "show only branches that have unmerged heads"
7226 msgid "show only branches that have unmerged heads"
7190 msgstr ""
7227 msgstr ""
7191
7228
7192 msgid "[-a]"
7229 msgid "[-a]"
7193 msgstr ""
7230 msgstr ""
7194
7231
7195 msgid "run even when remote repository is unrelated"
7232 msgid "run even when remote repository is unrelated"
7196 msgstr ""
7233 msgstr ""
7197
7234
7198 msgid "a changeset up to which you would like to bundle"
7235 msgid "a changeset up to which you would like to bundle"
7199 msgstr ""
7236 msgstr ""
7200
7237
7201 msgid "a base changeset to specify instead of a destination"
7238 msgid "a base changeset to specify instead of a destination"
7202 msgstr ""
7239 msgstr ""
7203
7240
7204 msgid "bundle all changesets in the repository"
7241 msgid "bundle all changesets in the repository"
7205 msgstr ""
7242 msgstr ""
7206
7243
7207 msgid "bundle compression type to use"
7244 msgid "bundle compression type to use"
7208 msgstr ""
7245 msgstr ""
7209
7246
7210 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7247 msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
7211 msgstr ""
7248 msgstr ""
7212
7249
7213 msgid "print output to file with formatted name"
7250 msgid "print output to file with formatted name"
7214 msgstr ""
7251 msgstr ""
7215
7252
7216 msgid "print the given revision"
7253 msgid "print the given revision"
7217 msgstr ""
7254 msgstr ""
7218
7255
7219 msgid "apply any matching decode filter"
7256 msgid "apply any matching decode filter"
7220 msgstr ""
7257 msgstr ""
7221
7258
7222 msgid "[OPTION]... FILE..."
7259 msgid "[OPTION]... FILE..."
7223 msgstr ""
7260 msgstr ""
7224
7261
7225 msgid "the clone will only contain a repository (no working copy)"
7262 msgid "the clone will only contain a repository (no working copy)"
7226 msgstr ""
7263 msgstr ""
7227
7264
7228 msgid "a changeset you would like to have after cloning"
7265 msgid "a changeset you would like to have after cloning"
7229 msgstr ""
7266 msgstr ""
7230
7267
7231 msgid "[OPTION]... SOURCE [DEST]"
7268 msgid "[OPTION]... SOURCE [DEST]"
7232 msgstr ""
7269 msgstr ""
7233
7270
7234 msgid "mark new/missing files as added/removed before committing"
7271 msgid "mark new/missing files as added/removed before committing"
7235 msgstr ""
7272 msgstr ""
7236
7273
7237 msgid "mark a branch as closed, hiding it from the branch list"
7274 msgid "mark a branch as closed, hiding it from the branch list"
7238 msgstr ""
7275 msgstr ""
7239
7276
7240 msgid "record a copy that has already occurred"
7277 msgid "record a copy that has already occurred"
7241 msgstr ""
7278 msgstr ""
7242
7279
7243 msgid "forcibly copy over an existing managed file"
7280 msgid "forcibly copy over an existing managed file"
7244 msgstr ""
7281 msgstr ""
7245
7282
7246 msgid "[OPTION]... [SOURCE]... DEST"
7283 msgid "[OPTION]... [SOURCE]... DEST"
7247 msgstr ""
7284 msgstr ""
7248
7285
7249 msgid "[INDEX] REV1 REV2"
7286 msgid "[INDEX] REV1 REV2"
7250 msgstr ""
7287 msgstr ""
7251
7288
7252 msgid "show the command options"
7289 msgid "show the command options"
7253 msgstr ""
7290 msgstr ""
7254
7291
7255 msgid "[-o] CMD"
7292 msgid "[-o] CMD"
7256 msgstr ""
7293 msgstr ""
7257
7294
7258 msgid "try extended date formats"
7295 msgid "try extended date formats"
7259 msgstr ""
7296 msgstr ""
7260
7297
7261 msgid "[-e] DATE [RANGE]"
7298 msgid "[-e] DATE [RANGE]"
7262 msgstr ""
7299 msgstr ""
7263
7300
7264 msgid "FILE REV"
7301 msgid "FILE REV"
7265 msgstr ""
7302 msgstr ""
7266
7303
7267 msgid "[PATH]"
7304 msgid "[PATH]"
7268 msgstr ""
7305 msgstr ""
7269
7306
7270 msgid "FILE"
7307 msgid "FILE"
7271 msgstr ""
7308 msgstr ""
7272
7309
7273 msgid "parent"
7310 msgid "parent"
7274 msgstr ""
7311 msgstr ""
7275
7312
7276 msgid "file list"
7313 msgid "file list"
7277 msgstr ""
7314 msgstr ""
7278
7315
7279 msgid "revision to rebuild to"
7316 msgid "revision to rebuild to"
7280 msgstr ""
7317 msgstr ""
7281
7318
7282 msgid "[-r REV] [REV]"
7319 msgid "[-r REV] [REV]"
7283 msgstr ""
7320 msgstr ""
7284
7321
7285 msgid "revision to debug"
7322 msgid "revision to debug"
7286 msgstr ""
7323 msgstr ""
7287
7324
7288 msgid "[-r REV] FILE"
7325 msgid "[-r REV] FILE"
7289 msgstr ""
7326 msgstr ""
7290
7327
7291 msgid "REV1 [REV2]"
7328 msgid "REV1 [REV2]"
7292 msgstr ""
7329 msgstr ""
7293
7330
7294 msgid "do not display the saved mtime"
7331 msgid "do not display the saved mtime"
7295 msgstr ""
7332 msgstr ""
7296
7333
7297 msgid "[OPTION]..."
7334 msgid "[OPTION]..."
7298 msgstr ""
7335 msgstr ""
7299
7336
7300 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7337 msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
7301 msgstr ""
7338 msgstr ""
7302
7339
7303 msgid "diff against the second parent"
7340 msgid "diff against the second parent"
7304 msgstr ""
7341 msgstr ""
7305
7342
7306 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7343 msgid "[OPTION]... [-o OUTFILESPEC] REV..."
7307 msgstr ""
7344 msgstr ""
7308
7345
7309 msgid "end fields with NUL"
7346 msgid "end fields with NUL"
7310 msgstr ""
7347 msgstr ""
7311
7348
7312 msgid "print all revisions that match"
7349 msgid "print all revisions that match"
7313 msgstr ""
7350 msgstr ""
7314
7351
7315 msgid "follow changeset history, or file history across copies and renames"
7352 msgid "follow changeset history, or file history across copies and renames"
7316 msgstr ""
7353 msgstr ""
7317
7354
7318 msgid "ignore case when matching"
7355 msgid "ignore case when matching"
7319 msgstr ""
7356 msgstr ""
7320
7357
7321 msgid "print only filenames and revs that match"
7358 msgid "print only filenames and revs that match"
7322 msgstr ""
7359 msgstr ""
7323
7360
7324 msgid "print matching line numbers"
7361 msgid "print matching line numbers"
7325 msgstr ""
7362 msgstr ""
7326
7363
7327 msgid "search in given revision range"
7364 msgid "search in given revision range"
7328 msgstr ""
7365 msgstr ""
7329
7366
7330 msgid "[OPTION]... PATTERN [FILE]..."
7367 msgid "[OPTION]... PATTERN [FILE]..."
7331 msgstr ""
7368 msgstr ""
7332
7369
7333 msgid "show only heads which are descendants of rev"
7370 msgid "show only heads which are descendants of rev"
7334 msgstr ""
7371 msgstr ""
7335
7372
7336 msgid "show only the active heads from open branches"
7373 msgid "show only the active heads from open branches"
7337 msgstr ""
7374 msgstr ""
7338
7375
7339 msgid "[-r REV] [REV]..."
7376 msgid "[-r REV] [REV]..."
7340 msgstr ""
7377 msgstr ""
7341
7378
7342 msgid "[TOPIC]"
7379 msgid "[TOPIC]"
7343 msgstr ""
7380 msgstr ""
7344
7381
7345 msgid "identify the specified rev"
7382 msgid "identify the specified rev"
7346 msgstr ""
7383 msgstr ""
7347
7384
7348 msgid "show local revision number"
7385 msgid "show local revision number"
7349 msgstr ""
7386 msgstr ""
7350
7387
7351 msgid "show global revision id"
7388 msgid "show global revision id"
7352 msgstr ""
7389 msgstr ""
7353
7390
7354 msgid "show branch"
7391 msgid "show branch"
7355 msgstr ""
7392 msgstr ""
7356
7393
7357 msgid "show tags"
7394 msgid "show tags"
7358 msgstr ""
7395 msgstr ""
7359
7396
7360 msgid "[-nibt] [-r REV] [SOURCE]"
7397 msgid "[-nibt] [-r REV] [SOURCE]"
7361 msgstr ""
7398 msgstr ""
7362
7399
7363 msgid ""
7400 msgid ""
7364 "directory strip option for patch. This has the same\n"
7401 "directory strip option for patch. This has the same\n"
7365 "meaning as the corresponding patch option"
7402 "meaning as the corresponding patch option"
7366 msgstr ""
7403 msgstr ""
7367
7404
7368 msgid "base path"
7405 msgid "base path"
7369 msgstr ""
7406 msgstr ""
7370
7407
7371 msgid "skip check for outstanding uncommitted changes"
7408 msgid "skip check for outstanding uncommitted changes"
7372 msgstr ""
7409 msgstr ""
7373
7410
7374 msgid "don't commit, just update the working directory"
7411 msgid "don't commit, just update the working directory"
7375 msgstr ""
7412 msgstr ""
7376
7413
7377 msgid "apply patch to the nodes from which it was generated"
7414 msgid "apply patch to the nodes from which it was generated"
7378 msgstr ""
7415 msgstr ""
7379
7416
7380 msgid "Use any branch information in patch (implied by --exact)"
7417 msgid "Use any branch information in patch (implied by --exact)"
7381 msgstr ""
7418 msgstr ""
7382
7419
7383 msgid "[OPTION]... PATCH..."
7420 msgid "[OPTION]... PATCH..."
7384 msgstr ""
7421 msgstr ""
7385
7422
7386 msgid "show newest record first"
7423 msgid "show newest record first"
7387 msgstr ""
7424 msgstr ""
7388
7425
7389 msgid "file to store the bundles into"
7426 msgid "file to store the bundles into"
7390 msgstr ""
7427 msgstr ""
7391
7428
7392 msgid "a specific revision up to which you would like to pull"
7429 msgid "a specific revision up to which you would like to pull"
7393 msgstr ""
7430 msgstr ""
7394
7431
7395 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7432 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
7396 msgstr ""
7433 msgstr ""
7397
7434
7398 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7435 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
7399 msgstr ""
7436 msgstr ""
7400
7437
7401 msgid "search the repository as it stood at rev"
7438 msgid "search the repository as it stood at rev"
7402 msgstr ""
7439 msgstr ""
7403
7440
7404 msgid "end filenames with NUL, for use with xargs"
7441 msgid "end filenames with NUL, for use with xargs"
7405 msgstr ""
7442 msgstr ""
7406
7443
7407 msgid "print complete paths from the filesystem root"
7444 msgid "print complete paths from the filesystem root"
7408 msgstr ""
7445 msgstr ""
7409
7446
7410 msgid "[OPTION]... [PATTERN]..."
7447 msgid "[OPTION]... [PATTERN]..."
7411 msgstr ""
7448 msgstr ""
7412
7449
7413 msgid "only follow the first parent of merge changesets"
7450 msgid "only follow the first parent of merge changesets"
7414 msgstr ""
7451 msgstr ""
7415
7452
7416 msgid "show revs matching date spec"
7453 msgid "show revs matching date spec"
7417 msgstr ""
7454 msgstr ""
7418
7455
7419 msgid "show copied files"
7456 msgid "show copied files"
7420 msgstr ""
7457 msgstr ""
7421
7458
7422 msgid "do case-insensitive search for a keyword"
7459 msgid "do case-insensitive search for a keyword"
7423 msgstr ""
7460 msgstr ""
7424
7461
7425 msgid "include revs where files were removed"
7462 msgid "include revs where files were removed"
7426 msgstr ""
7463 msgstr ""
7427
7464
7428 msgid "show only merges"
7465 msgid "show only merges"
7429 msgstr ""
7466 msgstr ""
7430
7467
7431 msgid "revs committed by user"
7468 msgid "revs committed by user"
7432 msgstr ""
7469 msgstr ""
7433
7470
7434 msgid "show only changesets within the given named branch"
7471 msgid "show only changesets within the given named branch"
7435 msgstr ""
7472 msgstr ""
7436
7473
7437 msgid "do not display revision or any of its ancestors"
7474 msgid "do not display revision or any of its ancestors"
7438 msgstr ""
7475 msgstr ""
7439
7476
7440 msgid "[OPTION]... [FILE]"
7477 msgid "[OPTION]... [FILE]"
7441 msgstr ""
7478 msgstr ""
7442
7479
7443 msgid "revision to display"
7480 msgid "revision to display"
7444 msgstr ""
7481 msgstr ""
7445
7482
7446 msgid "[-r REV]"
7483 msgid "[-r REV]"
7447 msgstr ""
7484 msgstr ""
7448
7485
7449 msgid "force a merge with outstanding changes"
7486 msgid "force a merge with outstanding changes"
7450 msgstr ""
7487 msgstr ""
7451
7488
7452 msgid "revision to merge"
7489 msgid "revision to merge"
7453 msgstr ""
7490 msgstr ""
7454
7491
7455 msgid "[-f] [[-r] REV]"
7492 msgid "[-f] [[-r] REV]"
7456 msgstr ""
7493 msgstr ""
7457
7494
7458 msgid "a specific revision up to which you would like to push"
7495 msgid "a specific revision up to which you would like to push"
7459 msgstr ""
7496 msgstr ""
7460
7497
7461 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7498 msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
7462 msgstr ""
7499 msgstr ""
7463
7500
7464 msgid "show parents from the specified rev"
7501 msgid "show parents from the specified rev"
7465 msgstr ""
7502 msgstr ""
7466
7503
7467 msgid "hg parents [-r REV] [FILE]"
7504 msgid "hg parents [-r REV] [FILE]"
7468 msgstr ""
7505 msgstr ""
7469
7506
7470 msgid "[NAME]"
7507 msgid "[NAME]"
7471 msgstr ""
7508 msgstr ""
7472
7509
7473 msgid "update to new tip if changesets were pulled"
7510 msgid "update to new tip if changesets were pulled"
7474 msgstr ""
7511 msgstr ""
7475
7512
7476 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7513 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
7477 msgstr ""
7514 msgstr ""
7478
7515
7479 msgid "force push"
7516 msgid "force push"
7480 msgstr ""
7517 msgstr ""
7481
7518
7482 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7519 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
7483 msgstr ""
7520 msgstr ""
7484
7521
7485 msgid "record delete for missing files"
7522 msgid "record delete for missing files"
7486 msgstr ""
7523 msgstr ""
7487
7524
7488 msgid "remove (and delete) file even if added or modified"
7525 msgid "remove (and delete) file even if added or modified"
7489 msgstr ""
7526 msgstr ""
7490
7527
7491 msgid "record a rename that has already occurred"
7528 msgid "record a rename that has already occurred"
7492 msgstr ""
7529 msgstr ""
7493
7530
7494 msgid "[OPTION]... SOURCE... DEST"
7531 msgid "[OPTION]... SOURCE... DEST"
7495 msgstr ""
7532 msgstr ""
7496
7533
7497 msgid "remerge all unresolved files"
7534 msgid "remerge all unresolved files"
7498 msgstr ""
7535 msgstr ""
7499
7536
7500 msgid "list state of files needing merge"
7537 msgid "list state of files needing merge"
7501 msgstr ""
7538 msgstr ""
7502
7539
7503 msgid "mark files as resolved"
7540 msgid "mark files as resolved"
7504 msgstr ""
7541 msgstr ""
7505
7542
7506 msgid "unmark files as resolved"
7543 msgid "unmark files as resolved"
7507 msgstr ""
7544 msgstr ""
7508
7545
7509 msgid "revert all changes when no arguments given"
7546 msgid "revert all changes when no arguments given"
7510 msgstr ""
7547 msgstr ""
7511
7548
7512 msgid "tipmost revision matching date"
7549 msgid "tipmost revision matching date"
7513 msgstr ""
7550 msgstr ""
7514
7551
7515 msgid "revision to revert to"
7552 msgid "revision to revert to"
7516 msgstr ""
7553 msgstr ""
7517
7554
7518 msgid "do not save backup copies of files"
7555 msgid "do not save backup copies of files"
7519 msgstr ""
7556 msgstr ""
7520
7557
7521 msgid "[OPTION]... [-r REV] [NAME]..."
7558 msgid "[OPTION]... [-r REV] [NAME]..."
7522 msgstr ""
7559 msgstr ""
7523
7560
7524 msgid "name of access log file to write to"
7561 msgid "name of access log file to write to"
7525 msgstr ""
7562 msgstr ""
7526
7563
7527 msgid "name of error log file to write to"
7564 msgid "name of error log file to write to"
7528 msgstr ""
7565 msgstr ""
7529
7566
7530 msgid "port to listen on (default: 8000)"
7567 msgid "port to listen on (default: 8000)"
7531 msgstr ""
7568 msgstr ""
7532
7569
7533 msgid "address to listen on (default: all interfaces)"
7570 msgid "address to listen on (default: all interfaces)"
7534 msgstr ""
7571 msgstr ""
7535
7572
7536 msgid "prefix path to serve from (default: server root)"
7573 msgid "prefix path to serve from (default: server root)"
7537 msgstr ""
7574 msgstr ""
7538
7575
7539 msgid "name to show in web pages (default: working dir)"
7576 msgid "name to show in web pages (default: working dir)"
7540 msgstr ""
7577 msgstr ""
7541
7578
7542 msgid "name of the webdir config file (serve more than one repo)"
7579 msgid "name of the webdir config file (serve more than one repo)"
7543 msgstr ""
7580 msgstr ""
7544
7581
7545 msgid "for remote clients"
7582 msgid "for remote clients"
7546 msgstr ""
7583 msgstr ""
7547
7584
7548 msgid "web templates to use"
7585 msgid "web templates to use"
7549 msgstr ""
7586 msgstr ""
7550
7587
7551 msgid "template style to use"
7588 msgid "template style to use"
7552 msgstr ""
7589 msgstr ""
7553
7590
7554 msgid "use IPv6 in addition to IPv4"
7591 msgid "use IPv6 in addition to IPv4"
7555 msgstr ""
7592 msgstr ""
7556
7593
7557 msgid "SSL certificate file"
7594 msgid "SSL certificate file"
7558 msgstr ""
7595 msgstr ""
7559
7596
7560 msgid "show untrusted configuration options"
7597 msgid "show untrusted configuration options"
7561 msgstr ""
7598 msgstr ""
7562
7599
7563 msgid "[-u] [NAME]..."
7600 msgid "[-u] [NAME]..."
7564 msgstr ""
7601 msgstr ""
7565
7602
7566 msgid "show status of all files"
7603 msgid "show status of all files"
7567 msgstr ""
7604 msgstr ""
7568
7605
7569 msgid "show only modified files"
7606 msgid "show only modified files"
7570 msgstr ""
7607 msgstr ""
7571
7608
7572 msgid "show only added files"
7609 msgid "show only added files"
7573 msgstr ""
7610 msgstr ""
7574
7611
7575 msgid "show only removed files"
7612 msgid "show only removed files"
7576 msgstr ""
7613 msgstr ""
7577
7614
7578 msgid "show only deleted (but tracked) files"
7615 msgid "show only deleted (but tracked) files"
7579 msgstr ""
7616 msgstr ""
7580
7617
7581 msgid "show only files without changes"
7618 msgid "show only files without changes"
7582 msgstr ""
7619 msgstr ""
7583
7620
7584 msgid "show only unknown (not tracked) files"
7621 msgid "show only unknown (not tracked) files"
7585 msgstr ""
7622 msgstr ""
7586
7623
7587 msgid "show only ignored files"
7624 msgid "show only ignored files"
7588 msgstr ""
7625 msgstr ""
7589
7626
7590 msgid "hide status prefix"
7627 msgid "hide status prefix"
7591 msgstr ""
7628 msgstr ""
7592
7629
7593 msgid "show source of copied files"
7630 msgid "show source of copied files"
7594 msgstr ""
7631 msgstr ""
7595
7632
7596 msgid "show difference from revision"
7633 msgid "show difference from revision"
7597 msgstr ""
7634 msgstr ""
7598
7635
7599 msgid "replace existing tag"
7636 msgid "replace existing tag"
7600 msgstr ""
7637 msgstr ""
7601
7638
7602 msgid "make the tag local"
7639 msgid "make the tag local"
7603 msgstr ""
7640 msgstr ""
7604
7641
7605 msgid "revision to tag"
7642 msgid "revision to tag"
7606 msgstr ""
7643 msgstr ""
7607
7644
7608 msgid "remove a tag"
7645 msgid "remove a tag"
7609 msgstr ""
7646 msgstr ""
7610
7647
7611 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7648 msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
7612 msgstr ""
7649 msgstr ""
7613
7650
7614 msgid "[-p]"
7651 msgid "[-p]"
7615 msgstr ""
7652 msgstr ""
7616
7653
7617 msgid "update to new tip if changesets were unbundled"
7654 msgid "update to new tip if changesets were unbundled"
7618 msgstr ""
7655 msgstr ""
7619
7656
7620 msgid "[-u] FILE..."
7657 msgid "[-u] FILE..."
7621 msgstr ""
7658 msgstr ""
7622
7659
7623 msgid "overwrite locally modified files (no backup)"
7660 msgid "overwrite locally modified files (no backup)"
7624 msgstr ""
7661 msgstr ""
7625
7662
7626 msgid "[-C] [-d DATE] [[-r] REV]"
7663 msgid "[-C] [-d DATE] [[-r] REV]"
7627 msgstr ""
7664 msgstr ""
7628
7665
7629 msgid "not found in manifest"
7666 msgid "not found in manifest"
7630 msgstr ""
7667 msgstr ""
7631
7668
7632 msgid "branch name not in UTF-8!"
7669 msgid "branch name not in UTF-8!"
7633 msgstr ""
7670 msgstr ""
7634
7671
7635 #, python-format
7672 #, python-format
7636 msgid " searching for copies back to rev %d\n"
7673 msgid " searching for copies back to rev %d\n"
7637 msgstr ""
7674 msgstr ""
7638
7675
7639 #, python-format
7676 #, python-format
7640 msgid ""
7677 msgid ""
7641 " unmatched files in local:\n"
7678 " unmatched files in local:\n"
7642 " %s\n"
7679 " %s\n"
7643 msgstr ""
7680 msgstr ""
7644
7681
7645 #, python-format
7682 #, python-format
7646 msgid ""
7683 msgid ""
7647 " unmatched files in other:\n"
7684 " unmatched files in other:\n"
7648 " %s\n"
7685 " %s\n"
7649 msgstr ""
7686 msgstr ""
7650
7687
7651 msgid " all copies found (* = to merge, ! = divergent):\n"
7688 msgid " all copies found (* = to merge, ! = divergent):\n"
7652 msgstr ""
7689 msgstr ""
7653
7690
7654 #, python-format
7691 #, python-format
7655 msgid " %s -> %s %s\n"
7692 msgid " %s -> %s %s\n"
7656 msgstr ""
7693 msgstr ""
7657
7694
7658 msgid " checking for directory renames\n"
7695 msgid " checking for directory renames\n"
7659 msgstr ""
7696 msgstr ""
7660
7697
7661 #, python-format
7698 #, python-format
7662 msgid " dir %s -> %s\n"
7699 msgid " dir %s -> %s\n"
7663 msgstr ""
7700 msgstr ""
7664
7701
7665 #, python-format
7702 #, python-format
7666 msgid " file %s -> %s\n"
7703 msgid " file %s -> %s\n"
7667 msgstr ""
7704 msgstr ""
7668
7705
7669 #, python-format
7706 #, python-format
7670 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7707 msgid "'\\n' and '\\r' disallowed in filenames: %r"
7671 msgstr ""
7708 msgstr ""
7672
7709
7673 #, python-format
7710 #, python-format
7674 msgid "directory %r already in dirstate"
7711 msgid "directory %r already in dirstate"
7675 msgstr ""
7712 msgstr ""
7676
7713
7677 #, python-format
7714 #, python-format
7678 msgid "file %r in dirstate clashes with %r"
7715 msgid "file %r in dirstate clashes with %r"
7679 msgstr ""
7716 msgstr ""
7680
7717
7681 #, python-format
7718 #, python-format
7682 msgid "not in dirstate: %s\n"
7719 msgid "not in dirstate: %s\n"
7683 msgstr ""
7720 msgstr ""
7684
7721
7685 msgid "character device"
7722 msgid "character device"
7686 msgstr ""
7723 msgstr ""
7687
7724
7688 msgid "block device"
7725 msgid "block device"
7689 msgstr ""
7726 msgstr ""
7690
7727
7691 msgid "fifo"
7728 msgid "fifo"
7692 msgstr ""
7729 msgstr ""
7693
7730
7694 msgid "socket"
7731 msgid "socket"
7695 msgstr ""
7732 msgstr ""
7696
7733
7697 msgid "directory"
7734 msgid "directory"
7698 msgstr ""
7735 msgstr ""
7699
7736
7700 #, python-format
7737 #, python-format
7701 msgid "%s: unsupported file type (type is %s)\n"
7738 msgid "%s: unsupported file type (type is %s)\n"
7702 msgstr ""
7739 msgstr ""
7703
7740
7704 #, python-format
7741 #, python-format
7705 msgid "abort: %s\n"
7742 msgid "abort: %s\n"
7706 msgstr ""
7743 msgstr ""
7707
7744
7708 #, python-format
7745 #, python-format
7709 msgid ""
7746 msgid ""
7710 "hg: command '%s' is ambiguous:\n"
7747 "hg: command '%s' is ambiguous:\n"
7711 " %s\n"
7748 " %s\n"
7712 msgstr ""
7749 msgstr ""
7713
7750
7714 #, python-format
7751 #, python-format
7715 msgid "timed out waiting for lock held by %s"
7752 msgid "timed out waiting for lock held by %s"
7716 msgstr ""
7753 msgstr ""
7717
7754
7718 #, python-format
7755 #, python-format
7719 msgid "lock held by %s"
7756 msgid "lock held by %s"
7720 msgstr ""
7757 msgstr ""
7721
7758
7722 #, python-format
7759 #, python-format
7723 msgid "abort: %s: %s\n"
7760 msgid "abort: %s: %s\n"
7724 msgstr ""
7761 msgstr ""
7725
7762
7726 #, python-format
7763 #, python-format
7727 msgid "abort: could not lock %s: %s\n"
7764 msgid "abort: could not lock %s: %s\n"
7728 msgstr ""
7765 msgstr ""
7729
7766
7730 #, python-format
7767 #, python-format
7731 msgid "hg %s: %s\n"
7768 msgid "hg %s: %s\n"
7732 msgstr ""
7769 msgstr ""
7733
7770
7734 #, python-format
7771 #, python-format
7735 msgid "hg: %s\n"
7772 msgid "hg: %s\n"
7736 msgstr ""
7773 msgstr ""
7737
7774
7738 #, python-format
7775 #, python-format
7739 msgid "abort: %s!\n"
7776 msgid "abort: %s!\n"
7740 msgstr ""
7777 msgstr ""
7741
7778
7742 #, python-format
7779 #, python-format
7743 msgid "abort: %s"
7780 msgid "abort: %s"
7744 msgstr ""
7781 msgstr ""
7745
7782
7746 msgid " empty string\n"
7783 msgid " empty string\n"
7747 msgstr ""
7784 msgstr ""
7748
7785
7749 msgid "killed!\n"
7786 msgid "killed!\n"
7750 msgstr ""
7787 msgstr ""
7751
7788
7752 #, python-format
7789 #, python-format
7753 msgid "hg: unknown command '%s'\n"
7790 msgid "hg: unknown command '%s'\n"
7754 msgstr ""
7791 msgstr ""
7755
7792
7756 #, python-format
7793 #, python-format
7757 msgid "abort: could not import module %s!\n"
7794 msgid "abort: could not import module %s!\n"
7758 msgstr ""
7795 msgstr ""
7759
7796
7760 msgid "(did you forget to compile extensions?)\n"
7797 msgid "(did you forget to compile extensions?)\n"
7761 msgstr ""
7798 msgstr ""
7762
7799
7763 msgid "(is your Python install correct?)\n"
7800 msgid "(is your Python install correct?)\n"
7764 msgstr ""
7801 msgstr ""
7765
7802
7766 #, python-format
7803 #, python-format
7767 msgid "abort: error: %s\n"
7804 msgid "abort: error: %s\n"
7768 msgstr ""
7805 msgstr ""
7769
7806
7770 msgid "broken pipe\n"
7807 msgid "broken pipe\n"
7771 msgstr ""
7808 msgstr ""
7772
7809
7773 msgid "interrupted!\n"
7810 msgid "interrupted!\n"
7774 msgstr ""
7811 msgstr ""
7775
7812
7776 msgid ""
7813 msgid ""
7777 "\n"
7814 "\n"
7778 "broken pipe\n"
7815 "broken pipe\n"
7779 msgstr ""
7816 msgstr ""
7780
7817
7781 msgid "abort: out of memory\n"
7818 msgid "abort: out of memory\n"
7782 msgstr ""
7819 msgstr ""
7783
7820
7784 msgid "** unknown exception encountered, details follow\n"
7821 msgid "** unknown exception encountered, details follow\n"
7785 msgstr ""
7822 msgstr ""
7786
7823
7787 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
7824 msgid "** report bug details to http://www.selenic.com/mercurial/bts\n"
7788 msgstr ""
7825 msgstr ""
7789
7826
7790 msgid "** or mercurial@selenic.com\n"
7827 msgid "** or mercurial@selenic.com\n"
7791 msgstr ""
7828 msgstr ""
7792
7829
7793 #, python-format
7830 #, python-format
7794 msgid "** Mercurial Distributed SCM (version %s)\n"
7831 msgid "** Mercurial Distributed SCM (version %s)\n"
7795 msgstr "** Mercurial - 分散構成管理(バージョン %s)\n"
7832 msgstr "** Mercurial - 分散構成管理(バージョン %s)\n"
7796
7833
7797 #, python-format
7834 #, python-format
7798 msgid "** Extensions loaded: %s\n"
7835 msgid "** Extensions loaded: %s\n"
7799 msgstr ""
7836 msgstr ""
7800
7837
7801 #, python-format
7838 #, python-format
7802 msgid "malformed --config option: %s"
7839 msgid "malformed --config option: %s"
7803 msgstr ""
7840 msgstr ""
7804
7841
7805 #, python-format
7842 #, python-format
7806 msgid "extension '%s' overrides commands: %s\n"
7843 msgid "extension '%s' overrides commands: %s\n"
7807 msgstr ""
7844 msgstr ""
7808
7845
7809 msgid "Option --config may not be abbreviated!"
7846 msgid "Option --config may not be abbreviated!"
7810 msgstr ""
7847 msgstr ""
7811
7848
7812 msgid "Option --cwd may not be abbreviated!"
7849 msgid "Option --cwd may not be abbreviated!"
7813 msgstr ""
7850 msgstr ""
7814
7851
7815 msgid ""
7852 msgid ""
7816 "Option -R has to be separated from other options (i.e. not -qR) and --"
7853 "Option -R has to be separated from other options (i.e. not -qR) and --"
7817 "repository may only be abbreviated as --repo!"
7854 "repository may only be abbreviated as --repo!"
7818 msgstr ""
7855 msgstr ""
7819
7856
7820 #, python-format
7857 #, python-format
7821 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7858 msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
7822 msgstr ""
7859 msgstr ""
7823
7860
7824 #, python-format
7861 #, python-format
7825 msgid "repository '%s' is not local"
7862 msgid "repository '%s' is not local"
7826 msgstr ""
7863 msgstr ""
7827
7864
7828 msgid "invalid arguments"
7865 msgid "invalid arguments"
7829 msgstr ""
7866 msgstr ""
7830
7867
7831 msgid "exception raised - generating profile anyway\n"
7868 msgid "exception raised - generating profile anyway\n"
7832 msgstr ""
7869 msgstr ""
7833
7870
7834 msgid ""
7871 msgid ""
7835 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7872 "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
7836 "misc/lsprof/"
7873 "misc/lsprof/"
7837 msgstr ""
7874 msgstr ""
7838
7875
7839 #, python-format
7876 #, python-format
7840 msgid "*** failed to import extension %s from %s: %s\n"
7877 msgid "*** failed to import extension %s from %s: %s\n"
7841 msgstr ""
7878 msgstr ""
7842
7879
7843 #, python-format
7880 #, python-format
7844 msgid "*** failed to import extension %s: %s\n"
7881 msgid "*** failed to import extension %s: %s\n"
7845 msgstr ""
7882 msgstr ""
7846
7883
7847 #, python-format
7884 #, python-format
7848 msgid "couldn't find merge tool %s\n"
7885 msgid "couldn't find merge tool %s\n"
7849 msgstr ""
7886 msgstr ""
7850
7887
7851 #, python-format
7888 #, python-format
7852 msgid "tool %s can't handle symlinks\n"
7889 msgid "tool %s can't handle symlinks\n"
7853 msgstr ""
7890 msgstr ""
7854
7891
7855 #, python-format
7892 #, python-format
7856 msgid "tool %s can't handle binary\n"
7893 msgid "tool %s can't handle binary\n"
7857 msgstr ""
7894 msgstr ""
7858
7895
7859 #, python-format
7896 #, python-format
7860 msgid "tool %s requires a GUI\n"
7897 msgid "tool %s requires a GUI\n"
7861 msgstr ""
7898 msgstr ""
7862
7899
7863 #, python-format
7900 #, python-format
7864 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7901 msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
7865 msgstr ""
7902 msgstr ""
7866
7903
7867 #, python-format
7904 #, python-format
7868 msgid ""
7905 msgid ""
7869 " no tool found to merge %s\n"
7906 " no tool found to merge %s\n"
7870 "keep (l)ocal or take (o)ther?"
7907 "keep (l)ocal or take (o)ther?"
7871 msgstr ""
7908 msgstr ""
7872
7909
7873 msgid "[lo]"
7910 msgid "[lo]"
7874 msgstr ""
7911 msgstr ""
7875
7912
7876 msgid "l"
7913 msgid "l"
7877 msgstr ""
7914 msgstr ""
7878
7915
7879 #, python-format
7916 #, python-format
7880 msgid "merging %s and %s to %s\n"
7917 msgid "merging %s and %s to %s\n"
7881 msgstr ""
7918 msgstr ""
7882
7919
7883 #, python-format
7920 #, python-format
7884 msgid "merging %s\n"
7921 msgid "merging %s\n"
7885 msgstr ""
7922 msgstr ""
7886
7923
7887 #, python-format
7924 #, python-format
7888 msgid "my %s other %s ancestor %s\n"
7925 msgid "my %s other %s ancestor %s\n"
7889 msgstr ""
7926 msgstr ""
7890
7927
7891 msgid " premerge successful\n"
7928 msgid " premerge successful\n"
7892 msgstr ""
7929 msgstr ""
7893
7930
7894 #, python-format
7931 #, python-format
7895 msgid ""
7932 msgid ""
7896 " output file %s appears unchanged\n"
7933 " output file %s appears unchanged\n"
7897 "was merge successful (yn)?"
7934 "was merge successful (yn)?"
7898 msgstr ""
7935 msgstr ""
7899
7936
7900 msgid "[yn]"
7937 msgid "[yn]"
7901 msgstr ""
7938 msgstr ""
7902
7939
7903 msgid "n"
7940 msgid "n"
7904 msgstr ""
7941 msgstr ""
7905
7942
7906 #, python-format
7943 #, python-format
7907 msgid "merging %s failed!\n"
7944 msgid "merging %s failed!\n"
7908 msgstr ""
7945 msgstr ""
7909
7946
7910 #, python-format
7947 #, python-format
7911 msgid "Inconsistent state, %s:%s is good and bad"
7948 msgid "Inconsistent state, %s:%s is good and bad"
7912 msgstr ""
7949 msgstr ""
7913
7950
7914 #, python-format
7951 #, python-format
7915 msgid "unknown bisect kind %s"
7952 msgid "unknown bisect kind %s"
7916 msgstr ""
7953 msgstr ""
7917
7954
7918 msgid "Date Formats"
7955 msgid "Date Formats"
7919 msgstr "日時表記"
7956 msgstr "日時表記"
7920
7957
7921 msgid ""
7958 msgid ""
7922 "\n"
7959 "\n"
7923 " Some commands allow the user to specify a date, e.g.:\n"
7960 " Some commands allow the user to specify a date, e.g.:\n"
7924 " * backout, commit, import, tag: Specify the commit date.\n"
7961 " * backout, commit, import, tag: Specify the commit date.\n"
7925 " * log, revert, update: Select revision(s) by date.\n"
7962 " * log, revert, update: Select revision(s) by date.\n"
7926 "\n"
7963 "\n"
7927 " Many date formats are valid. Here are some examples:\n"
7964 " Many date formats are valid. Here are some examples:\n"
7928 "\n"
7965 "\n"
7929 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7966 " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
7930 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7967 " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
7931 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7968 " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
7932 " \"Dec 6\" (midnight)\n"
7969 " \"Dec 6\" (midnight)\n"
7933 " \"13:18\" (today assumed)\n"
7970 " \"13:18\" (today assumed)\n"
7934 " \"3:39\" (3:39AM assumed)\n"
7971 " \"3:39\" (3:39AM assumed)\n"
7935 " \"3:39pm\" (15:39)\n"
7972 " \"3:39pm\" (15:39)\n"
7936 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7973 " \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
7937 " \"2006-12-6 13:18\"\n"
7974 " \"2006-12-6 13:18\"\n"
7938 " \"2006-12-6\"\n"
7975 " \"2006-12-6\"\n"
7939 " \"12-6\"\n"
7976 " \"12-6\"\n"
7940 " \"12/6\"\n"
7977 " \"12/6\"\n"
7941 " \"12/6/6\" (Dec 6 2006)\n"
7978 " \"12/6/6\" (Dec 6 2006)\n"
7942 "\n"
7979 "\n"
7943 " Lastly, there is Mercurial's internal format:\n"
7980 " Lastly, there is Mercurial's internal format:\n"
7944 "\n"
7981 "\n"
7945 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7982 " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
7946 "\n"
7983 "\n"
7947 " This is the internal representation format for dates. unixtime is\n"
7984 " This is the internal representation format for dates. unixtime is\n"
7948 " the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n"
7985 " the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n"
7949 " is the offset of the local timezone, in seconds west of UTC (negative\n"
7986 " is the offset of the local timezone, in seconds west of UTC (negative\n"
7950 " if the timezone is east of UTC).\n"
7987 " if the timezone is east of UTC).\n"
7951 "\n"
7988 "\n"
7952 " The log command also accepts date ranges:\n"
7989 " The log command also accepts date ranges:\n"
7953 "\n"
7990 "\n"
7954 " \"<{date}\" - on or before a given date\n"
7991 " \"<{datetime}\" - at or before a given date/time\n"
7955 " \">{date}\" - on or after a given date\n"
7992 " \">{datetime}\" - on or after a given date/time\n"
7956 " \"{date} to {date}\" - a date range, inclusive\n"
7993 " \"{datetime} to {datetime}\" - a date range, inclusive\n"
7957 " \"-{days}\" - within a given number of days of today\n"
7994 " \"-{days}\" - within a given number of days of today\n"
7958 " "
7995 " "
7959 msgstr ""
7996 msgstr ""
7960 "\n"
7997 "\n"
7961 " 以下のコマンドで日時指定が可能です:\n"
7998 " 以下のコマンドで日時指定が可能です:\n"
7962 " * backout, commit, import, tag: コミット日時の指定\n"
7999 " * backout, commit, import, tag: コミット日時の指定\n"
7963 " * log, revert, update: 日時によるリビジョンの指定\n"
8000 " * log, revert, update: 日時によるリビジョンの指定\n"
7964 "\n"
8001 "\n"
7965 " 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n"
8002 " 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n"
7966 "\n"
8003 "\n"
7967 " \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n"
8004 " \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n"
7968 " \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n"
8005 " \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n"
7969 " \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n"
8006 " \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n"
7970 " \"Dec 6\" (「午前0時」を想定)\n"
8007 " \"Dec 6\" (「午前0時」を想定)\n"
7971 " \"13:18\" (「本日」を想定)\n"
8008 " \"13:18\" (「本日」を想定)\n"
7972 " \"3:39\" (「3:39AM」を想定)\n"
8009 " \"3:39\" (「3:39AM」を想定)\n"
7973 " \"3:39pm\" (15:39)\n"
8010 " \"3:39pm\" (15:39)\n"
7974 " \"2006-12-06 13:18:29\" (ISO 8601 形式)\n"
8011 " \"2006-12-06 13:18:29\" (ISO 8601 形式)\n"
7975 " \"2006-12-6 13:18\"\n"
8012 " \"2006-12-6 13:18\"\n"
7976 " \"2006-12-6\"\n"
8013 " \"2006-12-6\"\n"
7977 " \"12-6\"\n"
8014 " \"12-6\"\n"
7978 " \"12/6\"\n"
8015 " \"12/6\"\n"
7979 " \"12/6/6\" (2006年12月6日)\n"
8016 " \"12/6/6\" (2006年12月6日)\n"
7980 "\n"
8017 "\n"
7981 " 最後に、Mercurial 固有の内部形式を示します。\n"
8018 " 最後に、Mercurial 固有の内部形式を示します。\n"
7982 "\n"
8019 "\n"
7983 " \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n"
8020 " \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n"
7984 "\n"
8021 "\n"
7985 " これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n"
8022 " これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n"
7986 " 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n"
8023 " 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n"
7987 " (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n"
8024 " (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n"
7988 "\n"
8025 "\n"
7989 " log コマンドには、日時範囲指定可能です:\n"
8026 " log コマンドには、日時範囲指定可能です:\n"
7990 "\n"
8027 "\n"
7991 " \"<{date}\" - 指定日時以前(指定日時含む)\n"
8028 " \"<{date}\" - 指定日時以前(指定日時含む)\n"
7992 " \">{date}\" - 指定日時以後(指定日時含む)\n"
8029 " \">{date}\" - 指定日時以後(指定日時含む)\n"
7993 " \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n"
8030 " \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n"
7994 " \"-{days}\" - 本日から指定日数以内\n"
8031 " \"-{days}\" - 本日から指定日数以内\n"
7995 " "
8032 " "
7996
8033
7997 msgid "File Name Patterns"
8034 msgid "File Name Patterns"
7998 msgstr "ファイル名パターン"
8035 msgstr "ファイル名パターン"
7999
8036
8000 msgid ""
8037 msgid ""
8001 "\n"
8038 "\n"
8002 " Mercurial accepts several notations for identifying one or more\n"
8039 " Mercurial accepts several notations for identifying one or more\n"
8003 " files at a time.\n"
8040 " files at a time.\n"
8004 "\n"
8041 "\n"
8005 " By default, Mercurial treats filenames as shell-style extended\n"
8042 " By default, Mercurial treats filenames as shell-style extended\n"
8006 " glob patterns.\n"
8043 " glob patterns.\n"
8007 "\n"
8044 "\n"
8008 " Alternate pattern notations must be specified explicitly.\n"
8045 " Alternate pattern notations must be specified explicitly.\n"
8009 "\n"
8046 "\n"
8010 " To use a plain path name without any pattern matching, start a\n"
8047 " To use a plain path name without any pattern matching, start it\n"
8011 " name with \"path:\". These path names must match completely, from\n"
8048 " with \"path:\". These path names must completely match starting at\n"
8012 " the root of the current repository.\n"
8049 " the current repository root.\n"
8013 "\n"
8050 "\n"
8014 " To use an extended glob, start a name with \"glob:\". Globs are\n"
8051 " To use an extended glob, start a name with \"glob:\". Globs are\n"
8015 " rooted at the current directory; a glob such as \"*.c\" will match\n"
8052 " rooted at the current directory; a glob such as \"*.c\" will only\n"
8016 " files ending in \".c\" in the current directory only.\n"
8053 " match files in the current directory ending with \".c\".\n"
8017 "\n"
8054 "\n"
8018 " The supported glob syntax extensions are \"**\" to match any string\n"
8055 " The supported glob syntax extensions are \"**\" to match any string\n"
8019 " across path separators, and \"{a,b}\" to mean \"a or b\".\n"
8056 " across path separators and \"{a,b}\" to mean \"a or b\".\n"
8020 "\n"
8057 "\n"
8021 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
8058 " To use a Perl/Python regular expression, start a name with \"re:\".\n"
8022 " Regexp pattern matching is anchored at the root of the repository.\n"
8059 " Regexp pattern matching is anchored at the root of the repository.\n"
8023 "\n"
8060 "\n"
8024 " Plain examples:\n"
8061 " Plain examples:\n"
8025 "\n"
8062 "\n"
8026 " path:foo/bar a name bar in a directory named foo in the root of\n"
8063 " path:foo/bar a name bar in a directory named foo in the root of\n"
8027 " the repository\n"
8064 " the repository\n"
8028 " path:path:name a file or directory named \"path:name\"\n"
8065 " path:path:name a file or directory named \"path:name\"\n"
8029 "\n"
8066 "\n"
8030 " Glob examples:\n"
8067 " Glob examples:\n"
8031 "\n"
8068 "\n"
8032 " glob:*.c any name ending in \".c\" in the current directory\n"
8069 " glob:*.c any name ending in \".c\" in the current directory\n"
8033 " *.c any name ending in \".c\" in the current directory\n"
8070 " *.c any name ending in \".c\" in the current directory\n"
8034 " **.c any name ending in \".c\" in the current directory, or\n"
8071 " **.c any name ending in \".c\" in any subdirectory of the\n"
8035 " any subdirectory\n"
8072 " current directory including itself.\n"
8036 " foo/*.c any name ending in \".c\" in the directory foo\n"
8073 " foo/*.c any name ending in \".c\" in the directory foo\n"
8037 " foo/**.c any name ending in \".c\" in the directory foo, or any\n"
8074 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
8038 " subdirectory\n"
8075 " including itself.\n"
8039 "\n"
8076 "\n"
8040 " Regexp examples:\n"
8077 " Regexp examples:\n"
8041 "\n"
8078 "\n"
8042 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
8079 " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
8043 "\n"
8080 "\n"
8044 " "
8081 " "
8045 msgstr ""
8082 msgstr ""
8046 "\n"
8083 "\n"
8047 " Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n"
8084 " Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n"
8048 "\n"
8085 "\n"
8049 " 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n"
8086 " 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n"
8050 " shell 形式の拡張ワイルドカード合致を行います。\n"
8087 " shell 形式の拡張ワイルドカード合致を行います。\n"
8051 "\n"
8088 "\n"
8052 " 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n"
8089 " 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n"
8053 "\n"
8090 "\n"
8054 " パターン合致を行わずに、指定された名前をそのまま使用する場合、\n"
8091 " パターン合致を行わずに、指定された名前をそのまま使用する場合、\n"
8055 " 名前の前に \"path:\" を記述します。この形式を使用する場合、\n"
8092 " 名前の前に \"path:\" を記述します。この形式を使用する場合、\n"
8056 " リポジトリのルートからのパスと完全に一致しなければなりません。\n"
8093 " リポジトリのルートからのパスと完全に一致しなければなりません。\n"
8057 "\n"
8094 "\n"
8058 " 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n"
8095 " 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n"
8059 " 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n"
8096 " 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n"
8060 " 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n"
8097 " 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n"
8061 "\n"
8098 "\n"
8062 " ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n"
8099 " ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n"
8063 " \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n"
8100 " \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n"
8064 "\n"
8101 "\n"
8065 " Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n"
8102 " Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n"
8066 " 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n"
8103 " 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n"
8067 " パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n"
8104 " パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n"
8068 " 「されません」ので注意が必要です)。\n"
8105 " 「されません」ので注意が必要です)。\n"
8069 "\n"
8106 "\n"
8070 " パターン合致未使用例:\n"
8107 " パターン合致未使用例:\n"
8071 "\n"
8108 "\n"
8072 " path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n"
8109 " path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n"
8073 " path:path:name \"path:name\" という名前\n"
8110 " path:path:name \"path:name\" という名前\n"
8074 "\n"
8111 "\n"
8075 " ワイルドカード指定例:\n"
8112 " ワイルドカード指定例:\n"
8076 "\n"
8113 "\n"
8077 " glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8114 " glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8078 " *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8115 " *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8079 " **.c 現ディレクトリないしその配下のディレクトリにおいて、\n"
8116 " **.c 現ディレクトリないしその配下のディレクトリにおいて、\n"
8080 " 名前が \".c\" で終わるもの\n"
8117 " 名前が \".c\" で終わるもの\n"
8081 " foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8118 " foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n"
8082 " foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n"
8119 " foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n"
8083 " 名前が \".c\" で終わるもの\n"
8120 " 名前が \".c\" で終わるもの\n"
8084 "\n"
8121 "\n"
8085 " 正規表現指定例:\n"
8122 " 正規表現指定例:\n"
8086 "\n"
8123 "\n"
8087 " re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n"
8124 " re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n"
8088 "\n"
8125 "\n"
8089 " "
8126 " "
8090
8127
8091 msgid "Environment Variables"
8128 msgid "Environment Variables"
8092 msgstr "環境変数"
8129 msgstr "環境変数"
8093
8130
8094 msgid ""
8131 msgid ""
8095 "\n"
8132 "\n"
8096 "HG::\n"
8133 "HG::\n"
8097 " Path to the 'hg' executable, automatically passed when running hooks,\n"
8134 " Path to the 'hg' executable, automatically passed when running hooks,\n"
8098 " extensions or external tools. If unset or empty, an executable named\n"
8135 " extensions or external tools. If unset or empty, this is the hg\n"
8099 " 'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n"
8136 " executable's name if it's frozen, or an executable named 'hg'\n"
8137 " (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
8138 " Windows) is searched.\n"
8100 "\n"
8139 "\n"
8101 "HGEDITOR::\n"
8140 "HGEDITOR::\n"
8102 " This is the name of the editor to use when committing. See EDITOR.\n"
8141 " This is the name of the editor to run when committing. See EDITOR.\n"
8103 "\n"
8142 "\n"
8104 " (deprecated, use .hgrc)\n"
8143 " (deprecated, use .hgrc)\n"
8105 "\n"
8144 "\n"
8106 "HGENCODING::\n"
8145 "HGENCODING::\n"
8107 " This overrides the default locale setting detected by Mercurial.\n"
8146 " This overrides the default locale setting detected by Mercurial.\n"
8108 " This setting is used to convert data including usernames,\n"
8147 " This setting is used to convert data including usernames,\n"
8109 " changeset descriptions, tag names, and branches. This setting can\n"
8148 " changeset descriptions, tag names, and branches. This setting can\n"
8110 " be overridden with the --encoding command-line option.\n"
8149 " be overridden with the --encoding command-line option.\n"
8111 "\n"
8150 "\n"
8112 "HGENCODINGMODE::\n"
8151 "HGENCODINGMODE::\n"
8113 " This sets Mercurial's behavior for handling unknown characters\n"
8152 " This sets Mercurial's behavior for handling unknown characters\n"
8114 " while transcoding user inputs. The default is \"strict\", which\n"
8153 " while transcoding user input. The default is \"strict\", which\n"
8115 " causes Mercurial to abort if it can't translate a character. Other\n"
8154 " causes Mercurial to abort if it can't map a character. Other\n"
8116 " settings include \"replace\", which replaces unknown characters, and\n"
8155 " settings include \"replace\", which replaces unknown characters, and\n"
8117 " \"ignore\", which drops them. This setting can be overridden with\n"
8156 " \"ignore\", which drops them. This setting can be overridden with\n"
8118 " the --encodingmode command-line option.\n"
8157 " the --encodingmode command-line option.\n"
8119 "\n"
8158 "\n"
8120 "HGMERGE::\n"
8159 "HGMERGE::\n"
8121 " An executable to use for resolving merge conflicts. The program\n"
8160 " An executable to use for resolving merge conflicts. The program\n"
8122 " will be executed with three arguments: local file, remote file,\n"
8161 " will be executed with three arguments: local file, remote file,\n"
8123 " ancestor file.\n"
8162 " ancestor file.\n"
8124 "\n"
8163 "\n"
8125 " (deprecated, use .hgrc)\n"
8164 " (deprecated, use .hgrc)\n"
8126 "\n"
8165 "\n"
8127 "HGRCPATH::\n"
8166 "HGRCPATH::\n"
8128 " A list of files or directories to search for hgrc files. Item\n"
8167 " A list of files or directories to search for hgrc files. Item\n"
8129 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
8168 " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
8130 " platform default search path is used. If empty, only .hg/hgrc of\n"
8169 " platform default search path is used. If empty, only the .hg/hgrc\n"
8131 " current repository is read.\n"
8170 " from the current repository is read.\n"
8132 "\n"
8171 "\n"
8133 " For each element in path, if a directory, all entries in directory\n"
8172 " For each element in HGRCPATH:\n"
8134 " ending with \".rc\" are added to path. Else, element itself is\n"
8173 " * if it's a directory, all directories ending with .rc are added\n"
8135 " added to path.\n"
8174 " * otherwise, the directory itself will be added\n"
8136 "\n"
8175 "\n"
8137 "HGUSER::\n"
8176 "HGUSER::\n"
8138 " This is the string used for the author of a commit.\n"
8177 " This is the string used as the author of a commit. If not set,\n"
8178 " available values will be considered in this order:\n"
8179 "\n"
8180 " * HGUSER (deprecated)\n"
8181 " * hgrc files from the HGRCPATH\n"
8182 " * EMAIL\n"
8183 " * interactive prompt\n"
8184 " * LOGNAME (with '@hostname' appended)\n"
8139 "\n"
8185 "\n"
8140 " (deprecated, use .hgrc)\n"
8186 " (deprecated, use .hgrc)\n"
8141 "\n"
8187 "\n"
8142 "EMAIL::\n"
8188 "EMAIL::\n"
8143 " If HGUSER is not set, this will be used as the author for a commit.\n"
8189 " May be used as the author of a commit; see HGUSER.\n"
8144 "\n"
8190 "\n"
8145 "LOGNAME::\n"
8191 "LOGNAME::\n"
8146 " If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n"
8192 " May be used as the author of a commit; see HGUSER.\n"
8147 " '@hostname' appended) as the author value for a commit.\n"
8148 "\n"
8193 "\n"
8149 "VISUAL::\n"
8194 "VISUAL::\n"
8150 " This is the name of the editor to use when committing. See EDITOR.\n"
8195 " This is the name of the editor to use when committing. See EDITOR.\n"
8151 "\n"
8196 "\n"
8152 "EDITOR::\n"
8197 "EDITOR::\n"
8153 " Sometimes Mercurial needs to open a text file in an editor\n"
8198 " Sometimes Mercurial needs to open a text file in an editor\n"
8154 " for a user to modify, for example when writing commit messages.\n"
8199 " for a user to modify, for example when writing commit messages.\n"
8155 " The editor it uses is determined by looking at the environment\n"
8200 " The editor it uses is determined by looking at the environment\n"
8156 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
8201 " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
8157 " non-empty one is chosen. If all of them are empty, the editor\n"
8202 " non-empty one is chosen. If all of them are empty, the editor\n"
8158 " defaults to 'vi'.\n"
8203 " defaults to 'vi'.\n"
8159 "\n"
8204 "\n"
8160 "PYTHONPATH::\n"
8205 "PYTHONPATH::\n"
8161 " This is used by Python to find imported modules and may need to be set\n"
8206 " This is used by Python to find imported modules and may need to be set\n"
8162 " appropriately if Mercurial is not installed system-wide.\n"
8207 " appropriately if this Mercurial is not installed system-wide.\n"
8163 " "
8208 " "
8164 msgstr ""
8209 msgstr ""
8165 "\n"
8210 "\n"
8166 "HG::\n"
8211 "HG::\n"
8167 " 'hg' コマンドへのパス。フック/エクステンションないし外部ツールの起動の\n"
8212 " 'hg' コマンドへのパス。フック/エクステンションないし外部ツールの起動の\n"
8168 " 際に自動的に設定されます。未設定や空の場合は、'hg' という名前の実行可能\n"
8213 " 際に自動的に設定されます。未設定や空の場合は、frozen 形式の\n"
8169 " ファイルが検索されます(Windows の場合 com/exe/bat/cmd 等の拡張子付き)。\n"
8214 " hg 実行可能ファイルの名前か設定されるか、'hg' という名前の実行可能\n"
8215 " ファイルが検索されます(Windows の場合、PATHEXT 環境変数に設定された\n"
8216 " COM/EXE/BAT/CMD 等の拡張子付き)。\n"
8170 "\n"
8217 "\n"
8171 "HGEDITOR::\n"
8218 "HGEDITOR::\n"
8172 " コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n"
8219 " コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n"
8173 " についても参照してください。\n"
8220 " についても参照してください。\n"
8174 "\n"
8221 "\n"
8175 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8222 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8176 "\n"
8223 "\n"
8177 "HGENCODING::\n"
8224 "HGENCODING::\n"
8178 " Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n"
8225 " Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n"
8179 " コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n"
8226 " コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n"
8180 " 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n"
8227 " 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n"
8181 " オプションの使用により、更に上書きすることが出来ます。\n"
8228 " オプションの使用により、更に上書きすることが出来ます。\n"
8182 "\n"
8229 "\n"
8183 "HGENCODINGMODE::\n"
8230 "HGENCODINGMODE::\n"
8184 " ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n"
8231 " ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n"
8185 " 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n"
8232 " 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n"
8186 " 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n"
8233 " 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n"
8187 " されたものとみなします。他には、「未知の文字の置き換え」を意味する\n"
8234 " されたものとみなします。他には、「未知の文字の置き換え」を意味する\n"
8188 " \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n"
8235 " \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n"
8189 " 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n"
8236 " 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n"
8190 " オプションの使用により、更に上書きすることが出来ます。\n"
8237 " オプションの使用により、更に上書きすることが出来ます。\n"
8191 "\n"
8238 "\n"
8192 "HGMERGE::\n"
8239 "HGMERGE::\n"
8193 " マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n"
8240 " マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n"
8194 " 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n"
8241 " 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n"
8195 " ファイルを表す3つの引数が指定されます。\n"
8242 " ファイルを表す3つの引数が指定されます。\n"
8196 "\n"
8243 "\n"
8197 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8244 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8198 "\n"
8245 "\n"
8199 "HGRCPATH::\n"
8246 "HGRCPATH::\n"
8200 " 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n"
8247 " 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n"
8201 " 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n"
8248 " 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n"
8202 " HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n"
8249 " HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n"
8203 " 読み込み先から読み込まれます。空の値が設定されている場合、\n"
8250 " 読み込み先から読み込まれます。空の値が設定されている場合、\n"
8204 " 現リポジトリの .hg/hgrc のみが読み込まれます。\n"
8251 " 現リポジトリの .hg/hgrc のみが読み込まれます。\n"
8205 "\n"
8252 "\n"
8206 " 指定された一覧の各要素に対して、ディレクトリ指定なら当該ディレクトリ\n"
8253 " 指定された一覧の各要素に対して、以下のように振舞います:\n"
8207 " 配下の \".rc\" で終わる名前のファイルが、ファイル指定の場合はその\n"
8254 " * ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n"
8208 " ファイル自身が、読み込み対象となります。\n"
8255 " * ファイルなら、そのファイル自身を読み込む\n"
8209 "\n"
8256 "\n"
8210 "HGUSER::\n"
8257 "HGUSER::\n"
8211 " チェンジセット作成者としてコミット時に記録する名前の指定。\n"
8258 " チェンジセット作成者としてコミット時に記録する名前の指定。\n"
8259 " 作成者名として採用される値の決定順序は以下の通りです。\n"
8260 "\n"
8261 " * HGUSER 環境変数値(推奨されません)\n"
8262 " * (HGRCPATH 環境変数で指定される)設定ファイル中の設定\n"
8263 " * EMAIL 環境変数値\n"
8264 " * 対話的な入力\n"
8265 " * LOGNAME 環境変数値('@hostname' が付与されます)\n"
8212 "\n"
8266 "\n"
8213 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8267 " (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
8214 "\n"
8268 "\n"
8215 "EMAIL::\n"
8269 "EMAIL::\n"
8216 " HGUSER 環境変数が設定されていない場合、チェンジセット作成者として\n"
8270 " チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
8217 " コミット時にこの環境変数値が記録されます。\n"
8271 " 詳細は HGUSER の記述を参照してください。\n"
8218 "\n"
8272 "\n"
8219 "LOGNAME::\n"
8273 "LOGNAME::\n"
8220 " HGUSER も EMAIL も共に設定されていない場合、チェンジセット作成者として\n"
8274 " チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
8221 " コミット時に('@hostname' を追加した)この環境変数値が記録されます。\n"
8275 " 詳細は HGUSER の記述を参照してください。\n"
8222 "\n"
8276 "\n"
8223 "VISUAL::\n"
8277 "VISUAL::\n"
8224 " コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n"
8278 " コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n"
8225 " についても参照してください。\n"
8279 " についても参照してください。\n"
8226 "\n"
8280 "\n"
8227 "EDITOR::\n"
8281 "EDITOR::\n"
8228 " コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n"
8282 " コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n"
8229 " 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n"
8283 " 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n"
8230 " あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
8284 " あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
8231 " 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n"
8285 " 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n"
8232 " (あるいは空)の場合は、'vi' が使用されます。\n"
8286 " (あるいは空)の場合は、'vi' が使用されます。\n"
8233 "\n"
8287 "\n"
8234 "PYTHONPATH::\n"
8288 "PYTHONPATH::\n"
8235 " Mercurial が当該システムの共有領域にインストールされていない場合、\n"
8289 " Mercurial が当該システムの共有領域にインストールされていない場合、\n"
8236 " Python が必要なモジュールを読み込むためには、この変数変数の設定が\n"
8290 " Python が必要なモジュールを読み込むためには、この変数変数の設定が\n"
8237 " 必要です。\n"
8291 " 必要です。\n"
8238 " "
8292 " "
8239
8293
8240 msgid "Specifying Single Revisions"
8294 msgid "Specifying Single Revisions"
8241 msgstr "単一リビジョンの指定"
8295 msgstr "単一リビジョンの指定"
8242
8296
8243 msgid ""
8297 msgid ""
8244 "\n"
8298 "\n"
8245 " Mercurial accepts several notations for identifying individual\n"
8299 " Mercurial supports several ways to specify individual\n"
8246 " revisions.\n"
8300 " revisions.\n"
8247 "\n"
8301 "\n"
8248 " A plain integer is treated as a revision number. Negative\n"
8302 " A plain integer is treated as a revision number. Negative\n"
8249 " integers are treated as offsets from the tip, with -1 denoting the\n"
8303 " integers are treated as toplogical offsets from the tip, with\n"
8250 " tip.\n"
8304 " -1 denoting the tip. As such, negative numbers are only useful\n"
8305 " if you've memorized your local tree numbers and want to save\n"
8306 " typing a single digit. This editor suggests copy and paste.\n"
8251 "\n"
8307 "\n"
8252 " A 40-digit hexadecimal string is treated as a unique revision\n"
8308 " A 40-digit hexadecimal string is treated as a unique revision\n"
8253 " identifier.\n"
8309 " identifier.\n"
8254 "\n"
8310 "\n"
8255 " A hexadecimal string less than 40 characters long is treated as a\n"
8311 " A hexadecimal string less than 40 characters long is treated as a\n"
8256 " unique revision identifier, and referred to as a short-form\n"
8312 " unique revision identifier, and referred to as a short-form\n"
8257 " identifier. A short-form identifier is only valid if it is the\n"
8313 " identifier. A short-form identifier is only valid if it is the\n"
8258 " prefix of one full-length identifier.\n"
8314 " prefix of exactly one full-length identifier.\n"
8259 "\n"
8315 "\n"
8260 " Any other string is treated as a tag name, which is a symbolic\n"
8316 " Any other string is treated as a tag name, which is a symbolic\n"
8261 " name associated with a revision identifier. Tag names may not\n"
8317 " name associated with a revision identifier. Tag names may not\n"
8262 " contain the \":\" character.\n"
8318 " contain the \":\" character.\n"
8263 "\n"
8319 "\n"
8264 " The reserved name \"tip\" is a special tag that always identifies\n"
8320 " The reserved name \"tip\" is a special tag that always identifies\n"
8265 " the most recent revision.\n"
8321 " the most recent revision.\n"
8266 "\n"
8322 "\n"
8267 " The reserved name \"null\" indicates the null revision. This is the\n"
8323 " The reserved name \"null\" indicates the null revision. This is the\n"
8268 " revision of an empty repository, and the parent of revision 0.\n"
8324 " revision of an empty repository, and the parent of revision 0.\n"
8269 "\n"
8325 "\n"
8270 " The reserved name \".\" indicates the working directory parent. If\n"
8326 " The reserved name \".\" indicates the working directory parent. If\n"
8271 " no working directory is checked out, it is equivalent to null.\n"
8327 " no working directory is checked out, it is equivalent to null.\n"
8272 " If an uncommitted merge is in progress, \".\" is the revision of\n"
8328 " If an uncommitted merge is in progress, \".\" is the revision of\n"
8273 " the first parent.\n"
8329 " the first parent.\n"
8274 " "
8330 " "
8275 msgstr ""
8331 msgstr ""
8276 "\n"
8332 "\n"
8277 " Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n"
8333 " Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n"
8278 "\n"
8334 "\n"
8279 " 整数値は「リビジョン番号」とみなされます。負値は、tip からの距離を\n"
8335 " 整数値は「リビジョン番号」とみなされます。負値は、tip からの距離を\n"
8280 " 表します(-1 は tip を表します)。\n"
8336 " 表し-1 は tip 自身を表します。負値の指定は、手元のリポジトリ中の\n"
8337 " 履歴遷移を把握している際に、入力を省力化したい場合にのみ有効です。\n"
8338 " 負値の利用はあまりお勧めできません。\n"
8281 "\n"
8339 "\n"
8282 " 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n"
8340 " 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n"
8283 "\n"
8341 "\n"
8284 " 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n"
8342 " 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n"
8285 " みなされます。短縮形式の識別子は、唯一の完全長の識別子と前方一致する\n"
8343 " みなされます。短縮形式の識別子は、厳密に1つの完全長の識別子とだけ\n"
8286 " 場合にのみ有効です。\n"
8344 " 前方一致する場合にのみ有効です。\n"
8287 "\n"
8345 "\n"
8288 " それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n"
8346 " それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n"
8289 " みなされます。タグ名は \":\" を含んでいないかもしれない。\n"
8347 " みなされます。タグ名は \":\" を含んでいないかもしれない。\n"
8290 "\n"
8348 "\n"
8291 " 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n"
8349 " 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n"
8292 " されています。\n"
8350 " されています。\n"
8293 "\n"
8351 "\n"
8294 " 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n"
8352 " 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n"
8295 " されており、リビジョン 0 の親は \"null\" リビジョンです。\n"
8353 " されており、リビジョン 0 の親は \"null\" リビジョンです。\n"
8296 "\n"
8354 "\n"
8297 " 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n"
8355 " 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n"
8298 " 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n"
8356 " 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n"
8299 " 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n"
8357 " 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n"
8300 " "
8358 " "
8301
8359
8302 msgid "Specifying Multiple Revisions"
8360 msgid "Specifying Multiple Revisions"
8303 msgstr "複数リビジョンの指定"
8361 msgstr "複数リビジョンの指定"
8304
8362
8305 msgid ""
8363 msgid ""
8306 "\n"
8364 "\n"
8307 " When Mercurial accepts more than one revision, they may be\n"
8365 " When Mercurial accepts more than one revision, they may be\n"
8308 " specified individually, or provided as a continuous range,\n"
8366 " specified individually, or provided as a topologically continuous\n"
8309 " separated by the \":\" character.\n"
8367 " range, separated by the \":\" character.\n"
8310 "\n"
8368 "\n"
8311 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
8369 " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
8312 " are revision identifiers. Both BEGIN and END are optional. If\n"
8370 " are revision identifiers. Both BEGIN and END are optional. If\n"
8313 " BEGIN is not specified, it defaults to revision number 0. If END\n"
8371 " BEGIN is not specified, it defaults to revision number 0. If END\n"
8314 " is not specified, it defaults to the tip. The range \":\" thus\n"
8372 " is not specified, it defaults to the tip. The range \":\" thus\n"
8315 " means \"all revisions\".\n"
8373 " means \"all revisions\".\n"
8316 "\n"
8374 "\n"
8317 " If BEGIN is greater than END, revisions are treated in reverse\n"
8375 " If BEGIN is greater than END, revisions are treated in reverse\n"
8318 " order.\n"
8376 " order.\n"
8319 "\n"
8377 "\n"
8320 " A range acts as a closed interval. This means that a range of 3:5\n"
8378 " A range acts as a closed interval. This means that a range of 3:5\n"
8321 " gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2.\n"
8379 " gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
8322 " "
8380 " "
8323 msgstr ""
8381 msgstr ""
8324 "\n"
8382 "\n"
8325 " Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n"
8383 " Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n"
8326 " 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n"
8384 " 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n"
8327 " 記号にした範囲指定による方法があります。\n"
8385 " 記号にした範囲指定による方法があります。\n"
8328 "\n"
8386 "\n"
8329 " 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n"
8387 " 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n"
8330 " 部分にはそれぞれリビジョン識別用の情報が記述されます。\n"
8388 " 部分にはそれぞれリビジョン識別用の情報が記述されます。\n"
8331 " \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n"
8389 " \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n"
8332 " 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n"
8390 " 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n"
8333 " \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n"
8391 " \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n"
8334 " 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n"
8392 " 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n"
8335 "\n"
8393 "\n"
8336 " \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n"
8394 " \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n"
8337 " とみなされます。\n"
8395 " とみなされます。\n"
8338 "\n"
8396 "\n"
8339 " 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n"
8397 " 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n"
8340 " 3, 4, 5 の指定と等価です。同様に 4:2 という範囲指定は 4, 3, 2 の指定と\n"
8398 " 3, 4, 5 の指定と等価です。同様に 9:6 という指定は 9, 8, 7, 6 の指定と\n"
8341 " 等価です。\n"
8399 " 等価です。\n"
8342 " "
8400 " "
8343
8401
8344 msgid "Diff Formats"
8402 msgid "Diff Formats"
8345 msgstr "差分形式"
8403 msgstr "差分形式"
8346
8404
8347 msgid ""
8405 msgid ""
8348 "\n"
8406 "\n"
8349 " Mercurial's default format for showing changes between two versions\n"
8407 " Mercurial's default format for showing changes between two versions\n"
8350 " of a file is compatible with the unified format of GNU diff, which\n"
8408 " of a file is compatible with the unified format of GNU diff, which\n"
8351 " can be used by GNU patch and many other standard tools.\n"
8409 " can be used by GNU patch and many other standard tools.\n"
8352 "\n"
8410 "\n"
8353 " While this standard format is often enough, it does not encode the\n"
8411 " While this standard format is often enough, it does not encode the\n"
8354 " following information:\n"
8412 " following information:\n"
8355 "\n"
8413 "\n"
8356 " - executable status\n"
8414 " - executable status and other permission bits\n"
8357 " - copy or rename information\n"
8415 " - copy or rename information\n"
8358 " - changes in binary files\n"
8416 " - changes in binary files\n"
8359 " - creation or deletion of empty files\n"
8417 " - creation or deletion of empty files\n"
8360 "\n"
8418 "\n"
8361 " Mercurial also supports the extended diff format from the git VCS\n"
8419 " Mercurial also supports the extended diff format from the git VCS\n"
8362 " which addresses these limitations. The git diff format is not\n"
8420 " which addresses these limitations. The git diff format is not\n"
8363 " produced by default because there are very few tools which\n"
8421 " produced by default because a few widespread tools still do not\n"
8364 " understand this format.\n"
8422 " understand this format.\n"
8365 "\n"
8423 "\n"
8366 " This means that when generating diffs from a Mercurial repository\n"
8424 " This means that when generating diffs from a Mercurial repository\n"
8367 " (e.g. with \"hg export\"), you should be careful about things like\n"
8425 " (e.g. with \"hg export\"), you should be careful about things like\n"
8368 " file copies and renames or other things mentioned above, because\n"
8426 " file copies and renames or other things mentioned above, because\n"
8369 " when applying a standard diff to a different repository, this extra\n"
8427 " when applying a standard diff to a different repository, this extra\n"
8370 " information is lost. Mercurial's internal operations (like push and\n"
8428 " information is lost. Mercurial's internal operations (like push and\n"
8371 " pull) are not affected by this, because they use an internal binary\n"
8429 " pull) are not affected by this, because they use an internal binary\n"
8372 " format for communicating changes.\n"
8430 " format for communicating changes.\n"
8373 "\n"
8431 "\n"
8374 " To make Mercurial produce the git extended diff format, use the\n"
8432 " To make Mercurial produce the git extended diff format, use the\n"
8375 " --git option available for many commands, or set 'git = True' in the\n"
8433 " --git option available for many commands, or set 'git = True' in the\n"
8376 " [diff] section of your hgrc. You do not need to set this option when\n"
8434 " [diff] section of your hgrc. You do not need to set this option when\n"
8377 " importing diffs in this format or using them in the mq extension.\n"
8435 " importing diffs in this format or using them in the mq extension.\n"
8378 " "
8436 " "
8379 msgstr ""
8437 msgstr ""
8380 "\n"
8438 "\n"
8381 " 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n"
8439 " 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n"
8382 " GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n"
8440 " GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n"
8383 " 標準的なツールで使用できるものです。\n"
8441 " 標準的なツールで使用できるものです。\n"
8384 "\n"
8442 "\n"
8385 " この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n"
8443 " この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n"
8386 "\n"
8444 "\n"
8387 " - 実行可否(権限設定)\n"
8445 " - 実行可否および権限設定\n"
8388 " - 複製/改名情報\n"
8446 " - 複製/改名情報\n"
8389 " - バイナリファイルの変更\n"
8447 " - バイナリファイルの変更\n"
8390 " - 空ファイルの作成/削除\n"
8448 " - 空ファイルの作成/削除\n"
8391 "\n"
8449 "\n"
8392 " Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n"
8450 " Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n"
8393 " 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n"
8451 " 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n"
8394 " 但し、殆どのツールが git 差分形式に対応していないため、Mercurial は\n"
8452 " 但し、普及しているツールの幾つかが git 差分形式に対応していないため、\n"
8395 " 指定が無い場合はこの形式では出力しません。\n"
8453 " Mercurial は指定が無い場合はこの形式では出力しません。\n"
8396 "\n"
8454 "\n"
8397 " つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n"
8455 " つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n"
8398 " 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n"
8456 " 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n"
8399 " ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n"
8457 " ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n"
8400 " 十分注意する必要があります。push や pull のように、Mercurial の\n"
8458 " 十分注意する必要があります。push や pull のように、Mercurial の\n"
8401 " 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n"
8459 " 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n"
8402 " ことから、情報の欠落に関しては心配する必要はありません。\n"
8460 " ことから、情報の欠落に関しては心配する必要はありません。\n"
8403 "\n"
8461 "\n"
8404 " Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n"
8462 " Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n"
8405 " 対して --git オプションを指定するか、設定ファイルの [diff] セクションに\n"
8463 " 対して --git オプションを指定するか、設定ファイルの [diff] セクションに\n"
8406 " 'git = True' 記述を追加してください。hg import や mq エクステンションを\n"
8464 " 'git = True' 記述を追加してください。hg import や mq エクステンションを\n"
8407 " 使用する場合は、この指定は不要です。\n"
8465 " 使用する場合は、この指定は不要です。\n"
8408 " "
8466 " "
8409
8467
8410 msgid "Template Usage"
8468 msgid "Template Usage"
8411 msgstr "テンプレートの利用"
8469 msgstr "テンプレートの利用"
8412
8470
8413 msgid ""
8471 msgid ""
8414 "\n"
8472 "\n"
8415 " Mercurial allows you to customize output of commands through\n"
8473 " Mercurial allows you to customize output of commands through\n"
8416 " templates. You can either pass in a template from the command line,\n"
8474 " templates. You can either pass in a template from the command line,\n"
8417 " via the --template option, or select an existing template-style (--"
8475 " via the --template option, or select an existing template-style (--"
8418 "style).\n"
8476 "style).\n"
8419 "\n"
8477 "\n"
8420 " You can customize output for any \"log-like\" command: log, outgoing,\n"
8478 " You can customize output for any \"log-like\" command: log, outgoing,\n"
8421 " incoming, tip, parents, heads and glog are all template-enabled.\n"
8479 " incoming, tip, parents, heads and glog.\n"
8422 "\n"
8480 "\n"
8423 " Three styles are packaged with Mercurial: default (the style used\n"
8481 " Three styles are packaged with Mercurial: default (the style used\n"
8424 " when no explicit preference is passed), compact and changelog. Usage:\n"
8482 " when no explicit preference is passed), compact and changelog. Usage:\n"
8425 "\n"
8483 "\n"
8426 " $ hg log -r1 --style changelog\n"
8484 " $ hg log -r1 --style changelog\n"
8427 "\n"
8485 "\n"
8428 " A template is a piece of text, with markup to invoke variable "
8486 " A template is a piece of text, with markup to invoke variable "
8429 "expansion:\n"
8487 "expansion:\n"
8430 "\n"
8488 "\n"
8431 " $ hg log -r1 --template \"{node}\\n\"\n"
8489 " $ hg log -r1 --template \"{node}\\n\"\n"
8432 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
8490 " b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
8433 "\n"
8491 "\n"
8434 " Strings in curly braces are called keywords. The availability of\n"
8492 " Strings in curly braces are called keywords. The availability of\n"
8435 " keywords depends on the exact context of the templater. These keywords\n"
8493 " keywords depends on the exact context of the templater. These keywords\n"
8436 " are usually available for templating a log-like command:\n"
8494 " are usually available for templating a log-like command:\n"
8437 "\n"
8495 "\n"
8438 " - author: String. The unmodified author of the changeset.\n"
8496 " - author: String. The unmodified author of the changeset.\n"
8439 " - branches: String. The name of the branch on which the changeset\n"
8497 " - branches: String. The name of the branch on which the changeset\n"
8440 " was committed. Will be empty if the branch name was default.\n"
8498 " was committed. Will be empty if the branch name was default.\n"
8441 " - date: Date information. The date when the changeset was committed.\n"
8499 " - date: Date information. The date when the changeset was committed.\n"
8442 " - desc: String. The text of the changeset description.\n"
8500 " - desc: String. The text of the changeset description.\n"
8443 " - files: List of strings. All files modified, added, or removed by\n"
8501 " - files: List of strings. All files modified, added, or removed by\n"
8444 " this changeset.\n"
8502 " this changeset.\n"
8445 " - file_adds: List of strings. Files added by this changeset.\n"
8503 " - file_adds: List of strings. Files added by this changeset.\n"
8446 " - file_mods: List of strings. Files modified by this changeset.\n"
8504 " - file_mods: List of strings. Files modified by this changeset.\n"
8447 " - file_dels: List of strings. Files removed by this changeset.\n"
8505 " - file_dels: List of strings. Files removed by this changeset.\n"
8448 " - node: String. The changeset identification hash, as a 40-character\n"
8506 " - node: String. The changeset identification hash, as a 40-character\n"
8449 " hexadecimal string.\n"
8507 " hexadecimal string.\n"
8450 " - parents: List of strings. The parents of the changeset.\n"
8508 " - parents: List of strings. The parents of the changeset.\n"
8451 " - rev: Integer. The repository-local changeset revision number.\n"
8509 " - rev: Integer. The repository-local changeset revision number.\n"
8452 " - tags: List of strings. Any tags associated with the changeset.\n"
8510 " - tags: List of strings. Any tags associated with the changeset.\n"
8453 "\n"
8511 "\n"
8454 " The \"date\" keyword does not produce human-readable output. If you\n"
8512 " The \"date\" keyword does not produce human-readable output. If you\n"
8455 " want to use a date in your output, you can use a filter to process it.\n"
8513 " want to use a date in your output, you can use a filter to process it.\n"
8456 " Filters are functions which return a string based on the input "
8514 " Filters are functions which return a string based on the input "
8457 "variable.\n"
8515 "variable.\n"
8458 " You can also use a chain of filters to get the wanted output:\n"
8516 " You can also use a chain of filters to get the desired output:\n"
8459 "\n"
8517 "\n"
8460 " $ hg tip --template \"{date|isodate}\\n\"\n"
8518 " $ hg tip --template \"{date|isodate}\\n\"\n"
8461 " 2008-08-21 18:22 +0000\n"
8519 " 2008-08-21 18:22 +0000\n"
8462 "\n"
8520 "\n"
8463 " List of filters:\n"
8521 " List of filters:\n"
8464 "\n"
8522 "\n"
8465 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
8523 " - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
8466 " every line except the last.\n"
8524 " every line except the last.\n"
8467 " - age: Date. Returns a human-readable age for the given date.\n"
8525 " - age: Date. Returns a human-readable date/time difference between\n"
8526 " the given date/time and the current date/time.\n"
8468 " - basename: Any text. Treats the text as a path, and returns the\n"
8527 " - basename: Any text. Treats the text as a path, and returns the\n"
8469 " basename. For example, \"foo/bar/baz\" becomes \"baz\".\n"
8528 " last component of the path after splitting by the path\n"
8470 " - date: Date. Returns a date in a Unix date command format, including\n"
8529 " separator (ignoring trailing seprators). For example,\n"
8530 " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
8531 "\".\n"
8532 " - date: Date. Returns a date in a Unix date format, including\n"
8471 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
8533 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
8472 " - domain: Any text. Finds the first string that looks like an email\n"
8534 " - domain: Any text. Finds the first string that looks like an email\n"
8473 " address, and extracts just the domain component.\n"
8535 " address, and extracts just the domain component.\n"
8536 " Example: 'User <user@example.com>' becomes 'example.com'.\n"
8474 " - email: Any text. Extracts the first string that looks like an email\n"
8537 " - email: Any text. Extracts the first string that looks like an email\n"
8475 " address.\n"
8538 " address. Example: 'User <user@example.com>' becomes\n"
8539 " 'user@example.com'.\n"
8476 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
8540 " - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
8477 " \"<\" and \">\" with XML entities.\n"
8541 " \"<\" and \">\" with XML entities.\n"
8478 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
8542 " - fill68: Any text. Wraps the text to fit in 68 columns.\n"
8479 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
8543 " - fill76: Any text. Wraps the text to fit in 76 columns.\n"
8480 " - firstline: Any text. Returns the first line of text.\n"
8544 " - firstline: Any text. Returns the first line of text.\n"
8481 " - hgdate: Date. Returns the date as a pair of numbers:\n"
8545 " - hgdate: Date. Returns the date as a pair of numbers:\n"
8482 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
8546 " \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
8483 " - isodate: Date. Returns the date in ISO 8601 format.\n"
8547 " - isodate: Date. Returns the date in ISO 8601 format.\n"
8484 " - obfuscate: Any text. Returns the input text rendered as a sequence\n"
8548 " - obfuscate: Any text. Returns the input text rendered as a sequence\n"
8485 " of XML entities.\n"
8549 " of XML entities.\n"
8486 " - person: Any text. Returns the text before an email address.\n"
8550 " - person: Any text. Returns the text before an email address.\n"
8487 " - rfc822date: Date. Returns a date using the same format used\n"
8551 " - rfc822date: Date. Returns a date using the same format used\n"
8488 " in email headers.\n"
8552 " in email headers.\n"
8489 " - short: Changeset hash. Returns the short form of a changeset hash,\n"
8553 " - short: Changeset hash. Returns the short form of a changeset hash,\n"
8490 " i.e. a 12-byte hexadecimal string.\n"
8554 " i.e. a 12-byte hexadecimal string.\n"
8491 " - shortdate: Date. Returns a date like \"2006-09-04\".\n"
8555 " - shortdate: Date. Returns a date like \"2006-09-18\".\n"
8492 " - strip: Any text. Strips all leading and trailing whitespace.\n"
8556 " - strip: Any text. Strips all leading and trailing whitespace.\n"
8493 " - tabindent: Any text. Returns the text, with every line except the\n"
8557 " - tabindent: Any text. Returns the text, with every line except the\n"
8494 " first starting with a tab character.\n"
8558 " first starting with a tab character.\n"
8495 " - urlescape: Any text. Escapes all \"special\" characters. For example,\n"
8559 " - urlescape: Any text. Escapes all \"special\" characters. For example,\n"
8496 " \"foo bar\" becomes \"foo%20bar\".\n"
8560 " \"foo bar\" becomes \"foo%20bar\".\n"
8497 " - user: Any text. Returns the user portion of an email address.\n"
8561 " - user: Any text. Returns the user portion of an email address.\n"
8498 " "
8562 " "
8499 msgstr ""
8563 msgstr ""
8500
8564
8501 msgid "Url Paths"
8565 msgid "Url Paths"
8502 msgstr "URLのパス指定"
8566 msgstr "URLのパス指定"
8503
8567
8504 msgid ""
8568 msgid ""
8505 "\n"
8569 "\n"
8506 " Valid URLs are of the form:\n"
8570 " Valid URLs are of the form:\n"
8507 "\n"
8571 "\n"
8508 " local/filesystem/path (or file://local/filesystem/path)\n"
8572 " local/filesystem/path (or file://local/filesystem/path)\n"
8509 " http://[user[:pass]@]host[:port]/[path]\n"
8573 " http://[user[:pass]@]host[:port]/[path]\n"
8510 " https://[user[:pass]@]host[:port]/[path]\n"
8574 " https://[user[:pass]@]host[:port]/[path]\n"
8511 " ssh://[user[:pass]@]host[:port]/[path]\n"
8575 " ssh://[user[:pass]@]host[:port]/[path]\n"
8512 "\n"
8576 "\n"
8513 " Paths in the local filesystem can either point to Mercurial\n"
8577 " Paths in the local filesystem can either point to Mercurial\n"
8514 " repositories or to bundle files (as created by 'hg bundle' or\n"
8578 " repositories or to bundle files (as created by 'hg bundle' or\n"
8515 " 'hg incoming --bundle').\n"
8579 " 'hg incoming --bundle').\n"
8516 "\n"
8580 "\n"
8517 " An optional identifier after # indicates a particular branch, tag,\n"
8581 " An optional identifier after # indicates a particular branch, tag,\n"
8518 " or changeset to deal with in the remote repository.\n"
8582 " or changeset to use from the remote repository.\n"
8519 "\n"
8583 "\n"
8520 " Some features, such as pushing to http:// and https:// URLs are\n"
8584 " Some features, such as pushing to http:// and https:// URLs are\n"
8521 " only possible if the feature is explicitly enabled on the\n"
8585 " only possible if the feature is explicitly enabled on the\n"
8522 " remote Mercurial server.\n"
8586 " remote Mercurial server.\n"
8523 "\n"
8587 "\n"
8524 " Some notes about using SSH with Mercurial:\n"
8588 " Some notes about using SSH with Mercurial:\n"
8525 " - SSH requires an accessible shell account on the destination machine\n"
8589 " - SSH requires an accessible shell account on the destination machine\n"
8526 " and a copy of hg in the remote path or specified with as remotecmd.\n"
8590 " and a copy of hg in the remote path or specified with as remotecmd.\n"
8527 " - path is relative to the remote user's home directory by default.\n"
8591 " - path is relative to the remote user's home directory by default.\n"
8528 " Use an extra slash at the start of a path to specify an absolute "
8592 " Use an extra slash at the start of a path to specify an absolute "
8529 "path:\n"
8593 "path:\n"
8530 " ssh://example.com//tmp/repository\n"
8594 " ssh://example.com//tmp/repository\n"
8531 " - Mercurial doesn't use its own compression via SSH; the right thing\n"
8595 " - Mercurial doesn't use its own compression via SSH; the right thing\n"
8532 " to do is to configure it in your ~/.ssh/config, e.g.:\n"
8596 " to do is to configure it in your ~/.ssh/config, e.g.:\n"
8533 " Host *.mylocalnetwork.example.com\n"
8597 " Host *.mylocalnetwork.example.com\n"
8534 " Compression no\n"
8598 " Compression no\n"
8535 " Host *\n"
8599 " Host *\n"
8536 " Compression yes\n"
8600 " Compression yes\n"
8537 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
8601 " Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
8538 " with the --ssh command line option.\n"
8602 " with the --ssh command line option.\n"
8539 "\n"
8603 "\n"
8540 " These urls can all be stored in your hgrc with path aliases under the\n"
8604 " These urls can all be stored in your hgrc with path aliases under the\n"
8541 " [paths] section like so:\n"
8605 " [paths] section like so:\n"
8542 " [paths]\n"
8606 " [paths]\n"
8543 " alias1 = URL1\n"
8607 " alias1 = URL1\n"
8544 " alias2 = URL2\n"
8608 " alias2 = URL2\n"
8545 " ...\n"
8609 " ...\n"
8546 "\n"
8610 "\n"
8547 " You can then use the alias for any command that uses a url (for example\n"
8611 " You can then use the alias for any command that uses a url (for example\n"
8548 " 'hg pull alias1' would pull from the 'alias1' path).\n"
8612 " 'hg pull alias1' would pull from the 'alias1' path).\n"
8549 "\n"
8613 "\n"
8550 " Two path aliases are more important because they are used as defaults\n"
8614 " Two path aliases are special because they are used as defaults\n"
8551 " when you do not provide the url to a command:\n"
8615 " when you do not provide the url to a command:\n"
8552 "\n"
8616 "\n"
8553 " default:\n"
8617 " default:\n"
8554 " When you create a repository with hg clone, the clone command saves\n"
8618 " When you create a repository with hg clone, the clone command saves\n"
8555 " the location of the source repository as the 'default' path. This is\n"
8619 " the location of the source repository as the new repository's\n"
8556 " then used when you omit a path from the push and pull commands.\n"
8620 " 'default' path. This is then used when you omit path from push-\n"
8621 " and pull-like commands (including in and out).\n"
8557 "\n"
8622 "\n"
8558 " default-push:\n"
8623 " default-push:\n"
8559 " The push command will look for a path named 'default-push', and\n"
8624 " The push command will look for a path named 'default-push', and\n"
8560 " prefer it over 'default' if both are defined.\n"
8625 " prefer it over 'default' if both are defined.\n"
8561 " "
8626 " "
8562 msgstr ""
8627 msgstr ""
8563 "\n"
8628 "\n"
8564 " 有効な URL 指定は以下の形式です:\n"
8629 " 有効な URL 指定は以下の形式です:\n"
8565 "\n"
8630 "\n"
8566 " local/filesystem/path (ないし file://local/filesystem/path)\n"
8631 " local/filesystem/path (ないし file://local/filesystem/path)\n"
8567 " http://[user[:pass]@]host[:port]/[path]\n"
8632 " http://[user[:pass]@]host[:port]/[path]\n"
8568 " https://[user[:pass]@]host[:port]/[path]\n"
8633 " https://[user[:pass]@]host[:port]/[path]\n"
8569 " ssh://[user[:pass]@]host[:port]/[path]\n"
8634 " ssh://[user[:pass]@]host[:port]/[path]\n"
8570 "\n"
8635 "\n"
8571 " ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n"
8636 " ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n"
8572 " バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n"
8637 " バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n"
8573 " 構いません。\n"
8638 " 構いません。\n"
8574 "\n"
8639 "\n"
8575 " 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n"
8640 " 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n"
8576 " することで、特定のブランチ、タグないしチェンジセットを指定することが\n"
8641 " することで、特定のブランチ、タグないしチェンジセットを指定することが\n"
8577 " 出来ます。\n"
8642 " 出来ます。\n"
8578 "\n"
8643 "\n"
8579 " http:// や https:// 形式の URL で指定される連携先への push の様な\n"
8644 " http:// や https:// 形式の URL で指定される連携先への push の様な\n"
8580 " 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n"
8645 " 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n"
8581 " 利用可能になっている場合に限り使用可能です。\n"
8646 " 利用可能になっている場合に限り使用可能です。\n"
8582 "\n"
8647 "\n"
8583 " Mercurial と SSH を併用する場合の注意点:\n"
8648 " Mercurial と SSH を併用する場合の注意点:\n"
8584 " - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n"
8649 " - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n"
8585 " hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n"
8650 " hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n"
8586 " 場合は、--remotecmd オプションで明示的に指定してください。\n"
8651 " 場合は、--remotecmd オプションで明示的に指定してください。\n"
8587 " - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n"
8652 " - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n"
8588 " からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n"
8653 " からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n"
8589 " 更にスラッシュ('/')を付与してください。\n"
8654 " 更にスラッシュ('/')を付与してください。\n"
8590 " 例: ssh://example.com//tmp/repository\n"
8655 " 例: ssh://example.com//tmp/repository\n"
8591 " - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n"
8656 " - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n"
8592 " ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n"
8657 " ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n"
8593 " Host *.mylocalnetwork.example.com\n"
8658 " Host *.mylocalnetwork.example.com\n"
8594 " Compression no\n"
8659 " Compression no\n"
8595 " Host *\n"
8660 " Host *\n"
8596 " Compression yes\n"
8661 " Compression yes\n"
8597 " あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n"
8662 " あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n"
8598 " --ssh オプションに対して、'ssh -C' を指定する方法もあります。\n"
8663 " --ssh オプションに対して、'ssh -C' を指定する方法もあります。\n"
8599 "\n"
8664 "\n"
8600 " 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n"
8665 " 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n"
8601 " することが出来ます。\n"
8666 " することが出来ます。\n"
8602 " [paths]\n"
8667 " [paths]\n"
8603 " alias1 = URL1\n"
8668 " alias1 = URL1\n"
8604 " alias2 = URL2\n"
8669 " alias2 = URL2\n"
8605 " ...\n"
8670 " ...\n"
8606 "\n"
8671 "\n"
8607 " URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n"
8672 " URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n"
8608 " (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n"
8673 " (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n"
8609 "\n"
8674 "\n"
8610 " コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n"
8675 " コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n"
8611 " 重要な別名が2つあります。\n"
8676 " 重要な別名が2つあります。\n"
8612 "\n"
8677 "\n"
8613 " default:\n"
8678 " default:\n"
8614 " 'hg clone' によって複製した場合、複製元リポジトリの URL が\n"
8679 " 'hg clone' によって複製した場合、新規リポジトリの 'default' として\n"
8615 " 'default' として保存されます。以後、連携先を省略して 'hg push' や\n"
8680 " 複製元リポジトリの URL が保存されます。\n"
8616 " 'hg pull' を実行した際には、この URL が連携先として使用されます。\n"
8681 " 以後、連携先を省略して 'hg push' や 'hg pull' に類するコマンドを\n"
8682 " 実行した際には、この URL が連携先として使用されます。\n"
8617 "\n"
8683 "\n"
8618 " default-push:\n"
8684 " default-push:\n"
8619 " 'hg push' は、'default-push' の別名で定義される URL を探します。\n"
8685 " 'hg push' は、'default-push' の別名で定義される URL を探します。\n"
8620 " 'default' が定義されている場合でも、'default-push' が定義されていれば\n"
8686 " 'default' が定義されている場合でも、'default-push' が定義されていれば\n"
8621 " こちらが優先されます。\n"
8687 " こちらが優先されます。\n"
8622 " "
8688 " "
8623
8689
8624 #, python-format
8690 #, python-format
8625 msgid "destination directory: %s\n"
8691 msgid "destination directory: %s\n"
8626 msgstr ""
8692 msgstr ""
8627
8693
8628 #, python-format
8694 #, python-format
8629 msgid "destination '%s' already exists"
8695 msgid "destination '%s' already exists"
8630 msgstr ""
8696 msgstr ""
8631
8697
8632 msgid ""
8698 msgid ""
8633 "src repository does not support revision lookup and so doesn't support clone "
8699 "src repository does not support revision lookup and so doesn't support clone "
8634 "by revision"
8700 "by revision"
8635 msgstr ""
8701 msgstr ""
8636
8702
8637 msgid "clone from remote to remote not supported"
8703 msgid "clone from remote to remote not supported"
8638 msgstr ""
8704 msgstr ""
8639
8705
8640 msgid "updating working directory\n"
8706 msgid "updating working directory\n"
8641 msgstr ""
8707 msgstr ""
8642
8708
8643 msgid "updated"
8709 msgid "updated"
8644 msgstr ""
8710 msgstr ""
8645
8711
8646 msgid "merged"
8712 msgid "merged"
8647 msgstr ""
8713 msgstr ""
8648
8714
8649 msgid "removed"
8715 msgid "removed"
8650 msgstr ""
8716 msgstr ""
8651
8717
8652 msgid "unresolved"
8718 msgid "unresolved"
8653 msgstr ""
8719 msgstr ""
8654
8720
8655 #, python-format
8721 #, python-format
8656 msgid "%d files %s"
8722 msgid "%d files %s"
8657 msgstr ""
8723 msgstr ""
8658
8724
8659 msgid "use 'hg resolve' to retry unresolved file merges\n"
8725 msgid "use 'hg resolve' to retry unresolved file merges\n"
8660 msgstr ""
8726 msgstr ""
8661
8727
8728 msgid ""
8729 "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
8730 "abandon\n"
8731 msgstr ""
8732
8662 msgid "(branch merge, don't forget to commit)\n"
8733 msgid "(branch merge, don't forget to commit)\n"
8663 msgstr ""
8734 msgstr ""
8664
8735
8665 #, python-format
8736 #, python-format
8666 msgid "error reading %s/.hg/hgrc: %s\n"
8737 msgid "error reading %s/.hg/hgrc: %s\n"
8667 msgstr ""
8738 msgstr ""
8668
8739
8669 msgid "SSL support is unavailable"
8740 msgid "SSL support is unavailable"
8670 msgstr ""
8741 msgstr ""
8671
8742
8672 msgid "IPv6 not available on this system"
8743 msgid "IPv6 not available on this system"
8673 msgstr ""
8744 msgstr ""
8674
8745
8675 #, python-format
8746 #, python-format
8676 msgid "cannot start server at '%s:%d': %s"
8747 msgid "cannot start server at '%s:%d': %s"
8677 msgstr ""
8748 msgstr ""
8678
8749
8679 #, python-format
8750 #, python-format
8680 msgid "calling hook %s: %s\n"
8751 msgid "calling hook %s: %s\n"
8681 msgstr ""
8752 msgstr ""
8682
8753
8683 #, python-format
8754 #, python-format
8684 msgid "%s hook is invalid (\"%s\" not in a module)"
8755 msgid "%s hook is invalid (\"%s\" not in a module)"
8685 msgstr ""
8756 msgstr ""
8686
8757
8687 #, python-format
8758 #, python-format
8688 msgid "%s hook is invalid (import of \"%s\" failed)"
8759 msgid "%s hook is invalid (import of \"%s\" failed)"
8689 msgstr ""
8760 msgstr ""
8690
8761
8691 #, python-format
8762 #, python-format
8692 msgid "%s hook is invalid (\"%s\" is not defined)"
8763 msgid "%s hook is invalid (\"%s\" is not defined)"
8693 msgstr ""
8764 msgstr ""
8694
8765
8695 #, python-format
8766 #, python-format
8696 msgid "%s hook is invalid (\"%s\" is not callable)"
8767 msgid "%s hook is invalid (\"%s\" is not callable)"
8697 msgstr ""
8768 msgstr ""
8698
8769
8699 #, python-format
8770 #, python-format
8700 msgid "error: %s hook failed: %s\n"
8771 msgid "error: %s hook failed: %s\n"
8701 msgstr ""
8772 msgstr ""
8702
8773
8703 #, python-format
8774 #, python-format
8704 msgid "error: %s hook raised an exception: %s\n"
8775 msgid "error: %s hook raised an exception: %s\n"
8705 msgstr ""
8776 msgstr ""
8706
8777
8707 #, python-format
8778 #, python-format
8708 msgid "%s hook failed"
8779 msgid "%s hook failed"
8709 msgstr ""
8780 msgstr ""
8710
8781
8711 #, python-format
8782 #, python-format
8712 msgid "warning: %s hook failed\n"
8783 msgid "warning: %s hook failed\n"
8713 msgstr ""
8784 msgstr ""
8714
8785
8715 #, python-format
8786 #, python-format
8716 msgid "running hook %s: %s\n"
8787 msgid "running hook %s: %s\n"
8717 msgstr ""
8788 msgstr ""
8718
8789
8719 #, python-format
8790 #, python-format
8720 msgid "%s hook %s"
8791 msgid "%s hook %s"
8721 msgstr ""
8792 msgstr ""
8722
8793
8723 #, python-format
8794 #, python-format
8724 msgid "warning: %s hook %s\n"
8795 msgid "warning: %s hook %s\n"
8725 msgstr ""
8796 msgstr ""
8726
8797
8727 msgid "connection ended unexpectedly"
8798 msgid "connection ended unexpectedly"
8728 msgstr ""
8799 msgstr ""
8729
8800
8730 #, python-format
8801 #, python-format
8731 msgid "unsupported URL component: \"%s\""
8802 msgid "unsupported URL component: \"%s\""
8732 msgstr ""
8803 msgstr ""
8733
8804
8734 #, python-format
8805 #, python-format
8735 msgid "using %s\n"
8806 msgid "using %s\n"
8736 msgstr ""
8807 msgstr ""
8737
8808
8738 #, python-format
8809 #, python-format
8739 msgid "capabilities: %s\n"
8810 msgid "capabilities: %s\n"
8740 msgstr ""
8811 msgstr ""
8741
8812
8742 msgid "operation not supported over http"
8813 msgid "operation not supported over http"
8743 msgstr ""
8814 msgstr ""
8744
8815
8745 #, python-format
8816 #, python-format
8746 msgid "sending %s command\n"
8817 msgid "sending %s command\n"
8747 msgstr ""
8818 msgstr ""
8748
8819
8749 #, python-format
8820 #, python-format
8750 msgid "sending %s bytes\n"
8821 msgid "sending %s bytes\n"
8751 msgstr ""
8822 msgstr ""
8752
8823
8753 msgid "authorization failed"
8824 msgid "authorization failed"
8754 msgstr ""
8825 msgstr ""
8755
8826
8756 #, python-format
8827 #, python-format
8757 msgid "http error while sending %s command\n"
8828 msgid "http error while sending %s command\n"
8758 msgstr ""
8829 msgstr ""
8759
8830
8760 msgid "http error, possibly caused by proxy setting"
8831 msgid "http error, possibly caused by proxy setting"
8761 msgstr ""
8832 msgstr ""
8762
8833
8763 #, python-format
8834 #, python-format
8764 msgid "real URL is %s\n"
8835 msgid "real URL is %s\n"
8765 msgstr ""
8836 msgstr ""
8766
8837
8767 #, python-format
8838 #, python-format
8768 msgid "Requested URL: '%s'\n"
8839 msgid "Requested URL: '%s'\n"
8769 msgstr ""
8840 msgstr ""
8770
8841
8771 #, python-format
8842 #, python-format
8772 msgid "'%s' does not appear to be an hg repository"
8843 msgid "'%s' does not appear to be an hg repository"
8773 msgstr ""
8844 msgstr ""
8774
8845
8775 #, python-format
8846 #, python-format
8776 msgid "'%s' sent a broken Content-Type header (%s)"
8847 msgid "'%s' sent a broken Content-Type header (%s)"
8777 msgstr ""
8848 msgstr ""
8778
8849
8779 #, python-format
8850 #, python-format
8780 msgid "'%s' uses newer protocol %s"
8851 msgid "'%s' uses newer protocol %s"
8781 msgstr ""
8852 msgstr ""
8782
8853
8783 msgid "look up remote revision"
8854 msgid "look up remote revision"
8784 msgstr ""
8855 msgstr ""
8785
8856
8786 msgid "unexpected response:"
8857 msgid "unexpected response:"
8787 msgstr ""
8858 msgstr ""
8788
8859
8789 msgid "look up remote changes"
8860 msgid "look up remote changes"
8790 msgstr ""
8861 msgstr ""
8791
8862
8792 msgid "push failed (unexpected response):"
8863 msgid "push failed (unexpected response):"
8793 msgstr ""
8864 msgstr ""
8794
8865
8795 #, python-format
8866 #, python-format
8796 msgid "push failed: %s"
8867 msgid "push failed: %s"
8797 msgstr ""
8868 msgstr ""
8798
8869
8799 msgid "Python support for SSL and HTTPS is not installed"
8870 msgid "Python support for SSL and HTTPS is not installed"
8800 msgstr ""
8871 msgstr ""
8801
8872
8802 msgid "cannot create new http repository"
8873 msgid "cannot create new http repository"
8803 msgstr ""
8874 msgstr ""
8804
8875
8805 #, python-format
8876 #, python-format
8806 msgid "%s: ignoring invalid syntax '%s'\n"
8877 msgid "%s: ignoring invalid syntax '%s'\n"
8807 msgstr ""
8878 msgstr ""
8808
8879
8809 #, python-format
8880 #, python-format
8810 msgid "skipping unreadable ignore file '%s': %s\n"
8881 msgid "skipping unreadable ignore file '%s': %s\n"
8811 msgstr ""
8882 msgstr ""
8812
8883
8813 #, python-format
8884 #, python-format
8814 msgid "repository %s not found"
8885 msgid "repository %s not found"
8815 msgstr ""
8886 msgstr ""
8816
8887
8817 #, python-format
8888 #, python-format
8818 msgid "repository %s already exists"
8889 msgid "repository %s already exists"
8819 msgstr ""
8890 msgstr ""
8820
8891
8821 #, python-format
8892 #, python-format
8822 msgid "requirement '%s' not supported"
8893 msgid "requirement '%s' not supported"
8823 msgstr ""
8894 msgstr ""
8824
8895
8825 #, python-format
8896 #, python-format
8826 msgid "%r cannot be used in a tag name"
8897 msgid "%r cannot be used in a tag name"
8827 msgstr ""
8898 msgstr ""
8828
8899
8829 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8900 msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
8830 msgstr ""
8901 msgstr ""
8831
8902
8832 #, python-format
8903 #, python-format
8833 msgid "%s, line %s: %s\n"
8904 msgid "%s, line %s: %s\n"
8834 msgstr ""
8905 msgstr ""
8835
8906
8836 msgid "cannot parse entry"
8907 msgid "cannot parse entry"
8837 msgstr ""
8908 msgstr ""
8838
8909
8839 #, python-format
8910 #, python-format
8840 msgid "node '%s' is not well formed"
8911 msgid "node '%s' is not well formed"
8841 msgstr ""
8912 msgstr ""
8842
8913
8843 #, python-format
8914 #, python-format
8844 msgid "tag '%s' refers to unknown node"
8915 msgid "tag '%s' refers to unknown node"
8845 msgstr ""
8916 msgstr ""
8846
8917
8847 #, python-format
8918 #, python-format
8848 msgid "unknown revision '%s'"
8919 msgid "unknown revision '%s'"
8849 msgstr ""
8920 msgstr ""
8850
8921
8851 #, python-format
8922 #, python-format
8852 msgid "filtering %s through %s\n"
8923 msgid "filtering %s through %s\n"
8853 msgstr ""
8924 msgstr ""
8854
8925
8855 msgid "journal already exists - run hg recover"
8926 msgid "journal already exists - run hg recover"
8856 msgstr ""
8927 msgstr ""
8857
8928
8858 msgid "rolling back interrupted transaction\n"
8929 msgid "rolling back interrupted transaction\n"
8859 msgstr ""
8930 msgstr ""
8860
8931
8861 msgid "no interrupted transaction available\n"
8932 msgid "no interrupted transaction available\n"
8862 msgstr ""
8933 msgstr ""
8863
8934
8864 msgid "rolling back last transaction\n"
8935 msgid "rolling back last transaction\n"
8865 msgstr ""
8936 msgstr ""
8866
8937
8867 #, python-format
8938 #, python-format
8868 msgid "Named branch could not be reset, current branch still is: %s\n"
8939 msgid "Named branch could not be reset, current branch still is: %s\n"
8869 msgstr ""
8940 msgstr ""
8870
8941
8871 msgid "no rollback information available\n"
8942 msgid "no rollback information available\n"
8872 msgstr ""
8943 msgstr ""
8873
8944
8874 #, python-format
8945 #, python-format
8875 msgid "waiting for lock on %s held by %r\n"
8946 msgid "waiting for lock on %s held by %r\n"
8876 msgstr ""
8947 msgstr ""
8877
8948
8878 #, python-format
8949 #, python-format
8879 msgid "repository %s"
8950 msgid "repository %s"
8880 msgstr ""
8951 msgstr ""
8881
8952
8882 #, python-format
8953 #, python-format
8883 msgid "working directory of %s"
8954 msgid "working directory of %s"
8884 msgstr ""
8955 msgstr ""
8885
8956
8886 #, python-format
8957 #, python-format
8887 msgid " %s: searching for copy revision for %s\n"
8958 msgid " %s: searching for copy revision for %s\n"
8888 msgstr ""
8959 msgstr ""
8889
8960
8890 #, python-format
8961 #, python-format
8891 msgid " %s: copy %s:%s\n"
8962 msgid " %s: copy %s:%s\n"
8892 msgstr ""
8963 msgstr ""
8893
8964
8894 msgid "cannot partially commit a merge (do not specify files or patterns)"
8965 msgid "cannot partially commit a merge (do not specify files or patterns)"
8895 msgstr ""
8966 msgstr ""
8896
8967
8897 #, python-format
8968 #, python-format
8898 msgid "%s not tracked!\n"
8969 msgid "%s not tracked!\n"
8899 msgstr ""
8970 msgstr ""
8900
8971
8901 msgid "unresolved merge conflicts (see hg resolve)"
8972 msgid "unresolved merge conflicts (see hg resolve)"
8902 msgstr ""
8973 msgstr ""
8903
8974
8904 msgid "nothing changed\n"
8975 msgid "nothing changed\n"
8905 msgstr ""
8976 msgstr ""
8906
8977
8907 #, python-format
8978 #, python-format
8908 msgid "trouble committing %s!\n"
8979 msgid "trouble committing %s!\n"
8909 msgstr ""
8980 msgstr ""
8910
8981
8911 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
8982 msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
8912 msgstr ""
8983 msgstr ""
8913
8984
8914 msgid "empty commit message"
8985 msgid "empty commit message"
8915 msgstr ""
8986 msgstr ""
8916
8987
8917 #, python-format
8988 #, python-format
8918 msgid "%s does not exist!\n"
8989 msgid "%s does not exist!\n"
8919 msgstr ""
8990 msgstr ""
8920
8991
8921 #, python-format
8992 #, python-format
8922 msgid ""
8993 msgid ""
8923 "%s: files over 10MB may cause memory and performance problems\n"
8994 "%s: files over 10MB may cause memory and performance problems\n"
8924 "(use 'hg revert %s' to unadd the file)\n"
8995 "(use 'hg revert %s' to unadd the file)\n"
8925 msgstr ""
8996 msgstr ""
8926
8997
8927 #, python-format
8998 #, python-format
8928 msgid "%s not added: only files and symlinks supported currently\n"
8999 msgid "%s not added: only files and symlinks supported currently\n"
8929 msgstr ""
9000 msgstr ""
8930
9001
8931 #, python-format
9002 #, python-format
8932 msgid "%s already tracked!\n"
9003 msgid "%s already tracked!\n"
8933 msgstr ""
9004 msgstr ""
8934
9005
8935 #, python-format
9006 #, python-format
8936 msgid "%s not added!\n"
9007 msgid "%s not added!\n"
8937 msgstr ""
9008 msgstr ""
8938
9009
8939 #, python-format
9010 #, python-format
8940 msgid "%s still exists!\n"
9011 msgid "%s still exists!\n"
8941 msgstr ""
9012 msgstr ""
8942
9013
8943 #, python-format
9014 #, python-format
8944 msgid "%s not removed!\n"
9015 msgid "%s not removed!\n"
8945 msgstr ""
9016 msgstr ""
8946
9017
8947 #, python-format
9018 #, python-format
8948 msgid "copy failed: %s is not a file or a symbolic link\n"
9019 msgid "copy failed: %s is not a file or a symbolic link\n"
8949 msgstr ""
9020 msgstr ""
8950
9021
8951 msgid "searching for changes\n"
9022 msgid "searching for changes\n"
8952 msgstr ""
9023 msgstr ""
8953
9024
8954 #, python-format
9025 #, python-format
8955 msgid "examining %s:%s\n"
9026 msgid "examining %s:%s\n"
8956 msgstr ""
9027 msgstr ""
8957
9028
8958 msgid "branch already found\n"
9029 msgid "branch already found\n"
8959 msgstr ""
9030 msgstr ""
8960
9031
8961 #, python-format
9032 #, python-format
8962 msgid "found incomplete branch %s:%s\n"
9033 msgid "found incomplete branch %s:%s\n"
8963 msgstr ""
9034 msgstr ""
8964
9035
8965 #, python-format
9036 #, python-format
8966 msgid "found new changeset %s\n"
9037 msgid "found new changeset %s\n"
8967 msgstr ""
9038 msgstr ""
8968
9039
8969 #, python-format
9040 #, python-format
8970 msgid "request %d: %s\n"
9041 msgid "request %d: %s\n"
8971 msgstr ""
9042 msgstr ""
8972
9043
8973 #, python-format
9044 #, python-format
8974 msgid "received %s:%s\n"
9045 msgid "received %s:%s\n"
8975 msgstr ""
9046 msgstr ""
8976
9047
8977 #, python-format
9048 #, python-format
8978 msgid "narrowing %d:%d %s\n"
9049 msgid "narrowing %d:%d %s\n"
8979 msgstr ""
9050 msgstr ""
8980
9051
8981 #, python-format
9052 #, python-format
8982 msgid "found new branch changeset %s\n"
9053 msgid "found new branch changeset %s\n"
8983 msgstr ""
9054 msgstr ""
8984
9055
8985 #, python-format
9056 #, python-format
8986 msgid "narrowed branch search to %s:%s\n"
9057 msgid "narrowed branch search to %s:%s\n"
8987 msgstr ""
9058 msgstr ""
8988
9059
8989 msgid "already have changeset "
9060 msgid "already have changeset "
8990 msgstr ""
9061 msgstr ""
8991
9062
8992 msgid "warning: repository is unrelated\n"
9063 msgid "warning: repository is unrelated\n"
8993 msgstr ""
9064 msgstr ""
8994
9065
8995 msgid "repository is unrelated"
9066 msgid "repository is unrelated"
8996 msgstr ""
9067 msgstr ""
8997
9068
8998 msgid "found new changesets starting at "
9069 msgid "found new changesets starting at "
8999 msgstr ""
9070 msgstr ""
9000
9071
9001 #, python-format
9072 #, python-format
9002 msgid "%d total queries\n"
9073 msgid "%d total queries\n"
9003 msgstr ""
9074 msgstr ""
9004
9075
9005 msgid "common changesets up to "
9076 msgid "common changesets up to "
9006 msgstr ""
9077 msgstr ""
9007
9078
9008 msgid "requesting all changes\n"
9079 msgid "requesting all changes\n"
9009 msgstr ""
9080 msgstr ""
9010
9081
9011 msgid ""
9082 msgid ""
9012 "Partial pull cannot be done because other repository doesn't support "
9083 "Partial pull cannot be done because other repository doesn't support "
9013 "changegroupsubset."
9084 "changegroupsubset."
9014 msgstr ""
9085 msgstr ""
9015
9086
9016 msgid "abort: push creates new remote heads!\n"
9087 msgid "abort: push creates new remote heads!\n"
9017 msgstr ""
9088 msgstr ""
9018
9089
9019 msgid "(did you forget to merge? use push -f to force)\n"
9090 msgid "(did you forget to merge? use push -f to force)\n"
9020 msgstr ""
9091 msgstr ""
9021
9092
9022 msgid "note: unsynced remote changes!\n"
9093 msgid "note: unsynced remote changes!\n"
9023 msgstr ""
9094 msgstr ""
9024
9095
9025 #, python-format
9096 #, python-format
9026 msgid "%d changesets found\n"
9097 msgid "%d changesets found\n"
9027 msgstr ""
9098 msgstr ""
9028
9099
9029 msgid "list of changesets:\n"
9100 msgid "list of changesets:\n"
9030 msgstr ""
9101 msgstr ""
9031
9102
9032 #, python-format
9103 #, python-format
9033 msgid "empty or missing revlog for %s"
9104 msgid "empty or missing revlog for %s"
9034 msgstr ""
9105 msgstr ""
9035
9106
9036 #, python-format
9107 #, python-format
9037 msgid "add changeset %s\n"
9108 msgid "add changeset %s\n"
9038 msgstr ""
9109 msgstr ""
9039
9110
9040 msgid "adding changesets\n"
9111 msgid "adding changesets\n"
9041 msgstr ""
9112 msgstr ""
9042
9113
9043 msgid "received changelog group is empty"
9114 msgid "received changelog group is empty"
9044 msgstr ""
9115 msgstr ""
9045
9116
9046 msgid "adding manifests\n"
9117 msgid "adding manifests\n"
9047 msgstr ""
9118 msgstr ""
9048
9119
9049 msgid "adding file changes\n"
9120 msgid "adding file changes\n"
9050 msgstr ""
9121 msgstr ""
9051
9122
9052 #, python-format
9123 #, python-format
9053 msgid "adding %s revisions\n"
9124 msgid "adding %s revisions\n"
9054 msgstr ""
9125 msgstr ""
9055
9126
9056 msgid "received file revlog group is empty"
9127 msgid "received file revlog group is empty"
9057 msgstr ""
9128 msgstr ""
9058
9129
9059 #, python-format
9130 #, python-format
9060 msgid " (%+d heads)"
9131 msgid " (%+d heads)"
9061 msgstr ""
9132 msgstr ""
9062
9133
9063 #, python-format
9134 #, python-format
9064 msgid "added %d changesets with %d changes to %d files%s\n"
9135 msgid "added %d changesets with %d changes to %d files%s\n"
9065 msgstr ""
9136 msgstr ""
9066
9137
9067 msgid "updating the branch cache\n"
9138 msgid "updating the branch cache\n"
9068 msgstr ""
9139 msgstr ""
9069
9140
9070 msgid "Unexpected response from remote server:"
9141 msgid "Unexpected response from remote server:"
9071 msgstr ""
9142 msgstr ""
9072
9143
9073 msgid "operation forbidden by server"
9144 msgid "operation forbidden by server"
9074 msgstr ""
9145 msgstr ""
9075
9146
9076 msgid "locking the remote repository failed"
9147 msgid "locking the remote repository failed"
9077 msgstr ""
9148 msgstr ""
9078
9149
9079 msgid "the server sent an unknown error code"
9150 msgid "the server sent an unknown error code"
9080 msgstr ""
9151 msgstr ""
9081
9152
9082 msgid "streaming all changes\n"
9153 msgid "streaming all changes\n"
9083 msgstr ""
9154 msgstr ""
9084
9155
9085 #, python-format
9156 #, python-format
9086 msgid "%d files to transfer, %s of data\n"
9157 msgid "%d files to transfer, %s of data\n"
9087 msgstr ""
9158 msgstr ""
9088
9159
9089 #, python-format
9160 #, python-format
9090 msgid "adding %s (%s)\n"
9161 msgid "adding %s (%s)\n"
9091 msgstr ""
9162 msgstr ""
9092
9163
9093 #, python-format
9164 #, python-format
9094 msgid "transferred %s in %.1f seconds (%s/sec)\n"
9165 msgid "transferred %s in %.1f seconds (%s/sec)\n"
9095 msgstr ""
9166 msgstr ""
9096
9167
9097 msgid "no [smtp]host in hgrc - cannot send mail"
9168 msgid "no [smtp]host in hgrc - cannot send mail"
9098 msgstr ""
9169 msgstr ""
9099
9170
9100 #, python-format
9171 #, python-format
9101 msgid "sending mail: smtp host %s, port %s\n"
9172 msgid "sending mail: smtp host %s, port %s\n"
9102 msgstr ""
9173 msgstr ""
9103
9174
9104 msgid "can't use TLS: Python SSL support not installed"
9175 msgid "can't use TLS: Python SSL support not installed"
9105 msgstr ""
9176 msgstr ""
9106
9177
9107 msgid "(using tls)\n"
9178 msgid "(using tls)\n"
9108 msgstr ""
9179 msgstr ""
9109
9180
9110 #, python-format
9181 #, python-format
9111 msgid "(authenticating to mail server as %s)\n"
9182 msgid "(authenticating to mail server as %s)\n"
9112 msgstr ""
9183 msgstr ""
9113
9184
9114 #, python-format
9185 #, python-format
9115 msgid "sending mail: %s\n"
9186 msgid "sending mail: %s\n"
9116 msgstr ""
9187 msgstr ""
9117
9188
9118 msgid "smtp specified as email transport, but no smtp host configured"
9189 msgid "smtp specified as email transport, but no smtp host configured"
9119 msgstr ""
9190 msgstr ""
9120
9191
9121 #, python-format
9192 #, python-format
9122 msgid "%r specified as email transport, but not in PATH"
9193 msgid "%r specified as email transport, but not in PATH"
9123 msgstr ""
9194 msgstr ""
9124
9195
9125 #, python-format
9196 #, python-format
9126 msgid "ignoring invalid sendcharset: %s\n"
9197 msgid "ignoring invalid sendcharset: %s\n"
9127 msgstr ""
9198 msgstr ""
9128
9199
9129 #, python-format
9200 #, python-format
9130 msgid "invalid email address: %s"
9201 msgid "invalid email address: %s"
9131 msgstr ""
9202 msgstr ""
9132
9203
9133 #, python-format
9204 #, python-format
9134 msgid "invalid local address: %s"
9205 msgid "invalid local address: %s"
9135 msgstr ""
9206 msgstr ""
9136
9207
9137 msgid "'\\n' and '\\r' disallowed in filenames"
9208 msgid "'\\n' and '\\r' disallowed in filenames"
9138 msgstr ""
9209 msgstr ""
9139
9210
9140 #, python-format
9211 #, python-format
9141 msgid "failed to remove %s from manifest"
9212 msgid "failed to remove %s from manifest"
9142 msgstr ""
9213 msgstr ""
9143
9214
9144 #, python-format
9215 #, python-format
9145 msgid "diff context lines count must be an integer, not %r"
9216 msgid "diff context lines count must be an integer, not %r"
9146 msgstr ""
9217 msgstr ""
9147
9218
9148 #, python-format
9219 #, python-format
9149 msgid ""
9220 msgid ""
9150 "untracked file in working directory differs from file in requested revision: "
9221 "untracked file in working directory differs from file in requested revision: "
9151 "'%s'"
9222 "'%s'"
9152 msgstr ""
9223 msgstr ""
9153
9224
9154 #, python-format
9225 #, python-format
9155 msgid "case-folding collision between %s and %s"
9226 msgid "case-folding collision between %s and %s"
9156 msgstr ""
9227 msgstr ""
9157
9228
9158 msgid "resolving manifests\n"
9229 msgid "resolving manifests\n"
9159 msgstr ""
9230 msgstr ""
9160
9231
9161 #, python-format
9232 #, python-format
9162 msgid " overwrite %s partial %s\n"
9233 msgid " overwrite %s partial %s\n"
9163 msgstr ""
9234 msgstr ""
9164
9235
9165 #, python-format
9236 #, python-format
9166 msgid " ancestor %s local %s remote %s\n"
9237 msgid " ancestor %s local %s remote %s\n"
9167 msgstr ""
9238 msgstr ""
9168
9239
9169 #, python-format
9240 #, python-format
9170 msgid ""
9241 msgid ""
9171 " conflicting flags for %s\n"
9242 " conflicting flags for %s\n"
9172 "(n)one, e(x)ec or sym(l)ink?"
9243 "(n)one, e(x)ec or sym(l)ink?"
9173 msgstr ""
9244 msgstr ""
9174
9245
9175 #, python-format
9246 #, python-format
9176 msgid ""
9247 msgid ""
9177 " local changed %s which remote deleted\n"
9248 " local changed %s which remote deleted\n"
9178 "use (c)hanged version or (d)elete?"
9249 "use (c)hanged version or (d)elete?"
9179 msgstr ""
9250 msgstr ""
9180
9251
9181 msgid "[cd]"
9252 msgid "[cd]"
9182 msgstr ""
9253 msgstr ""
9183
9254
9184 msgid "c"
9255 msgid "c"
9185 msgstr ""
9256 msgstr ""
9186
9257
9187 #, python-format
9258 #, python-format
9188 msgid ""
9259 msgid ""
9189 "remote changed %s which local deleted\n"
9260 "remote changed %s which local deleted\n"
9190 "use (c)hanged version or leave (d)eleted?"
9261 "use (c)hanged version or leave (d)eleted?"
9191 msgstr ""
9262 msgstr ""
9192
9263
9193 #, python-format
9264 #, python-format
9194 msgid "preserving %s for resolve of %s\n"
9265 msgid "preserving %s for resolve of %s\n"
9195 msgstr ""
9266 msgstr ""
9196
9267
9197 #, python-format
9268 #, python-format
9198 msgid "update failed to remove %s: %s!\n"
9269 msgid "update failed to remove %s: %s!\n"
9199 msgstr ""
9270 msgstr ""
9200
9271
9201 #, python-format
9272 #, python-format
9202 msgid "getting %s\n"
9273 msgid "getting %s\n"
9203 msgstr ""
9274 msgstr ""
9204
9275
9205 #, python-format
9276 #, python-format
9206 msgid "moving %s to %s\n"
9277 msgid "moving %s to %s\n"
9207 msgstr ""
9278 msgstr ""
9208
9279
9209 #, python-format
9280 #, python-format
9210 msgid "getting %s to %s\n"
9281 msgid "getting %s to %s\n"
9211 msgstr ""
9282 msgstr ""
9212
9283
9213 #, python-format
9284 #, python-format
9214 msgid "warning: detected divergent renames of %s to:\n"
9285 msgid "warning: detected divergent renames of %s to:\n"
9215 msgstr ""
9286 msgstr ""
9216
9287
9217 #, python-format
9288 #, python-format
9218 msgid "branch %s not found"
9289 msgid "branch %s not found"
9219 msgstr ""
9290 msgstr ""
9220
9291
9221 msgid "can't merge with ancestor"
9292 msgid "can't merge with ancestor"
9222 msgstr ""
9293 msgstr ""
9223
9294
9224 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
9295 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
9225 msgstr ""
9296 msgstr ""
9226
9297
9227 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
9298 msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
9228 msgstr ""
9299 msgstr ""
9229
9300
9230 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
9301 msgid "crosses branches (use 'hg merge' or 'hg update -C')"
9231 msgstr ""
9302 msgstr ""
9232
9303
9233 msgid "crosses named branches (use 'hg update -C' to discard changes)"
9304 msgid "crosses named branches (use 'hg update -C' to discard changes)"
9234 msgstr ""
9305 msgstr ""
9235
9306
9236 #, python-format
9307 #, python-format
9237 msgid "cannot create %s: destination already exists"
9308 msgid "cannot create %s: destination already exists"
9238 msgstr ""
9309 msgstr ""
9239
9310
9240 #, python-format
9311 #, python-format
9241 msgid "cannot create %s: unable to create destination directory"
9312 msgid "cannot create %s: unable to create destination directory"
9242 msgstr ""
9313 msgstr ""
9243
9314
9244 #, python-format
9315 #, python-format
9245 msgid "found patch at byte %d\n"
9316 msgid "found patch at byte %d\n"
9246 msgstr ""
9317 msgstr ""
9247
9318
9248 msgid "patch generated by hg export\n"
9319 msgid "patch generated by hg export\n"
9249 msgstr ""
9320 msgstr ""
9250
9321
9251 #, python-format
9322 #, python-format
9252 msgid "unable to find '%s' for patching\n"
9323 msgid "unable to find '%s' for patching\n"
9253 msgstr ""
9324 msgstr ""
9254
9325
9255 #, python-format
9326 #, python-format
9256 msgid "patching file %s\n"
9327 msgid "patching file %s\n"
9257 msgstr ""
9328 msgstr ""
9258
9329
9259 #, python-format
9330 #, python-format
9260 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
9331 msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
9261 msgstr ""
9332 msgstr ""
9262
9333
9263 #, python-format
9334 #, python-format
9264 msgid "bad hunk #%d %s (%d %d %d %d)"
9335 msgid "bad hunk #%d %s (%d %d %d %d)"
9265 msgstr ""
9336 msgstr ""
9266
9337
9267 #, python-format
9338 #, python-format
9268 msgid "file %s already exists\n"
9339 msgid "file %s already exists\n"
9269 msgstr ""
9340 msgstr ""
9270
9341
9271 #, python-format
9342 #, python-format
9272 msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n"
9343 msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n"
9273 msgstr ""
9344 msgstr ""
9274
9345
9275 #, python-format
9346 #, python-format
9276 msgid "Hunk #%d FAILED at %d\n"
9347 msgid "Hunk #%d FAILED at %d\n"
9277 msgstr ""
9348 msgstr ""
9278
9349
9279 #, python-format
9350 #, python-format
9280 msgid "bad hunk #%d"
9351 msgid "bad hunk #%d"
9281 msgstr ""
9352 msgstr ""
9282
9353
9283 #, python-format
9354 #, python-format
9284 msgid "bad hunk #%d old text line %d"
9355 msgid "bad hunk #%d old text line %d"
9285 msgstr ""
9356 msgstr ""
9286
9357
9287 msgid "could not extract binary patch"
9358 msgid "could not extract binary patch"
9288 msgstr ""
9359 msgstr ""
9289
9360
9290 #, python-format
9361 #, python-format
9291 msgid "binary patch is %d bytes, not %d"
9362 msgid "binary patch is %d bytes, not %d"
9292 msgstr ""
9363 msgstr ""
9293
9364
9294 #, python-format
9365 #, python-format
9295 msgid "unable to strip away %d dirs from %s"
9366 msgid "unable to strip away %d dirs from %s"
9296 msgstr ""
9367 msgstr ""
9297
9368
9298 msgid "undefined source and destination files"
9369 msgid "undefined source and destination files"
9299 msgstr ""
9370 msgstr ""
9300
9371
9301 #, python-format
9372 #, python-format
9302 msgid "malformed patch %s %s"
9373 msgid "malformed patch %s %s"
9303 msgstr ""
9374 msgstr ""
9304
9375
9305 #, python-format
9376 #, python-format
9306 msgid "unsupported parser state: %s"
9377 msgid "unsupported parser state: %s"
9307 msgstr ""
9378 msgstr ""
9308
9379
9309 #, python-format
9380 #, python-format
9310 msgid "patch command failed: %s"
9381 msgid "patch command failed: %s"
9311 msgstr ""
9382 msgstr ""
9312
9383
9313 #, python-format
9384 #, python-format
9314 msgid "no valid hunks found; trying with %r instead\n"
9385 msgid "no valid hunks found; trying with %r instead\n"
9315 msgstr ""
9386 msgstr ""
9316
9387
9317 #, python-format
9388 #, python-format
9318 msgid "saving bundle to %s\n"
9389 msgid "saving bundle to %s\n"
9319 msgstr ""
9390 msgstr ""
9320
9391
9321 msgid "adding branch\n"
9392 msgid "adding branch\n"
9322 msgstr ""
9393 msgstr ""
9323
9394
9324 #, python-format
9395 #, python-format
9325 msgid "cannot %s; remote repository does not support the %r capability"
9396 msgid "cannot %s; remote repository does not support the %r capability"
9326 msgstr ""
9397 msgstr ""
9327
9398
9328 #, python-format
9399 #, python-format
9329 msgid "unknown compression type %r"
9400 msgid "unknown compression type %r"
9330 msgstr ""
9401 msgstr ""
9331
9402
9332 #, python-format
9403 #, python-format
9333 msgid "index %s unknown flags %#04x for format v0"
9404 msgid "index %s unknown flags %#04x for format v0"
9334 msgstr ""
9405 msgstr ""
9335
9406
9336 #, python-format
9407 #, python-format
9337 msgid "index %s unknown flags %#04x for revlogng"
9408 msgid "index %s unknown flags %#04x for revlogng"
9338 msgstr ""
9409 msgstr ""
9339
9410
9340 #, python-format
9411 #, python-format
9341 msgid "index %s unknown format %d"
9412 msgid "index %s unknown format %d"
9342 msgstr ""
9413 msgstr ""
9343
9414
9344 msgid "no node"
9415 msgid "no node"
9345 msgstr ""
9416 msgstr ""
9346
9417
9347 msgid "ambiguous identifier"
9418 msgid "ambiguous identifier"
9348 msgstr ""
9419 msgstr ""
9349
9420
9350 msgid "no match found"
9421 msgid "no match found"
9351 msgstr ""
9422 msgstr ""
9352
9423
9353 #, python-format
9424 #, python-format
9354 msgid "incompatible revision flag %x"
9425 msgid "incompatible revision flag %x"
9355 msgstr ""
9426 msgstr ""
9356
9427
9357 #, python-format
9428 #, python-format
9358 msgid "%s not found in the transaction"
9429 msgid "%s not found in the transaction"
9359 msgstr ""
9430 msgstr ""
9360
9431
9361 msgid "unknown base"
9432 msgid "unknown base"
9362 msgstr ""
9433 msgstr ""
9363
9434
9364 msgid "consistency error adding group"
9435 msgid "consistency error adding group"
9365 msgstr ""
9436 msgstr ""
9366
9437
9367 #, python-format
9438 #, python-format
9368 msgid "%s looks like a binary file."
9439 msgid "%s looks like a binary file."
9369 msgstr ""
9440 msgstr ""
9370
9441
9371 msgid "can only specify two labels."
9442 msgid "can only specify two labels."
9372 msgstr ""
9443 msgstr ""
9373
9444
9374 msgid "warning: conflicts during merge.\n"
9445 msgid "warning: conflicts during merge.\n"
9375 msgstr ""
9446 msgstr ""
9376
9447
9377 #, python-format
9448 #, python-format
9378 msgid "couldn't parse location %s"
9449 msgid "couldn't parse location %s"
9379 msgstr ""
9450 msgstr ""
9380
9451
9381 msgid "could not create remote repo"
9452 msgid "could not create remote repo"
9382 msgstr ""
9453 msgstr ""
9383
9454
9384 msgid "remote: "
9455 msgid "remote: "
9385 msgstr ""
9456 msgstr ""
9386
9457
9387 msgid "no suitable response from remote hg"
9458 msgid "no suitable response from remote hg"
9388 msgstr ""
9459 msgstr ""
9389
9460
9390 #, python-format
9461 #, python-format
9391 msgid "push refused: %s"
9462 msgid "push refused: %s"
9392 msgstr ""
9463 msgstr ""
9393
9464
9394 msgid "unsynced changes"
9465 msgid "unsynced changes"
9395 msgstr ""
9466 msgstr ""
9396
9467
9397 msgid "cannot lock static-http repository"
9468 msgid "cannot lock static-http repository"
9398 msgstr ""
9469 msgstr ""
9399
9470
9400 msgid "cannot create new static-http repository"
9471 msgid "cannot create new static-http repository"
9401 msgstr ""
9472 msgstr ""
9402
9473
9403 #, python-format
9474 #, python-format
9404 msgid "invalid entry in fncache, line %s"
9475 msgid "invalid entry in fncache, line %s"
9405 msgstr ""
9476 msgstr ""
9406
9477
9407 msgid "scanning\n"
9478 msgid "scanning\n"
9408 msgstr ""
9479 msgstr ""
9409
9480
9410 #, python-format
9481 #, python-format
9411 msgid "%d files, %d bytes to transfer\n"
9482 msgid "%d files, %d bytes to transfer\n"
9412 msgstr ""
9483 msgstr ""
9413
9484
9414 #, python-format
9485 #, python-format
9415 msgid "sending %s (%d bytes)\n"
9486 msgid "sending %s (%d bytes)\n"
9416 msgstr ""
9487 msgstr ""
9417
9488
9418 msgid "unmatched quotes"
9489 msgid "unmatched quotes"
9419 msgstr ""
9490 msgstr ""
9420
9491
9421 #, python-format
9492 #, python-format
9422 msgid "style not found: %s"
9493 msgid "style not found: %s"
9423 msgstr ""
9494 msgstr ""
9424
9495
9425 #, python-format
9496 #, python-format
9426 msgid "%s:%s: parse error"
9497 msgid "%s:%s: parse error"
9427 msgstr ""
9498 msgstr ""
9428
9499
9429 #, python-format
9500 #, python-format
9430 msgid "template file %s: %s"
9501 msgid "template file %s: %s"
9431 msgstr ""
9502 msgstr ""
9432
9503
9433 #, python-format
9504 #, python-format
9434 msgid "Error expanding '%s%%%s'"
9505 msgid "Error expanding '%s%%%s'"
9435 msgstr ""
9506 msgstr ""
9436
9507
9437 msgid "transaction abort!\n"
9508 msgid "transaction abort!\n"
9438 msgstr ""
9509 msgstr ""
9439
9510
9440 #, python-format
9511 #, python-format
9441 msgid "failed to truncate %s\n"
9512 msgid "failed to truncate %s\n"
9442 msgstr ""
9513 msgstr ""
9443
9514
9444 msgid "rollback completed\n"
9515 msgid "rollback completed\n"
9445 msgstr ""
9516 msgstr ""
9446
9517
9447 #, python-format
9518 #, python-format
9448 msgid "Not trusting file %s from untrusted user %s, group %s\n"
9519 msgid "Not trusting file %s from untrusted user %s, group %s\n"
9449 msgstr ""
9520 msgstr ""
9450
9521
9451 #, python-format
9522 #, python-format
9452 msgid ""
9523 msgid ""
9453 "Failed to parse %s\n"
9524 "Failed to parse %s\n"
9454 "%s"
9525 "%s"
9455 msgstr ""
9526 msgstr ""
9456
9527
9457 #, python-format
9528 #, python-format
9458 msgid "Ignored: %s\n"
9529 msgid "Ignored: %s\n"
9459 msgstr ""
9530 msgstr ""
9460
9531
9461 #, python-format
9532 #, python-format
9462 msgid "unable to open %s: %s"
9533 msgid "unable to open %s: %s"
9463 msgstr ""
9534 msgstr ""
9464
9535
9465 #, python-format
9536 #, python-format
9466 msgid ""
9537 msgid ""
9467 "failed to parse %s\n"
9538 "failed to parse %s\n"
9468 "%s"
9539 "%s"
9469 msgstr ""
9540 msgstr ""
9470
9541
9471 #, python-format
9542 #, python-format
9472 msgid ""
9543 msgid ""
9473 "Error in configuration section [%s] parameter '%s':\n"
9544 "Error in configuration section [%s] parameter '%s':\n"
9474 "%s"
9545 "%s"
9475 msgstr ""
9546 msgstr ""
9476
9547
9477 #, python-format
9548 #, python-format
9478 msgid "Ignoring untrusted configuration option %s.%s = %s\n"
9549 msgid "Ignoring untrusted configuration option %s.%s = %s\n"
9479 msgstr ""
9550 msgstr ""
9480
9551
9481 #, python-format
9552 #, python-format
9482 msgid ""
9553 msgid ""
9483 "Error in configuration section [%s]:\n"
9554 "Error in configuration section [%s]:\n"
9484 "%s"
9555 "%s"
9485 msgstr ""
9556 msgstr ""
9486
9557
9487 msgid "enter a commit username:"
9558 msgid "enter a commit username:"
9488 msgstr ""
9559 msgstr ""
9489
9560
9490 #, python-format
9561 #, python-format
9491 msgid "No username found, using '%s' instead\n"
9562 msgid "No username found, using '%s' instead\n"
9492 msgstr ""
9563 msgstr ""
9493
9564
9494 msgid "Please specify a username."
9565 msgid "Please specify a username."
9495 msgstr ""
9566 msgstr ""
9496
9567
9497 #, python-format
9568 #, python-format
9498 msgid "username %s contains a newline\n"
9569 msgid "username %s contains a newline\n"
9499 msgstr ""
9570 msgstr ""
9500
9571
9501 msgid "unrecognized response\n"
9572 msgid "unrecognized response\n"
9502 msgstr ""
9573 msgstr ""
9503
9574
9504 msgid "response expected"
9575 msgid "response expected"
9505 msgstr ""
9576 msgstr ""
9506
9577
9507 msgid "password: "
9578 msgid "password: "
9508 msgstr ""
9579 msgstr ""
9509
9580
9510 msgid "edit failed"
9581 msgid "edit failed"
9511 msgstr ""
9582 msgstr ""
9512
9583
9513 msgid "http authorization required"
9584 msgid "http authorization required"
9514 msgstr ""
9585 msgstr ""
9515
9586
9516 msgid "http authorization required\n"
9587 msgid "http authorization required\n"
9517 msgstr ""
9588 msgstr ""
9518
9589
9519 #, python-format
9590 #, python-format
9520 msgid "realm: %s\n"
9591 msgid "realm: %s\n"
9521 msgstr ""
9592 msgstr ""
9522
9593
9523 #, python-format
9594 #, python-format
9524 msgid "user: %s\n"
9595 msgid "user: %s\n"
9525 msgstr ""
9596 msgstr ""
9526
9597
9527 msgid "user:"
9598 msgid "user:"
9528 msgstr ""
9599 msgstr ""
9529
9600
9530 #, python-format
9601 #, python-format
9531 msgid "proxying through http://%s:%s\n"
9602 msgid "proxying through http://%s:%s\n"
9532 msgstr ""
9603 msgstr ""
9533
9604
9534 #, python-format
9605 #, python-format
9535 msgid "http auth: user %s, password %s\n"
9606 msgid "http auth: user %s, password %s\n"
9536 msgstr ""
9607 msgstr ""
9537
9608
9538 #, python-format
9609 #, python-format
9539 msgid "%s, please check your locale settings"
9610 msgid "%s, please check your locale settings"
9540 msgstr ""
9611 msgstr ""
9541
9612
9542 #, python-format
9613 #, python-format
9543 msgid "command '%s' failed: %s"
9614 msgid "command '%s' failed: %s"
9544 msgstr ""
9615 msgstr ""
9545
9616
9546 #, python-format
9617 #, python-format
9547 msgid "path contains illegal component: %s"
9618 msgid "path contains illegal component: %s"
9548 msgstr ""
9619 msgstr ""
9549
9620
9550 #, python-format
9621 #, python-format
9551 msgid "path %r is inside repo %r"
9622 msgid "path %r is inside repo %r"
9552 msgstr ""
9623 msgstr ""
9553
9624
9554 #, python-format
9625 #, python-format
9555 msgid "path %r traverses symbolic link %r"
9626 msgid "path %r traverses symbolic link %r"
9556 msgstr ""
9627 msgstr ""
9557
9628
9558 msgid "Hardlinks not supported"
9629 msgid "Hardlinks not supported"
9559 msgstr ""
9630 msgstr ""
9560
9631
9561 msgid "user name not available - set USERNAME environment variable"
9632 msgid "user name not available - set USERNAME environment variable"
9562 msgstr ""
9633 msgstr ""
9563
9634
9564 #, python-format
9635 #, python-format
9565 msgid "exited with status %d"
9636 msgid "exited with status %d"
9566 msgstr ""
9637 msgstr ""
9567
9638
9568 #, python-format
9639 #, python-format
9569 msgid "killed by signal %d"
9640 msgid "killed by signal %d"
9570 msgstr ""
9641 msgstr ""
9571
9642
9572 #, python-format
9643 #, python-format
9573 msgid "stopped by signal %d"
9644 msgid "stopped by signal %d"
9574 msgstr ""
9645 msgstr ""
9575
9646
9576 msgid "invalid exit code"
9647 msgid "invalid exit code"
9577 msgstr ""
9648 msgstr ""
9578
9649
9579 #, python-format
9650 #, python-format
9580 msgid "could not symlink to %r: %s"
9651 msgid "could not symlink to %r: %s"
9581 msgstr ""
9652 msgstr ""
9582
9653
9583 #, python-format
9654 #, python-format
9584 msgid "invalid date: %r "
9655 msgid "invalid date: %r "
9585 msgstr ""
9656 msgstr ""
9586
9657
9587 #, python-format
9658 #, python-format
9588 msgid "date exceeds 32 bits: %d"
9659 msgid "date exceeds 32 bits: %d"
9589 msgstr ""
9660 msgstr ""
9590
9661
9591 #, python-format
9662 #, python-format
9592 msgid "impossible time zone offset: %d"
9663 msgid "impossible time zone offset: %d"
9593 msgstr ""
9664 msgstr ""
9594
9665
9595 #, python-format
9666 #, python-format
9596 msgid "invalid day spec: %s"
9667 msgid "invalid day spec: %s"
9597 msgstr ""
9668 msgstr ""
9598
9669
9599 #, python-format
9670 #, python-format
9600 msgid "%.0f GB"
9671 msgid "%.0f GB"
9601 msgstr ""
9672 msgstr ""
9602
9673
9603 #, python-format
9674 #, python-format
9604 msgid "%.1f GB"
9675 msgid "%.1f GB"
9605 msgstr ""
9676 msgstr ""
9606
9677
9607 #, python-format
9678 #, python-format
9608 msgid "%.2f GB"
9679 msgid "%.2f GB"
9609 msgstr ""
9680 msgstr ""
9610
9681
9611 #, python-format
9682 #, python-format
9612 msgid "%.0f MB"
9683 msgid "%.0f MB"
9613 msgstr ""
9684 msgstr ""
9614
9685
9615 #, python-format
9686 #, python-format
9616 msgid "%.1f MB"
9687 msgid "%.1f MB"
9617 msgstr ""
9688 msgstr ""
9618
9689
9619 #, python-format
9690 #, python-format
9620 msgid "%.2f MB"
9691 msgid "%.2f MB"
9621 msgstr ""
9692 msgstr ""
9622
9693
9623 #, python-format
9694 #, python-format
9624 msgid "%.0f KB"
9695 msgid "%.0f KB"
9625 msgstr ""
9696 msgstr ""
9626
9697
9627 #, python-format
9698 #, python-format
9628 msgid "%.1f KB"
9699 msgid "%.1f KB"
9629 msgstr ""
9700 msgstr ""
9630
9701
9631 #, python-format
9702 #, python-format
9632 msgid "%.2f KB"
9703 msgid "%.2f KB"
9633 msgstr ""
9704 msgstr ""
9634
9705
9635 #, python-format
9706 #, python-format
9636 msgid "%.0f bytes"
9707 msgid "%.0f bytes"
9637 msgstr ""
9708 msgstr ""
9638
9709
9639 msgid "cannot verify bundle or remote repos"
9710 msgid "cannot verify bundle or remote repos"
9640 msgstr ""
9711 msgstr ""
9641
9712
9642 msgid "interrupted"
9713 msgid "interrupted"
9643 msgstr ""
9714 msgstr ""
9644
9715
9645 #, python-format
9716 #, python-format
9646 msgid "empty or missing %s"
9717 msgid "empty or missing %s"
9647 msgstr ""
9718 msgstr ""
9648
9719
9649 #, python-format
9720 #, python-format
9650 msgid "data length off by %d bytes"
9721 msgid "data length off by %d bytes"
9651 msgstr ""
9722 msgstr ""
9652
9723
9653 #, python-format
9724 #, python-format
9654 msgid "index contains %d extra bytes"
9725 msgid "index contains %d extra bytes"
9655 msgstr ""
9726 msgstr ""
9656
9727
9657 #, python-format
9728 #, python-format
9658 msgid "warning: `%s' uses revlog format 1"
9729 msgid "warning: `%s' uses revlog format 1"
9659 msgstr ""
9730 msgstr ""
9660
9731
9661 #, python-format
9732 #, python-format
9662 msgid "warning: `%s' uses revlog format 0"
9733 msgid "warning: `%s' uses revlog format 0"
9663 msgstr ""
9734 msgstr ""
9664
9735
9665 #, python-format
9736 #, python-format
9666 msgid "rev %d point to %s changeset %d"
9737 msgid "rev %d point to %s changeset %d"
9667 msgstr ""
9738 msgstr ""
9668
9739
9669 #, python-format
9740 #, python-format
9670 msgid " (expected %s)"
9741 msgid " (expected %s)"
9671 msgstr ""
9742 msgstr ""
9672
9743
9673 #, python-format
9744 #, python-format
9674 msgid "unknown parent 1 %s of %s"
9745 msgid "unknown parent 1 %s of %s"
9675 msgstr ""
9746 msgstr ""
9676
9747
9677 #, python-format
9748 #, python-format
9678 msgid "unknown parent 2 %s of %s"
9749 msgid "unknown parent 2 %s of %s"
9679 msgstr ""
9750 msgstr ""
9680
9751
9681 #, python-format
9752 #, python-format
9682 msgid "checking parents of %s"
9753 msgid "checking parents of %s"
9683 msgstr ""
9754 msgstr ""
9684
9755
9685 #, python-format
9756 #, python-format
9686 msgid "duplicate revision %d (%d)"
9757 msgid "duplicate revision %d (%d)"
9687 msgstr ""
9758 msgstr ""
9688
9759
9689 #, python-format
9760 #, python-format
9690 msgid "repository uses revlog format %d\n"
9761 msgid "repository uses revlog format %d\n"
9691 msgstr ""
9762 msgstr ""
9692
9763
9693 msgid "checking changesets\n"
9764 msgid "checking changesets\n"
9694 msgstr ""
9765 msgstr ""
9695
9766
9696 #, python-format
9767 #, python-format
9697 msgid "unpacking changeset %s"
9768 msgid "unpacking changeset %s"
9698 msgstr ""
9769 msgstr ""
9699
9770
9700 msgid "checking manifests\n"
9771 msgid "checking manifests\n"
9701 msgstr ""
9772 msgstr ""
9702
9773
9703 msgid "file without name in manifest"
9774 msgid "file without name in manifest"
9704 msgstr ""
9775 msgstr ""
9705
9776
9706 #, python-format
9777 #, python-format
9707 msgid "reading manifest delta %s"
9778 msgid "reading manifest delta %s"
9708 msgstr ""
9779 msgstr ""
9709
9780
9710 msgid "crosschecking files in changesets and manifests\n"
9781 msgid "crosschecking files in changesets and manifests\n"
9711 msgstr ""
9782 msgstr ""
9712
9783
9713 #, python-format
9784 #, python-format
9714 msgid "changeset refers to unknown manifest %s"
9785 msgid "changeset refers to unknown manifest %s"
9715 msgstr ""
9786 msgstr ""
9716
9787
9717 msgid "in changeset but not in manifest"
9788 msgid "in changeset but not in manifest"
9718 msgstr ""
9789 msgstr ""
9719
9790
9720 msgid "in manifest but not in changeset"
9791 msgid "in manifest but not in changeset"
9721 msgstr ""
9792 msgstr ""
9722
9793
9723 msgid "checking files\n"
9794 msgid "checking files\n"
9724 msgstr ""
9795 msgstr ""
9725
9796
9726 #, python-format
9797 #, python-format
9727 msgid "cannot decode filename '%s'"
9798 msgid "cannot decode filename '%s'"
9728 msgstr ""
9799 msgstr ""
9729
9800
9730 msgid "missing revlog!"
9801 msgid "missing revlog!"
9731 msgstr ""
9802 msgstr ""
9732
9803
9733 #, python-format
9804 #, python-format
9734 msgid "%s not in manifests"
9805 msgid "%s not in manifests"
9735 msgstr ""
9806 msgstr ""
9736
9807
9737 #, python-format
9808 #, python-format
9738 msgid "unpacked size is %s, %s expected"
9809 msgid "unpacked size is %s, %s expected"
9739 msgstr ""
9810 msgstr ""
9740
9811
9741 #, python-format
9812 #, python-format
9742 msgid "unpacking %s"
9813 msgid "unpacking %s"
9743 msgstr ""
9814 msgstr ""
9744
9815
9745 #, python-format
9816 #, python-format
9746 msgid "empty or missing copy source revlog %s:%s"
9817 msgid "empty or missing copy source revlog %s:%s"
9747 msgstr ""
9818 msgstr ""
9748
9819
9749 #, python-format
9820 #, python-format
9750 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9821 msgid "warning: %s@%s: copy source revision is nullid %s:%s"
9751 msgstr ""
9822 msgstr ""
9752
9823
9753 #, python-format
9824 #, python-format
9754 msgid "checking rename of %s"
9825 msgid "checking rename of %s"
9755 msgstr ""
9826 msgstr ""
9756
9827
9757 #, python-format
9828 #, python-format
9758 msgid "%s in manifests not found"
9829 msgid "%s in manifests not found"
9759 msgstr ""
9830 msgstr ""
9760
9831
9761 #, python-format
9832 #, python-format
9762 msgid "warning: orphan revlog '%s'"
9833 msgid "warning: orphan revlog '%s'"
9763 msgstr ""
9834 msgstr ""
9764
9835
9765 #, python-format
9836 #, python-format
9766 msgid "%d files, %d changesets, %d total revisions\n"
9837 msgid "%d files, %d changesets, %d total revisions\n"
9767 msgstr ""
9838 msgstr ""
9768
9839
9769 #, python-format
9840 #, python-format
9770 msgid "%d warnings encountered!\n"
9841 msgid "%d warnings encountered!\n"
9771 msgstr ""
9842 msgstr ""
9772
9843
9773 #, python-format
9844 #, python-format
9774 msgid "%d integrity errors encountered!\n"
9845 msgid "%d integrity errors encountered!\n"
9775 msgstr ""
9846 msgstr ""
9776
9847
9777 #, python-format
9848 #, python-format
9778 msgid "(first damaged changeset appears to be %d)\n"
9849 msgid "(first damaged changeset appears to be %d)\n"
9779 msgstr ""
9850 msgstr ""
General Comments 0
You need to be logged in to leave comments. Login now