|
|
111.
|
|
|
Auto-resolve
|
|
|
|
|
Resolver automaticamente
|
|
Translated and reviewed by
Neliton Pereira Jr.
|
|
|
|
Located in
lib\conflicts.py:116
|
|
|
112.
|
|
|
&Merge conflict
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:148 lib\treewidget.py:1706
|
|
|
113.
|
|
|
Take "&THIS" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:154
|
|
|
114.
|
|
|
Take "&OTHER" version
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:156
|
|
|
115.
|
|
|
Mark as &resolved
|
|
|
|
|
Marcar como &resolvido
|
|
Translated and reviewed by
Rafael Neri
|
|
|
|
Located in
lib\conflicts.py:158
|
|
|
116.
|
|
|
%d conflict auto-resolved.
|
|
|
|
%d conflicts auto-resolved.
|
|
|
|
|
%d conflito resolvido automaticamente.
|
|
Translated and reviewed by
Neliton Pereira Jr.
|
|
|
|
%d conflitos resolvidos automaticamente.
|
|
Translated and reviewed by
Neliton Pereira Jr.
|
|
|
|
Located in
lib\conflicts.py:193
|
|
|
117.
|
|
|
&OK
|
|
|
|
|
&OK
|
|
Translated and reviewed by
B. A.
|
|
|
|
Located in
lib\conflicts.py:196 lib\conflicts.py:201 lib\diffwindow.py:461
lib\util.py:69 lib/widgets\shelve.py:630 lib/widgets\shelve.py:674
lib/widgets\shelve.py:721 lib/widgets\shelve.py:725
|
|
|
118.
|
|
|
All conflicts resolved.
|
|
|
|
|
Todos os conflitos resolvidos.
|
|
Translated and reviewed by
Rafael Neri
|
|
|
|
Located in
lib\conflicts.py:200
|
|
|
119.
|
|
|
Error while running merge tool (code %d)
|
|
|
|
|
Erro durante a execução da ferramenta de mesclagem (código %d)
|
|
Translated and reviewed by
Rafael Neri
|
|
|
|
Located in
lib\conflicts.py:235
|
|
|
120.
|
|
|
Error
|
|
|
|
|
Erro
|
|
Translated and reviewed by
Rafael Neri
|
|
|
|
Located in
lib\conflicts.py:236 lib\conflicts.py:298 lib\tag.py:194 lib\trace.py:193
lib\trace.py:200 lib\tree_branch.py:95 lib\util.py:420 lib\util.py:1011
lib\util.py:1021
|
