Mercurial > hg

comparison i18n/ja.po @ 15745:e47ba02ad06b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-ja: synchronized with 32a6e00e4cfe
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 29 Dec 2011 16:10:53 +0900
parents 84980b00fbcb
children f21de8d2c724
comparison
equal deleted inserted replaced
15701:32a6e00e4cfe 15745:e47ba02ad06b
50 # command(, this) (本)コマンド 50 # command(, this) (本)コマンド
51 # commit コミット 51 # commit コミット
52 # commit comment コミットログ 52 # commit comment コミットログ
53 # copy(of file, repo) 複製 53 # copy(of file, repo) 複製
54 # default(, by) 指定が無い場合/通常は 54 # default(, by) 指定が無い場合/通常は
55 # delete/remove (構成管理からの)登録除外 55 # delete (作業領域からの)ファイル削除
56 # diff 差分 56 # diff 差分
57 # directory ディレクトリ 57 # directory ディレクトリ
58 # dirstate dirstate 58 # dirstate dirstate
59 # entry エントリ 59 # entry エントリ
60 # extend(ed) 拡張 60 # extend(ed) 拡張
80 # pull (追加リビジョンの)取り込み 80 # pull (追加リビジョンの)取り込み
81 # push (追加リビジョンの)反映 81 # push (追加リビジョンの)反映
82 # push(patch) (パッチの)適用 82 # push(patch) (パッチの)適用
83 # raise(of exception) (例外の)発生 83 # raise(of exception) (例外の)発生
84 # remote(repo) 連携先(リポジトリ) 84 # remote(repo) 連携先(リポジトリ)
85 # remove (構成管理からの)登録除外
85 # rename 改名 86 # rename 改名
86 # repo(sitory) リポジトリ/(.hg を指す場合は)管理領域 87 # repo(sitory) リポジトリ/(.hg を指す場合は)管理領域
87 # resolve/unresolve (衝突)解消/(衝突)未解消 88 # resolve/unresolve (衝突)解消/(衝突)未解消
88 # revert/undo 取り消し 89 # revert/undo 取り消し
89 # revision リビジョン 90 # revision リビジョン
94 # summary 要約(情報) 95 # summary 要約(情報)
95 # support(, not) (未)サポート 96 # support(, not) (未)サポート
96 # support(, un) (未)サポート 97 # support(, un) (未)サポート
97 # tag タグ 98 # tag タグ
98 # tracked xxxx 構成管理対象の xxxx 99 # tracked xxxx 構成管理対象の xxxx
99 # xxxxx type xxxx 種別 100 # type, xxxxx xxxx 種別
101 # unknown xxxx 未知の xxxx
100 # user ユーザ 102 # user ユーザ
101 # unknown xxxx 未知の xxxx
102 # working copy(of xxx) 作業領域(中の xxx) 103 # working copy(of xxx) 作業領域(中の xxx)
103 # working directory 作業領域 104 # working directory 作業領域
104 # ======================================== 105 # ========================================
105 # 106 #
106 msgid "" 107 msgid ""
107 msgstr "" 108 msgstr ""
108 "Project-Id-Version: Mercurial\n" 109 "Project-Id-Version: Mercurial\n"
109 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" 110 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
110 "POT-Creation-Date: 2011-10-30 23:25+0900\n" 111 "POT-Creation-Date: 2011-12-29 12:28+0900\n"
111 "PO-Revision-Date: 2009-11-16 21:24+0100\n" 112 "PO-Revision-Date: 2009-11-16 21:24+0100\n"
112 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" 113 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
113 "Language-Team: Japanese\n" 114 "Language-Team: Japanese\n"
114 "Language: \n" 115 "Language: \n"
115 "MIME-Version: 1.0\n" 116 "MIME-Version: 1.0\n"
2031 msgid "svn: no revision found after start revision %d" 2032 msgid "svn: no revision found after start revision %d"
2032 msgstr "svn: 開始リビジョン %d 以降にリビジョンはありません" 2033 msgstr "svn: 開始リビジョン %d 以降にリビジョンはありません"
2033 2034
2034 #, python-format 2035 #, python-format
2035 msgid "%s not found up to revision %d" 2036 msgid "%s not found up to revision %d"
2036 msgstr "リビジョン %s は %d までのりビジョンに見当たりません" 2037 msgstr "リビジョン %s は %d までのリビジョンに見当たりません"
2037 2038
2038 msgid "scanning paths" 2039 msgid "scanning paths"
2039 msgstr "パスの走査中" 2040 msgstr "パスの走査中"
2040 2041
2041 #, python-format 2042 #, python-format
3514 #, fuzzy 3515 #, fuzzy
3515 msgid "converting revisions" 3516 msgid "converting revisions"
3516 msgstr "リビジョンの表示" 3517 msgstr "リビジョンの表示"
3517 3518
3518 #, python-format 3519 #, python-format
3519 msgid "Renamed/copied largefile %s becomes symlink" 3520 msgid "renamed/copied largefile %s becomes symlink"
3520 msgstr "" 3521 msgstr ""
3521 3522
3522 #, python-format 3523 #, python-format
3523 msgid "largefile %s becomes symlink" 3524 msgid "largefile %s becomes symlink"
3524 msgstr "" 3525 msgstr ""
3621 msgstr "%s を登録除外中\n" 3622 msgstr "%s を登録除外中\n"
3622 3623
3623 msgid "uncommitted local changes" 3624 msgid "uncommitted local changes"
3624 msgstr "作業領域に未コミットの変更があります" 3625 msgstr "作業領域に未コミットの変更があります"
3625 3626
3627 msgid "&Largefile"
3628 msgstr ""
3629
3630 msgid "&Normal file"
3631 msgstr ""
3632
3633 #, python-format
3634 msgid ""
3635 "%s has been turned into a largefile\n"
3636 "use (l)argefile or keep as (n)ormal file?"
3637 msgstr ""
3638
3639 #, python-format
3640 msgid ""
3641 "%s has been turned into a normal file\n"
3642 "keep as (l)argefile or use (n)ormal file?"
3643 msgstr ""
3644
3626 #, python-format 3645 #, python-format
3627 msgid "merging %s and %s to %s\n" 3646 msgid "merging %s and %s to %s\n"
3628 msgstr "%s と %s を %s にマージ中\n" 3647 msgstr "%s と %s を %s にマージ中\n"
3629 3648
3630 #, python-format 3649 #, python-format
3675 msgstr "" 3694 msgstr ""
3676 3695
3677 msgid "addremove cannot be run on a repo with largefiles" 3696 msgid "addremove cannot be run on a repo with largefiles"
3678 msgstr "" 3697 msgstr ""
3679 3698
3680 msgid "error: could not put received data into largefile store" 3699 #, python-format
3700 msgid "largefiles: failed to put %s (%s) into store: %s"
3681 msgstr "" 3701 msgstr ""
3682 3702
3683 #, python-format 3703 #, python-format
3684 msgid "requested largefile %s not present in cache" 3704 msgid "requested largefile %s not present in cache"
3685 msgstr "" 3705 msgstr ""
6278 6298
6279 msgid "cannot use detach with continue or abort" 6299 msgid "cannot use detach with continue or abort"
6280 msgstr "--detach と、 --abort や --continue は併用できません" 6300 msgstr "--detach と、 --abort や --continue は併用できません"
6281 6301
6282 msgid "abort and continue do not allow specifying revisions" 6302 msgid "abort and continue do not allow specifying revisions"
6283 msgstr "--abort や --continue と、 りビジョン指定は併用できません" 6303 msgstr "--abort や --continue と、 リビジョン指定は併用できません"
6284 6304
6285 msgid "tool option will be ignored\n" 6305 msgid "tool option will be ignored\n"
6286 msgstr "" 6306 msgstr ""
6287 6307
6288 #, fuzzy 6308 #, fuzzy
6731 "リポジトリにおけるハッシュ値への変換として、 .hg/transplant/transplants\n" 6751 "リポジトリにおけるハッシュ値への変換として、 .hg/transplant/transplants\n"
6732 "に記録されます。\n" 6752 "に記録されます。\n"
6733 6753
6734 #, python-format 6754 #, python-format
6735 msgid "skipping already applied revision %s\n" 6755 msgid "skipping already applied revision %s\n"
6736 msgstr "すでに適用したりビジョン %s を飛ばしています\n" 6756 msgstr "適用済みリビジョン %s を飛ばしています\n"
6737 6757
6738 #, python-format 6758 #, python-format
6739 msgid "skipping merge changeset %s:%s\n" 6759 msgid "skipping merge changeset %s:%s\n"
6740 msgstr "チェンジセット %s:%s のマージを飛ばしています\n" 6760 msgstr "チェンジセット %s:%s のマージを飛ばしています\n"
6741 6761
8273 8293
8274 msgid "set or show the current branch name" 8294 msgid "set or show the current branch name"
8275 msgstr "ブランチ名の設定、 ないし現ブランチ名の表示" 8295 msgstr "ブランチ名の設定、 ないし現ブランチ名の表示"
8276 8296
8277 msgid "" 8297 msgid ""
8298 " .. note::\n"
8299 " Branch names are permanent and global. Use :hg:`bookmark` to create "
8300 "a\n"
8301 " light-weight bookmark instead. See :hg:`help glossary` for more\n"
8302 " information about named branches and bookmarks."
8303 msgstr ""
8304 " .. note::\n"
8305 " ブランチ名は永続的で且つ共有されます。\n"
8306 " 軽量な名前付けが必要なら、\n"
8307 " :hg:`bookmark` でブックマークを作成してください。\n"
8308 " 名前付きブランチと、 ブックマークの詳細に関しては、\n"
8309 " :hg:`help glossary` を参照してください。"
8310
8311 msgid ""
8278 " With no argument, show the current branch name. With one argument,\n" 8312 " With no argument, show the current branch name. With one argument,\n"
8279 " set the working directory branch name (the branch will not exist\n" 8313 " set the working directory branch name (the branch will not exist\n"
8280 " in the repository until the next commit). Standard practice\n" 8314 " in the repository until the next commit). Standard practice\n"
8281 " recommends that primary development take place on the 'default'\n" 8315 " recommends that primary development take place on the 'default'\n"
8282 " branch." 8316 " branch."
8307 msgstr "" 8341 msgstr ""
8308 " 作業領域の内容を既存ブランチのもので更新する場合は :hg:`update` を\n" 8342 " 作業領域の内容を既存ブランチのもので更新する場合は :hg:`update` を\n"
8309 " 使用してください。 現ブランチを閉鎖する場合は\n" 8343 " 使用してください。 現ブランチを閉鎖する場合は\n"
8310 " :hg:`commit --close-branch` を使用してください。" 8344 " :hg:`commit --close-branch` を使用してください。"
8311 8345
8312 msgid ""
8313 " .. note::\n"
8314 " Branch names are permanent. Use :hg:`bookmark` to create a\n"
8315 " light-weight bookmark instead. See :hg:`help glossary` for more\n"
8316 " information about named branches and bookmarks."
8317 msgstr ""
8318 " .. note::\n"
8319 " ブランチ名は永続的なものです。軽量な名前付けをする場合は、\n"
8320 " :hg:`bookmark` でブックマークを作成してください。\n"
8321 " 名前付きブランチとブックマークの詳細に関しては、\n"
8322 " :hg:`help glossary` を参照してください。"
8323
8324 #, python-format 8346 #, python-format
8325 msgid "reset working directory to branch %s\n" 8347 msgid "reset working directory to branch %s\n"
8326 msgstr "作業領域のブランチを %s にリセット\n" 8348 msgstr "作業領域のブランチを %s にリセット\n"
8327 8349
8328 msgid "a branch of the same name already exists" 8350 msgid "a branch of the same name already exists"
8333 msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください" 8355 msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください"
8334 8356
8335 #, python-format 8357 #, python-format
8336 msgid "marked working directory as branch %s\n" 8358 msgid "marked working directory as branch %s\n"
8337 msgstr "作業領域をブランチ %s に設定\n" 8359 msgstr "作業領域をブランチ %s に設定\n"
8360
8361 msgid "(branches are permanent and global, did you want a bookmark?)\n"
8362 msgstr "(ブランチは永続的且つ共有されます。ブックマークはいかがですか？)\n"
8338 8363
8339 msgid "show only branches that have unmerged heads" 8364 msgid "show only branches that have unmerged heads"
8340 msgstr "未マージなヘッドを持つブランチのみを表示" 8365 msgstr "未マージなヘッドを持つブランチのみを表示"
8341 8366
8342 msgid "show normal and closed branches" 8367 msgid "show normal and closed branches"
9467 " already been grafted, or that are merges will be skipped." 9492 " already been grafted, or that are merges will be skipped."
9468 msgstr "" 9493 msgstr ""
9469 9494
9470 msgid "" 9495 msgid ""
9471 " If a graft merge results in conflicts, the graft process is\n" 9496 " If a graft merge results in conflicts, the graft process is\n"
9472 " aborted so that the current merge can be manually resolved. Once\n" 9497 " interrupted so that the current merge can be manually resolved.\n"
9473 " all conflicts are addressed, the graft process can be continued\n" 9498 " Once all conflicts are addressed, the graft process can be\n"
9474 " with the -c/--continue option." 9499 " continued with the -c/--continue option."
9475 msgstr "" 9500 msgstr ""
9476 9501
9477 msgid "" 9502 msgid ""
9478 " .. note::\n" 9503 " .. note::\n"
9479 " The -c/--continue option does not reapply earlier options." 9504 " The -c/--continue option does not reapply earlier options."
9528 msgid "skipping ancestor revision %s\n" 9553 msgid "skipping ancestor revision %s\n"
9529 msgstr "祖先ビジョン %s を飛ばしています\n" 9554 msgstr "祖先ビジョン %s を飛ばしています\n"
9530 9555
9531 #, python-format 9556 #, python-format
9532 msgid "skipping already grafted revision %s\n" 9557 msgid "skipping already grafted revision %s\n"
9533 msgstr "すでに移植したりビジョン %s を飛ばしています\n" 9558 msgstr "移植済みビジョン %s を飛ばしています\n"
9559
9560 #, python-format
9561 msgid "skipping already grafted revision %s (same origin %d)\n"
9562 msgstr "移植済みリビジョン %s を飛ばしています (由来元: %d)\n"
9563
9564 #, python-format
9565 msgid "skipping already grafted revision %s (was grafted from %d)\n"
9566 msgstr "移植済みリビジョン %s を飛ばしています (移植元: %d)\n"
9567
9568 #, python-format
9569 msgid "grafting revision %s\n"
9570 msgstr "リビジョン %s の移植中\n"
9534 9571
9535 msgid "unresolved conflicts, can't continue" 9572 msgid "unresolved conflicts, can't continue"
9536 msgstr "衝突が未解消のため、継続できません" 9573 msgstr "衝突が未解消のため、継続できません"
9537 9574
9538 msgid "use hg resolve and hg graft --continue" 9575 msgid "use hg resolve and hg graft --continue"
9894 msgstr "" 9931 msgstr ""
9895 " パス指定有りでの起動の際には、 他のリポジトリないしバンドルファイルの\n" 9932 " パス指定有りでの起動の際には、 他のリポジトリないしバンドルファイルの\n"
9896 " 状態を表示します。" 9933 " 状態を表示します。"
9897 9934
9898 msgid " - generate a build identifier for the working directory::" 9935 msgid " - generate a build identifier for the working directory::"
9899 msgstr "" 9936 msgstr " - 作業領域のビルド識別情報の生成::"
9900 9937
9901 msgid " hg id --id > build-id.dat" 9938 msgid " hg id --id > build-id.dat"
9902 msgstr "" 9939 msgstr " hg id --id > build-id.dat"
9903 9940
9904 msgid " - find the revision corresponding to a tag::" 9941 msgid " - find the revision corresponding to a tag::"
9905 msgstr "" 9942 msgstr " - タグに対応するリビジョンの特定::"
9906 9943
9907 msgid " hg id -n -r 1.3" 9944 msgid " hg id -n -r 1.3"
9908 msgstr "" 9945 msgstr " hg id -n -r 1.3"
9909 9946
9910 msgid " - check the most recent revision of a remote repository::" 9947 msgid " - check the most recent revision of a remote repository::"
9911 msgstr "" 9948 msgstr " - 連携先リポジトリにおける最新リビジョンの確認::"
9912 9949
9913 msgid " hg id -r tip http://selenic.com/hg/" 9950 msgid " hg id -r tip http://selenic.com/hg/"
9914 msgstr "" 9951 msgstr " hg id -r tip http://selenic.com/hg/"
9915 9952
9916 msgid "can't query remote revision number, branch, or tags" 9953 msgid "can't query remote revision number, branch, or tags"
9917 msgstr "リビジョン番号/ブランチ/タグは遠隔問い合わせできません" 9954 msgstr "リビジョン番号/ブランチ/タグは遠隔問い合わせできません"
9918 9955
9919 msgid "" 9956 msgid ""
10024 " 標準入力からパッチを取り込むには、 パッチ名に \"-\" を指定します。\n" 10061 " 標準入力からパッチを取り込むには、 パッチ名に \"-\" を指定します。\n"
10025 " URL が指定された場合、 パッチを当該 URL からダウンロードします。\n" 10062 " URL が指定された場合、 パッチを当該 URL からダウンロードします。\n"
10026 " -d/--date での日時表記は :hg:`help dates` を参照してください。" 10063 " -d/--date での日時表記は :hg:`help dates` を参照してください。"
10027 10064
10028 msgid " - import a traditional patch from a website and detect renames::" 10065 msgid " - import a traditional patch from a website and detect renames::"
10029 msgstr "" 10066 msgstr " - ウェブサイトから入手した標準的なパッチの適用と改名の判定::"
10030 10067
10031 msgid " hg import -s 80 http://example.com/bugfix.patch" 10068 msgid " hg import -s 80 http://example.com/bugfix.patch"
10032 msgstr "" 10069 msgstr " hg import -s 80 http://example.com/bugfix.patch"
10033 10070
10034 msgid " - import a changeset from an hgweb server::" 10071 msgid " - import a changeset from an hgweb server::"
10035 msgstr "" 10072 msgstr " - hgweb サーバからの指定リビジョンの取り込み::"
10036 10073
10037 msgid " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa" 10074 msgid " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
10038 msgstr "" 10075 msgstr " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
10039 10076
10040 msgid " - import all the patches in an Unix-style mbox::" 10077 msgid " - import all the patches in an Unix-style mbox::"
10041 msgstr "" 10078 msgstr " - Unix 形式 mbox ファイル中の全パッチの取り込み::"
10042 10079
10043 msgid " hg import incoming-patches.mbox" 10080 msgid " hg import incoming-patches.mbox"
10044 msgstr "" 10081 msgstr " hg import incoming-patches.mbox"
10045 10082
10046 msgid "" 10083 msgid ""
10047 " - attempt to exactly restore an exported changeset (not always\n" 10084 " - attempt to exactly restore an exported changeset (not always\n"
10048 " possible)::" 10085 " possible)::"
10049 msgstr "" 10086 msgstr ""
10087 " - export されたリビジョンの厳密適用 (常に成功するとは限りません)::"
10050 10088
10051 msgid " hg import --exact proposed-fix.patch" 10089 msgid " hg import --exact proposed-fix.patch"
10052 msgstr "" 10090 msgstr " hg import --exact proposed-fix.patch"
10053 10091
10054 msgid "need at least one patch to import" 10092 msgid "need at least one patch to import"
10055 msgstr "取り込みには最低1つのパッチ名指定が必要です" 10093 msgstr "取り込みには最低1つのパッチ名指定が必要です"
10056 10094
10057 msgid "cannot use --no-commit with --bypass" 10095 msgid "cannot use --no-commit with --bypass"
10227 10265
10228 msgid "show only merges" 10266 msgid "show only merges"
10229 msgstr "マージ実施リビジョンのみを表示" 10267 msgstr "マージ実施リビジョンのみを表示"
10230 10268
10231 msgid "revisions committed by user" 10269 msgid "revisions committed by user"
10232 msgstr "当該ユーザによってコミットされたリビジョンを表示" 10270 msgstr "当該ユーザによるリビジョンを表示"
10233 10271
10234 msgid "show only changesets within the given named branch (DEPRECATED)" 10272 msgid "show only changesets within the given named branch (DEPRECATED)"
10235 msgstr "指定の名前付きブランチに属するリビジョンのみを表示 (非推奨)" 10273 msgstr "指定の名前付きブランチに属するリビジョンを表示 (非推奨)"
10236 10274
10237 msgid "show changesets within the given named branch" 10275 msgid "show changesets within the given named branch"
10238 msgstr "指定の名前付きブランチに属するリビジョンを表示" 10276 msgstr "指定の名前付きブランチに属するリビジョンを表示"
10239 10277
10240 msgid "do not display revision or any of its ancestors" 10278 msgid "do not display revision or any of its ancestors"
10305 " for performance reasons, log FILE may omit duplicate changes\n" 10343 " for performance reasons, log FILE may omit duplicate changes\n"
10306 " made on branches and will not show deletions. To see all\n" 10344 " made on branches and will not show deletions. To see all\n"
10307 " changes including duplicates and deletions, use the --removed\n" 10345 " changes including duplicates and deletions, use the --removed\n"
10308 " switch." 10346 " switch."
10309 msgstr "" 10347 msgstr ""
10348 " .. note::\n"
10349 " ファイル名指定付きでの実行では、 複数ブランチ上での同一変更や、\n"
10350 " 登録除外実施リビジョンは、 性能的な点から表示しません。\n"
10351 " 重複変更や登録除外を含め、 全てのリビジョンを表示する場合、\n"
10352 " --removed を指定してください。"
10310 10353
10311 msgid " - changesets with full descriptions and file lists::" 10354 msgid " - changesets with full descriptions and file lists::"
10312 msgstr "" 10355 msgstr " - 全リビジョンのコミットメッセージとファイル一覧の表示::"
10313 10356
10314 msgid " hg log -v" 10357 msgid " hg log -v"
10315 msgstr "" 10358 msgstr " hg log -v"
10316 10359
10317 msgid " - changesets ancestral to the working directory::" 10360 msgid " - changesets ancestral to the working directory::"
10318 msgstr "" 10361 msgstr " - 作業領域の祖先の表示::"
10319 10362
10320 msgid " hg log -f" 10363 msgid " hg log -f"
10321 msgstr "" 10364 msgstr " hg log -f"
10322 10365
10323 msgid " - last 10 commits on the current branch::" 10366 msgid " - last 10 commits on the current branch::"
10324 msgstr "" 10367 msgstr " - 現行ブランチにおける直近の 10 リビジョンの表示::"
10325 10368
10326 msgid " hg log -l 10 -b ." 10369 msgid " hg log -l 10 -b ."
10327 msgstr "" 10370 msgstr " hg log -l 10 -b ."
10328 10371
10329 msgid "" 10372 msgid ""
10330 " - changesets showing all modifications of a file, including removals::" 10373 " - changesets showing all modifications of a file, including removals::"
10331 msgstr "" 10374 msgstr " - 登録除外を含む、ファイルに対する全変更の表示::"
10332 10375
10333 msgid " hg log --removed file.c" 10376 msgid " hg log --removed file.c"
10334 msgstr "" 10377 msgstr " hg log --removed file.c"
10335 10378
10336 msgid "" 10379 msgid ""
10337 " - all changesets that touch a directory, with diffs, excluding merges::" 10380 " - all changesets that touch a directory, with diffs, excluding merges::"
10338 msgstr "" 10381 msgstr " - マージ以外での、ディレクトリ配下への全変更の差分付き表示::"
10339 10382
10340 msgid " hg log -Mp lib/" 10383 msgid " hg log -Mp lib/"
10341 msgstr "" 10384 msgstr " hg log -Mp lib/"
10342 10385
10343 msgid " - all revision numbers that match a keyword::" 10386 msgid " - all revision numbers that match a keyword::"
10344 msgstr "" 10387 msgstr " - 指定キーワードに合致する全リビジョン番号の表示::"
10345 10388
10346 msgid " hg log -k bug --template \"{rev}\\n\"" 10389 msgid " hg log -k bug --template \"{rev}\\n\""
10347 msgstr "" 10390 msgstr " hg log -k bug --template \"{rev}\\n\""
10348 10391
10349 msgid " - check if a given changeset is included is a tagged release::" 10392 msgid " - check if a given changeset is included is a tagged release::"
10350 msgstr "" 10393 msgstr " - 指定リビジョンが指定タグ時点において含まれているかを確認::"
10351 10394
10352 msgid " hg log -r \"a21ccf and ancestor(1.9)\"" 10395 msgid " hg log -r \"a21ccf and ancestor(1.9)\""
10353 msgstr "" 10396 msgstr " hg log -r \"a21ccf and ancestor(1.9)\""
10354 10397
10355 msgid " - find all changesets by some user in a date range::" 10398 msgid " - find all changesets by some user in a date range::"
10356 msgstr "" 10399 msgstr " - 指定期間における指定ユーザによる全変更の表示::"
10357 10400
10358 msgid " hg log -k alice -d \"may 2008 to jul 2008\"" 10401 msgid " hg log -k alice -d \"may 2008 to jul 2008\""
10359 msgstr "" 10402 msgstr " hg log -k alice -d \"may 2008 to jul 2008\""
10360 10403
10361 msgid " - summary of all changesets after the last tag::" 10404 msgid " - summary of all changesets after the last tag::"
10362 msgstr "" 10405 msgstr " - 最後のタグ付け以降の全変更の概要の表示::"
10363 10406
10364 msgid "" 10407 msgid ""
10365 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" 10408 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
10366 msgstr "" 10409 msgstr ""
10410 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
10367 10411
10368 msgid "" 10412 msgid ""
10369 " See :hg:`help revisions` and :hg:`help revsets` for more about\n" 10413 " See :hg:`help revisions` and :hg:`help revsets` for more about\n"
10370 " specifying revisions." 10414 " specifying revisions."
10371 msgstr "" 10415 msgstr ""
11187 #, python-format 11231 #, python-format
11188 msgid "no changes needed to %s\n" 11232 msgid "no changes needed to %s\n"
11189 msgstr "%s には改変の必要がありません\n" 11233 msgstr "%s には改変の必要がありません\n"
11190 11234
11191 msgid "ignore safety measures" 11235 msgid "ignore safety measures"
11192 msgstr "" 11236 msgstr "安全判定を無視"
11193 11237
11194 msgid "roll back the last transaction (dangerous)" 11238 msgid "roll back the last transaction (dangerous)"
11195 msgstr "直前のトランザクションの巻き戻し(要注意)" 11239 msgstr "直前のトランザクションの巻き戻し(要注意)"
11196 11240
11197 msgid "" 11241 msgid ""
11235 " an older changeset, and then rollback. The update removes the\n" 11279 " an older changeset, and then rollback. The update removes the\n"
11236 " changes you committed from the working directory, and rollback\n" 11280 " changes you committed from the working directory, and rollback\n"
11237 " removes them from history. To avoid data loss, you must pass\n" 11281 " removes them from history. To avoid data loss, you must pass\n"
11238 " --force in this case." 11282 " --force in this case."
11239 msgstr "" 11283 msgstr ""
11284 " 例えば commit、旧リビジョンへの update、 rollback の順で実行すると、\n"
11285 " データが喪失します。 commit 内容が、 update により作業領域から、\n"
11286 " rollback により履歴から破棄されるためです。\n"
11287 " このケースにおけるデータ喪失を避けるには --force を指定してください。\n"
11288 " (訳注: --force 指定が『無い』場合、 このケースのようなデータ喪失は、\n"
11289 " 実行中断により防止されます。 原文では、 --force 指定は\n"
11290 " \"avoid data loss\" (データ喪失の回避) のためと記載されていますが、\n"
11291 " 実際には『データ喪失に構わず rollback を強行する』場合にのみ\n"
11292 " --force を指定してください)"
11240 11293
11241 msgid "" 11294 msgid ""
11242 " This command is not intended for use on public repositories. Once\n" 11295 " This command is not intended for use on public repositories. Once\n"
11243 " changes are visible for pull by other users, rolling a transaction\n" 11296 " changes are visible for pull by other users, rolling a transaction\n"
11244 " back locally is ineffective (someone else may already have pulled\n" 11297 " back locally is ineffective (someone else may already have pulled\n"
11507 " ! = 構成管理対象にも関わらず作業領域にファイルが無い(missing)\n" 11560 " ! = 構成管理対象にも関わらず作業領域にファイルが無い(missing)\n"
11508 " ? = 構成管理対象外(unknown)\n" 11561 " ? = 構成管理対象外(unknown)\n"
11509 " I = 無視(Ignored)\n" 11562 " I = 無視(Ignored)\n"
11510 " = 直前に表示される新規登録予定ファイル(A)の複製元" 11563 " = 直前に表示される新規登録予定ファイル(A)の複製元"
11511 11564
11512 msgid " - show changes in the working directory relative to a changeset:" 11565 msgid ""
11513 msgstr "" 11566 " - show changes in the working directory relative to a\n"
11567 " changeset::"
11568 msgstr " - 作業領域と指定リビジョンとの間での状態変更を表示::"
11514 11569
11515 msgid " hg status --rev 9353" 11570 msgid " hg status --rev 9353"
11516 msgstr "" 11571 msgstr " hg status --rev 9353"
11517 11572
11518 msgid " - show all changes including copies in an existing changeset::" 11573 msgid " - show all changes including copies in an existing changeset::"
11519 msgstr "" 11574 msgstr " - 指定リビジョンにおける状態変更 (複製元含む) を表示::"
11520 11575
11521 msgid " hg status --copies --change 9353" 11576 msgid " hg status --copies --change 9353"
11522 msgstr "" 11577 msgstr " hg status --copies --change 9353"
11523 11578
11524 msgid " - get a NUL separated list of added files, suitable for xargs::" 11579 msgid " - get a NUL separated list of added files, suitable for xargs::"
11525 msgstr "" 11580 msgstr " - 追加登録されたファイルの NUL 区切り一覧の表示 (xargs 向け)::"
11526 11581
11527 msgid " hg status -an0" 11582 msgid " hg status -an0"
11528 msgstr "" 11583 msgstr " hg status -an0"
11529 11584
11530 msgid "check for push and pull" 11585 msgid "check for push and pull"
11531 msgstr "push/pull 実施結果の確認" 11586 msgstr "push/pull 実施結果の確認"
11532 11587
11533 msgid "summarize working directory state" 11588 msgid "summarize working directory state"
12081 msgstr "pull と merge を実施するか、 push -f で強制実行してください" 12136 msgstr "pull と merge を実施するか、 push -f で強制実行してください"
12082 12137
12083 msgid "did you forget to merge? use push -f to force" 12138 msgid "did you forget to merge? use push -f to force"
12084 msgstr "マージは済んでいますか？ push -f で強制実行できます" 12139 msgstr "マージは済んでいますか？ push -f で強制実行できます"
12085 12140
12141 #, python-format
12142 msgid "new remote heads on branch '%s'\n"
12143 msgstr "新しいヘッドが連携先のブランチ '%s' に作成されます\n"
12144
12145 #, python-format
12146 msgid "new remote head %s\n"
12147 msgstr "新しいヘッド %s が連携先に作成されます\n"
12148
12086 msgid "note: unsynced remote changes!\n" 12149 msgid "note: unsynced remote changes!\n"
12087 msgstr "注意: 連携先での変更点が取り込まれていません!\n" 12150 msgstr "注意: 連携先での変更点が取り込まれていません!\n"
12088 12151
12089 #, python-format 12152 #, python-format
12090 msgid "abort: %s\n" 12153 msgid "abort: %s\n"
12134 msgstr "hg %s: %s\n" 12197 msgstr "hg %s: %s\n"
12135 12198
12136 #, python-format 12199 #, python-format
12137 msgid "hg: %s\n" 12200 msgid "hg: %s\n"
12138 msgstr "hg: %s\n" 12201 msgstr "hg: %s\n"
12202
12203 msgid "abort: remote error:\n"
12204 msgstr "中止: 連携エラー:\n"
12139 12205
12140 #, python-format 12206 #, python-format
12141 msgid "abort: %s!\n" 12207 msgid "abort: %s!\n"
12142 msgstr "中止: %s!\n" 12208 msgstr "中止: %s!\n"
12143 12209
12361 msgid "" 12427 msgid ""
12362 "``removed()``\n" 12428 "``removed()``\n"
12363 " File that is removed according to status." 12429 " File that is removed according to status."
12364 msgstr "" 12430 msgstr ""
12365 "``removed()``\n" 12431 "``removed()``\n"
12366 " 削除ステータスを持つファイル" 12432 " 登録除外(予定)ステータスを持つファイル"
12367 12433
12368 #. i18n: "removed" is a keyword 12434 #. i18n: "removed" is a keyword
12369 msgid "removed takes no arguments" 12435 msgid "removed takes no arguments"
12370 msgstr "removed 指定には引数が指定できません" 12436 msgstr "removed 指定には引数が指定できません"
12371 12437
12372 msgid "" 12438 msgid ""
12373 "``deleted()``\n" 12439 "``deleted()``\n"
12374 " File that is deleted according to status." 12440 " File that is deleted according to status."
12375 msgstr "" 12441 msgstr ""
12376 "``deleted()``\n" 12442 "``deleted()``\n"
12377 " 削除ステータスを持つファイル" 12443 " 作業領域のファイル不在ステータスを持つファイル"
12378 12444
12379 #. i18n: "deleted" is a keyword 12445 #. i18n: "deleted" is a keyword
12380 msgid "deleted takes no arguments" 12446 msgid "deleted takes no arguments"
12381 msgstr "deleted 指定には引数が指定できません" 12447 msgstr "deleted 指定には引数が指定できません"
12382 12448
12567 #, python-format 12633 #, python-format
12568 msgid "unknown bisect kind %s" 12634 msgid "unknown bisect kind %s"
12569 msgstr "未知の分岐種類 %s" 12635 msgstr "未知の分岐種類 %s"
12570 12636
12571 msgid "invalid bisect state" 12637 msgid "invalid bisect state"
12572 msgstr "" 12638 msgstr "bisect 状態が不正です"
12573 12639
12574 #. i18n: bisect changeset status 12640 #. i18n: bisect changeset status
12575 msgid "good" 12641 msgid "good"
12576 msgstr "" 12642 msgstr ""
12577 12643
17759 "-----------------------------------" 17825 "-----------------------------------"
17760 msgstr "" 17826 msgstr ""
17761 17827
17762 msgid "" 17828 msgid ""
17763 ":add: add does not recurse in subrepos unless -S/--subrepos is\n" 17829 ":add: add does not recurse in subrepos unless -S/--subrepos is\n"
17764 " specified. Subversion subrepositories are currently silently\n" 17830 " specified. Git and Subversion subrepositories are currently\n"
17765 " ignored." 17831 " silently ignored."
17766 msgstr "" 17832 msgstr ""
17767 17833
17768 msgid "" 17834 msgid ""
17769 ":archive: archive does not recurse in subrepositories unless\n" 17835 ":archive: archive does not recurse in subrepositories unless\n"
17770 " -S/--subrepos is specified." 17836 " -S/--subrepos is specified."
17771 msgstr "" 17837 msgstr ""
17772 17838
17773 msgid "" 17839 msgid ""
17774 ":commit: commit creates a consistent snapshot of the state of the\n" 17840 ":commit: commit creates a consistent snapshot of the state of the\n"
17775 " entire project and its subrepositories. It does this by first\n" 17841 " entire project and its subrepositories. If any subrepositories\n"
17776 " attempting to commit all modified subrepositories, then recording\n" 17842 " have been modified, Mercurial will abort. Mercurial can be made\n"
17777 " their state and finally committing it in the parent\n" 17843 " to instead commit all modified subrepositories by specifying\n"
17778 " repository. Mercurial can be made to abort if any subrepository\n" 17844 " -S/--subrepos, or setting \"ui.commitsubrepos=True\" in a\n"
17779 " content is modified by setting \"ui.commitsubrepos=no\" in a\n" 17845 " configuration file (see :hg:`help config`). After there are no\n"
17780 " configuration file (see :hg:`help config`)." 17846 " longer any modified subrepositories, it records their state and\n"
17847 " finally commits it in the parent repository."
17781 msgstr "" 17848 msgstr ""
17782 17849
17783 msgid "" 17850 msgid ""
17784 ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" 17851 ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
17785 " specified. Changes are displayed as usual, on the subrepositories\n" 17852 " specified. Changes are displayed as usual, on the subrepositories\n"
17786 " elements. Subversion subrepositories are currently silently\n" 17853 " elements. Git and Subversion subrepositories are currently\n"
17787 " ignored." 17854 " silently ignored."
17788 msgstr "" 17855 msgstr ""
17789 17856
17790 msgid "" 17857 msgid ""
17791 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" 17858 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
17792 " is specified. Subversion subrepositories are currently silently\n" 17859 " is specified. Git and Subversion subrepositories are currently\n"
17793 " ignored." 17860 " silently ignored."
17794 msgstr "" 17861 msgstr ""
17795 17862
17796 msgid "" 17863 msgid ""
17797 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" 17864 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
17798 " is specified. Subversion subrepositories are currently silently\n" 17865 " is specified. Git and Subversion subrepositories are currently\n"
17799 " ignored." 17866 " silently ignored."
17800 msgstr "" 17867 msgstr ""
17801 17868
17802 msgid "" 17869 msgid ""
17803 ":pull: pull is not recursive since it is not clear what to pull prior\n" 17870 ":pull: pull is not recursive since it is not clear what to pull prior\n"
17804 " to running :hg:`update`. Listing and retrieving all\n" 17871 " to running :hg:`update`. Listing and retrieving all\n"
17809 17876
17810 msgid "" 17877 msgid ""
17811 ":push: Mercurial will automatically push all subrepositories first\n" 17878 ":push: Mercurial will automatically push all subrepositories first\n"
17812 " when the parent repository is being pushed. This ensures new\n" 17879 " when the parent repository is being pushed. This ensures new\n"
17813 " subrepository changes are available when referenced by top-level\n" 17880 " subrepository changes are available when referenced by top-level\n"
17814 " repositories." 17881 " repositories. Push is a no-op for Subversion subrepositories."
17815 msgstr "" 17882 msgstr ""
17816 17883
17817 msgid "" 17884 msgid ""
17818 ":status: status does not recurse into subrepositories unless\n" 17885 ":status: status does not recurse into subrepositories unless\n"
17819 " -S/--subrepos is specified. Subrepository changes are displayed as\n" 17886 " -S/--subrepos is specified. Subrepository changes are displayed as\n"
19300 msgid "unknown repository format: requires features '%s' (upgrade Mercurial)" 19367 msgid "unknown repository format: requires features '%s' (upgrade Mercurial)"
19301 msgstr "未知のリポジトリ形式です: '%s' サポートが必要 (要 Mercurial 更新)" 19368 msgstr "未知のリポジトリ形式です: '%s' サポートが必要 (要 Mercurial 更新)"
19302 19369
19303 msgid "searching for changes\n" 19370 msgid "searching for changes\n"
19304 msgstr "変更点を探索中\n" 19371 msgstr "変更点を探索中\n"
19372
19373 msgid "all local heads known remotely\n"
19374 msgstr ""
19375
19376 msgid "sampling from both directions\n"
19377 msgstr ""
19305 19378
19306 msgid "queries" 19379 msgid "queries"
19307 msgstr "問い合わせ" 19380 msgstr "問い合わせ"
19308 19381
19309 msgid "searching" 19382 msgid "searching"