|
|
98.
|
|
|
Would you like to import your previously configured external merge tool: 
%(old_cmdline)s
as:
%(new_cmdline)s |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:443
|
|
|
99.
|
|
|
old_cmdline
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:446
|
|
|
100.
|
|
|
&Ignore and proceed
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:608
|
|
|
101.
|
|
|
&Change the values
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:609
|
|
|
110.
|
|
|
M&erge tool:
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:100
|
|
|
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
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
121.
|
|
|
Bazaar 2.4 or later is required for external mergetools support
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:265
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:275
|
