|
|
65.
|
|
|
contents conflict
|
|
|
|
|
conflicte de contingut
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:116
|
|
|
66.
|
|
|
text conflict
|
|
|
|
|
conflicte de text
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:118
|
|
|
67.
|
|
|
duplicate id
|
|
|
|
|
identificador duplicat
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:120
|
|
|
68.
|
|
|
duplicate
|
|
|
|
|
duplicat
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:122
|
|
|
69.
|
|
|
parent loop
|
|
|
|
|
bucle del pare
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:124
|
|
|
70.
|
|
|
unversioned parent
|
|
|
|
|
pare sense versionar
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:126
|
|
|
71.
|
|
|
missing parent
|
|
|
|
|
manca el pare
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:128
|
|
|
72.
|
|
|
deleting parent
|
|
|
|
|
supressió del pare
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:130
|
|
|
73.
|
|
|
unknown type of conflict
|
|
|
|
|
tipus de conflicte desconegut
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:132
|
|
|
74.
|
|
|
No file was selected
|
|
|
|
|
No s'ha seleccionat cap fitxer
|
|
Translated and reviewed by
David Planella
|
|
|
|
Located in
../conflicts.py:161
|
