|
82.
|
|
|
All changes applied successfully.
|
|
|
|
Todas as mudanças foram aplicadas com sucesso.
|
|
Translated and reviewed by
Alexandre Sapata Carbonell
|
|
|
|
Located in
../diff.py:494 ../merge.py:145
|
|
83.
|
|
|
Conflicts encountered
|
|
|
There are conflicts to be resolved.
|
|
|
|
Encontrado conflitos
|
|
Translated and reviewed by
Alexandre Sapata Carbonell
|
|
|
|
Located in
../diff.py:497 ../merge.py:148
|
|
84.
|
|
|
Please resolve the conflicts manually before committing.
|
|
|
|
Por favor resolva os conflitos manualmente antes de consolidar.
|
|
Translated and reviewed by
Leandro Pereira de Lima e Silva
|
|
|
|
Located in
../diff.py:498 ../merge.py:149
|
|
85.
|
|
|
Directory is not a branch
|
|
|
|
O diretório não é um ramo.
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
Located in
../errors.py:31
|
|
86.
|
|
|
You can perform this action only in a branch.
|
|
|
|
Esta operação só pode ser executada em um ramo.
|
|
Translated and reviewed by
Leandro Pereira de Lima e Silva
|
|
|
|
Located in
../errors.py:32
|
|
87.
|
|
|
Directory is not a checkout
|
|
|
|
O diretório não é um checagem de ítens.
|
|
Translated and reviewed by
Edvaldo de Souza Cruz
|
In Ubuntu: |
|
O diretório não é um checagem de ítens.
|
|
|
Suggested by
Edvaldo de Souza Cruz
|
|
|
|
Located in
../errors.py:34
|
|
88.
|
|
|
You can perform local commit only on checkouts.
|
|
|
|
Você só pode executar consolidações locais em checkouts.
|
|
Translated by
Flávio Pontes
|
|
Reviewed by
Paulo Guilherme Pilotti Duarte
|
|
|
|
Located in
../errors.py:35
|
|
89.
|
|
|
No changes to commit
|
|
|
|
Sem mudanças para consolidar
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
Located in
../errors.py:37
|
|
90.
|
|
|
Try force commit if you want to commit anyway.
|
|
|
|
Tente impor a consolidação se você quiser consolidar de qualquer maneira.
|
|
Translated and reviewed by
Flávio Pontes
|
|
|
|
Located in
../errors.py:38
|
|
91.
|
|
|
No changes to merge
|
|
|
|
Nenhuma mudança para mesclar
|
|
Translated and reviewed by
Paulo Guilherme Pilotti Duarte
|
|
|
|
Located in
../errors.py:40
|