|
|
131.
|
|
|
Unknown
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:51
|
|
|
132.
|
|
|
Added
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:54
|
|
|
133.
|
|
|
Deleted
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:57
|
|
|
134.
|
|
|
Modified
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:60
|
|
|
135.
|
|
|
Unmodified
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:64
|
|
|
136.
|
|
|
A conflict has appeared, please solve it manually.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:131 singleconflictdialog.cpp:106
|
|
|
137.
|
|
|
Use Selected Item
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:136
|
|
|
138.
|
|
|
Duplicate Items
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:140 singleconflictdialog.cpp:115
|
|
|
139.
|
|
|
Ignore Conflict
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
multiconflictdialog.cpp:144 singleconflictdialog.cpp:119
|
|
|
140.
|
|
|
Select Member Type
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
pluginpicker.cpp:105
|
