|
|
82.
|
|
|
All changes applied successfully.
|
|
|
|
|
Alle wijzigingen succesvol verwerkt.
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../diff.py:494 ../merge.py:145
|
|
|
83.
|
|
|
Conflicts encountered
|
|
|
There are conflicts to be resolved.
|
|
|
|
|
Conflict gedetecteerd
|
|
Translated and reviewed by
Wim Rosseel
|
|
|
|
Located in
../diff.py:497 ../merge.py:148
|
|
|
84.
|
|
|
Please resolve the conflicts manually before committing.
|
|
|
|
|
Los de conflicten handmatig op alvorens te committen.
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../diff.py:498 ../merge.py:149
|
|
|
85.
|
|
|
Directory is not a branch
|
|
|
|
|
Map is geen branch
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:31
|
|
|
86.
|
|
|
You can perform this action only in a branch.
|
|
|
|
|
Deze actie kan alleen op een branch uitgevoerd worden.
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:32
|
|
|
87.
|
|
|
Directory is not a checkout
|
|
|
|
|
Map is geen checkout
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:34
|
|
|
88.
|
|
|
You can perform local commit only on checkouts.
|
|
|
|
|
Lokaal committen kan alleen op checkouts.
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:35
|
|
|
89.
|
|
|
No changes to commit
|
|
|
|
|
Niets te committen
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:37
|
|
|
90.
|
|
|
Try force commit if you want to commit anyway.
|
|
|
|
|
Forceer een commit als u toch wilt committen.
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:38
|
|
|
91.
|
|
|
No changes to merge
|
|
|
|
|
Geen wijzigingen voor merge
|
|
Translated and reviewed by
wouter bolsterlee
|
|
|
|
Located in
../errors.py:40
|
