|
337.
|
|
|
Flags
|
|
|
|
Флаги
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:143
|
|
338.
|
|
|
Attribute: %1
|
|
|
|
Атрибут: %1
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:161
conflicthandling/conflictresolvedialog.cpp:168
conflicthandling/conflictresolvedialog.cpp:177
|
|
339.
|
|
|
Conflict Resolution
|
Context: |
|
@title:window
|
|
|
|
Разрешение конфликта
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:188
|
|
340.
|
|
|
Take left one
|
|
|
|
Применить левое
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:192
|
|
341.
|
|
|
Take right one
|
|
|
|
Применить правое
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:193
|
|
342.
|
|
|
Keep both
|
|
|
|
Оставить оба
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:194
|
|
343.
|
|
|
Two updates conflict with each other.<nl/>Please choose which update(s) to apply.
|
Context: |
|
@label
|
|
|
|
Два обновления конфликтуют.<nl/>Выберите, какое из обновление следует применить.
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:203
|
|
344.
|
|
|
Data
|
|
|
|
Данные
|
|
Translated by
Alexander Potashev
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:233
|