|
|
308.
|
|
|
Did not find other item for conflict handling
|
|
|
|
|
Hittade inte något annat objekt för konflikthantering
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflicthandler.cpp:68
|
|
|
309.
|
|
|
Modification Time
|
|
|
|
|
Ändringstid
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:129
|
|
|
310.
|
|
|
Flags
|
|
|
|
|
Flaggor
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:143
|
|
|
311.
|
|
|
Attribute: %1
|
|
|
|
|
Egenskap: %1
|
|
Translated by
Stefan Asserhäll
|
|
|
|
Located in
conflicthandling/conflictresolvedialog.cpp:161
conflicthandling/conflictresolvedialog.cpp:168
conflicthandling/conflictresolvedialog.cpp:177
|
|
|
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
|
