|
|
113.
|
|
|
Take "&THIS" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:154
|
|
|
114.
|
|
|
Take "&OTHER" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:156
|
|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
解決済みにする(&R)
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
%d個の競合が解決済みになりました
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
OK(&O)
|
|
Translated by
Kentaro Hayashi
|
|
|
|
Located in
lib\conflicts.py:196 lib\conflicts.py:201 lib\diffwindow.py:461
lib\util.py:69 lib/widgets\shelve.py:630 lib/widgets\shelve.py:674
lib/widgets\shelve.py:721 lib/widgets\shelve.py:725
|
|
|
118.
|
|
|
All conflicts resolved.
|
|
|
|
|
全ての競合は解決されました。
|
|
Translated by
Regen
|
|
Reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:200
|
|
|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
|
merge ツールの実行中にエラーが発生しました (コード %d)
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:235
|
|
|
120.
|
|
|
Error
|
|
|
|
|
エラー
|
|
Translated and reviewed by
Nazo
|
|
|
|
Located in
lib\conflicts.py:236 lib\conflicts.py:298 lib\tag.py:194 lib\trace.py:193
lib\trace.py:200 lib\tree_branch.py:95 lib\util.py:420 lib\util.py:1011
lib\util.py:1021
|
|
|
121.
|
|
|
Bazaar 2.4 or later is required for external mergetools support
|
|
|
|
|
外部マージツールのサポートにはBazaar 2.4以降が必要です
|
|
Translated and reviewed by
IWATA Hidetaka
|
|
|
|
Located in
lib\conflicts.py:265
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
qconfig の merge タブで外部のマージプログラムを設定してください
|
|
Translated and reviewed by
methane
|
|
|
|
Located in
lib\conflicts.py:275
|
