|
|
70.
|
|
|
unversioned parent
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../conflicts.py:126
|
|
|
71.
|
|
|
missing parent
|
|
|
|
|
genitore mancante
|
|
Translated by
Milo Casagrande
|
|
Reviewed by
Milo Casagrande
|
|
|
|
Located in
../conflicts.py:128
|
|
|
72.
|
|
|
deleting parent
|
|
|
|
|
eliminazione genitore
|
|
Translated and reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:130
|
|
|
73.
|
|
|
unknown type of conflict
|
|
|
|
|
tipo di conflitto sconosciuto
|
|
Translated by
Milo Casagrande
|
|
Reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:132
|
|
|
74.
|
|
|
No file was selected
|
|
|
|
|
Non è stato selezionato alcun file
|
|
Translated and reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:161
|
|
|
75.
|
|
|
Please select a file from the list.
|
|
|
|
|
Selezionare un file dall'elenco.
|
|
Translated and reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:162
|
|
|
76.
|
|
|
Call to external utility failed
|
|
|
|
|
Chiamata all'utilità esterna non riuscita
|
|
Translated and reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:172
|
|
|
77.
|
|
|
Cannot resolve conflict
|
|
|
|
|
Impossibile risolvere il conflitto
|
|
Translated by
Milo Casagrande
|
|
Reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:174
|
|
|
78.
|
|
|
Only conflicts on the text of files can be resolved with Olive at the moment. Content conflicts, on the structure of the tree, need to be resolved using the command line.
|
|
|
|
|
Al momento è possibile risolvere con Olive solo i conflitti sui file di testo. I conflitti di contenuto, sulla struttura dell'albero, devono essere risolti usando la riga di comando.
|
|
Translated and reviewed by
Luca Ferretti
|
|
|
|
Located in
../conflicts.py:175
|
|
|
79.
|
|
|
_View
|
|
|
View menu
|
|
|
|
|
_Mostra
|
|
Translated and reviewed by
Luca Livraghi
|
|
|
|
Located in
../diff.py:445
|
