|
|
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
|
|
|
65.
|
|
|
Parents
|
|
|
|
|
Pais
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:378 tortoisehg/hgqt/matching.py:124
tortoisehg/hgqt/merge.py:469
|
|
|
66.
|
|
|
Working Directory
|
|
|
|
|
Directoria de trabalho
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:382 tortoisehg/hgqt/customtools.py:771
tortoisehg/hgqt/merge.py:473 tortoisehg/hgqt/repomodel.py:767
tortoisehg/hgqt/repomodel.py:769 tortoisehg/hgqt/revdetails.py:635
tortoisehg/hgqt/shelve.py:48 tortoisehg/hgqt/thgimport.py:122
|
|
|
67.
|
|
|
Working Directory (merged)
|
|
|
|
|
Directoria de trabalho (unida)
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:422 tortoisehg/hgqt/merge.py:510
|
|
|
68.
|
|
|
Commit message
|
|
|
|
|
Mensagem de envio
|
|
Translated and reviewed by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:430 tortoisehg/hgqt/merge.py:519
|
|
|
69.
|
|
|
Skip final confirmation page, close after commit.
|
|
|
|
|
Saltar página de confirmação final e fechar após submeter.
|
|
Translated by
lloco73
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:454 tortoisehg/hgqt/merge.py:545
|
