Show More
@@ -91,3 +91,4 b' 2195ac506c6ababe86985b932f4948837c0891b5' | |||
|
91 | 91 | 269c80ee5b3cb3684fa8edc61501b3506d02eb10 0 iQIVAwUAU4uX5CBXgaxoKi1yAQLpdg/+OxulOKwZN+Nr7xsRhUijYjyAElRf2mGDvMrbAOA2xNf85DOXjOrX5TKETumf1qANA5cHa1twA8wYgxUzhx30H+w5EsLjyeSsOncRnD5WZNqSoIq2XevT0T4c8xdyNftyBqK4h/SC/t2h3vEiSCUaGcfNK8yk4XO45MIk4kk9nlA9jNWdA5ZMLgEFBye2ggz0JjEAPUkVDqlr9sNORDEbnwZxGPV8CK9HaL/I8VWClaFgjKQmjqV3SQsNFe2XPffzXmIipFJ+ODuXVxYpAsvLiGmcfuUfSDHQ4L9QvjBsWe1PgYMr/6CY/lPYmR+xW5mJUE9eIdN4MYcXgicLrmMpdF5pToNccNCMtfa6CDvEasPRqe2bDzL/Q9dQbdOVE/boaYBlgmYLL+/u+dpqip9KkyGgbSo9uJzst1mLTCzJmr5bw+surul28i9HM+4+Lewg4UUdHLz46no1lfTlB5o5EAhiOZBTEVdoBaKfewVpDa/aBRvtWX7UMVRG5qrtA0sXwydN00Jaqkr9m20W0jWjtc1ZC72QCrynVHOyfIb2rN98rnuy2QN4bTvjNpNjHOhhhPTOoVo0YYPdiUupm46vymUTQCmWsglU4Rlaa3vXneP7JenL5TV8WLPs9J28lF0IkOnyBXY7OFcpvYO1euu7iR1VdjfrQukMyaX18usymiA= |
|
92 | 92 | 2d8cd3d0e83c7336c0cb45a9f88638363f993848 0 iQIVAwUAU7OLTCBXgaxoKi1yAQJ+pw/+M3yOesgf55eo3PUTZw02QZxDyEg9ElrRc6664/QFXaJuYdz8H3LGG/NYs8uEdYihiGpS1Qc70jwd1IoUlrCELsaSSZpzWQ+VpQFX29aooBoetfL+8WgqV8zJHCtY0E1EBg/Z3ZL3n2OS++fVeWlKtp5mwEq8uLTUmhIS7GseP3bIG/CwF2Zz4bzhmPGK8V2s74aUvELZLCfkBE1ULNs7Nou1iPDGnhYOD53eq1KGIPlIg1rnLbyYw5bhS20wy5IxkWf2eCaXfmQBTG61kO5m3nkzfVgtxmZHLqYggISTJXUovfGsWZcp5a71clCSMVal+Mfviw8L/UPHG0Ie1c36djJiFLxM0f2HlwVMjegQOZSAeMGg1YL1xnIys2zMMsKgEeR+JISTal1pJyLcT9x5mr1HCnUczSGXE5zsixN+PORRnZOqcEZTa2mHJ1h5jJeEm36B/eR57BMJG+i0QgZqTpLzYTFrp2eWokGMjFB1MvgAkL2YoRsw9h6TeIwqzK8mFwLi28bf1c90gX9uMbwY/NOqGzfQKBR9bvCjs2k/gmJ+qd5AbC3DvOxHnN6hRZUqNq76Bo4F+CUVcjQ/NXnfnOIVNbILpl5Un5kl+8wLFM+mNxDxduajaUwLhSHZofKmmCSLbuuaGmQTC7a/4wzhQM9e5dX0X/8sOo8CptW7uw4= |
|
93 | 93 | 6c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 0 iQIVAwUAU8n97yBXgaxoKi1yAQKqcA/+MT0VFoP6N8fHnlxj85maoM2HfZbAzX7oEW1B8F1WH6rHESHDexDWIYWJ2XnEeTD4GCXN0/1p+O/I0IMPNzqoSz8BU0SR4+ejhRkGrKG7mcFiF5G8enxaiISn9nmax6DyRfqtOQBzuXYGObXg9PGvMS6zbR0SorJK61xX7fSsUNN6BAvHJfpwcVkOrrFAIpEhs/Gh9wg0oUKCffO/Abs6oS+P6nGLylpIyXqC7rKZ4uPVc6Ljh9DOcpV4NCU6kQbNE7Ty79E0/JWWLsHOEY4F4WBzI7rVh7dOkRMmfNGaqvKkuNkJOEqTR1o1o73Hhbxn4NU7IPbVP/zFKC+/4QVtcPk2IPlpK1MqA1H2hBNYZhJlNhvAa7LwkIxM0916/zQ8dbFAzp6Ay/t/L0tSEcIrudTz2KTrY0WKw+pkzB/nTwaS3XZre6H2B+gszskmf1Y41clkIy/nH9K7zBuzANWyK3+bm40vmMoBbbnsweUAKkyCwqm4KTyQoYQWzu/ZiZcI+Uuk/ajJ9s7EhJbIlSnYG9ttWL/IZ1h+qPU9mqVO9fcaqkeL/NIRh+IsnzaWo0zmHU1bK+/E29PPGGf3v6+IEJmXg7lvNl5pHiMd2tb7RNO/UaNSv1Y2E9naD4FQwSWo38GRBcnRGuKCLdZNHGUR+6dYo6BJCGG8wtZvNXb3TOo= |
|
94 | 3178e49892020336491cdc6945885c4de26ffa8b 0 iQIVAwUAU9whUCBXgaxoKi1yAQJDKxAAoGzdHXV/BvZ598VExEQ8IqkmBVIP1QZDVBr/orMc1eFM4tbGKxumMGbqgJsg+NetI0irkh/YWeJQ13lT4Og72iJ+4UC9eF9pcpUKr/0eBYdU2N/p2MIbVNWh3aF5QkbuQpSri0VbHOWkxqwoqrrwXEjgHaKYP4PKh+Dzukax4yzBUIyzAG38pt4a8hbjnozCl2uAikxk4Ojg+ZufhPoZWgFEuYzSfK5SrwVKOwuxKYFGbbVGTQMIXLvBhOipAmHp4JMEYHfG85kwuyx/DCDbGmXKPQYQfClwjJ4ob/IwG8asyMsPWs+09vrvpVO08HBuph3GjuiWJ1fhEef/ImWmZdQySI9Y4SjwP4dMVfzLCnY+PYPDM9Sq/5Iee13gI2lVM2NtAfQZPXh9l8u6SbCir1UhMNMx0qVMkqMAATmiZ+ETHCO75q4Wdcmnv5fk2PbvaGBVtrHGeiyuz5mK/j4cMbd0R9R0hR1PyC4dOhNqOnbqELNIe0rKNByG1RkpiQYsqZTU6insmnZrv4fVsxfA4JOObPfKNT4oa24MHS73ldLFCfQAuIxVE7RDJJ3bHeh/yO6Smo28FuVRldBl5e+wj2MykS8iVcuSa1smw6gJ14iLBH369nlR3fAAQxI0omVYPDHLr7SsH3vJasTaCD7V3SL4lW6vo/yaAh4ImlTAE+Y= |
@@ -104,3 +104,4 b' 2195ac506c6ababe86985b932f4948837c0891b5' | |||
|
104 | 104 | 269c80ee5b3cb3684fa8edc61501b3506d02eb10 3.0.1 |
|
105 | 105 | 2d8cd3d0e83c7336c0cb45a9f88638363f993848 3.0.2 |
|
106 | 106 | 6c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 3.1-rc |
|
107 | 3178e49892020336491cdc6945885c4de26ffa8b 3.1 |
@@ -127,7 +127,8 b' class convert_git(converter_source):' | |||
|
127 | 127 | size = int(info[2]) |
|
128 | 128 | data = self.catfilepipe[1].read(size) |
|
129 | 129 | if len(data) < size: |
|
130 |
raise util.Abort(_('cannot read %r object at %s: |
|
|
130 | raise util.Abort(_('cannot read %r object at %s: unexpected size') | |
|
131 | % (type, rev)) | |
|
131 | 132 | # read the trailing newline |
|
132 | 133 | self.catfilepipe[1].read(1) |
|
133 | 134 | return data |
@@ -19,7 +19,7 b" testedwith = 'internal'" | |||
|
19 | 19 | @command('fetch', |
|
20 | 20 | [('r', 'rev', [], |
|
21 | 21 | _('a specific revision you would like to pull'), _('REV')), |
|
22 | ('e', 'edit', None, _('edit commit message')), | |
|
22 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
|
23 | 23 | ('', 'force-editor', None, _('edit commit message (DEPRECATED)')), |
|
24 | 24 | ('', 'switch-parent', None, _('switch parents when merging')), |
|
25 | 25 | ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, |
@@ -203,7 +203,7 b' def keystr(ui, key):' | |||
|
203 | 203 | ('k', 'key', '', |
|
204 | 204 | _('the key id to sign with'), _('ID')), |
|
205 | 205 | ('m', 'message', '', |
|
206 | _('commit message'), _('TEXT')), | |
|
206 | _('use text as commit message'), _('TEXT')), | |
|
207 | 207 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
208 | 208 | ] + commands.commitopts2, |
|
209 | 209 | _('hg sign [OPTION]... [REV]...')) |
@@ -158,6 +158,7 b' from mercurial import context' | |||
|
158 | 158 | from mercurial import hg |
|
159 | 159 | from mercurial import node |
|
160 | 160 | from mercurial import repair |
|
161 | from mercurial import scmutil | |
|
161 | 162 | from mercurial import util |
|
162 | 163 | from mercurial import obsolete |
|
163 | 164 | from mercurial import merge as mergemod |
@@ -567,11 +568,11 b' def _histedit(ui, repo, *freeargs, **opt' | |||
|
567 | 568 | remote = None |
|
568 | 569 | root = findoutgoing(ui, repo, remote, force, opts) |
|
569 | 570 | else: |
|
570 |
r |
|
|
571 |
if len(r |
|
|
571 | rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs))) | |
|
572 | if len(rr) != 1: | |
|
572 | 573 | raise util.Abort(_('The specified revisions must have ' |
|
573 | 574 | 'exactly one common root')) |
|
574 |
root = r |
|
|
575 | root = rr[0].node() | |
|
575 | 576 | |
|
576 | 577 | keep = opts.get('keep', False) |
|
577 | 578 | revs = between(repo, root, topmost, keep) |
@@ -1996,7 +1996,7 b' class queue(object):' | |||
|
1996 | 1996 | imported.append(patchname) |
|
1997 | 1997 | patchname = None |
|
1998 | 1998 | if rev and repo.ui.configbool('mq', 'secret', False): |
|
1999 |
# if we added anything with --rev, |
|
|
1999 | # if we added anything with --rev, move the secret root | |
|
2000 | 2000 | phases.retractboundary(repo, phases.secret, [n]) |
|
2001 | 2001 | self.parseseries() |
|
2002 | 2002 | self.applieddirty = True |
@@ -2407,7 +2407,7 b' def setupheaderopts(ui, opts):' | |||
|
2407 | 2407 | opts['date'] = "%d %d" % util.makedate() |
|
2408 | 2408 | |
|
2409 | 2409 | @command("^qnew", |
|
2410 | [('e', 'edit', None, _('edit commit message')), | |
|
2410 | [('e', 'edit', None, _('invoke editor on commit messages')), | |
|
2411 | 2411 | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), |
|
2412 | 2412 | ('g', 'git', None, _('use git extended diff format')), |
|
2413 | 2413 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
@@ -2453,7 +2453,7 b' def new(ui, repo, patch, *args, **opts):' | |||
|
2453 | 2453 | return 0 |
|
2454 | 2454 | |
|
2455 | 2455 | @command("^qrefresh", |
|
2456 | [('e', 'edit', None, _('edit commit message')), | |
|
2456 | [('e', 'edit', None, _('invoke editor on commit messages')), | |
|
2457 | 2457 | ('g', 'git', None, _('use git extended diff format')), |
|
2458 | 2458 | ('s', 'short', None, |
|
2459 | 2459 | _('refresh only files already in the patch and specified files')), |
@@ -2523,7 +2523,7 b' def diff(ui, repo, *pats, **opts):' | |||
|
2523 | 2523 | return 0 |
|
2524 | 2524 | |
|
2525 | 2525 | @command('qfold', |
|
2526 |
[('e', 'edit', None, _(' |
|
|
2526 | [('e', 'edit', None, _('invoke editor on commit messages')), | |
|
2527 | 2527 | ('k', 'keep', None, _('keep folded patch files')), |
|
2528 | 2528 | ] + commands.commitopts, |
|
2529 | 2529 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) |
This diff has been collapsed as it changes many lines, (1125 lines changed) Show them Hide them | |||
@@ -149,8 +149,8 b' msgid ""' | |||
|
149 | 149 | msgstr "" |
|
150 | 150 | "Project-Id-Version: Mercurial\n" |
|
151 | 151 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
152 |
"POT-Creation-Date: 2014-0 |
|
|
153 |
"PO-Revision-Date: 2014-0 |
|
|
152 | "POT-Creation-Date: 2014-08-01 17:00+0900\n" | |
|
153 | "PO-Revision-Date: 2014-08-01 17:24+0900\n" | |
|
154 | 154 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" |
|
155 | 155 | "Language-Team: Japanese\n" |
|
156 | 156 | "Language: ja\n" |
@@ -1173,7 +1173,7 b' msgid ""' | |||
|
1173 | 1173 | " bzurl=http://my-project.org/bugzilla\n" |
|
1174 | 1174 | " user=bugmail@my-project.org\n" |
|
1175 | 1175 | " password=plugh\n" |
|
1176 | " version=xmlrpc\n" | |
|
1176 | " version=xmlrpc+email\n" | |
|
1177 | 1177 | " bzemail=bugzilla@my-project.org\n" |
|
1178 | 1178 | " template=Changeset {node|short} in {root|basename}.\n" |
|
1179 | 1179 | " {hgweb}/{webroot}/rev/{node|short}\\n\n" |
@@ -1184,7 +1184,7 b' msgstr ""' | |||
|
1184 | 1184 | " bzurl=http://my-project.org/bugzilla\n" |
|
1185 | 1185 | " user=bugmail@my-project.org\n" |
|
1186 | 1186 | " password=plugh\n" |
|
1187 | " version=xmlrpc\n" | |
|
1187 | " version=xmlrpc+email\n" | |
|
1188 | 1188 | " bzemail=bugzilla@my-project.org\n" |
|
1189 | 1189 | " template=Changeset {node|short} in {root|basename}.\n" |
|
1190 | 1190 | " {hgweb}/{webroot}/rev/{node|short}\\n\n" |
@@ -1357,6 +1357,15 b' msgstr ""' | |||
|
1357 | 1357 | "本エクステンションは非推奨です。:hg:`log -r \"children(REV)\"`\n" |
|
1358 | 1358 | "を使用してください。\n" |
|
1359 | 1359 | |
|
1360 | msgid "REV" | |
|
1361 | msgstr "リビジョン" | |
|
1362 | ||
|
1363 | msgid "show children of the specified revision" | |
|
1364 | msgstr "指定リビジョンの子リビジョンの表示" | |
|
1365 | ||
|
1366 | msgid "hg children [-r REV] [FILE]" | |
|
1367 | msgstr "hg children [-r REV] [FILE]" | |
|
1368 | ||
|
1360 | 1369 | msgid "show the children of the given or working directory revision" |
|
1361 | 1370 | msgstr "指定リビジョンの子リビジョンの表示" |
|
1362 | 1371 | |
@@ -1375,15 +1384,6 b' msgstr ""' | |||
|
1375 | 1384 | " します。\n" |
|
1376 | 1385 | " " |
|
1377 | 1386 | |
|
1378 | msgid "REV" | |
|
1379 | msgstr "リビジョン" | |
|
1380 | ||
|
1381 | msgid "show children of the specified revision" | |
|
1382 | msgstr "指定リビジョンの子リビジョンの表示" | |
|
1383 | ||
|
1384 | msgid "hg children [-r REV] [FILE]" | |
|
1385 | msgstr "hg children [-r REV] [FILE]" | |
|
1386 | ||
|
1387 | 1387 | msgid "command to display statistics about repository history" |
|
1388 | 1388 | msgstr "変更履歴の統計情報表示のコマンド" |
|
1389 | 1389 | |
@@ -1394,6 +1394,45 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe5\xae\x9f\xe6\x96\xbd\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %d \xe3\x82\x92\xe7\x84\xa1\xe8\xa6\x96...\\n"' | |||
|
1394 | 1394 | msgid "analyzing" |
|
1395 | 1395 | msgstr "解析中" |
|
1396 | 1396 | |
|
1397 | msgid "count rate for the specified revision or range" | |
|
1398 | msgstr "処理対象とする特定リビジョン/範囲の指定" | |
|
1399 | ||
|
1400 | msgid "DATE" | |
|
1401 | msgstr "日時" | |
|
1402 | ||
|
1403 | msgid "count rate for revisions matching date spec" | |
|
1404 | msgstr "指定日時と一致したリビジョンを処理対象とする" | |
|
1405 | ||
|
1406 | msgid "TEMPLATE" | |
|
1407 | msgstr "テンプレート" | |
|
1408 | ||
|
1409 | msgid "template to group changesets" | |
|
1410 | msgstr "リビジョン表示をグループ化するためのテンプレート" | |
|
1411 | ||
|
1412 | msgid "FORMAT" | |
|
1413 | msgstr "書式" | |
|
1414 | ||
|
1415 | msgid "strftime-compatible format for grouping by date" | |
|
1416 | msgstr "日時グループ化のための strftime 互換形式フォーマット" | |
|
1417 | ||
|
1418 | msgid "count rate by number of changesets" | |
|
1419 | msgstr "リビジョン数で統計" | |
|
1420 | ||
|
1421 | msgid "sort by key (default: sort by count)" | |
|
1422 | msgstr "キーによる整列(無指定時: 統計量で整列)" | |
|
1423 | ||
|
1424 | msgid "display added/removed lines separately" | |
|
1425 | msgstr "追加/削除行表示の分離" | |
|
1426 | ||
|
1427 | msgid "FILE" | |
|
1428 | msgstr "ファイル" | |
|
1429 | ||
|
1430 | msgid "file with email aliases" | |
|
1431 | msgstr "ユーザ名変換用ファイル" | |
|
1432 | ||
|
1433 | msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" | |
|
1434 | msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" | |
|
1435 | ||
|
1397 | 1436 | msgid "histogram of changes to the repository" |
|
1398 | 1437 | msgstr "リポジトリにおける変更の統計分布表示" |
|
1399 | 1438 | |
@@ -1475,45 +1514,6 b' msgstr ""' | |||
|
1475 | 1514 | msgid "skipping malformed alias: %s\n" |
|
1476 | 1515 | msgstr "不正な形式の別名を無視: %s\n" |
|
1477 | 1516 | |
|
1478 | msgid "count rate for the specified revision or range" | |
|
1479 | msgstr "処理対象とする特定リビジョン/範囲の指定" | |
|
1480 | ||
|
1481 | msgid "DATE" | |
|
1482 | msgstr "日時" | |
|
1483 | ||
|
1484 | msgid "count rate for revisions matching date spec" | |
|
1485 | msgstr "指定日時と一致したリビジョンを処理対象とする" | |
|
1486 | ||
|
1487 | msgid "TEMPLATE" | |
|
1488 | msgstr "テンプレート" | |
|
1489 | ||
|
1490 | msgid "template to group changesets" | |
|
1491 | msgstr "リビジョン表示をグループ化するためのテンプレート" | |
|
1492 | ||
|
1493 | msgid "FORMAT" | |
|
1494 | msgstr "書式" | |
|
1495 | ||
|
1496 | msgid "strftime-compatible format for grouping by date" | |
|
1497 | msgstr "日時グループ化のための strftime 互換形式フォーマット" | |
|
1498 | ||
|
1499 | msgid "count rate by number of changesets" | |
|
1500 | msgstr "リビジョン数で統計" | |
|
1501 | ||
|
1502 | msgid "sort by key (default: sort by count)" | |
|
1503 | msgstr "キーによる整列(無指定時: 統計量で整列)" | |
|
1504 | ||
|
1505 | msgid "display added/removed lines separately" | |
|
1506 | msgstr "追加/削除行表示の分離" | |
|
1507 | ||
|
1508 | msgid "FILE" | |
|
1509 | msgstr "ファイル" | |
|
1510 | ||
|
1511 | msgid "file with email aliases" | |
|
1512 | msgstr "ユーザ名変換用ファイル" | |
|
1513 | ||
|
1514 | msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" | |
|
1515 | msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" | |
|
1516 | ||
|
1517 | 1517 | msgid "colorize output from some commands" |
|
1518 | 1518 | msgstr "コマンド出力のカラー化" |
|
1519 | 1519 | |
@@ -1766,6 +1766,45 b' msgstr "\xe5\x88\xa9\xe7\x94\xa8\xe5\x8f\xaf\xe8\x83\xbd\xe3\x81\xaa\xe8\x89\xb2\xe6\x8c\x87\xe5\xae\x9a:\\n"' | |||
|
1766 | 1766 | msgid "import revisions from foreign VCS repositories into Mercurial" |
|
1767 | 1767 | msgstr "他の構成管理ツールから Mercurial への履歴取り込み" |
|
1768 | 1768 | |
|
1769 | msgid "username mapping filename (DEPRECATED, use --authormap instead)" | |
|
1770 | msgstr "ユーザ名変換ファイルの指定 (非推奨: --authormap を使用してください)" | |
|
1771 | ||
|
1772 | msgid "source repository type" | |
|
1773 | msgstr "変換元リポジトリ種別" | |
|
1774 | ||
|
1775 | msgid "destination repository type" | |
|
1776 | msgstr "変換先のリポジトリ種別" | |
|
1777 | ||
|
1778 | msgid "import up to source revision REV" | |
|
1779 | msgstr "変換元の指定リビジョンまでの取り込み" | |
|
1780 | ||
|
1781 | msgid "remap usernames using this file" | |
|
1782 | msgstr "変換時のユーザ名変換用ファイル" | |
|
1783 | ||
|
1784 | msgid "remap file names using contents of file" | |
|
1785 | msgstr "変換時のファイル名変換用ファイル" | |
|
1786 | ||
|
1787 | msgid "splice synthesized history into place" | |
|
1788 | msgstr "継ぎ合わせによる履歴の合成" | |
|
1789 | ||
|
1790 | msgid "change branch names while converting" | |
|
1791 | msgstr "変換時のブランチ名変換用ファイル" | |
|
1792 | ||
|
1793 | msgid "try to sort changesets by branches" | |
|
1794 | msgstr "ブランチによるリビジョンの並び替え" | |
|
1795 | ||
|
1796 | msgid "try to sort changesets by date" | |
|
1797 | msgstr "日付によるリビジョンの並び替え" | |
|
1798 | ||
|
1799 | msgid "preserve source changesets order" | |
|
1800 | msgstr "元リポジトリでのリビジョン順を尊重" | |
|
1801 | ||
|
1802 | msgid "try to reorder closed revisions" | |
|
1803 | msgstr "閉鎖実施リビジョン群の並び替え" | |
|
1804 | ||
|
1805 | msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" | |
|
1806 | msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" | |
|
1807 | ||
|
1769 | 1808 | msgid "convert a foreign SCM repository to a Mercurial one." |
|
1770 | 1809 | msgstr "別 SCM のリポジトリから Mercurial リポジトリへの変換" |
|
1771 | 1810 | |
@@ -2307,65 +2346,6 b' msgstr ""' | |||
|
2307 | 2346 | " デフォルト値は True。\n" |
|
2308 | 2347 | " " |
|
2309 | 2348 | |
|
2310 | msgid "create changeset information from CVS" | |
|
2311 | msgstr "CVS からのリビジョン情報の作成" | |
|
2312 | ||
|
2313 | msgid "" | |
|
2314 | " This command is intended as a debugging tool for the CVS to\n" | |
|
2315 | " Mercurial converter, and can be used as a direct replacement for\n" | |
|
2316 | " cvsps." | |
|
2317 | msgstr "" | |
|
2318 | " 本コマンドの位置付けは、 CVS から Mercurial への変換におけるデバッグ\n" | |
|
2319 | " ツールであり、 cvsps の代替ツールとして使用可能です。" | |
|
2320 | ||
|
2321 | msgid "" | |
|
2322 | " Hg debugcvsps reads the CVS rlog for current directory (or any\n" | |
|
2323 | " named directory) in the CVS repository, and converts the log to a\n" | |
|
2324 | " series of changesets based on matching commit log entries and\n" | |
|
2325 | " dates." | |
|
2326 | msgstr "" | |
|
2327 | " 本コマンドは、 現ディレクトリ (または指定ディレクトリ) 中の CVS rlog\n" | |
|
2328 | " を読み込み、 コミットログの内容と日付を元にリビジョンを推測します。" | |
|
2329 | ||
|
2330 | msgid "username mapping filename (DEPRECATED, use --authormap instead)" | |
|
2331 | msgstr "ユーザ名変換ファイルの指定 (非推奨: --authormap を使用してください)" | |
|
2332 | ||
|
2333 | msgid "source repository type" | |
|
2334 | msgstr "変換元リポジトリ種別" | |
|
2335 | ||
|
2336 | msgid "destination repository type" | |
|
2337 | msgstr "変換先のリポジトリ種別" | |
|
2338 | ||
|
2339 | msgid "import up to source revision REV" | |
|
2340 | msgstr "変換元の指定リビジョンまでの取り込み" | |
|
2341 | ||
|
2342 | msgid "remap usernames using this file" | |
|
2343 | msgstr "変換時のユーザ名変換用ファイル" | |
|
2344 | ||
|
2345 | msgid "remap file names using contents of file" | |
|
2346 | msgstr "変換時のファイル名変換用ファイル" | |
|
2347 | ||
|
2348 | msgid "splice synthesized history into place" | |
|
2349 | msgstr "継ぎ合わせによる履歴の合成" | |
|
2350 | ||
|
2351 | msgid "change branch names while converting" | |
|
2352 | msgstr "変換時のブランチ名変換用ファイル" | |
|
2353 | ||
|
2354 | msgid "try to sort changesets by branches" | |
|
2355 | msgstr "ブランチによるリビジョンの並び替え" | |
|
2356 | ||
|
2357 | msgid "try to sort changesets by date" | |
|
2358 | msgstr "日付によるリビジョンの並び替え" | |
|
2359 | ||
|
2360 | msgid "preserve source changesets order" | |
|
2361 | msgstr "元リポジトリでのリビジョン順を尊重" | |
|
2362 | ||
|
2363 | msgid "try to reorder closed revisions" | |
|
2364 | msgstr "閉鎖実施リビジョン群の並び替え" | |
|
2365 | ||
|
2366 | msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" | |
|
2367 | msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" | |
|
2368 | ||
|
2369 | 2349 | msgid "only return changes on specified branches" |
|
2370 | 2350 | msgstr "指定ブランチのみの変換" |
|
2371 | 2351 | |
@@ -2399,6 +2379,26 b' msgstr "\xe2\x80\xbb \xe5\xbe\x8c\xe6\x96\xb9\xe4\xba\x92\xe6\x8f\x9b\xe6\x80\xa7\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xae\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3"' | |||
|
2399 | 2379 | msgid "hg debugcvsps [OPTION]... [PATH]..." |
|
2400 | 2380 | msgstr "hg debugcvsps [OPTION]... [PATH]..." |
|
2401 | 2381 | |
|
2382 | msgid "create changeset information from CVS" | |
|
2383 | msgstr "CVS からのリビジョン情報の作成" | |
|
2384 | ||
|
2385 | msgid "" | |
|
2386 | " This command is intended as a debugging tool for the CVS to\n" | |
|
2387 | " Mercurial converter, and can be used as a direct replacement for\n" | |
|
2388 | " cvsps." | |
|
2389 | msgstr "" | |
|
2390 | " 本コマンドの位置付けは、 CVS から Mercurial への変換におけるデバッグ\n" | |
|
2391 | " ツールであり、 cvsps の代替ツールとして使用可能です。" | |
|
2392 | ||
|
2393 | msgid "" | |
|
2394 | " Hg debugcvsps reads the CVS rlog for current directory (or any\n" | |
|
2395 | " named directory) in the CVS repository, and converts the log to a\n" | |
|
2396 | " series of changesets based on matching commit log entries and\n" | |
|
2397 | " dates." | |
|
2398 | msgstr "" | |
|
2399 | " 本コマンドは、 現ディレクトリ (または指定ディレクトリ) 中の CVS rlog\n" | |
|
2400 | " を読み込み、 コミットログの内容と日付を元にリビジョンを推測します。" | |
|
2401 | ||
|
2402 | 2402 | msgid ":svnrev: String. Converted subversion revision number." |
|
2403 | 2403 | msgstr ":svnrev: 文字列。 変換元の subversion リビジョン番号。" |
|
2404 | 2404 | |
@@ -2726,6 +2726,10 b' msgid "cannot read %r object at %s"' | |||
|
2726 | 2726 | msgstr "%r オブジェクトが %s から読み込めません" |
|
2727 | 2727 | |
|
2728 | 2728 | #, python-format |
|
2729 | msgid "cannot read %r object at %s: unexpected size" | |
|
2730 | msgstr "%r オブジェクトが %s から読み込めません: 想定外のサイズ" | |
|
2731 | ||
|
2732 | #, python-format | |
|
2729 | 2733 | msgid "cannot read submodules config file in %s" |
|
2730 | 2734 | msgstr "%s におけるサブモジュールの設定ファイルが読み込めません" |
|
2731 | 2735 | |
@@ -3313,6 +3317,27 b' msgstr "--rev \xe3\x81\xa8 --change \xe3\x81\xaf\xe5\x90\x8c\xe6\x99\x82\xe3\x81\xab\xe3\x81\xaf\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||
|
3313 | 3317 | msgid "cleaning up temp directory\n" |
|
3314 | 3318 | msgstr "一時ディレクトリの破棄中\n" |
|
3315 | 3319 | |
|
3320 | msgid "CMD" | |
|
3321 | msgstr "コマンド" | |
|
3322 | ||
|
3323 | msgid "comparison program to run" | |
|
3324 | msgstr "差分表示プログラム" | |
|
3325 | ||
|
3326 | msgid "OPT" | |
|
3327 | msgstr "オプション" | |
|
3328 | ||
|
3329 | msgid "pass option to comparison program" | |
|
3330 | msgstr "差分表示プログラムへのオプション指定" | |
|
3331 | ||
|
3332 | msgid "revision" | |
|
3333 | msgstr "リビジョン" | |
|
3334 | ||
|
3335 | msgid "change made by revision" | |
|
3336 | msgstr "当該リビジョンにおける変更内容の表示" | |
|
3337 | ||
|
3338 | msgid "hg extdiff [OPT]... [FILE]..." | |
|
3339 | msgstr "hg extdiff [OPT]... [FILE]..." | |
|
3340 | ||
|
3316 | 3341 | msgid "use external program to diff repository (or selected files)" |
|
3317 | 3342 | msgstr "外部コマンドを使用したリポジトリ(または指定ファイル)の差分表示" |
|
3318 | 3343 | |
@@ -3348,27 +3373,6 b' msgstr ""' | |||
|
3348 | 3373 | " リビジョンが1つ指定された場合、 作業領域との間の差分が表示されます。\n" |
|
3349 | 3374 | " リビジョンが指定されない場合、 作業領域と親との差分が表示されます。" |
|
3350 | 3375 | |
|
3351 | msgid "CMD" | |
|
3352 | msgstr "コマンド" | |
|
3353 | ||
|
3354 | msgid "comparison program to run" | |
|
3355 | msgstr "差分表示プログラム" | |
|
3356 | ||
|
3357 | msgid "OPT" | |
|
3358 | msgstr "オプション" | |
|
3359 | ||
|
3360 | msgid "pass option to comparison program" | |
|
3361 | msgstr "差分表示プログラムへのオプション指定" | |
|
3362 | ||
|
3363 | msgid "revision" | |
|
3364 | msgstr "リビジョン" | |
|
3365 | ||
|
3366 | msgid "change made by revision" | |
|
3367 | msgstr "当該リビジョンにおける変更内容の表示" | |
|
3368 | ||
|
3369 | msgid "hg extdiff [OPT]... [FILE]..." | |
|
3370 | msgstr "hg extdiff [OPT]... [FILE]..." | |
|
3371 | ||
|
3372 | 3376 | #, python-format |
|
3373 | 3377 | msgid "use %(path)s to diff repository (or selected files)" |
|
3374 | 3378 | msgstr "%(path)s によるリポジトリ(または指定ファイル)の差分表示" |
@@ -3454,6 +3458,21 b' msgstr "factotum \xe3\x81\x8c\xe5\xbf\x9c\xe7\xad\x94\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||
|
3454 | 3458 | msgid "pull, update and merge in one command (DEPRECATED)" |
|
3455 | 3459 | msgstr "pull, update, merge の一括実行 (非推奨)" |
|
3456 | 3460 | |
|
3461 | msgid "a specific revision you would like to pull" | |
|
3462 | msgstr "取り込み対象リビジョンの指定" | |
|
3463 | ||
|
3464 | msgid "invoke editor on commit messages" | |
|
3465 | msgstr "コミットログ入力にエディタを起動" | |
|
3466 | ||
|
3467 | msgid "edit commit message (DEPRECATED)" | |
|
3468 | msgstr "コミットログの編集(非推奨)" | |
|
3469 | ||
|
3470 | msgid "switch parents when merging" | |
|
3471 | msgstr "マージの際の第1親リビジョンを切り替え" | |
|
3472 | ||
|
3473 | msgid "hg fetch [SOURCE]" | |
|
3474 | msgstr "hg fetch [SOURCE]" | |
|
3475 | ||
|
3457 | 3476 | msgid "pull changes from a remote repository, merge new changes if needed." |
|
3458 | 3477 | msgstr "連携先リポジトリからの取り込みと、 必要に応じたマージ実施" |
|
3459 | 3478 | |
@@ -3541,21 +3560,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %d:%s \xe3\x81\xa8\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe4\xb8\xad\\n"' | |||
|
3541 | 3560 | msgid "new changeset %d:%s merges remote changes with local\n" |
|
3542 | 3561 | msgstr "新規リビジョン %d:%s により、連携先とローカルのリビジョンをマージ\n" |
|
3543 | 3562 | |
|
3544 | msgid "a specific revision you would like to pull" | |
|
3545 | msgstr "取り込み対象リビジョンの指定" | |
|
3546 | ||
|
3547 | msgid "edit commit message" | |
|
3548 | msgstr "コミットログの編集" | |
|
3549 | ||
|
3550 | msgid "edit commit message (DEPRECATED)" | |
|
3551 | msgstr "コミットログの編集(非推奨)" | |
|
3552 | ||
|
3553 | msgid "switch parents when merging" | |
|
3554 | msgstr "マージの際の第1親リビジョンを切り替え" | |
|
3555 | ||
|
3556 | msgid "hg fetch [SOURCE]" | |
|
3557 | msgstr "hg fetch [SOURCE]" | |
|
3558 | ||
|
3559 | 3563 | msgid "commands to sign and verify changesets" |
|
3560 | 3564 | msgstr "リビジョンへの署名および検証コマンド" |
|
3561 | 3565 | |
@@ -3613,8 +3617,8 b' msgstr "\xe7\xbd\xb2\xe5\x90\x8d\xe3\x81\xab\xe4\xbd\xbf\xe7\x94\xa8\xe3\x81\x99\xe3\x82\x8b\xe9\x8d\xb5ID"' | |||
|
3613 | 3617 | msgid "TEXT" |
|
3614 | 3618 | msgstr "テキスト" |
|
3615 | 3619 | |
|
3616 | msgid "commit message" | |
|
3617 | msgstr "コミットログ" | |
|
3620 | msgid "use text as commit message" | |
|
3621 | msgstr "指定テキストをコミットログとして使用" | |
|
3618 | 3622 | |
|
3619 | 3623 | msgid "hg sign [OPTION]... [REV]..." |
|
3620 | 3624 | msgstr "hg sign [OPTION]... [REV]..." |
@@ -3885,42 +3889,6 b' msgstr ""' | |||
|
3885 | 3889 | "上記設定により、 リビジョンのコンテキストメニューには、 対象リビジョンと、\n" |
|
3886 | 3890 | "指定したリビジョンに対して、 vdiff を起動する項目が追加されます。\n" |
|
3887 | 3891 | |
|
3888 | msgid "diff trees from two commits" | |
|
3889 | msgstr "2リビジョン間の差分ツリー表示" | |
|
3890 | ||
|
3891 | msgid "output common ancestor information" | |
|
3892 | msgstr "共通の祖先リビジョンの情報表示" | |
|
3893 | ||
|
3894 | msgid "cat a specific revision" | |
|
3895 | msgstr "指定リビジョン時点の内容表示" | |
|
3896 | ||
|
3897 | msgid "cat-file: type or revision not supplied\n" | |
|
3898 | msgstr "cat-file: 種別もリビジョンも指定されていません\n" | |
|
3899 | ||
|
3900 | msgid "aborting hg cat-file only understands commits\n" | |
|
3901 | msgstr "中止: catfile は commit 種別でのみ実行可能です\n" | |
|
3902 | ||
|
3903 | msgid "parse given revisions" | |
|
3904 | msgstr "指定リビジョンの解析" | |
|
3905 | ||
|
3906 | msgid "print revisions" | |
|
3907 | msgstr "リビジョンの表示" | |
|
3908 | ||
|
3909 | msgid "print extension options" | |
|
3910 | msgstr "エクステンション設定の表示" | |
|
3911 | ||
|
3912 | msgid "start interactive history viewer" | |
|
3913 | msgstr "対話的な履歴参照の開始" | |
|
3914 | ||
|
3915 | msgid "NUM" | |
|
3916 | msgstr "数値" | |
|
3917 | ||
|
3918 | msgid "limit number of changes displayed" | |
|
3919 | msgstr "最大表示リビジョン数" | |
|
3920 | ||
|
3921 | msgid "hg view [-l LIMIT] [REVRANGE]" | |
|
3922 | msgstr "hg view [-l LIMIT] [REVRANGE]" | |
|
3923 | ||
|
3924 | 3892 | msgid "generate patch" |
|
3925 | 3893 | msgstr "パッチの生成" |
|
3926 | 3894 | |
@@ -3939,17 +3907,26 b' msgstr "\xe3\x82\xb3\xe3\x83\x94\xe3\x83\xbc\xe3\x81\xae\xe6\xa4\x9c\xe5\x87\xba"' | |||
|
3939 | 3907 | msgid "search" |
|
3940 | 3908 | msgstr "検索" |
|
3941 | 3909 | |
|
3942 | msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." | |
|
3943 | msgstr "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." | |
|
3910 | msgid "diff trees from two commits" | |
|
3911 | msgstr "2リビジョン間の差分ツリー表示" | |
|
3912 | ||
|
3913 | msgid "hg debug-merge-base REV REV" | |
|
3914 | msgstr "hg debug-merge-base REV REV" | |
|
3915 | ||
|
3916 | msgid "output common ancestor information" | |
|
3917 | msgstr "共通の祖先リビジョンの情報表示" | |
|
3944 | 3918 | |
|
3945 | 3919 | msgid "hg debug-cat-file [OPTION]... TYPE FILE" |
|
3946 | 3920 | msgstr "hg debug-cat-file [OPTION]... TYPE FILE" |
|
3947 | 3921 | |
|
3948 | msgid "hg debug-config" | |
|
3949 | msgstr "hg debug-config" | |
|
3950 | ||
|
3951 | msgid "hg debug-merge-base REV REV" | |
|
3952 | msgstr "hg debug-merge-base REV REV" | |
|
3922 | msgid "cat a specific revision" | |
|
3923 | msgstr "指定リビジョン時点の内容表示" | |
|
3924 | ||
|
3925 | msgid "cat-file: type or revision not supplied\n" | |
|
3926 | msgstr "cat-file: 種別もリビジョンも指定されていません\n" | |
|
3927 | ||
|
3928 | msgid "aborting hg cat-file only understands commits\n" | |
|
3929 | msgstr "中止: catfile は commit 種別でのみ実行可能です\n" | |
|
3953 | 3930 | |
|
3954 | 3931 | #. i18n: bisect changeset status |
|
3955 | 3932 | msgid "ignored" |
@@ -3958,6 +3935,9 b' msgstr "\xe7\x84\xa1\xe8\xa6\x96"' | |||
|
3958 | 3935 | msgid "hg debug-rev-parse REV" |
|
3959 | 3936 | msgstr "hg debug-rev-parse REV" |
|
3960 | 3937 | |
|
3938 | msgid "parse given revisions" | |
|
3939 | msgstr "指定リビジョンの解析" | |
|
3940 | ||
|
3961 | 3941 | msgid "header" |
|
3962 | 3942 | msgstr "ヘッダ" |
|
3963 | 3943 | |
@@ -3970,8 +3950,26 b' msgstr "\xe8\xa6\xaa"' | |||
|
3970 | 3950 | msgid "max-count" |
|
3971 | 3951 | msgstr "最大数" |
|
3972 | 3952 | |
|
3973 | msgid "hg debug-rev-list [OPTION]... REV..." | |
|
3974 | msgstr "hg debug-rev-list [OPTION]... REV..." | |
|
3953 | msgid "print revisions" | |
|
3954 | msgstr "リビジョンの表示" | |
|
3955 | ||
|
3956 | msgid "hg debug-config" | |
|
3957 | msgstr "hg debug-config" | |
|
3958 | ||
|
3959 | msgid "print extension options" | |
|
3960 | msgstr "エクステンション設定の表示" | |
|
3961 | ||
|
3962 | msgid "NUM" | |
|
3963 | msgstr "数値" | |
|
3964 | ||
|
3965 | msgid "limit number of changes displayed" | |
|
3966 | msgstr "最大表示リビジョン数" | |
|
3967 | ||
|
3968 | msgid "hg view [-l LIMIT] [REVRANGE]" | |
|
3969 | msgstr "hg view [-l LIMIT] [REVRANGE]" | |
|
3970 | ||
|
3971 | msgid "start interactive history viewer" | |
|
3972 | msgstr "対話的な履歴参照の開始" | |
|
3975 | 3973 | |
|
3976 | 3974 | msgid "syntax highlighting for hgweb (requires Pygments)" |
|
3977 | 3975 | msgstr "hgweb におけるシンタックスハイライト (要 Pygments)" |
@@ -5138,6 +5136,15 b' msgstr "%r \xe3\x81\xaf\xe6\x9c\xaa\xe3\x82\xb5\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88\xe3\x81\xaa URL \xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xa7\xe3\x81\x99"' | |||
|
5138 | 5136 | msgid "%s does not appear to be a largefile store" |
|
5139 | 5137 | msgstr "%s は largefiles 対応とは思われません" |
|
5140 | 5138 | |
|
5139 | msgid "minimum size (MB) for files to be converted as largefiles" | |
|
5140 | msgstr "大容量ファイル化するファイルの最小サイズ (MB)" | |
|
5141 | ||
|
5142 | msgid "convert from a largefiles repo to a normal repo" | |
|
5143 | msgstr "大容量ファイル使用リポジトリから通常リポジトリへの変換" | |
|
5144 | ||
|
5145 | msgid "hg lfconvert SOURCE DEST [FILE ...]" | |
|
5146 | msgstr "hg lfconvert SOURCE DEST [FILE ...]" | |
|
5147 | ||
|
5141 | 5148 | #, python-format |
|
5142 | 5149 | msgid "%s is not a local Mercurial repo" |
|
5143 | 5150 | msgstr "%s はローカルの Mercurial リポジトリではありません" |
@@ -5195,6 +5202,12 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f\xe5\xa4\xa7\xe5\xae\xb9\xe9\x87\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe5\x8f\x96\xe5\xbe\x97\xe4\xb8\xad\\n"' | |||
|
5195 | 5202 | msgid "%d largefiles updated, %d removed\n" |
|
5196 | 5203 | msgstr "大容量ファイルの更新数 %d、 削除数 %d\n" |
|
5197 | 5204 | |
|
5205 | msgid "pull largefiles for these revisions" | |
|
5206 | msgstr "指定リビジョンに関連する大容量ファイルを入手" | |
|
5207 | ||
|
5208 | msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
|
5209 | msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
|
5210 | ||
|
5198 | 5211 | msgid "no revisions specified" |
|
5199 | 5212 | msgstr "リビジョン指定がありません" |
|
5200 | 5213 | |
@@ -5206,21 +5219,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %s \xe3\x81\xab\xe9\x96\xa2\xe9\x80\xa3\xe3\x81\x99\xe3\x82\x8b\xe5\xa4\xa7\xe5\xae\xb9\xe9\x87\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe5\x8f\x96\xe5\xbe\x97\xe4\xb8\xad\\n"' | |||
|
5206 | 5219 | msgid "%d largefiles cached\n" |
|
5207 | 5220 | msgstr "大容量ファイル %d 個をキャッシュ\n" |
|
5208 | 5221 | |
|
5209 | msgid "minimum size (MB) for files to be converted as largefiles" | |
|
5210 | msgstr "大容量ファイル化するファイルの最小サイズ (MB)" | |
|
5211 | ||
|
5212 | msgid "convert from a largefiles repo to a normal repo" | |
|
5213 | msgstr "大容量ファイル使用リポジトリから通常リポジトリへの変換" | |
|
5214 | ||
|
5215 | msgid "hg lfconvert SOURCE DEST [FILE ...]" | |
|
5216 | msgstr "hg lfconvert SOURCE DEST [FILE ...]" | |
|
5217 | ||
|
5218 | msgid "pull largefiles for these revisions" | |
|
5219 | msgstr "指定リビジョンに関連する大容量ファイルを入手" | |
|
5220 | ||
|
5221 | msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
|
5222 | msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" | |
|
5223 | ||
|
5224 | 5222 | #, python-format |
|
5225 | 5223 | msgid "largefiles: size must be number (not %s)\n" |
|
5226 | 5224 | msgstr "largefiles: サイズは数値で指定してください (%s は不正です)\n" |
@@ -5347,8 +5345,9 b' msgstr "%s \xe3\x81\xaf\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93: \xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xaf\xe6\x97\xa2\xe3\x81\xab\xe6\x9c\xaa\xe7\x99\xbb\xe9\x8c\xb2\xe3\x81\xa7\xe3\x81\x99\\n"' | |||
|
5347 | 5345 | msgid "largefiles: no files to upload\n" |
|
5348 | 5346 | msgstr "largefiles: 転送予定ファイルはありません\n" |
|
5349 | 5347 | |
|
5350 | msgid "largefiles to upload:\n" | |
|
5351 | msgstr "転送予定大容量ファイル:\n" | |
|
5348 | #, python-format | |
|
5349 | msgid "largefiles to upload (%d entities):\n" | |
|
5350 | msgstr "転送予定大容量ファイル (実体数 %d):\n" | |
|
5352 | 5351 | |
|
5353 | 5352 | #. i18n: column positioning for "hg summary" |
|
5354 | 5353 | msgid "largefiles: (no remote repo)\n" |
@@ -5360,8 +5359,8 b' msgstr "largefiles: (\xe8\xbb\xa2\xe9\x80\x81\xe4\xba\x88\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xaa\xe3\x81\x97)\\n"' | |||
|
5360 | 5359 | |
|
5361 | 5360 | #. i18n: column positioning for "hg summary" |
|
5362 | 5361 | #, python-format |
|
5363 | msgid "largefiles: %d to upload\n" | |
|
5364 |
msgstr "largefiles: %d 個の転送予定 |
|
|
5362 | msgid "largefiles: %d entities for %d files to upload\n" | |
|
5363 | msgstr "largefiles: %d 個のファイルに対して %d 個の実体を転送予定\n" | |
|
5365 | 5364 | |
|
5366 | 5365 | #, python-format |
|
5367 | 5366 | msgid "largefile %s is not in cache and could not be downloaded" |
@@ -5774,6 +5773,10 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xaf MQ \xe3\x81\xae\xe7\xae\xa1\xe7\x90\x86\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xab\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||
|
5774 | 5773 | msgid "cannot write patch \"%s\": %s" |
|
5775 | 5774 | msgstr "パッチ \"%s\" の書き出しに失敗: %s" |
|
5776 | 5775 | |
|
5776 | #. i18n: this message is shown in editor with "HG: " prefix | |
|
5777 | msgid "Leave message empty to use default message." | |
|
5778 | msgstr "メッセージが空のままならコミットを中止します。" | |
|
5779 | ||
|
5777 | 5780 | #, python-format |
|
5778 | 5781 | msgid "error unlinking %s\n" |
|
5779 | 5782 | msgstr "%s の unlink に失敗\n" |
@@ -6413,9 +6416,6 b' msgstr ""' | |||
|
6413 | 6416 | " 通常と変わりなく機能します。 git 差分形式の詳細に関しては、\n" |
|
6414 | 6417 | " 'help diffs' を参照してください。" |
|
6415 | 6418 | |
|
6416 | msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" | |
|
6417 | msgstr "\"-e\" と、 \"-m\" または \"-l\" は併用できません" | |
|
6418 | ||
|
6419 | 6419 | msgid "hg qdiff [OPTION]... [FILE]..." |
|
6420 | 6420 | msgstr "hg qdiff [OPTION]... [FILE]..." |
|
6421 | 6421 | |
@@ -6442,9 +6442,6 b' msgstr ""' | |||
|
6442 | 6442 | " 場合は :hg:`diff` を、 作業領域の変更内容を含まない現行パッチの内容\n" |
|
6443 | 6443 | " のみを見たい場合は :hg:`export qtip` を使用してください。" |
|
6444 | 6444 | |
|
6445 | msgid "edit patch header" | |
|
6446 | msgstr "パッチヘッダ内容の編集" | |
|
6447 | ||
|
6448 | 6445 | msgid "keep folded patch files" |
|
6449 | 6446 | msgstr "併合対象パッチのパッチファイル削除を抑止" |
|
6450 | 6447 | |
@@ -7391,6 +7388,22 b' msgid "If pager.attend is present, pager' | |||
|
7391 | 7388 | msgstr "pager.attend 設定時は pager.ignore 設定は無視されます。" |
|
7392 | 7389 | |
|
7393 | 7390 | msgid "" |
|
7391 | "Lastly, you can enable and disable paging for individual commands with\n" | |
|
7392 | "the attend-<command> option. This setting takes precedence over\n" | |
|
7393 | "existing attend and ignore options and defaults::" | |
|
7394 | msgstr "" | |
|
7395 | "``attend-<command>`` 設定により、 ページングの有無を、 個別のコマンド毎に、\n" | |
|
7396 | "設定可能です。 既存の ``attend`` や ``ignore`` 設定やデフォルト挙動よりも、\n" | |
|
7397 | "この設定が優先されます::" | |
|
7398 | ||
|
7399 | msgid "" | |
|
7400 | " [pager]\n" | |
|
7401 | " attend-cat = false" | |
|
7402 | msgstr "" | |
|
7403 | " [pager]\n" | |
|
7404 | " attend-cat = false" | |
|
7405 | ||
|
7406 | msgid "" | |
|
7394 | 7407 | "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" |
|
7395 | 7408 | "to specify them in your user configuration file." |
|
7396 | 7409 | msgstr "" |
@@ -7401,11 +7414,11 b' msgstr ""' | |||
|
7401 | 7414 | msgid "" |
|
7402 | 7415 | "The --pager=... option can also be used to control when the pager is\n" |
|
7403 | 7416 | "used. Use a boolean value like yes, no, on, off, or use auto for\n" |
|
7404 |
"normal behavior. |
|
|
7417 | "normal behavior." | |
|
7405 | 7418 | msgstr "" |
|
7406 | 7419 | "ページャーの使用は、 --pager=... でも制御できます。\n" |
|
7407 | 7420 | "真偽値の yes no on off 以外に、 無指定時挙動に相当する auto\n" |
|
7408 |
"を指定できます。 |
|
|
7421 | "を指定できます。" | |
|
7409 | 7422 | |
|
7410 | 7423 | msgid "when to paginate (boolean, always, auto, or never)" |
|
7411 | 7424 | msgstr "ページャーの要否 (真偽値、 always auto または never)" |
@@ -7900,6 +7913,12 b' msgstr "\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc\xe7\x99\xba\xe7\x94\x9f\xe6\x99\x82\xe3\x81\xab\xe3\x81\xaf\xe5\x87\xa6\xe7\x90\x86\xe3\x82\x92\xe4\xb8\xad\xe6\xad\xa2"' | |||
|
7900 | 7913 | msgid "purge ignored files too" |
|
7901 | 7914 | msgstr "無視対象ファイルも削除" |
|
7902 | 7915 | |
|
7916 | msgid "purge empty directories" | |
|
7917 | msgstr "空ディレクトリを削除" | |
|
7918 | ||
|
7919 | msgid "purge files" | |
|
7920 | msgstr "ファイルを削除" | |
|
7921 | ||
|
7903 | 7922 | msgid "print filenames instead of deleting them" |
|
7904 | 7923 | msgstr "ファイル削除の変わりにファイル名表示を実施" |
|
7905 | 7924 | |
@@ -7920,8 +7939,8 b' msgstr ""' | |||
|
7920 | 7939 | " 記録済みのリビジョンや、 未コミット変更をテストする場合など、\n" |
|
7921 | 7940 | " 作業領域を綺麗にしたい場合に有用です。" |
|
7922 | 7941 | |
|
7923 | msgid " This means that purge will delete:" | |
|
7924 |
msgstr " 本コマンドは、 以下のファイル |
|
|
7942 | msgid " This means that purge will delete the following by default:" | |
|
7943 | msgstr " 本コマンドのデフォルト挙動では、 以下のファイルが削除されます:" | |
|
7925 | 7944 | |
|
7926 | 7945 | msgid "" |
|
7927 | 7946 | " - Unknown files: files marked with \"?\" by :hg:`status`\n" |
@@ -7945,6 +7964,15 b' msgstr ""' | |||
|
7945 | 7964 | " - 新規登録されたファイル (:hg:`add` 実施対象)" |
|
7946 | 7965 | |
|
7947 | 7966 | msgid "" |
|
7967 | " The --files and --dirs options can be used to direct purge to delete\n" | |
|
7968 | " only files, only directories, or both. If neither option is given,\n" | |
|
7969 | " both will be deleted." | |
|
7970 | msgstr "" | |
|
7971 | " ``--files``/``--dirs`` により、 ファイルのみ、 ディレクトリのみ、\n" | |
|
7972 | " あるいは両方を、 削除対象に指定できます。 オプション無指定の場合は、\n" | |
|
7973 | " ファイル・ディレクトリの両方が削除されます。" | |
|
7974 | ||
|
7975 | msgid "" | |
|
7948 | 7976 | " If directories are given on the command line, only files in these\n" |
|
7949 | 7977 | " directories are considered." |
|
7950 | 7978 | msgstr "" |
@@ -8017,9 +8045,6 b' msgstr "\xe7\xa7\xbb\xe5\x8b\x95\xe5\xbe\x8c\xe3\x81\xab\xe7\xa7\xbb\xe5\x8b\x95\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe5\x8d\x98\xe4\xb8\x80\xe5\x8c\x96"' | |||
|
8017 | 8045 | msgid "use text as collapse commit message" |
|
8018 | 8046 | msgstr "指定テキストを要約コミットログとして使用" |
|
8019 | 8047 | |
|
8020 | msgid "invoke editor on commit messages" | |
|
8021 | msgstr "コミットログ入力にエディタを起動" | |
|
8022 | ||
|
8023 | 8048 | msgid "read collapse commit message from file" |
|
8024 | 8049 | msgstr "要約コミットログをファイルから読み込み" |
|
8025 | 8050 | |
@@ -8481,6 +8506,9 b' msgstr " ? - \xe3\x83\x98\xe3\x83\xab\xe3\x83\x97\xe8\xa1\xa8\xe7\xa4\xba(?)"' | |||
|
8481 | 8506 | msgid " This command is not available when committing a merge." |
|
8482 | 8507 | msgstr " 本コマンドをマージのコミットに使用することはできません。" |
|
8483 | 8508 | |
|
8509 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." | |
|
8510 | msgstr "hg qrecord [OPTION]... PATCH [FILE]..." | |
|
8511 | ||
|
8484 | 8512 | msgid "interactively record a new patch" |
|
8485 | 8513 | msgstr "新規パッチのコミット内容を対話的に選択" |
|
8486 | 8514 | |
@@ -8509,15 +8537,15 b' msgstr "\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe8\xa7\xa3\xe6\x9e\x90\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97: %s"' | |||
|
8509 | 8537 | msgid "no changes to record\n" |
|
8510 | 8538 | msgstr "記録可能な変更がありません\n" |
|
8511 | 8539 | |
|
8512 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." | |
|
8513 | msgstr "hg qrecord [OPTION]... PATCH [FILE]..." | |
|
8514 | ||
|
8515 | 8540 | msgid "interactively select changes to refresh" |
|
8516 | 8541 | msgstr "パッチ更新内容を対話的に選択" |
|
8517 | 8542 | |
|
8518 | 8543 | msgid "recreates hardlinks between repository clones" |
|
8519 | 8544 | msgstr "複製リポジトリ間でのハードリンクの再生成" |
|
8520 | 8545 | |
|
8546 | msgid "[ORIGIN]" | |
|
8547 | msgstr "[ORIGIN]" | |
|
8548 | ||
|
8521 | 8549 | msgid "recreate hardlinks between two repositories" |
|
8522 | 8550 | msgstr "2つのリポジトリ間でのハードリンクの再生成" |
|
8523 | 8551 | |
@@ -8614,9 +8642,6 b' msgstr "\xe5\x86\x8d\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe4\xb8\xad"' | |||
|
8614 | 8642 | msgid "relinked %d files (%s reclaimed)\n" |
|
8615 | 8643 | msgstr "%d ファイルを再リンク (%s バイトの節約)\n" |
|
8616 | 8644 | |
|
8617 | msgid "[ORIGIN]" | |
|
8618 | msgstr "[ORIGIN]" | |
|
8619 | ||
|
8620 | 8645 | msgid "extend schemes with shortcuts to repository swarms" |
|
8621 | 8646 | msgstr "連携先リポジトリ群に対する略記指定の拡張" |
|
8622 | 8647 | |
@@ -8701,6 +8726,12 b' msgstr "\xe7\x8b\xac\xe8\x87\xaa\xe3\x82\xb9\xe3\x82\xad\xe3\x83\xbc\xe3\x83\x9e %s:// \xe3\x81\xaf\xe3\x80\x81 \xe3\x83\x89\xe3\x83\xa9\xe3\x82\xa4\xe3\x83\x96\xe6\x96\x87\xe5\xad\x97 %s:\\\\ \xe3\x81\xa8\xe8\xa1\x9d\xe7\xaa\x81\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\\n"' | |||
|
8701 | 8726 | msgid "share a common history between several working directories" |
|
8702 | 8727 | msgstr "複数作業領域による履歴情報領域の共有" |
|
8703 | 8728 | |
|
8729 | msgid "do not create a working copy" | |
|
8730 | msgstr "作業領域の更新を抑止します" | |
|
8731 | ||
|
8732 | msgid "[-U] SOURCE [DEST]" | |
|
8733 | msgstr "[-U] SOURCE [DEST]" | |
|
8734 | ||
|
8704 | 8735 | msgid "create a new shared repository" |
|
8705 | 8736 | msgstr "共有リポジトリの新規作成" |
|
8706 | 8737 | |
@@ -8746,12 +8777,6 b' msgstr ""' | |||
|
8746 | 8777 | msgid "this is not a shared repo" |
|
8747 | 8778 | msgstr "共有状態のリポジトリではありません" |
|
8748 | 8779 | |
|
8749 | msgid "do not create a working copy" | |
|
8750 | msgstr "作業領域の更新を抑止します" | |
|
8751 | ||
|
8752 | msgid "[-U] SOURCE [DEST]" | |
|
8753 | msgstr "[-U] SOURCE [DEST]" | |
|
8754 | ||
|
8755 | 8780 | msgid "save and restore changes to the working directory" |
|
8756 | 8781 | msgstr "作業領域中の変更内容の退避および復旧" |
|
8757 | 8782 | |
@@ -9045,6 +9070,10 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xab\xe5\xa4\x89\xe6\x9b\xb4\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99"' | |||
|
9045 | 9070 | msgid "local changed subrepos found" |
|
9046 | 9071 | msgstr "サブリポジトリに変更があります" |
|
9047 | 9072 | |
|
9073 | #, python-format | |
|
9074 | msgid "bookmark '%s' deleted\n" | |
|
9075 | msgstr "ブックマーク '%s' が破棄されました\n" | |
|
9076 | ||
|
9048 | 9077 | msgid "" |
|
9049 | 9078 | "strip specified revision (optional, can specify revisions without this " |
|
9050 | 9079 | "option)" |
@@ -9053,12 +9082,6 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe5\x89\x8a\xe9\x99\xa4 (\xe6\x9c\xac\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe7\x84\xa1\xe3\x81\x97\xe3\x81\xa7\xe3\x82\x82\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe6\x8c\x87\xe5\xae\x9a\xe5\x8f\xaf\xe8\x83\xbd)"' | |||
|
9053 | 9082 | msgid "force removal of changesets, discard uncommitted changes (no backup)" |
|
9054 | 9083 | msgstr "リビジョンを強制的に削除し、 未コミット変更内容を破棄(保存無し)" |
|
9055 | 9084 | |
|
9056 | msgid "" | |
|
9057 | "bundle only changesets with local revision number greater than REV which are " | |
|
9058 | "not descendants of REV (DEPRECATED)" | |
|
9059 | msgstr "" | |
|
9060 | "指定リビジョンよりリビジョン番号が大きく子孫以外のものを bundle 化(非推奨)" | |
|
9061 | ||
|
9062 | 9085 | msgid "no backups" |
|
9063 | 9086 | msgstr "バックアップ作成の抑止" |
|
9064 | 9087 | |
@@ -9137,10 +9160,6 b' msgstr ""' | |||
|
9137 | 9160 | msgid "bookmark '%s' not found" |
|
9138 | 9161 | msgstr "ブックマーク '%s' がありません" |
|
9139 | 9162 | |
|
9140 | #, python-format | |
|
9141 | msgid "bookmark '%s' deleted\n" | |
|
9142 | msgstr "ブックマーク '%s' が破棄されました\n" | |
|
9143 | ||
|
9144 | 9163 | msgid "empty revision set" |
|
9145 | 9164 | msgstr "指定に該当するリビジョンはありません" |
|
9146 | 9165 | |
@@ -9997,6 +10016,13 b' msgid "%s: no key named \'%s\'"' | |||
|
9997 | 10016 | msgstr "%s: '%s' というキーはありません" |
|
9998 | 10017 | |
|
9999 | 10018 | #, python-format |
|
10019 | msgid "available styles: %s\n" | |
|
10020 | msgstr "利用可能なスタイル: %s\n" | |
|
10021 | ||
|
10022 | msgid "specify a template" | |
|
10023 | msgstr "テンプレートを指定してください" | |
|
10024 | ||
|
10025 | #, python-format | |
|
10000 | 10026 | msgid "found revision %s from %s\n" |
|
10001 | 10027 | msgstr "リビジョン %s (%s) が指定日時に合致します\n" |
|
10002 | 10028 | |
@@ -10042,12 +10068,15 b' msgstr "\xe4\xb8\xad\xe9\x80\x94\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %s \xe3\x82\x92\xe9\x99\xa4\xe5\xa4\x96\xe4\xb8\xad\\n"' | |||
|
10042 | 10068 | msgid "stripping amended changeset %s\n" |
|
10043 | 10069 | msgstr "改変対象リビジョン %s を除外中\n" |
|
10044 | 10070 | |
|
10071 | msgid "Leave message empty to abort commit." | |
|
10072 | msgstr "メッセージが空のままならコミットを中止します。" | |
|
10073 | ||
|
10074 | msgid "empty commit message" | |
|
10075 | msgstr "コミットログがありません" | |
|
10076 | ||
|
10045 | 10077 | msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." |
|
10046 | 10078 | msgstr "HG: コミットログを入力してください。'HG:' で始まる行は無視されます。" |
|
10047 | 10079 | |
|
10048 | msgid "HG: Leave message empty to abort commit." | |
|
10049 | msgstr "HG: メッセージが空のままならコミットを中止します。" | |
|
10050 | ||
|
10051 | 10080 | #, python-format |
|
10052 | 10081 | msgid "HG: user: %s" |
|
10053 | 10082 | msgstr "HG: ユーザ: %s" |
@@ -10082,9 +10111,6 b' msgstr "HG: %s \xe3\x82\x92\xe5\x89\x8a\xe9\x99\xa4"' | |||
|
10082 | 10111 | msgid "HG: no files changed" |
|
10083 | 10112 | msgstr "HG: ファイル変更なし" |
|
10084 | 10113 | |
|
10085 | msgid "empty commit message" | |
|
10086 | msgstr "コミットログがありません" | |
|
10087 | ||
|
10088 | 10114 | msgid "created new head\n" |
|
10089 | 10115 | msgstr "新規ヘッドが増えました\n" |
|
10090 | 10116 | |
@@ -10209,9 +10235,6 b' msgstr "\xe3\x83\x91\xe3\x82\xbf\xe3\x83\xbc\xe3\x83\xb3\xe3\x81\xab\xe5\x90\x88\xe8\x87\xb4\xe3\x81\x97\xe3\x81\x9f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe5\x87\xa6\xe7\x90\x86\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xab\xe8\xbf\xbd\xe5\x8a\xa0"' | |||
|
10209 | 10235 | msgid "exclude names matching the given patterns" |
|
10210 | 10236 | msgstr "パターンに合致したファイルを処理対象から除外" |
|
10211 | 10237 | |
|
10212 | msgid "use text as commit message" | |
|
10213 | msgstr "指定テキストをコミットログとして使用" | |
|
10214 | ||
|
10215 | 10238 | msgid "read commit message from file" |
|
10216 | 10239 | msgstr "コミットログをファイルから読み込み" |
|
10217 | 10240 | |
@@ -10886,69 +10909,77 b' msgstr "\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf\xe3\x82\x92\xe9\x9d\x9e\xe3\x82\xa2\xe3\x82\xaf\xe3\x83\x86\xe3\x82\xa3\xe3\x83\x96\xe5\x8c\x96"' | |||
|
10886 | 10909 | msgid "hg bookmarks [OPTIONS]... [NAME]..." |
|
10887 | 10910 | msgstr "hg bookmarks [OPTIONS]... [NAME]..." |
|
10888 | 10911 | |
|
10889 | msgid "track a line of development with movable markers" | |
|
10890 | msgstr "移動可能なマーキングによる履歴進展の追跡" | |
|
10891 | ||
|
10892 | msgid "" | |
|
10893 | " Bookmarks are pointers to certain commits that move when committing.\n" | |
|
10894 |
" Bookmarks are |
|
|
10895 | " possible to use :hg:`merge NAME` to merge from a given bookmark, and\n" | |
|
10896 | " :hg:`update NAME` to update to a given bookmark." | |
|
10897 | msgstr "" | |
|
10898 | " ブックマーク (bookmark) は、 コミット操作に追従して移動する、\n" | |
|
10899 | " リビジョン特定用の情報です。\n" | |
|
10900 | " ブックマークのリポジトリ間伝播は、 自動的には行われません。\n" | |
|
10901 | " ブックマークに対しては、 改名/複製/削除が可能です。\n" | |
|
10902 | " :hg:`merge` や :hg:`update` へのリビジョン指定において、\n" | |
|
10903 | " ブックマークを使用することが可能です。" | |
|
10904 | ||
|
10905 | msgid "" | |
|
10906 | " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" | |
|
10907 | " directory's parent revision with the given name. If you specify\n" | |
|
10908 | " a revision using -r REV (where REV may be an existing bookmark),\n" | |
|
10909 | " the bookmark is assigned to that revision." | |
|
10910 | msgstr "" | |
|
10911 | " :hg:`bookmark NAME` を実行することで、 作業領域の親リビジョンに、\n" | |
|
10912 | " 指定された名前で、 ブックマークが設定されます。\n" | |
|
10913 | " -r を使用して、 対象リビジョンを指定した場合\n" | |
|
10914 | " (対象指定自体にも、 ブックマークを使用可能)\n" | |
|
10915 | " そのリビジョンにブックマークが設定されます。" | |
|
10916 | ||
|
10917 | msgid "" | |
|
10918 | " Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" | |
|
10919 | " push` and :hg:`help pull`). This requires both the local and remote\n" | |
|
10920 | " repositories to support bookmarks. For versions prior to 1.8, this " | |
|
10921 | "means\n" | |
|
10922 | " the bookmarks extension must be enabled." | |
|
10912 | msgid "create a new bookmark or list existing bookmarks" | |
|
10913 | msgstr "ブックマークの、新規作成、又は既存の一覧表示" | |
|
10914 | ||
|
10915 | msgid "" | |
|
10916 | " Bookmarks are labels on changesets to help track lines of development.\n" | |
|
10917 | " Bookmarks are unversioned and can be moved, renamed and deleted.\n" | |
|
10918 | " Deleting or moving a bookmark has no effect on the associated changesets." | |
|
10919 | msgstr "" | |
|
10920 | " リビジョンへのラベルであるブックマークは、 作業履歴の追跡を助けます。\n" | |
|
10921 | " ブックマークへの操作は履歴記録されず、 移動・削除・改名も可能です。\n" | |
|
10922 | " ブックマークの削除・移動による、 対象リビジョンへの影響はありません。" | |
|
10923 | ||
|
10924 | msgid "" | |
|
10925 | " Creating or updating to a bookmark causes it to be marked as 'active'.\n" | |
|
10926 | " Active bookmarks are indicated with a '*'.\n" | |
|
10927 | " When a commit is made, an active bookmark will advance to the new " | |
|
10928 | "commit.\n" | |
|
10929 | " A plain :hg:`update` will also advance an active bookmark, if possible.\n" | |
|
10930 | " Updating away from a bookmark will cause it to be deactivated." | |
|
10931 | msgstr "" | |
|
10932 | " ブックマークの作成や更新は、 ブックマークを 'アクティブ' 化します。\n" | |
|
10933 | " アクティブなブックマークは '*' 付きで表示されます。 コミットの際に、\n" | |
|
10934 | " アクティブなブックマークの参照先は、 新規リビジョンへと移動します。\n" | |
|
10935 | " アクティブブックマークは、 リビジョン指定無し :hg:`update` で移動が、\n" | |
|
10936 | " リビジョン指定付き :hg:`update` で非アクティブ化が発生します。" | |
|
10937 | ||
|
10938 | msgid "" | |
|
10939 | " Bookmarks can be pushed and pulled between repositories (see\n" | |
|
10940 | " :hg:`help push` and :hg:`help pull`). If a shared bookmark has\n" | |
|
10941 | " diverged, a new 'divergent bookmark' of the form 'name@path' will\n" | |
|
10942 | " be created. Using :hg:'merge' will resolve the divergence." | |
|
10923 | 10943 | msgstr "" |
|
10924 | 10944 | " ブックマークは、 リポジトリ間での取り込みや反映が可能です\n" |
|
10925 | " (:hg:`help push` および :hg:`help pull` 参照)。\n" | |
|
10926 | " 但し、 連携するリポジトリの両方が、\n" | |
|
10927 | " ブックマーク機能に対応している必要があります\n" | |
|
10928 | " 1.8 版より前の Mercurial の場合、 \n" | |
|
10929 | " bookmarks エクステンションを有効にしてください。" | |
|
10930 | ||
|
10931 | msgid "" | |
|
10932 | " If you set a bookmark called '@', new clones of the repository will\n" | |
|
10933 | " have that revision checked out (and the bookmark made active) by\n" | |
|
10934 | " default." | |
|
10935 | msgstr "" | |
|
10936 | " ブックマーク '@' が設定されている場合、 特に指定がなければ、\n" | |
|
10937 | " 複製先の作業領域は、 そのリビジョンで更新されます (ブックマーク '@'\n" | |
|
10938 | " はアクティブになります)" | |
|
10939 | ||
|
10940 | msgid "" | |
|
10941 | " With -i/--inactive, the new bookmark will not be made the active\n" | |
|
10942 | " bookmark. If -r/--rev is given, the new bookmark will not be made\n" | |
|
10943 | " active even if -i/--inactive is not given. If no NAME is given, the\n" | |
|
10944 | " current active bookmark will be marked inactive.\n" | |
|
10945 | " " | |
|
10946 | msgstr "" | |
|
10947 | " -i/--inactive 指定のある場合、 作成された新規ブックマークは、\n" | |
|
10948 | " アクティブにはなりません。 -r/--rev 指定のある場合、 -i/--inactive\n" | |
|
10949 | " 指定が無くても、 新規ブックマークはアクティブになりません。\n" | |
|
10950 | " -i/--inactive 指定時に、 ブックマーク名指定が無い場合は、\n" | |
|
10951 | " 現在アクティブなブックマークが、 非アクティブ化されます。\n" | |
|
10945 | " (:hg:`help push` および :hg:`help pull` 参照)。 連携先リポジトリで、\n" | |
|
10946 | " 同名ブックマークの参照先が分岐 (divergent) する場合、\n" | |
|
10947 | " 'ブックマーク名@連携先' 形式の '分岐ブックマーク' が新規作成されます。\n" | |
|
10948 | " :hg:'merge' により分岐が解消されます。" | |
|
10949 | ||
|
10950 | msgid "" | |
|
10951 | " A bookmark named '@' has the special property that :hg:`clone` will\n" | |
|
10952 | " check it out by default if it exists." | |
|
10953 | msgstr "" | |
|
10954 | " ブックマーク '@' が存在する場合、 :hg:`clone` での作業領域更新の、\n" | |
|
10955 | " デフォルト対象リビジョンとして使用されます。" | |
|
10956 | ||
|
10957 | msgid " - create an active bookmark for a new line of development::" | |
|
10958 | msgstr " - 新規開発ライン向けに、アクティブブックマークを作成::" | |
|
10959 | ||
|
10960 | msgid " hg book new-feature" | |
|
10961 | msgstr " hg book new-feature" | |
|
10962 | ||
|
10963 | msgid " - create an inactive bookmark as a place marker::" | |
|
10964 | msgstr " - 非アクティブブックマークをマーキング代わりに作成::" | |
|
10965 | ||
|
10966 | msgid " hg book -i reviewed" | |
|
10967 | msgstr " hg book -i reviewed" | |
|
10968 | ||
|
10969 | msgid " - create an inactive bookmark on another changeset::" | |
|
10970 | msgstr " - 作業領域親リビジョン以外を指す非アクティブブックマークを作成::" | |
|
10971 | ||
|
10972 | msgid " hg book -r .^ tested" | |
|
10973 | msgstr " hg book -r .^ tested" | |
|
10974 | ||
|
10975 | msgid " - move the '@' bookmark from another branch::" | |
|
10976 | msgstr " - ブックマーク '@' を作業領域親リビジョンに強制的に移動::" | |
|
10977 | ||
|
10978 | msgid "" | |
|
10979 | " hg book -f @\n" | |
|
10980 | " " | |
|
10981 | msgstr "" | |
|
10982 | " hg book -f @\n" | |
|
10952 | 10983 | " " |
|
10953 | 10984 | |
|
10954 | 10985 | msgid "bookmark names cannot consist entirely of whitespace" |
@@ -11453,9 +11484,6 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe8\xa6\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe6\x94\xb9\xe5\xa4\x89"' | |||
|
11453 | 11484 | msgid "use the secret phase for committing" |
|
11454 | 11485 | msgstr "secret フェーズでコミット中" |
|
11455 | 11486 | |
|
11456 | msgid "further edit commit message already specified" | |
|
11457 | msgstr "指定されたコミットログをエディタで更に編集" | |
|
11458 | ||
|
11459 | 11487 | msgid "commit the specified files or all outstanding changes" |
|
11460 | 11488 | msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録" |
|
11461 | 11489 | |
@@ -12620,6 +12648,13 b' msgid " hg log --debug -r ."' | |||
|
12620 | 12648 | msgstr " hg log --debug -r ." |
|
12621 | 12649 | |
|
12622 | 12650 | msgid "" |
|
12651 | " See :hg:`help revisions` and :hg:`help revsets` for more about\n" | |
|
12652 | " specifying revisions." | |
|
12653 | msgstr "" | |
|
12654 | " リビジョン指定の詳細は :hg:`help revisions` および :hg:`help revsets`\n" | |
|
12655 | " を参照してください。" | |
|
12656 | ||
|
12657 | msgid "" | |
|
12623 | 12658 | " Returns 0 on successful completion.\n" |
|
12624 | 12659 | " " |
|
12625 | 12660 | msgstr "" |
@@ -12931,6 +12966,9 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe6\x9b\xb4\xe6\x96\xb0\xe3\x81\xae\xe3\x81\xbf\xe3\x81\xa7\xe3\x80\x81 \xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe5\xae\x9f\xe6\x96\xbd\xe3\x82\x92\xe6\x8a\x91\xe6\xad\xa2"' | |||
|
12931 | 12966 | msgid "apply patch without touching the working directory" |
|
12932 | 12967 | msgstr "作業領域の内容を変更せずにパッチを適用" |
|
12933 | 12968 | |
|
12969 | msgid "commit even if some hunks fail" | |
|
12970 | msgstr "適用失敗があってもコミットを実施" | |
|
12971 | ||
|
12934 | 12972 | msgid "apply patch to the nodes from which it was generated" |
|
12935 | 12973 | msgstr "パッチ作成時と同じ親リビジョンに対して適用" |
|
12936 | 12974 | |
@@ -13012,6 +13050,26 b' msgstr ""' | |||
|
13012 | 13050 | " パッチによる変更結果から、 改名や複製を検出します。" |
|
13013 | 13051 | |
|
13014 | 13052 | msgid "" |
|
13053 | " Use --partial to ensure a changeset will be created from the patch\n" | |
|
13054 | " even if some hunks fail to apply. Hunks that fail to apply will be\n" | |
|
13055 | " written to a <target-file>.rej file. Conflicts can then be resolved\n" | |
|
13056 | " by hand before :hg:`commit --amend` is run to update the created\n" | |
|
13057 | " changeset. This flag exists to let people import patches that\n" | |
|
13058 | " partially apply without losing the associated metadata (author,\n" | |
|
13059 | " date, description, ...). Note that when none of the hunk applies\n" | |
|
13060 | " cleanly, :hg:`import --partial` will create an empty changeset,\n" | |
|
13061 | " importing only the patch metadata." | |
|
13062 | msgstr "" | |
|
13063 | " --partial 指定により、 パッチが部分的にしか適用されない場合でも、\n" | |
|
13064 | " 新規リビジョンの生成が保証されます。 適用失敗したパッチ部位は、\n" | |
|
13065 | " ``対象ファイル.rej`` ファイルに保存されます。 適用失敗部位の問題を、\n" | |
|
13066 | " 手動で解消した上で、 :hg:`commit --amend` で取り込むことも可能です。\n" | |
|
13067 | " --partial には、 パッチに含まれるメタデータ情報 (コミットユーザ名、\n" | |
|
13068 | " 日付、 コミットログなど) を失うことを回避する目的があります。\n" | |
|
13069 | " パッチ適用が完全に失敗した場合でも、 :hg:`import --partial` は、\n" | |
|
13070 | " メタデータのみが記録された、 新規リビジョンを作成します。" | |
|
13071 | ||
|
13072 | msgid "" | |
|
13015 | 13073 | " To read a patch from standard input, use \"-\" as the patch name. If\n" |
|
13016 | 13074 | " a URL is specified, the patch will be downloaded from it.\n" |
|
13017 | 13075 | " See :hg:`help dates` for a list of formats valid for -d/--date." |
@@ -13047,6 +13105,13 b' msgstr ""' | |||
|
13047 | 13105 | msgid " hg import --exact proposed-fix.patch" |
|
13048 | 13106 | msgstr " hg import --exact proposed-fix.patch" |
|
13049 | 13107 | |
|
13108 | msgid "" | |
|
13109 | " Returns 0 on success, 1 on partial success (see --partial).\n" | |
|
13110 | " " | |
|
13111 | msgstr "" | |
|
13112 | " 成功時のコマンド終了値は 0、部分成功時は 1 です (--partial 参照).\n" | |
|
13113 | " " | |
|
13114 | ||
|
13050 | 13115 | msgid "need at least one patch to import" |
|
13051 | 13116 | msgstr "取り込みには最低1つのパッチ名指定が必要です" |
|
13052 | 13117 | |
@@ -13059,6 +13124,12 b' msgstr "--similarity \xe3\x81\xa8 --bypass \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||
|
13059 | 13124 | msgid "applying patch from stdin\n" |
|
13060 | 13125 | msgstr "標準入力からのパッチを適用中\n" |
|
13061 | 13126 | |
|
13127 | msgid "patch applied partially\n" | |
|
13128 | msgstr "パッチの一部のみが適用されました\n" | |
|
13129 | ||
|
13130 | msgid "(fix the .rej files and run `hg commit --amend`)\n" | |
|
13131 | msgstr "(.rej ファイル中の却下差分への対処後に hg commit --amend を推奨)\n" | |
|
13132 | ||
|
13062 | 13133 | #, python-format |
|
13063 | 13134 | msgid "%s: no diffs found" |
|
13064 | 13135 | msgstr "%s: 差分がありません" |
@@ -13330,6 +13401,12 b' msgstr " - \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\xad\xe3\x83\xbc\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89\xe3\x81\xab\xe5\x90\x88\xe8\x87\xb4\xe3\x81\x99\xe3\x82\x8b\xe5\x85\xa8\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe7\x95\xaa\xe5\x8f\xb7\xe3\x81\xae\xe8\xa1\xa8\xe7\xa4\xba::"' | |||
|
13330 | 13401 | msgid " hg log -k bug --template \"{rev}\\n\"" |
|
13331 | 13402 | msgstr " hg log -k bug --template \"{rev}\\n\"" |
|
13332 | 13403 | |
|
13404 | msgid " - list available log templates::" | |
|
13405 | msgstr " - 利用可能なテンプレートスタイル一覧の表示::" | |
|
13406 | ||
|
13407 | msgid " hg log -T list" | |
|
13408 | msgstr " hg log -T list" | |
|
13409 | ||
|
13333 | 13410 | msgid " - check if a given changeset is included is a tagged release::" |
|
13334 | 13411 | msgstr " - 指定リビジョンが指定タグ時点において含まれているかを確認::" |
|
13335 | 13412 | |
@@ -13351,13 +13428,6 b' msgstr ""' | |||
|
13351 | 13428 | " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" |
|
13352 | 13429 | |
|
13353 | 13430 | msgid "" |
|
13354 | " See :hg:`help revisions` and :hg:`help revsets` for more about\n" | |
|
13355 | " specifying revisions." | |
|
13356 | msgstr "" | |
|
13357 | " リビジョン指定の詳細は :hg:`help revisions` および :hg:`help revsets`\n" | |
|
13358 | " を参照してください。" | |
|
13359 | ||
|
13360 | msgid "" | |
|
13361 | 13431 | " See :hg:`help templates` for more about pre-packaged styles and\n" |
|
13362 | 13432 | " specifying custom templates." |
|
13363 | 13433 | msgstr "" |
@@ -14106,8 +14176,17 b' msgstr "\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x8c\xe9\x81\x8e\xe5\x89\xb0\xe3\x81\xa7\xe3\x81\x99"' | |||
|
14106 | 14176 | msgid "can't specify --all and patterns" |
|
14107 | 14177 | msgstr "--all とパターンは同時に指定できません" |
|
14108 | 14178 | |
|
14109 |
msgid "no files or directories specified |
|
|
14110 |
msgstr " |
|
|
14179 | msgid "no files or directories specified" | |
|
14180 | msgstr "ファイル/ディレクトリ指定がありません" | |
|
14181 | ||
|
14182 | msgid "resolve command not applicable when not merging" | |
|
14183 | msgstr "マージが実施されていない場合は resolve コマンドを使用できません" | |
|
14184 | ||
|
14185 | msgid "arguments do not match paths that need resolving\n" | |
|
14186 | msgstr "指定パターンは衝突解消対象ファイルに合致しません\n" | |
|
14187 | ||
|
14188 | msgid "(no more unresolved files)\n" | |
|
14189 | msgstr "(衝突未解消ファイルはありません)\n" | |
|
14111 | 14190 | |
|
14112 | 14191 | msgid "revert all changes when no arguments given" |
|
14113 | 14192 | msgstr "引数指定が無い場合に、 全ファイルの内容を復旧" |
@@ -14178,9 +14257,6 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe3\x81\x8c\xe6\x9c\xaa\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x81\xaa\xe4\xb8\x8a\xe3\x81\xab\xe3\x80\x81\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe6\x98\x8e\xe7\xa4\xba\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||
|
14178 | 14257 | msgid "use \"hg update\" or see \"hg help revert\"" |
|
14179 | 14258 | msgstr "\"hg update\" 実施を検討するか、\"hg help revert\" を参照" |
|
14180 | 14259 | |
|
14181 | msgid "no files or directories specified" | |
|
14182 | msgstr "ファイル/ディレクトリ指定がありません" | |
|
14183 | ||
|
14184 | 14260 | msgid "" |
|
14185 | 14261 | "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to " |
|
14186 | 14262 | "abort the merge" |
@@ -14674,9 +14750,6 b' msgstr "\xe3\x82\xbf\xe3\x82\xb0\xe4\xbb\x98\xe3\x81\x91\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3"' | |||
|
14674 | 14750 | msgid "remove a tag" |
|
14675 | 14751 | msgstr "タグの削除" |
|
14676 | 14752 | |
|
14677 | msgid "use <text> as commit message" | |
|
14678 | msgstr "指定文字列をコミットログとして使用" | |
|
14679 | ||
|
14680 | 14753 | msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." |
|
14681 | 14754 | msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." |
|
14682 | 14755 | |
@@ -14937,6 +15010,14 b' msgstr ""' | |||
|
14937 | 15010 | msgid "cannot specify both -c/--check and -C/--clean" |
|
14938 | 15011 | msgstr "-c/--check と -C/--clean は併用できません" |
|
14939 | 15012 | |
|
15013 | #, python-format | |
|
15014 | msgid "(activating bookmark %s)\n" | |
|
15015 | msgstr "(ブックマーク %s をアクティブ化中)\n" | |
|
15016 | ||
|
15017 | #, python-format | |
|
15018 | msgid "(leaving bookmark %s)\n" | |
|
15019 | msgstr "(ブックマーク %s を非アクティブ化中)\n" | |
|
15020 | ||
|
14940 | 15021 | msgid "verify the integrity of the repository" |
|
14941 | 15022 | msgstr "リポジトリの整合性検証" |
|
14942 | 15023 | |
@@ -14982,6 +15063,13 b' msgstr ""' | |||
|
14982 | 15063 | "頒布条件に関しては同梱されるライセンス条項をお読みください。\n" |
|
14983 | 15064 | "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n" |
|
14984 | 15065 | |
|
15066 | msgid "" | |
|
15067 | "\n" | |
|
15068 | "Enabled extensions:" | |
|
15069 | msgstr "" | |
|
15070 | "\n" | |
|
15071 | "有効化されているエクステンション:" | |
|
15072 | ||
|
14985 | 15073 | #, python-format |
|
14986 | 15074 | msgid "unknown mode %s" |
|
14987 | 15075 | msgstr "未知のモード %s" |
@@ -15139,6 +15227,10 b' msgid "push creates new remote head %s o' | |||
|
15139 | 15227 | msgstr "新しいヘッド %s が連携先のブランチ '%s' に作成されます!" |
|
15140 | 15228 | |
|
15141 | 15229 | #, python-format |
|
15230 | msgid "push creates new remote head %s with bookmark '%s'!" | |
|
15231 | msgstr "新しいヘッド %s がブックマーク '%s' 付きで連携先に作成されます!" | |
|
15232 | ||
|
15233 | #, python-format | |
|
15142 | 15234 | msgid "push creates new remote head %s!" |
|
15143 | 15235 | msgstr "新しいヘッド %s が連携先に作成されます!" |
|
15144 | 15236 | |
@@ -15404,6 +15496,10 b' msgid "push includes divergent changeset' | |||
|
15404 | 15496 | msgstr "履歴反映対象に分岐 (divergent) した後継リビジョンが含まれます!: %s" |
|
15405 | 15497 | |
|
15406 | 15498 | #, python-format |
|
15499 | msgid "server ignored update of %s to public!\n" | |
|
15500 | msgstr "連携先で、%s の public 化が無視されました!\n" | |
|
15501 | ||
|
15502 | #, python-format | |
|
15407 | 15503 | msgid "updating %s to public failed!\n" |
|
15408 | 15504 | msgstr "%s のフェーズの public 化に失敗!\n" |
|
15409 | 15505 | |
@@ -15423,6 +15519,10 b' msgid ""' | |||
|
15423 | 15519 | msgstr "連携先の changegroupsubset 機能未対応により、 部分取り込みできません。" |
|
15424 | 15520 | |
|
15425 | 15521 | #, python-format |
|
15522 | msgid "unsupported getbundle arguments: %s" | |
|
15523 | msgstr "getbundle プロトコルに未知の引数が指定されました: %s" | |
|
15524 | ||
|
15525 | #, python-format | |
|
15426 | 15526 | msgid "*** failed to import extension %s from %s: %s\n" |
|
15427 | 15527 | msgstr "*** %s のインポートに失敗 (%s): %s\n" |
|
15428 | 15528 | |
@@ -15524,6 +15624,21 b' msgid "warning: internal:merge cannot me' | |||
|
15524 | 15624 | msgstr "警告: internal:merge はシンボリックリンク %s をマージできません\n" |
|
15525 | 15625 | |
|
15526 | 15626 | msgid "" |
|
15627 | "``internal:tagmerge``\n" | |
|
15628 | "Uses the internal tag merge algorithm (experimental)." | |
|
15629 | msgstr "" | |
|
15630 | "``internal:tagmerge``\n" | |
|
15631 | "タグファイル専用のマージ処理を行います (実験的実装)" | |
|
15632 | ||
|
15633 | #, python-format | |
|
15634 | msgid "" | |
|
15635 | "automatic tag merging of %s failed! (use 'hg resolve --tool internal:merge' " | |
|
15636 | "or another merge tool of your choice)\n" | |
|
15637 | msgstr "" | |
|
15638 | "タグファイル %s の自動マージに失敗しました ('hg resolve --tool internal:" | |
|
15639 | "merge'あるいは別のツールを使ってマージしてください)\n" | |
|
15640 | ||
|
15641 | msgid "" | |
|
15527 | 15642 | "``internal:dump``\n" |
|
15528 | 15643 | "Creates three versions of the files to merge, containing the\n" |
|
15529 | 15644 | " contents of local, other and base. These files can then be used to\n" |
@@ -16045,6 +16160,20 b' msgstr "\xe3\x83\x88\xe3\x83\x94\xe3\x83\x83\xe3\x82\xaf"' | |||
|
16045 | 16160 | msgid "Extension Commands" |
|
16046 | 16161 | msgstr "エクステンション由来のコマンド" |
|
16047 | 16162 | |
|
16163 | msgid "no matches" | |
|
16164 | msgstr "該当するヘルプトピックはありません" | |
|
16165 | ||
|
16166 | msgid "try \"hg help\" for a list of topics" | |
|
16167 | msgstr "ヘルプトピックの一覧は \"hg help\" で表示されます" | |
|
16168 | ||
|
16169 | #, python-format | |
|
16170 | msgid "no such help topic: %s" | |
|
16171 | msgstr "該当するヘルプトピックはありません: %s" | |
|
16172 | ||
|
16173 | #, python-format | |
|
16174 | msgid "try \"hg help --keyword %s\"" | |
|
16175 | msgstr "\"hg help --keyword %s\" を使用してみてください" | |
|
16176 | ||
|
16048 | 16177 | msgid "Mercurial Distributed SCM\n" |
|
16049 | 16178 | msgstr "Mercurial - 分散構成管理ツール\n" |
|
16050 | 16179 | |
@@ -16776,10 +16905,132 b' msgstr ""' | |||
|
16776 | 16905 | |
|
16777 | 16906 | msgid "" |
|
16778 | 16907 | "\n" |
|
16908 | "``committemplate``\n" | |
|
16909 | "------------------" | |
|
16910 | msgstr "" | |
|
16911 | "\n" | |
|
16912 | "``committemplate``\n" | |
|
16913 | "------------------" | |
|
16914 | ||
|
16915 | msgid "" | |
|
16916 | "``changeset`` configuration in this section is used as the template to\n" | |
|
16917 | "customize the text shown in the editor when committing." | |
|
16918 | msgstr "" | |
|
16919 | "本セクションでの ``changeset`` 設定は、 コミット時のエディタ起動の際に、\n" | |
|
16920 | "表示されるテキストのカスタマイズに使用されます。" | |
|
16921 | ||
|
16922 | msgid "" | |
|
16923 | "In addition to pre-defined template keywords, commit log specific one\n" | |
|
16924 | "below can be used for customization:" | |
|
16925 | msgstr "" | |
|
16926 | "既存のテンプレートキーワードの他に、 本セクションでの定義でのみ有効な、\n" | |
|
16927 | "以下のテンプレートキーワードが使用できます:" | |
|
16928 | ||
|
16929 | msgid "" | |
|
16930 | "``extramsg``\n" | |
|
16931 | " String: Extra message (typically 'Leave message empty to abort\n" | |
|
16932 | " commit.'). This may be changed by some commands or extensions." | |
|
16933 | msgstr "" | |
|
16934 | "``extramsg``\n" | |
|
16935 | " 文字列。 追加メッセージ (通常は 'メッセージが空のままならコミットを\n" | |
|
16936 | " 中止します。') 実行されるコマンドによって、指定される内容が、\n" | |
|
16937 | " 異なる場合があります。 (※ 訳注: MQ 系コマンドで異なる内容になります)" | |
|
16938 | ||
|
16939 | msgid "" | |
|
16940 | "For example, the template configuration below shows as same text as\n" | |
|
16941 | "one shown by default::" | |
|
16942 | msgstr "" | |
|
16943 | "例えば、 以下のような設定記述により、 カスタマイズ未実施の際の表示と、\n" | |
|
16944 | "全く同じ内容の情報が表示されます::" | |
|
16945 | ||
|
16946 | msgid "" | |
|
16947 | " [committemplate]\n" | |
|
16948 | " changeset = {desc}\\n\\n\n" | |
|
16949 | " HG: Enter commit message. Lines beginning with 'HG:' are removed.\n" | |
|
16950 | " HG: {extramsg}\n" | |
|
16951 | " HG: --\n" | |
|
16952 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
|
16953 | " \"HG: branch merge\\n\")\n" | |
|
16954 | " }HG: branch '{branch}'\\n{if(currentbookmark,\n" | |
|
16955 | " \"HG: bookmark '{currentbookmark}'\\n\") }{subrepos %\n" | |
|
16956 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" | |
|
16957 | " \"HG: added {file}\\n\" }{file_mods %\n" | |
|
16958 | " \"HG: changed {file}\\n\" }{file_dels %\n" | |
|
16959 | " \"HG: removed {file}\\n\" }{if(files, \"\",\n" | |
|
16960 | " \"HG: no files changed\\n\")}" | |
|
16961 | msgstr "" | |
|
16962 | " [committemplate]\n" | |
|
16963 | " changeset = {desc}\\n\\n\n" | |
|
16964 | " HG: コミットログを入力してください。'HG:' で始まる行は無視されます。\n" | |
|
16965 | " HG: {extramsg}\n" | |
|
16966 | " HG: --\n" | |
|
16967 | " HG: ユーザ: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
|
16968 | " \"HG: ブランチのマージ\\n\")\n" | |
|
16969 | " }HG: ブランチ '{branch}'\\n{if(currentbookmark,\n" | |
|
16970 | " \"HG: ブックマーク '{currentbookmark}'\\n\") }{subrepos %\n" | |
|
16971 | " \"HG: サブリポジトリ {subrepo}\\n\" }{file_adds %\n" | |
|
16972 | " \"HG: {file} を追加\\n\" }{file_mods %\n" | |
|
16973 | " \"HG: {file} を変更\\n\" }{file_dels %\n" | |
|
16974 | " \"HG: {file} を削除\\n\" }{if(files, \"\",\n" | |
|
16975 | " \"HG: ファイル変更なし\\n\")}" | |
|
16976 | ||
|
16977 | msgid "" | |
|
16978 | " For some problematic encodings (see :hg:`help win32mbcs` for\n" | |
|
16979 | " detail), this customization should be configured carefully, to\n" | |
|
16980 | " avoid showing broken characters." | |
|
16981 | msgstr "" | |
|
16982 | " 問題のある文字コード (詳細は :hg:`help win32mbcs` 参照) を使う場合、\n" | |
|
16983 | " 本機能によるカスタマイズは、 表示内容が崩れないように注意が必要です。" | |
|
16984 | ||
|
16985 | msgid "" | |
|
16986 | " For example, if multibyte character ending with backslash (0x5c) is\n" | |
|
16987 | " followed by ASCII character 'n' in the customized template,\n" | |
|
16988 | " sequence of backslash and 'n' is treated as line-feed unexpectedly\n" | |
|
16989 | " (and multibyte character is broken, too)." | |
|
16990 | msgstr "" | |
|
16991 | " 例えば、 バックスラッシュ (0x5c) で終了する複数バイト文字が、 ASCII\n" | |
|
16992 | " 文字の ``n`` を後ろに伴うようなテンプレート定義では、 この2バイトが、\n" | |
|
16993 | " 改行文字扱いされてしまいます (先行する複数バイト文字も崩れます)。\n" | |
|
16994 | " (※ 訳注: cp932/Shift-JIS では「ソ」や「能」などが該当します)" | |
|
16995 | ||
|
16996 | msgid "" | |
|
16997 | "Customized template is used for commands below (``--edit`` may be\n" | |
|
16998 | "required):" | |
|
16999 | msgstr "" | |
|
17000 | "カスタマイズ用テンプレートは、 以下のコマンドで利用されます\n" | |
|
17001 | "(エディタ起動のために ``--edit`` オプションが必要な場合もあります):" | |
|
17002 | ||
|
17003 | msgid "" | |
|
17004 | "- :hg:`backout`\n" | |
|
17005 | "- :hg:`commit`\n" | |
|
17006 | "- :hg:`fetch` (for merge commit only)\n" | |
|
17007 | "- :hg:`graft`\n" | |
|
17008 | "- :hg:`histedit`\n" | |
|
17009 | "- :hg:`import`\n" | |
|
17010 | "- :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`\n" | |
|
17011 | "- :hg:`rebase`\n" | |
|
17012 | "- :hg:`shelve`\n" | |
|
17013 | "- :hg:`sign`\n" | |
|
17014 | "- :hg:`tag`\n" | |
|
17015 | "- :hg:`transplant`" | |
|
17016 | msgstr "" | |
|
17017 | "- :hg:`backout`\n" | |
|
17018 | "- :hg:`commit`\n" | |
|
17019 | "- :hg:`fetch` (マージコミット時限定)\n" | |
|
17020 | "- :hg:`graft`\n" | |
|
17021 | "- :hg:`histedit`\n" | |
|
17022 | "- :hg:`import`\n" | |
|
17023 | "- :hg:`qfold`, :hg:`qnew` および :hg:`qrefresh`\n" | |
|
17024 | "- :hg:`rebase`\n" | |
|
17025 | "- :hg:`shelve`\n" | |
|
17026 | "- :hg:`sign`\n" | |
|
17027 | "- :hg:`tag`\n" | |
|
17028 | "- :hg:`transplant`" | |
|
17029 | ||
|
17030 | msgid "" | |
|
16779 | 17031 | "``decode/encode``\n" |
|
16780 | 17032 | "-----------------" |
|
16781 | 17033 | msgstr "" |
|
16782 | "\n" | |
|
16783 | 17034 | "``decode/encode``\n" |
|
16784 | 17035 | "-----------------" |
|
16785 | 17036 | |
@@ -17799,8 +18050,14 b' msgstr ""' | |||
|
17799 | 18050 | |
|
17800 | 18051 | msgid "" |
|
17801 | 18052 | "This section configures external merge tools to use for file-level\n" |
|
17802 | "merges." | |
|
17803 | msgstr "ファイル単位のマージを行う外部マージツールの設定。" | |
|
18053 | "merges. This section has likely been preconfigured at install time.\n" | |
|
18054 | "Use :hg:`config merge-tools` to check the existing configuration.\n" | |
|
18055 | "Also see :hg:`help merge-tools` for more details." | |
|
18056 | msgstr "" | |
|
18057 | "本セクションは、 ファイル毎のマージ処理のための、 外部ツールを設定します。\n" | |
|
18058 | "インストール時に事前設定されている可能性もあります。 既存の設定内容は、\n" | |
|
18059 | ":hg:`config merge-tools` で確認できます。 設定の詳細は\n" | |
|
18060 | ":hg:`help merge-tools` も参照してください。" | |
|
17804 | 18061 | |
|
17805 | 18062 | msgid "Example ``~/.hgrc``::" |
|
17806 | 18063 | msgstr "``~/.hgrc`` での設定例を以下に示します::" |
@@ -17823,6 +18080,13 b' msgstr ""' | |||
|
17823 | 18080 | " kdiff3.priority = 1" |
|
17824 | 18081 | |
|
17825 | 18082 | msgid "" |
|
18083 | " # Changing the priority of preconfigured tool\n" | |
|
18084 | " vimdiff.priority = 0" | |
|
18085 | msgstr "" | |
|
18086 | " # 設定済みツール間での優先度の変更\n" | |
|
18087 | " vimdiff.priority = 0" | |
|
18088 | ||
|
18089 | msgid "" | |
|
17826 | 18090 | " # Define new tool\n" |
|
17827 | 18091 | " myHtmlTool.args = -m $local $other $base $output\n" |
|
17828 | 18092 | " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" |
@@ -17856,13 +18120,26 b' msgid ""' | |||
|
17856 | 18120 | "``args``\n" |
|
17857 | 18121 | " The arguments to pass to the tool executable. You can refer to the\n" |
|
17858 | 18122 | " files being merged as well as the output file through these\n" |
|
17859 | " variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" | |
|
18123 | " variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning\n" | |
|
18124 | " of ``$local`` and ``$other`` can vary depending on which action is being\n" | |
|
18125 | " performed. During and update or merge, ``$local`` represents the original\n" | |
|
18126 | " state of the file, while ``$other`` represents the commit you are " | |
|
18127 | "updating\n" | |
|
18128 | " to or the commit you are merging with. During a rebase ``$local``\n" | |
|
18129 | " represents the destination of the rebase, and ``$other`` represents the\n" | |
|
18130 | " commit being rebased.\n" | |
|
17860 | 18131 | " Default: ``$local $base $other``" |
|
17861 | 18132 | msgstr "" |
|
17862 | 18133 | "``args``\n" |
|
17863 |
" 実行 |
|
|
17864 |
" |
|
|
17865 | " 結果ファイルを指定可能です。 デフォルト値: ``$local $base $other``" | |
|
18134 | " 実行時にツールに指定される引数。 ``$base``, ``$local``, ``$other``, \n" | |
|
18135 | " ``$output`` といった表記により、マージ対象や、 結果格納先ファイルも、\n" | |
|
18136 | " 指定可能です。 ``$local`` や ``$other`` は、 実施する処理に応じて、\n" | |
|
18137 | " 意味合いが変化します。 update や merge コマンドの場合、 ``$local``\n" | |
|
18138 | " はコマンド実施前時点の作業領域の、 ``$other`` は対象リビジョン時点の、\n" | |
|
18139 | " それぞれの内容を保持するファイルを指します。 一方で rebase の場合は、\n" | |
|
18140 | " ``$local`` が rebase 先、 ``$other`` が rebase 元リビジョン時点の、\n" | |
|
18141 | " それぞれの内容を保持するファイルを指します。デフォルト値:\n" | |
|
18142 | " ``$local $base $other``" | |
|
17866 | 18143 | |
|
17867 | 18144 | msgid "" |
|
17868 | 18145 | "``premerge``\n" |
@@ -18669,6 +18946,50 b' msgstr ""' | |||
|
18669 | 18946 | " セクションの説明を参照してください。" |
|
18670 | 18947 | |
|
18671 | 18948 | msgid "" |
|
18949 | "``mergemarkers``\n" | |
|
18950 | " Sets the merge conflict marker label styling. The ``detailed``\n" | |
|
18951 | " style uses the ``mergemarkertemplate`` setting to style the labels.\n" | |
|
18952 | " The ``basic`` style just uses 'local' and 'other' as the marker label.\n" | |
|
18953 | " One of ``basic`` or ``detailed``.\n" | |
|
18954 | " Default is ``basic``." | |
|
18955 | msgstr "" | |
|
18956 | "``mergemarkers``\n" | |
|
18957 | " マージで衝突が検出された際に、 ファイルに挿入される衝突マークの、\n" | |
|
18958 | " 情報ラベル部分の形式。 ``detailed`` 形式では ``mergemarkertemplate``\n" | |
|
18959 | " によるテンプレート定義が使用されます。 ``basic`` 形式では ``local``\n" | |
|
18960 | " および ``other`` だけの単純なラベルになります。上記のいずれかのみ、\n" | |
|
18961 | " 指定可能です。デフォルト値: ``basic``" | |
|
18962 | ||
|
18963 | msgid "" | |
|
18964 | "``mergemarkertemplate``\n" | |
|
18965 | " The template used to print the commit description next to each conflict\n" | |
|
18966 | " marker during merge conflicts. See :hg:`help templates` for the " | |
|
18967 | "template\n" | |
|
18968 | " format.\n" | |
|
18969 | " Defaults to showing the hash, tags, branches, bookmarks, author, and\n" | |
|
18970 | " the first line of the commit description.\n" | |
|
18971 | " You have to pay attention to encodings of managed files, if you\n" | |
|
18972 | " use non-ASCII characters in tags, branches, bookmarks, author\n" | |
|
18973 | " and/or commit descriptions. At template expansion, non-ASCII\n" | |
|
18974 | " characters use the encoding specified by ``--encoding`` global\n" | |
|
18975 | " option, ``HGENCODING`` or other locale setting environment\n" | |
|
18976 | " variables. The difference of encoding between merged file and\n" | |
|
18977 | " conflict markers causes serious problem." | |
|
18978 | msgstr "" | |
|
18979 | "``mergemarkertemplate``\n" | |
|
18980 | " マージで衝突が検出された際に、 ファイルに挿入される衝突マークの、\n" | |
|
18981 | " テンプレート機能による定義。 テンプレート機能そのものに関する詳細は\n" | |
|
18982 | " :hg:`help templates` を参照してください。 デフォルト設定では、\n" | |
|
18983 | " ハッシュ値、タグ名、ブランチ名、ブックマーク、ユーザ名および、\n" | |
|
18984 | " コミットログの一行目を表示します。 タグ名、ブランチ名、ブックマーク、\n" | |
|
18985 | " ユーザ名、 コミットログのいずれかで非 ASCII 文字を使用している場合は、\n" | |
|
18986 | " マージ対象ファイルの文字コードに、 注意を払う必要があります。\n" | |
|
18987 | " テンプレート展開の際に、 非 ASCII 文字は ``--encoding`` オプション、\n" | |
|
18988 | " ``HGENCODING`` あるいは各種ロケール環境変数で指定された文字コードで、\n" | |
|
18989 | " 符号化されます。 マージ対象ファイルの文字コードと異なる場合、\n" | |
|
18990 | " 文字コード混在による深刻な問題を生じます。" | |
|
18991 | ||
|
18992 | msgid "" | |
|
18672 | 18993 | "``portablefilenames``\n" |
|
18673 | 18994 | " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" |
|
18674 | 18995 | " Default is ``warn``.\n" |
@@ -22750,33 +23071,29 b' msgstr ""' | |||
|
22750 | 23071 | |
|
22751 | 23072 | msgid "" |
|
22752 | 23073 | "Mercurial allows you to customize output of commands through\n" |
|
22753 |
"templates. You can either pass in a template |
|
|
22754 | "line, via the --template option, or select an existing\n" | |
|
22755 | "template-style (--style)." | |
|
22756 | msgstr "" | |
|
22757 | "Mercurial では、 テンプレート機能によってコマンドの出力をカスタマイズ\n" | |
|
22758 | "することができます。 コマンドラインからの指定では、 --template による\n" | |
|
22759 | "テンプレート指定と、 --style によるスタイル指定の両方が使用できます。" | |
|
23074 | "templates. You can either pass in a template or select an existing\n" | |
|
23075 | "template-style from the command line, via the --template option." | |
|
23076 | msgstr "" | |
|
23077 | "Mercurial は、 コマンド出力をテンプレート機能でカスタマイズ可能です。\n" | |
|
23078 | "コマンドラインの --template オプション経由で、 テンプレート指定や、\n" | |
|
23079 | "スタイル定義 (※ 訳注: 同梱のもの以外に独自定義可能) を指定できます。" | |
|
22760 | 23080 | |
|
22761 | 23081 | msgid "" |
|
22762 | 23082 | "You can customize output for any \"log-like\" command: log,\n" |
|
22763 |
"outgoing, incoming, tip, parents, heads |
|
|
23083 | "outgoing, incoming, tip, parents, and heads." | |
|
22764 | 23084 | msgstr "" |
|
22765 | 23085 | "「log 的」な出力を行う一連のコマンド出力をカスタマイズ可能です:\n" |
|
22766 |
"log, outgoing, incoming, tip, parents, heads |
|
|
22767 | ||
|
22768 | msgid "" | |
|
22769 |
" |
|
|
22770 | "when no explicit preference is passed), compact, changelog, phases\n" | |
|
22771 | "and xml.\n" | |
|
22772 | "Usage::" | |
|
22773 | msgstr "" | |
|
22774 | "Mercurial には、 default(明示的な指定が無い場合のスタイル)、 compact、\n" | |
|
22775 | "changelog、 phases、 および xml の5つのスタイル設定が同梱されています。\n" | |
|
22776 | "スタイルの指定方法は以下の通り::" | |
|
22777 | ||
|
22778 | msgid " $ hg log -r1 --style changelog" | |
|
22779 | msgstr " $ hg log -r1 --style changelog" | |
|
23086 | "log, outgoing, incoming, tip, parents, heads" | |
|
23087 | ||
|
23088 | msgid "" | |
|
23089 | "Some built-in styles are packaged with Mercurial. These can be listed\n" | |
|
23090 | "with :hg:`log --template list`. Example usage::" | |
|
23091 | msgstr "" | |
|
23092 | "いくつかのスタイル定義が Mercurial に同梱されています。 スタイルの一覧は\n" | |
|
23093 | ":hg:`log --template list` で表示されます。 スタイル定義の利用例::" | |
|
23094 | ||
|
23095 | msgid " $ hg log -r1.0::1.1 --template changelog" | |
|
23096 | msgstr " $ hg log -r1.0::1.1 --template changelog" | |
|
22780 | 23097 | |
|
22781 | 23098 | msgid "" |
|
22782 | 23099 | "A template is a piece of text, with markup to invoke variable\n" |
@@ -22873,12 +23190,18 b' msgstr "- rstdoc(text, style)"' | |||
|
22873 | 23190 | msgid "- shortest(node)" |
|
22874 | 23191 | msgstr "- shortest(node)" |
|
22875 | 23192 | |
|
23193 | msgid "- startswith(string, text)" | |
|
23194 | msgstr "- startswith(string, text)" | |
|
23195 | ||
|
22876 | 23196 | msgid "- strip(text[, chars])" |
|
22877 | 23197 | msgstr "- strip(text[, chars])" |
|
22878 | 23198 | |
|
22879 | 23199 | msgid "- sub(pat, repl, expr)" |
|
22880 | 23200 | msgstr "- sub(pat, repl, expr)" |
|
22881 | 23201 | |
|
23202 | msgid "- word(number, text[, separator])" | |
|
23203 | msgstr "- word(number, text[, separator])" | |
|
23204 | ||
|
22882 | 23205 | msgid "Also, for any expression that returns a list, there is a list operator:" |
|
22883 | 23206 | msgstr "また、 列挙形式を返す expr に対しては、 以下の様な記述が可能です:" |
|
22884 | 23207 | |
@@ -22900,6 +23223,12 b' msgstr "- \xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe4\xb8\x80\xe8\xa6\xa7\xe3\x82\x92 \\", \\" \xe3\x81\xa7\xe9\x80\xa3\xe7\xb5\x90::"' | |||
|
22900 | 23223 | msgid " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" |
|
22901 | 23224 | msgstr " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" |
|
22902 | 23225 | |
|
23226 | msgid "- Modify each line of a commit description::" | |
|
23227 | msgstr "- コミットログの各行の行頭に文字を追加::" | |
|
23228 | ||
|
23229 | msgid " $ hg log --template \"{splitlines(desc) % '**** {line}\\n'}\"" | |
|
23230 | msgstr " $ hg log --template \"{splitlines(desc) % '**** {line}\\n'}\"" | |
|
23231 | ||
|
22903 | 23232 | msgid "- Format date::" |
|
22904 | 23233 | msgstr "- 日時情報の整形::" |
|
22905 | 23234 | |
@@ -22963,8 +23292,22 b' msgstr ""' | |||
|
22963 | 23292 | msgid "- Mark the working copy parent with '@'::" |
|
22964 | 23293 | msgstr "- 作業領域の親リビジョンに '@' を表示::" |
|
22965 | 23294 | |
|
22966 |
msgid " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\" |
|
|
22967 |
msgstr " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\" |
|
|
23295 | msgid " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"" | |
|
23296 | msgstr " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"" | |
|
23297 | ||
|
23298 | msgid "- Show only commit descriptions that start with \"template\"::" | |
|
23299 | msgstr "- \"template\" で始まるコミットログのみを表示::" | |
|
23300 | ||
|
23301 | msgid "" | |
|
23302 | " $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" | |
|
23303 | msgstr "" | |
|
23304 | " $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" | |
|
23305 | ||
|
23306 | msgid "- Print the first word of each line of a commit message::" | |
|
23307 | msgstr "- コミットログの最初の語のみを表示::" | |
|
23308 | ||
|
23309 | msgid " $ hg log --template \"{word(\\\"0\\\", desc)}\\n\"\n" | |
|
23310 | msgstr " $ hg log --template \"{word(\\\"0\\\", desc)}\\n\"\n" | |
|
22968 | 23311 | |
|
22969 | 23312 | msgid "Valid URLs are of the form::" |
|
22970 | 23313 | msgstr "有効な URL 指定は以下の形式です::" |
@@ -23367,8 +23710,11 b' msgstr "\xe8\xad\xa6\xe5\x91\x8a: \xe3\x82\xbf\xe3\x82\xb0 %s \xe3\x81\x8c\xe6\x97\xa2\xe5\xad\x98\xe3\x81\xae\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe5\x90\x8d\xe3\x81\xa8\xe8\xa1\x9d\xe7\xaa\x81\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\\n"' | |||
|
23367 | 23710 | msgid "working copy of .hgtags is changed (please commit .hgtags manually)" |
|
23368 | 23711 | msgstr "作業領域の .hgtags が変更されています (手動でコミットしてください)" |
|
23369 | 23712 | |
|
23370 |
msgid "abandoned transaction found |
|
|
23371 |
msgstr "中断トランザクションを検出 |
|
|
23713 | msgid "abandoned transaction found" | |
|
23714 | msgstr "中断トランザクションを検出しました" | |
|
23715 | ||
|
23716 | msgid "run 'hg recover' to clean up transaction" | |
|
23717 | msgstr "情報を破棄する場合は 'hg recover' を実施してください" | |
|
23372 | 23718 | |
|
23373 | 23719 | msgid "rolling back interrupted transaction\n" |
|
23374 | 23720 | msgstr "中断されたトランザクションをロールバック中\n" |
@@ -24549,9 +24895,6 b' msgstr ""' | |||
|
24549 | 24895 | "``min(set)``\n" |
|
24550 | 24896 | " 指定リビジョン群中で、 リビジョン番号が最小のもの。" |
|
24551 | 24897 | |
|
24552 | msgid "_missingancestors requires two arguments" | |
|
24553 | msgstr "_missingancestors の引数は2つです" | |
|
24554 | ||
|
24555 | 24898 | msgid "" |
|
24556 | 24899 | "``modifies(pattern)``\n" |
|
24557 | 24900 | " Changesets modifying files matched by pattern." |
@@ -25324,6 +25667,17 b' msgstr ""' | |||
|
25324 | 25667 | "リビジョン %s を反映できません。\n" |
|
25325 | 25668 | |
|
25326 | 25669 | #, python-format |
|
25670 | msgid "" | |
|
25671 | "automatic .hgtags merge failed\n" | |
|
25672 | "the following %d tags are in conflict: %s\n" | |
|
25673 | msgstr "" | |
|
25674 | "タグファイルの自動マージに失敗しました。\n" | |
|
25675 | "%d 個のタグ定義が衝突しています: %s\n" | |
|
25676 | ||
|
25677 | msgid ".hgtags merged successfully\n" | |
|
25678 | msgstr "タグファイルのマージに成功しました\n" | |
|
25679 | ||
|
25680 | #, python-format | |
|
25327 | 25681 | msgid "%s, line %s: %s\n" |
|
25328 | 25682 | msgstr "%s %s行目: %s\n" |
|
25329 | 25683 | |
@@ -25512,6 +25866,9 b' msgstr ""' | |||
|
25512 | 25866 | msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." |
|
25513 | 25867 | msgstr ":shortdate: 日時情報。 \"2006-09-18\" 形式で可読化します。" |
|
25514 | 25868 | |
|
25869 | msgid ":splitlines: Any text. Split text into a list of lines." | |
|
25870 | msgstr ":splitlines: 文字列。 文字列を行のリストに分割します。" | |
|
25871 | ||
|
25515 | 25872 | msgid "" |
|
25516 | 25873 | ":stringify: Any type. Turns the value into text by converting values into\n" |
|
25517 | 25874 | " text and concatenating them." |
@@ -25570,6 +25927,13 b' msgstr ""' | |||
|
25570 | 25927 | msgid ":children: List of strings. The children of the changeset." |
|
25571 | 25928 | msgstr ":children: 文字列列挙。 リビジョンの子供。" |
|
25572 | 25929 | |
|
25930 | msgid "" | |
|
25931 | ":currentbookmark: String. The active bookmark, if it is\n" | |
|
25932 | " associated with the changeset" | |
|
25933 | msgstr "" | |
|
25934 | ":currentbookmark: 文字列. アクティブブックマーク (対象リビジョンに対して、\n" | |
|
25935 | " 関連付けられている場合のみ)" | |
|
25936 | ||
|
25573 | 25937 | msgid ":date: Date information. The date when the changeset was committed." |
|
25574 | 25938 | msgstr ":date: 日時情報。 リビジョンが記録された日時。" |
|
25575 | 25939 | |
@@ -25672,6 +26036,9 b' msgstr ":phaseidx: \xe6\x95\xb0\xe5\x80\xa4\xe3\x80\x82 \xe5\xbd\x93\xe8\xa9\xb2\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa7\xe3\x83\xbc\xe3\x82\xba\xe5\x80\xa4\xe3\x80\x82"' | |||
|
25672 | 26036 | msgid ":rev: Integer. The repository-local changeset revision number." |
|
25673 | 26037 | msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。" |
|
25674 | 26038 | |
|
26039 | msgid ":subrepos: List of strings. Updated subrepositories in the changeset." | |
|
26040 | msgstr ":subrepos: 文字列挙。 当該リビジョンで更新されたサブリポジトリ名。" | |
|
26041 | ||
|
25675 | 26042 | msgid ":tags: List of strings. Any tags associated with the changeset." |
|
25676 | 26043 | msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。" |
|
25677 | 26044 | |
@@ -25688,8 +26055,9 b' msgstr ""' | |||
|
25688 | 26055 | msgid "unknown method '%s'" |
|
25689 | 26056 | msgstr "未知の処理 '%s' が指定されました" |
|
25690 | 26057 | |
|
25691 | msgid "expected a symbol" | |
|
25692 | msgstr "シンボル指定が必要です" | |
|
26058 | #, python-format | |
|
26059 | msgid "expected a symbol, got '%s'" | |
|
26060 | msgstr "シンボル (symbol) 指定が必要です (実際の指定は '%s')" | |
|
25693 | 26061 | |
|
25694 | 26062 | #, python-format |
|
25695 | 26063 | msgid "unknown function '%s'" |
@@ -25760,6 +26128,15 b' msgstr "strip \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf1\xe3\x81\xa4\xe3\x81\xbe\xe3\x81\x9f\xe3\x81\xaf2\xe3\x81\xa4\xe3\x81\xa7\xe3\x81\x99"' | |||
|
25760 | 26128 | msgid "sub expects three arguments" |
|
25761 | 26129 | msgstr "sub は引数が3つ必要です" |
|
25762 | 26130 | |
|
26131 | #. i18n: "startswith" is a keyword | |
|
26132 | msgid "startswith expects two arguments" | |
|
26133 | msgstr "startswith の引数は2つです" | |
|
26134 | ||
|
26135 | #. i18n: "word" is a keyword | |
|
26136 | #, python-format | |
|
26137 | msgid "word expects two or three arguments, got %d" | |
|
26138 | msgstr "word は2または3の引数が必要です (実際の引数は %d 個)" | |
|
26139 | ||
|
25763 | 26140 | msgid "unmatched quotes" |
|
25764 | 26141 | msgstr "引用符の対応関係が不正です" |
|
25765 | 26142 |
@@ -2662,8 +2662,8 b' msgid "cannot read %r object at %s"' | |||
|
2662 | 2662 | msgstr "não é possível ler objeto %r em %s" |
|
2663 | 2663 | |
|
2664 | 2664 | #, python-format |
|
2665 |
msgid "cannot read %r object at %s: |
|
|
2666 |
msgstr "não é possível ler objeto %r em %s: |
|
|
2665 | msgid "cannot read %r object at %s: unexpected size" | |
|
2666 | msgstr "não é possível ler objeto %r em %s: tamanho inesperado" | |
|
2667 | 2667 | |
|
2668 | 2668 | #, python-format |
|
2669 | 2669 | msgid "cannot read submodules config file in %s" |
@@ -3424,8 +3424,8 b' msgstr "pull, update e merge em um coman' | |||
|
3424 | 3424 | msgid "a specific revision you would like to pull" |
|
3425 | 3425 | msgstr "uma revisão específica que você gostaria de trazer" |
|
3426 | 3426 | |
|
3427 | msgid "edit commit message" | |
|
3428 |
msgstr "editar mensage |
|
|
3427 | msgid "invoke editor on commit messages" | |
|
3428 | msgstr "chama um editor para mensagens de consolidação" | |
|
3429 | 3429 | |
|
3430 | 3430 | msgid "edit commit message (DEPRECATED)" |
|
3431 | 3431 | msgstr "editar mensagem de consolidação (OBSOLETO)" |
@@ -3586,11 +3586,8 b' msgstr "o id da chave com a qual assinar' | |||
|
3586 | 3586 | msgid "TEXT" |
|
3587 | 3587 | msgstr "TEXTO" |
|
3588 | 3588 | |
|
3589 | msgid "commit message" | |
|
3590 | msgstr "mensagem de consolidação" | |
|
3591 | ||
|
3592 | msgid "invoke editor on commit messages" | |
|
3593 | msgstr "chama um editor para mensagens de consolidação" | |
|
3589 | msgid "use text as commit message" | |
|
3590 | msgstr "usa o texto como mensagem de consolidação" | |
|
3594 | 3591 | |
|
3595 | 3592 | msgid "hg sign [OPTION]... [REV]..." |
|
3596 | 3593 | msgstr "hg sign [OPÇÃO]... [REV]..." |
@@ -6467,9 +6464,6 b' msgstr ""' | |||
|
6467 | 6464 | " mudanças feitas pelo patch atual sem incluir as mudanças feitas\n" |
|
6468 | 6465 | " desde o último qrefresh." |
|
6469 | 6466 | |
|
6470 | msgid "edit patch header" | |
|
6471 | msgstr "edita o cabeçalho do patch" | |
|
6472 | ||
|
6473 | 6467 | msgid "keep folded patch files" |
|
6474 | 6468 | msgstr "mantém os arquivos dos patches incorporados" |
|
6475 | 6469 | |
@@ -10379,9 +10373,6 b' msgstr "inclui nomes que casem com os padr\xc3\xb5es fornecidos"' | |||
|
10379 | 10373 | msgid "exclude names matching the given patterns" |
|
10380 | 10374 | msgstr "exclui nomes que casem com os padrões fornecidos" |
|
10381 | 10375 | |
|
10382 | msgid "use text as commit message" | |
|
10383 | msgstr "usa o texto como mensagem de consolidação" | |
|
10384 | ||
|
10385 | 10376 | msgid "read commit message from file" |
|
10386 | 10377 | msgstr "lê de um arquivo a mensagem de consolidação" |
|
10387 | 10378 | |
@@ -11680,9 +11671,6 b' msgstr "emenda o pai do diret\xc3\xb3rio de trabalho"' | |||
|
11680 | 11671 | msgid "use the secret phase for committing" |
|
11681 | 11672 | msgstr "consolida a revisão na fase \"secret\"" |
|
11682 | 11673 | |
|
11683 | msgid "further edit commit message already specified" | |
|
11684 | msgstr "edita a mensagem de consolidação especificada" | |
|
11685 | ||
|
11686 | 11674 | msgid "commit the specified files or all outstanding changes" |
|
11687 | 11675 | msgstr "consolida os arquivos pedidos ou todas as mudanças por gravar" |
|
11688 | 11676 | |
@@ -13378,6 +13366,9 b' msgstr "aplicando patch da entrada padr\xc3\xa3o\\n"' | |||
|
13378 | 13366 | msgid "patch applied partially\n" |
|
13379 | 13367 | msgstr "o patch foi aplicado parcialmente\n" |
|
13380 | 13368 | |
|
13369 | msgid "(fix the .rej files and run `hg commit --amend`)\n" | |
|
13370 | msgstr "(corrija os arquivos .rej e execute `hg commit --amend`)\n" | |
|
13371 | ||
|
13381 | 13372 | #, python-format |
|
13382 | 13373 | msgid "%s: no diffs found" |
|
13383 | 13374 | msgstr "%s: nenhum diff encontrado" |
@@ -15053,9 +15044,6 b' msgstr "revis\xc3\xa3o a receber a etiqueta"' | |||
|
15053 | 15044 | msgid "remove a tag" |
|
15054 | 15045 | msgstr "remove uma etiqueta" |
|
15055 | 15046 | |
|
15056 | msgid "use <text> as commit message" | |
|
15057 | msgstr "usa <texto> como mensagem de consolidação" | |
|
15058 | ||
|
15059 | 15047 | msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." |
|
15060 | 15048 | msgstr "[-f] [-l] [-m TEXTO] [-d DATA] [-u USUÁRIO] [-r REV] NOME..." |
|
15061 | 15049 | |
@@ -26722,9 +26710,11 b' msgstr "strip espera um ou dois argument' | |||
|
26722 | 26710 | msgid "sub expects three arguments" |
|
26723 | 26711 | msgstr "sub espera três argumentos" |
|
26724 | 26712 | |
|
26713 | #. i18n: "startswith" is a keyword | |
|
26725 | 26714 | msgid "startswith expects two arguments" |
|
26726 | 26715 | msgstr "startswith espera dois argumentos" |
|
26727 | 26716 | |
|
26717 | #. i18n: "word" is a keyword | |
|
26728 | 26718 | #, python-format |
|
26729 | 26719 | msgid "word expects two or three arguments, got %d" |
|
26730 | 26720 | msgstr "word espera dois ou três argumentos, %d recebidos" |
@@ -1629,7 +1629,7 b' def _makelogrevset(repo, pats, opts, rev' | |||
|
1629 | 1629 | |
|
1630 | 1630 | filematcher = None |
|
1631 | 1631 | if opts.get('patch') or opts.get('stat'): |
|
1632 | if follow: | |
|
1632 | if follow and not match.always(): | |
|
1633 | 1633 | # _makelogfilematcher expects its files argument to be relative to |
|
1634 | 1634 | # the repo root, so use match.files(), not pats. |
|
1635 | 1635 | filematcher = _makelogfilematcher(repo, match.files(), followfirst) |
@@ -8,7 +8,7 b'' | |||
|
8 | 8 | from node import hex, bin, nullid, nullrev, short |
|
9 | 9 | from lock import release |
|
10 | 10 | from i18n import _ |
|
11 | import os, re, difflib, time, tempfile, errno | |
|
11 | import os, re, difflib, time, tempfile, errno, shlex | |
|
12 | 12 | import sys |
|
13 | 13 | import hg, scmutil, util, revlog, copies, error, bookmarks |
|
14 | 14 | import patch, help, encoding, templatekw, discovery |
@@ -1339,8 +1339,7 b' def clone(ui, source, dest=None, **opts)' | |||
|
1339 | 1339 | _('mark a branch as closed, hiding it from the branch list')), |
|
1340 | 1340 | ('', 'amend', None, _('amend the parent of the working dir')), |
|
1341 | 1341 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1342 | ('e', 'edit', None, | |
|
1343 | _('further edit commit message already specified')), | |
|
1342 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
|
1344 | 1343 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1345 | 1344 | _('[OPTION]... [FILE]...'), |
|
1346 | 1345 | inferrepo=True) |
@@ -2248,7 +2247,7 b' def debuginstall(ui):' | |||
|
2248 | 2247 | # editor |
|
2249 | 2248 | ui.status(_("checking commit editor...\n")) |
|
2250 | 2249 | editor = ui.geteditor() |
|
2251 |
cmdpath = util.findexe( |
|
|
2250 | cmdpath = util.findexe(shlex.split(editor)[0]) | |
|
2252 | 2251 | if not cmdpath: |
|
2253 | 2252 | if editor == 'vi': |
|
2254 | 2253 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
@@ -3883,7 +3882,7 b' def import_(ui, repo, patch1=None, *patc' | |||
|
3883 | 3882 | parents = [repo[node]] |
|
3884 | 3883 | if rej: |
|
3885 | 3884 | ui.write_err(_("patch applied partially\n")) |
|
3886 | ui.write_err(("(fix the .rej files and run " | |
|
3885 | ui.write_err(_("(fix the .rej files and run " | |
|
3887 | 3886 | "`hg commit --amend`)\n")) |
|
3888 | 3887 | ret = 1 |
|
3889 | 3888 | break |
@@ -5695,8 +5694,8 b' def summary(ui, repo, **opts):' | |||
|
5695 | 5694 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5696 | 5695 | ('', 'remove', None, _('remove a tag')), |
|
5697 | 5696 | # -l/--local is already there, commitopts cannot be used |
|
5698 | ('e', 'edit', None, _('edit commit message')), | |
|
5699 |
('m', 'message', '', _('use |
|
|
5697 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
|
5698 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), | |
|
5700 | 5699 | ] + commitopts2, |
|
5701 | 5700 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5702 | 5701 | def tag(ui, repo, name1, *names, **opts): |
@@ -120,7 +120,7 b' class basectx(object):' | |||
|
120 | 120 | mf2 = self._manifestmatches(match, s) |
|
121 | 121 | |
|
122 | 122 | modified, added, clean = [], [], [] |
|
123 | deleted, unknown, ignored = s[3], [], [] | |
|
123 | deleted, unknown, ignored = s[3], s[4], s[5] | |
|
124 | 124 | withflags = mf1.withflags() | mf2.withflags() |
|
125 | 125 | for fn, mf2node in mf2.iteritems(): |
|
126 | 126 | if fn in mf1: |
@@ -135,6 +135,10 b' class basectx(object):' | |||
|
135 | 135 | elif fn not in deleted: |
|
136 | 136 | added.append(fn) |
|
137 | 137 | removed = mf1.keys() |
|
138 | if removed: | |
|
139 | # need to filter files if they are already reported as removed | |
|
140 | unknown = [fn for fn in unknown if fn not in mf1] | |
|
141 | ignored = [fn for fn in ignored if fn not in mf1] | |
|
138 | 142 | |
|
139 | 143 | return [modified, added, removed, deleted, unknown, ignored, clean] |
|
140 | 144 | |
@@ -316,7 +320,8 b' class basectx(object):' | |||
|
316 | 320 | listunknown) |
|
317 | 321 | |
|
318 | 322 | if reversed: |
|
319 | r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3] | |
|
323 | # reverse added and removed | |
|
324 | r[1], r[2] = r[2], r[1] | |
|
320 | 325 | |
|
321 | 326 | if listsubrepos: |
|
322 | 327 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
@@ -766,7 +766,7 b' def _dispatch(req):' | |||
|
766 | 766 | if options['version']: |
|
767 | 767 | return commands.version_(ui) |
|
768 | 768 | if options['help']: |
|
769 | return commands.help_(ui, cmd) | |
|
769 | return commands.help_(ui, cmd, command=True) | |
|
770 | 770 | elif not cmd: |
|
771 | 771 | return commands.help_(ui, 'shortlist') |
|
772 | 772 |
@@ -468,6 +468,7 b' def sub(context, mapping, args):' | |||
|
468 | 468 | |
|
469 | 469 | def startswith(context, mapping, args): |
|
470 | 470 | if len(args) != 2: |
|
471 | # i18n: "startswith" is a keyword | |
|
471 | 472 | raise error.ParseError(_("startswith expects two arguments")) |
|
472 | 473 | |
|
473 | 474 | patn = stringify(args[0][0](context, mapping, args[0][1])) |
@@ -480,6 +481,7 b' def startswith(context, mapping, args):' | |||
|
480 | 481 | def word(context, mapping, args): |
|
481 | 482 | """return nth word from a string""" |
|
482 | 483 | if not (2 <= len(args) <= 3): |
|
484 | # i18n: "word" is a keyword | |
|
483 | 485 | raise error.ParseError(_("word expects two or three arguments, got %d") |
|
484 | 486 | % len(args)) |
|
485 | 487 |
@@ -437,7 +437,7 b' class ui(object):' | |||
|
437 | 437 | """ |
|
438 | 438 | user = os.environ.get("HGUSER") |
|
439 | 439 | if user is None: |
|
440 | user = self.config("ui", "username") | |
|
440 | user = self.config("ui", ["username", "user"]) | |
|
441 | 441 | if user is not None: |
|
442 | 442 | user = os.path.expandvars(user) |
|
443 | 443 | if user is None: |
@@ -8,6 +8,15 b' Create an extension to test bundle2 API' | |||
|
8 | 8 | > code. We still need to be able to test it while it grow up. |
|
9 | 9 | > """ |
|
10 | 10 | > |
|
11 | > import sys, os | |
|
12 | > from mercurial import cmdutil | |
|
13 | > from mercurial import util | |
|
14 | > from mercurial import bundle2 | |
|
15 | > from mercurial import scmutil | |
|
16 | > from mercurial import discovery | |
|
17 | > from mercurial import changegroup | |
|
18 | > from mercurial import error | |
|
19 | > | |
|
11 | 20 | > try: |
|
12 | 21 | > import msvcrt |
|
13 | 22 | > msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) |
@@ -16,14 +25,6 b' Create an extension to test bundle2 API' | |||
|
16 | 25 | > except ImportError: |
|
17 | 26 | > pass |
|
18 | 27 | > |
|
19 | > import sys | |
|
20 | > from mercurial import cmdutil | |
|
21 | > from mercurial import util | |
|
22 | > from mercurial import bundle2 | |
|
23 | > from mercurial import scmutil | |
|
24 | > from mercurial import discovery | |
|
25 | > from mercurial import changegroup | |
|
26 | > from mercurial import error | |
|
27 | 28 | > cmdtable = {} |
|
28 | 29 | > command = cmdutil.command(cmdtable) |
|
29 | 30 | > |
@@ -52,15 +52,34 b'' | |||
|
52 | 52 | abort: no username supplied |
|
53 | 53 | (use "hg config --edit" to set your username) |
|
54 | 54 | [255] |
|
55 | ||
|
56 | # test alternate config var | |
|
57 | ||
|
58 | $ echo 1234 > asdf | |
|
59 | $ echo "[ui]" > .hg/hgrc | |
|
60 | $ echo "user = Foo Bar II <foo2@bar.com>" >> .hg/hgrc | |
|
61 | $ hg commit -m commit-1 | |
|
62 | $ hg tip | |
|
63 | changeset: 4:6f24bfb4c617 | |
|
64 | tag: tip | |
|
65 | user: Foo Bar II <foo2@bar.com> | |
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
67 | summary: commit-1 | |
|
68 | ||
|
69 | # test no .hg/hgrc (uses generated non-interactive username) | |
|
70 | ||
|
71 | $ echo space > asdf | |
|
55 | 72 |
$ |
|
56 | 73 |
$ |
|
57 | 74 | no username found, using '[^']*' instead (re) |
|
58 | 75 | |
|
59 | $ echo space > asdf | |
|
76 | $ echo space2 > asdf | |
|
60 | 77 | $ hg commit -u ' ' -m commit-1 |
|
61 | 78 | transaction abort! |
|
62 | 79 | rollback completed |
|
63 | 80 | abort: empty username! |
|
64 | 81 | [255] |
|
65 | 82 | |
|
83 | # don't add tests here, previous test is unstable | |
|
84 | ||
|
66 | 85 | $ cd .. |
@@ -862,6 +862,17 b' test deprecated option is hidden with tr' | |||
|
862 | 862 | *"hg -v help debugoptDEP"* (glob) |
|
863 | 863 | #endif |
|
864 | 864 | |
|
865 | Test commands that collide with topics (issue4240) | |
|
866 | ||
|
867 | $ hg config -hq | |
|
868 | hg config [-u] [NAME]... | |
|
869 | ||
|
870 | show combined config settings from all hgrc files | |
|
871 | $ hg showconfig -hq | |
|
872 | hg config [-u] [NAME]... | |
|
873 | ||
|
874 | show combined config settings from all hgrc files | |
|
875 | ||
|
865 | 876 | Test a help topic |
|
866 | 877 | |
|
867 | 878 | $ hg help revs |
@@ -324,6 +324,30 b' try with --rev' | |||
|
324 | 324 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
325 | 325 | summary: a |
|
326 | 326 | |
|
327 | Verify that revsetalias entries work with histedit: | |
|
328 | $ cat >> $HGRCPATH <<EOF | |
|
329 | > [revsetalias] | |
|
330 | > grandparent(ARG) = p1(p1(ARG)) | |
|
331 | > EOF | |
|
332 | $ echo extra commit >> c | |
|
333 | $ hg ci -m 'extra commit to c' | |
|
334 | $ HGEDITOR=cat hg histedit 'grandparent(.)' | |
|
335 | pick ece0b8d93dda 6 c | |
|
336 | pick 803ef1c6fcfd 7 e | |
|
337 | pick 9c863c565126 8 extra commit to c | |
|
338 | ||
|
339 | # Edit history between ece0b8d93dda and 9c863c565126 | |
|
340 | # | |
|
341 | # Commits are listed from least to most recent | |
|
342 | # | |
|
343 | # Commands: | |
|
344 | # p, pick = use commit | |
|
345 | # e, edit = use commit, but stop for amending | |
|
346 | # f, fold = use commit, but combine it with the one above | |
|
347 | # d, drop = remove commit from history | |
|
348 | # m, mess = edit message without changing commit content | |
|
349 | # | |
|
350 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
327 | 351 | |
|
328 | 352 | should also work if a commit message is missing |
|
329 | 353 | $ BUNDLE="$TESTDIR/missing-comment.hg" |
@@ -260,6 +260,98 b' log -pf b inside dir' | |||
|
260 | 260 | +a |
|
261 | 261 | |
|
262 | 262 | |
|
263 | log -pf, but no args | |
|
264 | ||
|
265 | $ hg log -pf | |
|
266 | changeset: 3:2ca5ba701980 | |
|
267 | user: test | |
|
268 | date: Thu Jan 01 00:00:04 1970 +0000 | |
|
269 | summary: d | |
|
270 | ||
|
271 | diff -r f8954cd4dc1f -r 2ca5ba701980 a | |
|
272 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
|
273 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
274 | @@ -1,1 +0,0 @@ | |
|
275 | -a | |
|
276 | diff -r f8954cd4dc1f -r 2ca5ba701980 b | |
|
277 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
278 | +++ b/b Thu Jan 01 00:00:04 1970 +0000 | |
|
279 | @@ -0,0 +1,1 @@ | |
|
280 | +a | |
|
281 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
|
282 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
283 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
|
284 | @@ -0,0 +1,1 @@ | |
|
285 | +a | |
|
286 | diff -r f8954cd4dc1f -r 2ca5ba701980 g | |
|
287 | --- a/g Thu Jan 01 00:00:03 1970 +0000 | |
|
288 | +++ b/g Thu Jan 01 00:00:04 1970 +0000 | |
|
289 | @@ -1,2 +1,2 @@ | |
|
290 | f | |
|
291 | -g | |
|
292 | +f | |
|
293 | ||
|
294 | changeset: 2:f8954cd4dc1f | |
|
295 | user: test | |
|
296 | date: Thu Jan 01 00:00:03 1970 +0000 | |
|
297 | summary: c | |
|
298 | ||
|
299 | diff -r d89b0a12d229 -r f8954cd4dc1f b | |
|
300 | --- a/b Thu Jan 01 00:00:02 1970 +0000 | |
|
301 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
302 | @@ -1,1 +0,0 @@ | |
|
303 | -a | |
|
304 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
|
305 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
306 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
|
307 | @@ -0,0 +1,1 @@ | |
|
308 | +a | |
|
309 | diff -r d89b0a12d229 -r f8954cd4dc1f f | |
|
310 | --- a/f Thu Jan 01 00:00:02 1970 +0000 | |
|
311 | +++ b/f Thu Jan 01 00:00:03 1970 +0000 | |
|
312 | @@ -1,1 +1,2 @@ | |
|
313 | f | |
|
314 | +f | |
|
315 | diff -r d89b0a12d229 -r f8954cd4dc1f g | |
|
316 | --- a/g Thu Jan 01 00:00:02 1970 +0000 | |
|
317 | +++ b/g Thu Jan 01 00:00:03 1970 +0000 | |
|
318 | @@ -1,1 +1,2 @@ | |
|
319 | f | |
|
320 | +g | |
|
321 | ||
|
322 | changeset: 1:d89b0a12d229 | |
|
323 | user: test | |
|
324 | date: Thu Jan 01 00:00:02 1970 +0000 | |
|
325 | summary: b | |
|
326 | ||
|
327 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
|
328 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
329 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
|
330 | @@ -0,0 +1,1 @@ | |
|
331 | +a | |
|
332 | diff -r 9161b9aeaf16 -r d89b0a12d229 g | |
|
333 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
334 | +++ b/g Thu Jan 01 00:00:02 1970 +0000 | |
|
335 | @@ -0,0 +1,1 @@ | |
|
336 | +f | |
|
337 | ||
|
338 | changeset: 0:9161b9aeaf16 | |
|
339 | user: test | |
|
340 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
341 | summary: a | |
|
342 | ||
|
343 | diff -r 000000000000 -r 9161b9aeaf16 a | |
|
344 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
345 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
|
346 | @@ -0,0 +1,1 @@ | |
|
347 | +a | |
|
348 | diff -r 000000000000 -r 9161b9aeaf16 f | |
|
349 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
|
350 | +++ b/f Thu Jan 01 00:00:01 1970 +0000 | |
|
351 | @@ -0,0 +1,1 @@ | |
|
352 | +f | |
|
353 | ||
|
354 | ||
|
263 | 355 | log -vf dir/b |
|
264 | 356 | |
|
265 | 357 | $ hg log -vf dir/b |
@@ -196,6 +196,14 b' try to import --push' | |||
|
196 | 196 | now at: appendbar.diff |
|
197 | 197 | $ hg qfin -a |
|
198 | 198 | patch b.diff finalized without changeset message |
|
199 | $ touch .hg/patches/2.diff | |
|
200 | $ hg qimport -r 'p1(.)::' | |
|
201 | abort: patch "2.diff" already exists | |
|
202 | [255] | |
|
203 | $ hg qapplied | |
|
204 | 3.diff | |
|
205 | $ hg qfin -a | |
|
206 | $ rm .hg/patches/2.diff | |
|
199 | 207 | $ hg qimport -r 'p1(.)::' -P |
|
200 | 208 | $ hg qpop -a |
|
201 | 209 | popping 3.diff |
@@ -31,7 +31,7 b' help qrefresh (no record)' | |||
|
31 | 31 | |
|
32 | 32 | options: |
|
33 | 33 | |
|
34 | -e --edit edit commit message | |
|
34 | -e --edit invoke editor on commit messages | |
|
35 | 35 | -g --git use git extended diff format |
|
36 | 36 | -s --short refresh only files already in the patch and |
|
37 | 37 | specified files |
@@ -75,7 +75,7 b' help qrefresh (record)' | |||
|
75 | 75 | |
|
76 | 76 | options: |
|
77 | 77 | |
|
78 | -e --edit edit commit message | |
|
78 | -e --edit invoke editor on commit messages | |
|
79 | 79 | -g --git use git extended diff format |
|
80 | 80 | -s --short refresh only files already in the patch and |
|
81 | 81 | specified files |
@@ -62,7 +62,7 b' help record (record)' | |||
|
62 | 62 | list |
|
63 | 63 | --amend amend the parent of the working dir |
|
64 | 64 | -s --secret use the secret phase for committing |
|
65 |
-e --edit |
|
|
65 | -e --edit invoke editor on commit messages | |
|
66 | 66 | -I --include PATTERN [+] include names matching the given patterns |
|
67 | 67 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
68 | 68 | -m --message TEXT use text as commit message |
@@ -135,7 +135,7 b' help (mq present)' | |||
|
135 | 135 | |
|
136 | 136 | options: |
|
137 | 137 | |
|
138 | -e --edit edit commit message | |
|
138 | -e --edit invoke editor on commit messages | |
|
139 | 139 | -g --git use git extended diff format |
|
140 | 140 | -U --currentuser add "From: <current user>" to patch |
|
141 | 141 | -u --user USER add "From: <USER>" to patch |
@@ -280,6 +280,12 b' hg status -A --change 1 and revset:' | |||
|
280 | 280 | R removed |
|
281 | 281 | C deleted |
|
282 | 282 | |
|
283 | status against non-parent with unknown file (issue4321) | |
|
284 | ||
|
285 | $ touch unknown | |
|
286 | $ hg status --rev 0 unknown | |
|
287 | ? unknown | |
|
288 | ||
|
283 | 289 | status of removed but existing in working directory. "? removed" should |
|
284 | 290 | not be included: |
|
285 | 291 |
General Comments 0
You need to be logged in to leave comments.
Login now