|
126.
|
|
|
path conflict
|
|
|
|
conflicto en la ruta
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:310
|
|
127.
|
|
|
contents conflict
|
|
|
|
conflicto de contenidos
|
|
Translated by
DiegoJ
|
|
Reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:311
|
|
128.
|
|
|
text conflict
|
|
|
|
texto conflictivo
|
|
Translated and reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:312
|
|
129.
|
|
|
duplicate id
|
|
|
|
id duplicado
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:313
|
|
130.
|
|
|
duplicate
|
|
|
|
duplicado
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:314
|
|
131.
|
|
|
parent loop
|
|
|
|
ciclo padre
|
|
Translated and reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:315
|
|
132.
|
|
|
unversioned parent
|
|
|
|
padre sin versionar
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:316
|
|
133.
|
|
|
missing parent
|
|
|
|
no se encuentra el padre
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:317
|
|
134.
|
|
|
deleting parent
|
|
|
|
borrando padre
|
|
Translated and reviewed by
DiegoJ
|
|
|
|
Located in
lib\conflicts.py:318
|
|
135.
|
|
|
non-directory parent
|
|
|
|
padre no-directorio
|
|
Translated and reviewed by
Luis Alejandro Rangel Sánchez
|
|
|
|
Located in
lib\conflicts.py:319
|