|
|
72.
|
|
|
deleting parent
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../conflicts.py:130
|
|
|
73.
|
|
|
unknown type of conflict
|
|
|
|
|
tipo de conflito desconhecido
|
|
Translated and reviewed by
Leandro Pereira de Lima e Silva
|
|
|
|
Located in
../conflicts.py:132
|
|
|
74.
|
|
|
No file was selected
|
|
|
|
|
Nenhum arquivo foi selecionado
|
|
Translated and reviewed by
Leandro Pereira de Lima e Silva
|
|
|
|
Located in
../conflicts.py:161
|
|
|
75.
|
|
|
Please select a file from the list.
|
|
|
|
|
Por favor selecione um arquivo da lista.
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
Located in
../conflicts.py:162
|
|
|
76.
|
|
|
Call to external utility failed
|
|
|
|
|
Falha na chamada a utilitário externo
|
|
Translated and reviewed by
Leandro Pereira de Lima e Silva
|
|
|
|
Located in
../conflicts.py:172
|
|
|
77.
|
|
|
Cannot resolve conflict
|
|
|
|
|
Não é possível resolver o conflito
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
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.
|
|
|
|
|
No momento, o Olive só consegue resolver conflitos no texto de arquivos. Conflitos de conteúdo, na estrutura da árvore, têm que ser resolvidos usando a linha de comando.
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
Located in
../conflicts.py:175
|
|
|
79.
|
|
|
_View
|
|
|
View menu
|
|
|
|
|
_Visualizar
|
|
Translated and reviewed by
Alexandre Sapata Carbonell
|
|
|
|
Located in
../diff.py:445
|
|
|
80.
|
|
|
Wrap _Long Lines
|
|
|
|
|
Quebra de _Linhas Longas
|
|
Translated by
Paulo Guilherme Pilotti Duarte
|
|
Reviewed by
Edvaldo de Souza Cruz
|
|
|
|
Located in
../diff.py:448
|
|
|
81.
|
|
|
Merge successful
|
|
|
No conflicts found.
|
|
|
|
|
Fusão bem sucedida
|
|
Translated and reviewed by
Alexandre Sapata Carbonell
|
|
|
|
Located in
../diff.py:493 ../merge.py:144
|
