|
|
124.
|
|
|
The extmerge definition: '%(tool)s' is invalid. 
Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge tab. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
外部マージツールの定義が無効です。: '%(tool)s'
フラグ '%(flags)s' が指定されていません。qconfigのマージタブで修正してください。 |
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:299
|
|
|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
|
%s フラグがありません。 qconfig の merge タブで設定してください
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:305
|
|
|
126.
|
|
|
path conflict
|
|
|
|
|
パスの競合
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:310
|
|
|
127.
|
|
|
contents conflict
|
|
|
|
|
内容の競合
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:311
|
|
|
128.
|
|
|
text conflict
|
|
|
|
|
テキストの競合
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:312
|
|
|
129.
|
|
|
duplicate id
|
|
|
|
|
重複ID
|
|
Translated and reviewed by
Sakae Akanuma
|
|
|
|
Located in
lib\conflicts.py:313
|
|
|
130.
|
|
|
duplicate
|
|
|
|
|
複製
|
|
Translated and reviewed by
Kentaro Hayashi
|
|
|
|
Located in
lib\conflicts.py:314
|
|
|
131.
|
|
|
parent loop
|
|
|
|
|
フォルダ構成のループ
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:315
|
|
|
132.
|
|
|
unversioned parent
|
|
|
|
|
親のバージョンが定義されていません
|
|
Translated by
Sakae Akanuma
|
|
Reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:316
|
|
|
133.
|
|
|
missing parent
|
|
|
|
|
親が見つかりません
|
|
Translated by
Sakae Akanuma
|
|
Reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:317
|
