Show More
@@ -99,7 +99,7 b' msgid ""' | |||||
99 | msgstr "" |
|
99 | msgstr "" | |
100 | "Project-Id-Version: Mercurial\n" |
|
100 | "Project-Id-Version: Mercurial\n" | |
101 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
101 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
102 |
"POT-Creation-Date: 2010-0 |
|
102 | "POT-Creation-Date: 2010-03-02 11:58+0900\n" | |
103 | "PO-Revision-Date: 2009-11-16 21:24+0100\n" |
|
103 | "PO-Revision-Date: 2009-11-16 21:24+0100\n" | |
104 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" |
|
104 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" | |
105 | "Language-Team: Japanese\n" |
|
105 | "Language-Team: Japanese\n" | |
@@ -7192,50 +7192,56 b' msgstr ""' | |||||
7192 | " " |
|
7192 | " " | |
7193 |
|
7193 | |||
7194 | msgid "" |
|
7194 | msgid "" | |
7195 | "retry file merges from a merge or update\n" |
|
7195 | "various operations to help finish a merge\n" | |
7196 | "\n" |
|
7196 | "\n" | |
7197 | " This command can cleanly retry unresolved file merges using file\n" |
|
7197 | " This command includes several actions that are often useful while\n" | |
7198 | " revisions preserved from the last update or merge.\n" |
|
7198 | " performing a merge, after running ``merge`` but before running\n" | |
7199 | "\n" |
|
7199 | " ``commit``. (It is only meaningful if your working directory has\n" | |
7200 | " If a conflict is resolved manually, please note that the changes\n" |
|
7200 | " two parents.) It is most relevant for merges with unresolved\n" | |
7201 | " will be overwritten if the merge is retried with resolve. The\n" |
|
7201 | " conflicts, which are typically a result of non-interactive merging with\n" | |
7202 | " -m/--mark switch should be used to mark the file as resolved.\n" |
|
7202 | " ``internal:merge`` or a command-line merge tool like ``diff3``.\n" | |
7203 | "\n" |
|
7203 | "\n" | |
7204 | " You can specify a set of files to operate on, or use the -a/--all\n" |
|
7204 | " The available actions are:\n" | |
7205 | " switch to select all unresolved files.\n" |
|
7205 | "\n" | |
7206 | "\n" |
|
7206 | " 1) list files that were merged with conflicts (U, for unresolved)\n" | |
7207 | " This command also allows listing resolved files and manually\n" |
|
7207 | " and without conflicts (R, for resolved): ``hg resolve -l``\n" | |
7208 | " indicating whether or not files are resolved. All files must be\n" |
|
7208 | " (this is like ``status`` for merges)\n" | |
7209 | " marked as resolved before a commit is permitted.\n" |
|
7209 | " 2) record that you have resolved conflicts in certain files:\n" | |
7210 | "\n" |
|
7210 | " ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" | |
7211 | " The codes used to show the status of files are::\n" |
|
7211 | " 3) forget that you have resolved conflicts in certain files:\n" | |
7212 | "\n" |
|
7212 | " ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" | |
7213 | " U = unresolved\n" |
|
7213 | " 4) discard your current attempt(s) at resolving conflicts and\n" | |
7214 | " R = resolved\n" |
|
7214 | " restart the merge from scratch: ``hg resolve file...``\n" | |
7215 | " " |
|
7215 | " (or ``-a`` for all unresolved files)\n" | |
7216 | msgstr "" |
|
7216 | "\n" | |
7217 | "merge や update におけるファイルマージの再実施\n" |
|
7217 | " Note that Mercurial will not let you commit files with unresolved merge\n" | |
7218 | "\n" |
|
7218 | " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" | |
7219 | " 衝突が「未解消」のファイルに対し、直前の 'hg merge' や 'hg update'\n" |
|
7219 | " after a conflicting merge.\n" | |
7220 | " 時点におけるファイルの内容を用いて、綺麗な状態からのマージ処理を実施\n" |
|
7220 | " " | |
7221 | " します。\n" |
|
7221 | msgstr "" | |
7222 | "\n" |
|
7222 | "マージ作業完了を補助する種々の操作\n" | |
7223 | " 衝突を手動で解消した場合、本コマンドでマージ処理が再実行されると、\n" |
|
7223 | "\n" | |
7224 | " 手動で変更した解消内容が上書きされてしまいます。手動で衝突を解消した\n" |
|
7224 | " 本コマンドには、``merge`` 実行後から ``commit`` 実行までの、\n" | |
7225 | " 場合、-m/--mark を指定して本コマンドを実行することで、ファイルの衝突\n" |
|
7225 | " マージ作業を補助する複数の機能が含まれています\n" | |
7226 | " 解消状態を「解消済み」にしてください。\n" |
|
7226 | " (本コマンドは作業領域が2つの親を持つ場合にのみ意味を持ちます)。\n" | |
7227 | "\n" |
|
7227 | " 典型的には、``internal:merge`` や、``diff3`` のようなコマンド行\n" | |
7228 | " 実施対象を明示的に指定する以外に、-a/--all を指定することで\n" |
|
7228 | " ベースのマージツールによる非対話的なマージの結果によって生じた\n" | |
7229 | " 衝突が「未解消」な全てのファイルを実施対象にすることもできます。\n" |
|
7229 | " 未解消の衝突の扱いに関する機能です。\n" | |
7230 | "\n" |
|
7230 | "\n" | |
7231 | " 本コマンドは、ファイルの衝突解消状態の一覧表示や、「解消済み」/\n" |
|
7231 | " 以下の操作が可能です:\n" | |
7232 | " 「未解消」といった衝突解消状態の手動変更もできます。全てのファイルの\n" |
|
7232 | "\n" | |
7233 | " 衝突解消状態が「解消済み」になるまでは、コミットができません。\n" |
|
7233 | " 1) 衝突未解消(U: unresolved)および衝突解消済み(R: resolved)なマージ\n" | |
7234 | "\n" |
|
7234 | " 対象ファイルを一覧表示: ``hg resolve -l``\n" | |
7235 | " ファイルの衝突解消状態表示には以下の記号が使用されます::\n" |
|
7235 | " (マージにおける ``status`` のようなものです)\n" | |
7236 | "\n" |
|
7236 | " 2) 指定ファイルの衝突を解消したことを記録:\n" | |
7237 | " U = 未解消(Unresolved)\n" |
|
7237 | " ``hg resolve -m [file ...]`` (無指定時は全ファイルが対象)\n" | |
7238 | " R = 解消済み(Resolved)\n" |
|
7238 | " 3) 指定ファイルの衝突を解消したことを取り消す:\n" | |
|
7239 | " ``hg resolve -u [file ...]`` (無指定時は全ファイルが対象)\n" | |||
|
7240 | " 4) 全ての衝突解消作業を破棄し、マージを最初からやり直す:\n" | |||
|
7241 | " ``hg resolve file...`` (``-a`` 指定時は全ファイルが対象)\n" | |||
|
7242 | "\n" | |||
|
7243 | " 衝突未解消のファイルがある間はコミットできません。マージにおける\n" | |||
|
7244 | " 衝突解消の際には、コミット前に ``hg resolve -m ...`` してください。\n" | |||
7239 | " " |
|
7245 | " " | |
7240 |
|
7246 | |||
7241 | msgid "too many options specified" |
|
7247 | msgid "too many options specified" |
General Comments 0
You need to be logged in to leave comments.
Login now