|
125.
|
|
|
Missing the flag: %s. Configure in qconfig under the merge tab.
|
|
|
|
De vlag %s ontbreekt. Configureer dit in qconfig onder het tabblad Samenvoegen.
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:305
|
|
126.
|
|
|
path conflict
|
|
|
|
padconflict
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:310
|
|
127.
|
|
|
contents conflict
|
|
|
|
conflicterende inhoud
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:311
|
|
128.
|
|
|
text conflict
|
|
|
|
conflicterende text
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:312
|
|
129.
|
|
|
duplicate id
|
|
|
|
dubbel id
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:313
|
|
130.
|
|
|
duplicate
|
|
|
|
duplicaat
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:314
|
|
131.
|
|
|
parent loop
|
|
|
|
parent loop
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:315
|
|
132.
|
|
|
unversioned parent
|
|
|
|
parent niet onder versiebeheer
|
|
Translated and reviewed by
Jeroen Hellingman
|
|
|
|
Located in
lib\conflicts.py:316
|
|
133.
|
|
|
missing parent
|
|
|
|
ontbrekende parent
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:317
|
|
134.
|
|
|
deleting parent
|
|
|
|
parent verwijderen
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:318
|