|
|
1780.
|
|
|
discard update (breaks move)
|
|
|
|
|
odbaciti nadogradnju (prekidni potez)
|
|
Translated by
Medina Mališević
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
../svn/conflict-callbacks.c:549
|
|
|
1781.
|
|
|
discard update, mark resolved, the move will will become a copy
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:549
|
|
|
1782.
|
|
|
apply update to move destination
|
|
|
|
|
primijeniti nadogradnju na destinaciju premještaja
|
|
Translated by
Medina Mališević
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
../svn/conflict-callbacks.c:563
|
|
|
1783.
|
|
|
apply incoming update to move destination [mine-conflict]
|
|
|
|
|
primijeniti dolazeću nadogradnju na destinaciju premještaja [mine-conflict]
|
|
Translated by
Medina Mališević
|
|
Reviewed by
Samir Ribić
|
|
|
|
Located in
../svn/conflict-callbacks.c:532
|
|
|
1784.
|
|
|
keep affected local moves
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:577 ../svn/conflict-callbacks.c:593
|
|
|
1785.
|
|
|
keep any local moves affected by this deletion [mine-conflict]
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:577
|
|
|
1786.
|
|
|
mark resolved (breaks moves)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:580 ../svn/conflict-callbacks.c:596
|
|
|
1787.
|
|
|
mark resolved, any affected moves will become copies
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:580
|
|
|
1788.
|
|
|
keep any moves affected by this replacement [mine-conflict]
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:593
|
|
|
1789.
|
|
|
mark resolved (any affected moves will become copies)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../svn/conflict-callbacks.c:596
|
