|
|
311.
|
|
|
Attribute: %1
|
|
|
|
|
属性：%1
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:161
conflicthandling/conflictresolvedialog.cpp:168
conflicthandling/conflictresolvedialog.cpp:177
|
|
|
312.
|
|
|
Conflict Resolution
|
| Context: |
|
@title:window
|
|
|
|
|
冲突解决
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:188
|
|
|
313.
|
|
|
Take left one
|
|
|
|
|
选择左项
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:192
|
|
|
314.
|
|
|
Take right one
|
|
|
|
|
选择右项
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:193
|
|
|
315.
|
|
|
Keep both
|
|
|
|
|
保留两者
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:194
|
|
|
316.
|
|
|
Two updates conflict with each other.<nl/>Please choose which update(s) to apply.
|
| Context: |
|
@label
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:203
|
|
|
317.
|
|
|
Data
|
|
|
|
|
数据
|
|
Translated by
nihui
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:233
|
