|
312.
|
|
|
Conflict Resolution
|
Context: |
|
@title:window
|
|
|
|
Konfliktupplösning
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:188
|
|
313.
|
|
|
Take left one
|
|
|
|
Ta den vänstra
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:192
|
|
314.
|
|
|
Take right one
|
|
|
|
Ta den högra
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:193
|
|
315.
|
|
|
Keep both
|
|
|
|
Behåll båda
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:194
|
|
316.
|
|
|
Two updates conflict with each other.<nl/>Please choose which update(s) to apply.
|
Context: |
|
@label
|
|
|
|
Två uppdateringar har konflikter med varandra.<nl/>Välj vilken eller vilka uppdateringar som ska utföras.
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:203
|
|
317.
|
|
|
Data
|
|
|
|
Uppgifter
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:233
|