|
|
55.
|
|
|
Before backout, you must <a href="commit"><b>commit</b></a>, <a href="shelve"><b>shelve</b></a> to patch, or <a href="discard"><b>discard</b></a> changes.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:223
|
|
|
56.
|
|
|
Automatically resolve merge conflicts where possible
|
|
|
|
|
Resolver automáticamente conflitos de uniões sempre que possível
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:234 tortoisehg/hgqt/graft.py:113
tortoisehg/hgqt/merge.py:265 tortoisehg/hgqt/rebase.py:104
tortoisehg/hgqt/sync.py:1118 tortoisehg/hgqt/update.py:138
|
|
|
57.
|
|
|
<b>Uncommitted local changes are detected</b>
|
|
|
|
|
<b>Foram detectadas alterações locais não submetidas</b>
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:272 tortoisehg/hgqt/merge.py:323
|
|
|
58.
|
|
|
Clean
|
|
|
|
|
Limpar
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:276
|
|
|
59.
|
|
|
Backing out, then merging...
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:287
|
|
|
60.
|
|
|
All conflicting files will be marked unresolved.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:288 tortoisehg/hgqt/merge.py:347
|
|
|
61.
|
|
|
Automatically advance to next page when backout and merge are complete.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:299
|
|
|
62.
|
|
|
%d files have <b>merge conflicts</b> that must be <a href="resolve"><b>resolved</b></a>
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:327 tortoisehg/hgqt/merge.py:412
|
|
|
63.
|
|
|
No merge conflicts, ready to commit
|
|
|
|
|
Sem conflitos de união, pornto para submeter
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:332 tortoisehg/hgqt/merge.py:425
|
|
|
64.
|
|
|
Commit backout and merge results
|
|
|
|
|
Reverter submissão e unir resultados
|
|
Translated by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:366
|
