We are currently indexing your data, so search results may be incomplete until we finish.
stable i18n: pull latest translations from launchpad
Changeset b31068921a67…
Parent 19066a706eaf…
by
Changes to 30 files · Browse files at b31068921a67 Showing diff from parent 19066a706eaf Diff from another changeset...
-
i18n/tortoisehg/ca.po
-
i18n/tortoisehg/cs.po
-
i18n/tortoisehg/da.po
-
i18n/tortoisehg/de.po
-
i18n/tortoisehg/en_AU.po
-
i18n/tortoisehg/en_GB.po
-
i18n/tortoisehg/es.po
-
i18n/tortoisehg/et.po
-
i18n/tortoisehg/fa.po
-
i18n/tortoisehg/fr.po
-
i18n/tortoisehg/he.po
-
i18n/tortoisehg/hr.po
-
i18n/tortoisehg/hu.po
-
i18n/tortoisehg/it.po
-
i18n/tortoisehg/ja.po
-
i18n/tortoisehg/ko.po
-
i18n/tortoisehg/nb.po
-
i18n/tortoisehg/nl.po
-
i18n/tortoisehg/nn.po
-
i18n/tortoisehg/oc.po
-
i18n/tortoisehg/pl.po
-
i18n/tortoisehg/pt.po
-
i18n/tortoisehg/pt_BR.po
-
i18n/tortoisehg/ru.po
-
i18n/tortoisehg/sr.po
-
i18n/tortoisehg/sv.po
-
i18n/tortoisehg/tr.po
-
i18n/tortoisehg/uk.po
-
i18n/tortoisehg/zh_CN.po
-
i18n/tortoisehg/zh_TW.po
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
|
|
@@ -7,15 +7,16 @@ msgstr ""
"Project-Id-Version: tortoisehg\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-03-31 11:23-0300\n"
-"PO-Revision-Date: 2011-03-31 14:59+0000\n"
+"POT-Creation-Date: 2011-04-19 15:50-0300\n"
+"PO-Revision-Date: 2011-04-19 19:09+0000\n"
"Last-Translator: Wagner Bruna <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-01 14:41+0000\n"
-"X-Generator: Launchpad (build 12710)\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2011-04-22 14:13+0000\n"
+"X-Generator: Launchpad (build 12883)\n"
#: TortoiseHgOverlayServer.py:50
msgid "TortoiseHg Overlay Icon Server"
@@ -67,65 +68,65 @@msgid "A new version of TortoiseHg is ready for download!"
msgstr "Uma nova versão do TortoiseHg está disponível para download!"
-#: tortoisehg/hgqt/annotate.py:110
+#: tortoisehg/hgqt/annotate.py:112
msgid "Search in original revision"
msgstr "Procurar na revisão original"
-#: tortoisehg/hgqt/annotate.py:112
+#: tortoisehg/hgqt/annotate.py:114
msgid "Search in working revision"
msgstr "Procurar na revisão de trabalho"
-#: tortoisehg/hgqt/annotate.py:114
+#: tortoisehg/hgqt/annotate.py:116
msgid "Search in current annotation"
msgstr "Procurar na anotação atual"
-#: tortoisehg/hgqt/annotate.py:115
+#: tortoisehg/hgqt/annotate.py:117
msgid "Search in history"
msgstr "Procurar no histórico"
-#: tortoisehg/hgqt/annotate.py:126
+#: tortoisehg/hgqt/annotate.py:128
msgid "Annotate originating revision"
msgstr "Anotar revisão de origem"
-#: tortoisehg/hgqt/annotate.py:127
+#: tortoisehg/hgqt/annotate.py:129
msgid "View originating revision"
msgstr "Ver revisão de origem"
-#: tortoisehg/hgqt/annotate.py:139
+#: tortoisehg/hgqt/annotate.py:141
#, python-format
msgid "Annotate parent revision %d"
msgstr "Anotar revisão pai %d"
-#: tortoisehg/hgqt/annotate.py:141
+#: tortoisehg/hgqt/annotate.py:143
#, python-format
msgid "View parent revision %d"
msgstr "Ver revisão pai %d"
-#: tortoisehg/hgqt/annotate.py:171
+#: tortoisehg/hgqt/annotate.py:181
msgid "Unable to annotate"
msgstr "Incapaz de fazer a anotação"
-#: tortoisehg/hgqt/annotate.py:172
+#: tortoisehg/hgqt/annotate.py:182
#, python-format
msgid "%s is not found in revision %d"
msgstr "%s não foi encontrado na revisão %d"
-#: tortoisehg/hgqt/annotate.py:181 tortoisehg/hgqt/annotate.py:187
-#: tortoisehg/hgqt/fileview.py:534 tortoisehg/hgqt/fileview.py:693
+#: tortoisehg/hgqt/annotate.py:191 tortoisehg/hgqt/annotate.py:197
+#: tortoisehg/hgqt/fileview.py:534 tortoisehg/hgqt/fileview.py:726
msgid "File or diffs not displayed: "
msgstr "Arquivo ou diffs não mostrados: "
-#: tortoisehg/hgqt/annotate.py:188 tortoisehg/hgqt/fileview.py:548
-#: tortoisehg/hgqt/fileview.py:694 tortoisehg/hgtk/chunks.py:73
+#: tortoisehg/hgqt/annotate.py:198 tortoisehg/hgqt/fileview.py:548
+#: tortoisehg/hgqt/fileview.py:727 tortoisehg/hgtk/chunks.py:73
msgid "File is larger than the specified max size.\n"
msgstr "O arquivo é maior que o tamanho máximo especificado.\n"
-#: tortoisehg/hgqt/annotate.py:194 tortoisehg/hgqt/fileview.py:553
+#: tortoisehg/hgqt/annotate.py:204 tortoisehg/hgqt/fileview.py:553
#: tortoisehg/hgtk/chunks.py:85
msgid "File is binary.\n"
msgstr "O arquivo é binário.\n"
-#: tortoisehg/hgqt/annotate.py:385
+#: tortoisehg/hgqt/annotate.py:395
#, python-format
msgid "Annotate %s@%d"
msgstr "Anotação de %s@%d"
@@ -136,7 +137,7 @@
#: tortoisehg/hgqt/archive.py:40 tortoisehg/hgqt/bookmark.py:50
#: tortoisehg/hgqt/csinfo.py:105 tortoisehg/hgqt/csinfo.py:106
-#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:574
+#: tortoisehg/hgqt/cslist.py:87 tortoisehg/hgqt/merge.py:579
#: tortoisehg/hgqt/tag.py:49 tortoisehg/hgtk/bookmark.py:75
#: tortoisehg/hgtk/csinfo.py:211 tortoisehg/hgtk/csinfo.py:212
#: tortoisehg/hgtk/cslist.py:142 tortoisehg/hgtk/tagadd.py:66
@@ -147,7 +148,8 @@msgid "Only files modified/created in this revision"
msgstr "Apenas arquivos criados ou modificados nesta revisão"
-#: tortoisehg/hgqt/archive.py:47
+#: tortoisehg/hgqt/archive.py:47 tortoisehg/hgqt/grep.py:69
+#: tortoisehg/hgqt/sync.py:1389
msgid "Recurse into subrepositories"
msgstr "Executa recursivamente em sub-repositórios"
@@ -156,8 +158,8 @@msgid "Destination path:"
msgstr "Caminho de destino:"
-#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:56
-#: tortoisehg/hgqt/clone.py:68 tortoisehg/hgqt/hginit.py:37
+#: tortoisehg/hgqt/archive.py:58 tortoisehg/hgqt/clone.py:58
+#: tortoisehg/hgqt/clone.py:69 tortoisehg/hgqt/hginit.py:37
#: tortoisehg/hgqt/thgimport.py:53 tortoisehg/hgtk/archive.py:69
#: tortoisehg/hgtk/clone.py:70 tortoisehg/hgtk/hginit.py:55
#: tortoisehg/hgtk/thgconfig.py:394 tortoisehg/hgtk/thgimport.py:63
@@ -213,11 +215,11 @@#: tortoisehg/hgqt/archive.py:114 tortoisehg/hgqt/commit.py:532
#: tortoisehg/hgqt/commit.py:540 tortoisehg/hgqt/commit.py:567
#: tortoisehg/hgqt/commit.py:580 tortoisehg/hgqt/compress.py:150
-#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:169
-#: tortoisehg/hgqt/merge.py:363 tortoisehg/hgqt/merge.py:397
-#: tortoisehg/hgqt/merge.py:461 tortoisehg/hgqt/rebase.py:221
+#: tortoisehg/hgqt/merge.py:64 tortoisehg/hgqt/merge.py:174
+#: tortoisehg/hgqt/merge.py:368 tortoisehg/hgqt/merge.py:402
+#: tortoisehg/hgqt/merge.py:466 tortoisehg/hgqt/rebase.py:221
#: tortoisehg/hgqt/rebase.py:242 tortoisehg/hgqt/rename.py:104
-#: tortoisehg/hgqt/repotreeitem.py:287 tortoisehg/hgqt/resolve.py:351
+#: tortoisehg/hgqt/repotreeitem.py:287 tortoisehg/hgqt/resolve.py:356
#: tortoisehg/hgqt/settings.py:672 tortoisehg/hgqt/settings.py:770
#: tortoisehg/hgqt/wctxactions.py:234 tortoisehg/hgqt/wctxactions.py:247
#: tortoisehg/hgqt/wctxactions.py:302 tortoisehg/hgtk/shellconf.py:28
@@ -252,9 +254,9 @@msgid "Gzip tar archives"
msgstr "Arquivos tar gzip"
-#: tortoisehg/hgqt/archive.py:241 tortoisehg/hgtk/archive.py:183
-msgid "Compressed zip archives"
-msgstr "Arquivos zip comprimidos"
+#: tortoisehg/hgqt/archive.py:238 tortoisehg/hgqt/archive.py:241
+msgid "Zip archives"
+msgstr "Arquivos zip"
#: tortoisehg/hgqt/archive.py:316 tortoisehg/hgqt/archive.py:334
msgid "Duplicate Name"
@@ -311,10 +313,10 @@msgid "Backed out changeset: "
msgstr "Revisão anulada: "
-#: tortoisehg/hgqt/backout.py:59 tortoisehg/hgqt/clone.py:94
-#: tortoisehg/hgqt/commit.py:220 tortoisehg/hgqt/merge.py:313
+#: tortoisehg/hgqt/backout.py:59 tortoisehg/hgqt/clone.py:95
+#: tortoisehg/hgqt/commit.py:220 tortoisehg/hgqt/merge.py:318
#: tortoisehg/hgqt/mq.py:53 tortoisehg/hgqt/postreview_ui.py:170
-#: tortoisehg/hgqt/rebase.py:57 tortoisehg/hgqt/sync.py:136
+#: tortoisehg/hgqt/rebase.py:57 tortoisehg/hgqt/sync.py:137
#: tortoisehg/hgqt/tag.py:64 tortoisehg/hgtk/hgemail.py:64
msgid "Options"
msgstr "Opções"
@@ -328,17 +330,17 @@msgstr ""
"Consolidar anulação antes de mesclar com pai do diretório de trabalho atual"
-#: tortoisehg/hgqt/backout.py:79 tortoisehg/hgqt/merge.py:330
-#: tortoisehg/hgqt/rebase.py:69 tortoisehg/hgqt/sync.py:931
+#: tortoisehg/hgqt/backout.py:79 tortoisehg/hgqt/merge.py:335
+#: tortoisehg/hgqt/rebase.py:69 tortoisehg/hgqt/sync.py:938
#: tortoisehg/hgqt/update.py:97
msgid "Automatically resolve merge conflicts where possible"
-msgstr "Automaticamente resolve conflitos de mesclagem, se possível"
+msgstr "Resolver conflitos de mesclagem automaticamente, se possível"
#: tortoisehg/hgqt/backout.py:111
msgid "&Backout"
msgstr "&Backout"
-#: tortoisehg/hgqt/backout.py:114 tortoisehg/hgqt/clone.py:158
+#: tortoisehg/hgqt/backout.py:114 tortoisehg/hgqt/clone.py:159
#: tortoisehg/hgqt/cmdui.py:741 tortoisehg/hgqt/thgimport.py:117
#: tortoisehg/hgqt/thgstrip.py:110 tortoisehg/hgqt/update.py:129
msgid "Detail"
@@ -350,7 +352,7 @@msgstr "Backout '%s' - %s"
#: tortoisehg/hgqt/backout.py:145 tortoisehg/hgqt/commit.py:399
-#: tortoisehg/hgqt/mq.py:455 tortoisehg/hgtk/backout.py:139
+#: tortoisehg/hgqt/mq.py:470 tortoisehg/hgtk/backout.py:139
#: tortoisehg/hgtk/commit.py:581
msgid "Confirm Discard Message"
msgstr "Confirmar Descarte da Mensagem"
@@ -359,19 +361,13 @@msgid "Discard current backout message?"
msgstr "Descartar mensagem de anulação atual?"
-#: tortoisehg/hgqt/backout.py:217 tortoisehg/hgqt/commit.py:179
-#: tortoisehg/hgqt/commit.py:621 tortoisehg/hgqt/commit.py:627
-#: tortoisehg/hgqt/commit.py:926 tortoisehg/hgqt/compress.py:122
-#: tortoisehg/hgqt/repowidget.py:163 tortoisehg/hgqt/repowidget.py:233
-#: tortoisehg/hgqt/settings.py:366 tortoisehg/hgtk/commit.py:654
-#: tortoisehg/hgtk/commit.py:951 tortoisehg/hgtk/commit.py:1015
-#: tortoisehg/hgtk/commit.py:1264 tortoisehg/hgtk/gdialog.py:485
-#: tortoisehg/hgtk/history.py:279 tortoisehg/hgtk/merge.py:136
-#: tortoisehg/hgtk/thgconfig.py:89
+#: tortoisehg/hgqt/backout.py:228 tortoisehg/hgqt/commit.py:926
+#: tortoisehg/hgqt/compress.py:122 tortoisehg/hgqt/repowidget.py:233
+msgctxt "action button"
msgid "Commit"
msgstr "Commit (consolidar)"
-#: tortoisehg/hgqt/backout.py:233
+#: tortoisehg/hgqt/backout.py:244
msgid ""
"Backout generated merge <b>conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
@@ -379,7 +375,7 @@"O comando backout gerou <b>conflitos</b> de mesclagem que devem ser <a "
"href=\"resolve\"><b>resolvidos</b></a>"
-#: tortoisehg/hgqt/backout.py:239
+#: tortoisehg/hgqt/backout.py:250
msgid ""
"You may commit the backed out changes after <a "
"href=\"status\"><b>verifying</b></a> them"
@@ -441,8 +437,8 @@
#: tortoisehg/hgqt/bisect.py:114 tortoisehg/hgqt/bisect.py:135
#: tortoisehg/hgqt/commit.py:597 tortoisehg/hgqt/commit.py:854
-#: tortoisehg/hgqt/commit.py:874 tortoisehg/hgqt/hgignore.py:233
-#: tortoisehg/hgqt/hginit.py:180 tortoisehg/hgqt/status.py:401
+#: tortoisehg/hgqt/commit.py:874 tortoisehg/hgqt/hgignore.py:245
+#: tortoisehg/hgqt/hginit.py:180 tortoisehg/hgqt/status.py:402
#: tortoisehg/hgqt/wctxactions.py:121
#, python-format
msgid "%s (hint: %s)"
@@ -516,6 +512,11 @@msgid "Bookmark '%s' has been renamed to '%s'"
msgstr "O marcador '%s' foi renomeado para '%s'"
+#: tortoisehg/hgqt/branchop.py:22
+#, python-format
+msgid "%s - branch operation"
+msgstr "%s - mudança de ramo nomeado"
+
#: tortoisehg/hgqt/branchop.py:29 tortoisehg/hgtk/commit.py:48
msgid "Select branch of merge commit"
msgstr "Selecione o ramo para consolidação da mesclagem"
@@ -567,8 +568,8 @@msgid "Error writing file"
msgstr "Erro ao gravar o arquivo"
-#: tortoisehg/hgqt/bugreport.py:123 tortoisehg/hgqt/qqueue.py:345
-#: tortoisehg/hgqt/qreorder.py:222
+#: tortoisehg/hgqt/bugreport.py:123 tortoisehg/hgqt/qqueue.py:342
+#: tortoisehg/hgqt/qreorder.py:225
msgid "TortoiseHg Error"
msgstr "Erro do TortoiseHg"
@@ -584,7 +585,7 @@msgid "Patch failed to apply"
msgstr "A aplicação do patch falhou"
-#: tortoisehg/hgqt/chunks.py:130 tortoisehg/hgqt/mq.py:263
+#: tortoisehg/hgqt/chunks.py:130 tortoisehg/hgqt/mq.py:268
msgid "Manually resolve rejected chunks?"
msgstr "Resolver manualmente os trechos rejeitados?"
@@ -621,108 +622,113 @@msgstr ""
"Patches adicionados ou removidos devem ser mesclados no diretório de trabalho"
-#: tortoisehg/hgqt/chunks.py:447 tortoisehg/hgqt/status.py:141
+#: tortoisehg/hgqt/chunks.py:451 tortoisehg/hgqt/status.py:141
msgctxt "files"
msgid "All"
msgstr "Todos"
-#: tortoisehg/hgqt/chunks.py:451 tortoisehg/hgqt/status.py:145
+#: tortoisehg/hgqt/chunks.py:455 tortoisehg/hgqt/status.py:145
msgctxt "files"
msgid "None"
msgstr "Nenhum"
-#: tortoisehg/hgqt/chunks.py:507
+#: tortoisehg/hgqt/chunks.py:511
#, python-format
msgid "Chunks selected: %d / %d"
msgstr "Trechos selecionados: %d / %d"
-#: tortoisehg/hgqt/clone.py:59 tortoisehg/hgqt/rename.py:65
+#: tortoisehg/hgqt/clone.py:61 tortoisehg/hgqt/rename.py:65
#: tortoisehg/hgqt/thgimport.py:62 tortoisehg/hgtk/thgimport.py:82
msgid "Source:"
msgstr "Origem:"
-#: tortoisehg/hgqt/clone.py:71 tortoisehg/hgqt/rename.py:70
+#: tortoisehg/hgqt/clone.py:72 tortoisehg/hgqt/rename.py:70
#: tortoisehg/hgtk/hginit.py:58
msgid "Destination:"
msgstr "Destino:"
-#: tortoisehg/hgqt/clone.py:116 tortoisehg/hgtk/clone.py:127
+#: tortoisehg/hgqt/clone.py:117 tortoisehg/hgtk/clone.py:127
msgid "Clone to revision:"
msgstr "Clonar até a revisão:"
-#: tortoisehg/hgqt/clone.py:119 tortoisehg/hgtk/clone.py:141
+#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:141
msgid "Do not update the new working directory"
msgstr "Não atualizar o novo diretório de trabalho"
-#: tortoisehg/hgqt/clone.py:120 tortoisehg/hgtk/clone.py:142
+#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:142
msgid "Use pull protocol to copy metadata"
msgstr "Usar o protocolo pull para copiar metadados"
-#: tortoisehg/hgqt/clone.py:121 tortoisehg/hgtk/clone.py:143
+#: tortoisehg/hgqt/clone.py:122 tortoisehg/hgtk/clone.py:143
msgid "Use uncompressed transfer"
msgstr "Usar transferência não comprimida"
-#: tortoisehg/hgqt/clone.py:122
+#: tortoisehg/hgqt/clone.py:123
msgid "Include patch queue"
msgstr "Incluir fila de patches"
-#: tortoisehg/hgqt/clone.py:128 tortoisehg/hgtk/clone.py:149
+#: tortoisehg/hgqt/clone.py:129 tortoisehg/hgtk/clone.py:149
#: tortoisehg/hgtk/history.py:467 tortoisehg/hgtk/synch.py:179
msgid "Use proxy server"
msgstr "Usar servidor proxy"
-#: tortoisehg/hgqt/clone.py:134 tortoisehg/hgqt/sync.py:1398
+#: tortoisehg/hgqt/clone.py:135 tortoisehg/hgqt/sync.py:1405
#: tortoisehg/hgtk/clone.py:159 tortoisehg/hgtk/synch.py:202
msgid "Remote command:"
msgstr "Comando remoto:"
-#: tortoisehg/hgqt/clone.py:137
+#: tortoisehg/hgqt/clone.py:138
msgid "Start revision:"
msgstr "Revisão inicial:"
-#: tortoisehg/hgqt/clone.py:155
+#: tortoisehg/hgqt/clone.py:156
msgid "&Clone"
msgstr "&Clonar"
-#: tortoisehg/hgqt/clone.py:168
+#: tortoisehg/hgqt/clone.py:169
#, python-format
msgid "Clone - %s"
msgstr "Clonar - %s"
-#: tortoisehg/hgqt/clone.py:228 tortoisehg/hgqt/clone.py:255
-#: tortoisehg/hgqt/clone.py:262 tortoisehg/hgtk/clone.py:37
+#: tortoisehg/hgqt/clone.py:229 tortoisehg/hgqt/clone.py:256
+#: tortoisehg/hgqt/clone.py:263 tortoisehg/hgqt/clone.py:313
+#: tortoisehg/hgtk/clone.py:37
msgid "TortoiseHg Clone"
msgstr "TortoiseHg Clone"
-#: tortoisehg/hgqt/clone.py:229
+#: tortoisehg/hgqt/clone.py:230
msgid "Error creating destination folder"
msgstr "Erro ao criar pasta de destino"
-#: tortoisehg/hgqt/clone.py:230
+#: tortoisehg/hgqt/clone.py:231
msgid "Please specify a different path."
msgstr "Por favor especifique um caminho diferente."
-#: tortoisehg/hgqt/clone.py:256 tortoisehg/hgtk/clone.py:288
+#: tortoisehg/hgqt/clone.py:257 tortoisehg/hgtk/clone.py:288
msgid "Source path is empty"
msgstr "O caminho original está vazio"
-#: tortoisehg/hgqt/clone.py:257
+#: tortoisehg/hgqt/clone.py:258
msgid "Please enter a valid source path."
msgstr "Por favor forneça um caminho de origem válido."
-#: tortoisehg/hgqt/clone.py:263 tortoisehg/hgtk/clone.py:294
+#: tortoisehg/hgqt/clone.py:264 tortoisehg/hgtk/clone.py:294
msgid "Source and destination are the same"
msgstr "Origem e destino são iguais"
-#: tortoisehg/hgqt/clone.py:264
+#: tortoisehg/hgqt/clone.py:265
msgid "Please specify different paths."
msgstr "Por favor especifique caminhos diferentes."
-#: tortoisehg/hgqt/clone.py:325
+#: tortoisehg/hgqt/clone.py:314
+msgid "Please enter a new destination path."
+msgstr "Por favor digite um novo caminho de destino."
+
+#: tortoisehg/hgqt/clone.py:334
msgid "Select source repository"
msgstr "Selecione repositório de origem"
-#: tortoisehg/hgqt/clone.py:334
+#: tortoisehg/hgqt/clone.py:343
msgid "Select destination repository"
msgstr "Selecione repositório de destino"
@@ -756,7 +762,7 @@msgid "Terminated"
msgstr "Terminado"
-#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:747
+#: tortoisehg/hgqt/cmdui.py:307 tortoisehg/hgqt/merge.py:758
#: tortoisehg/hgtk/p4pending.py:101
msgid "Finished"
msgstr "Finalizado"
@@ -784,7 +790,7 @@msgstr "Janela de Comandos do TortoiseHg"
#: tortoisehg/hgqt/cmdui.py:770 tortoisehg/hgqt/merge.py:65
-#: tortoisehg/hgqt/rebase.py:243 tortoisehg/hgqt/resolve.py:352
+#: tortoisehg/hgqt/rebase.py:243 tortoisehg/hgqt/resolve.py:357
#: tortoisehg/hgqt/settings.py:669 tortoisehg/hgtk/commit.py:323
#: tortoisehg/hgtk/merge.py:196 tortoisehg/hgtk/thgconfig.py:846
msgid "Confirm Exit"
@@ -814,6 +820,11 @@msgid "C&onfigure Format"
msgstr "C&onfigurar Formato"
+#: tortoisehg/hgqt/commit.py:179
+msgctxt "window title"
+msgid "Commit"
+msgstr "Consolidação"
+
#: tortoisehg/hgqt/commit.py:206
msgid "Commit Dialog Toolbar"
msgstr "Barra de Diálogo de Commit"
@@ -855,7 +866,7 @@msgid "Confirm Undo"
msgstr "Confirmar Desfazimento"
-#: tortoisehg/hgqt/commit.py:400 tortoisehg/hgqt/mq.py:456
+#: tortoisehg/hgqt/commit.py:400 tortoisehg/hgqt/mq.py:471
#: tortoisehg/hgtk/commit.py:582
msgid "Discard current commit message?"
msgstr "Descartar mensagem de consolidação atual?"
@@ -933,6 +944,21 @@msgid "Remove selected deleted files?"
msgstr "Remover os arquivos apagados marcados?"
+#: tortoisehg/hgqt/commit.py:621
+msgctxt "start progress"
+msgid "Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:627
+msgctxt "stop progress"
+msgid "Commit"
+msgstr ""
+
+#: tortoisehg/hgqt/commit.py:645
+#, python-format
+msgid "%s - commit options"
+msgstr "%s - opções de consolidação"
+
#: tortoisehg/hgqt/commit.py:652
msgid "Set username:"
msgstr "Nome de usuário"
@@ -968,16 +994,16 @@msgstr "Incapaz de salvar nome de usuário"
#: tortoisehg/hgqt/commit.py:782 tortoisehg/hgqt/commit.py:805
-#: tortoisehg/hgqt/commit.py:828 tortoisehg/hgqt/sync.py:873
-#: tortoisehg/hgqt/sync.py:971 tortoisehg/hgqt/sync.py:1041
-#: tortoisehg/hgqt/sync.py:1205
+#: tortoisehg/hgqt/commit.py:828 tortoisehg/hgqt/sync.py:880
+#: tortoisehg/hgqt/sync.py:978 tortoisehg/hgqt/sync.py:1048
+#: tortoisehg/hgqt/sync.py:1212
msgid "Iniparse must be installed."
msgstr "O pacote iniparse deve estar instalado."
#: tortoisehg/hgqt/commit.py:797 tortoisehg/hgqt/commit.py:820
#: tortoisehg/hgqt/commit.py:843 tortoisehg/hgqt/settings.py:976
-#: tortoisehg/hgqt/sync.py:883 tortoisehg/hgqt/sync.py:982
-#: tortoisehg/hgqt/sync.py:1059 tortoisehg/hgqt/sync.py:1243
+#: tortoisehg/hgqt/sync.py:890 tortoisehg/hgqt/sync.py:989
+#: tortoisehg/hgqt/sync.py:1066 tortoisehg/hgqt/sync.py:1250
#: tortoisehg/hgtk/thgconfig.py:1654
msgid "Unable to write configuration file"
msgstr "Não foi possível escrever o arquivo de configuração"
@@ -998,6 +1024,11 @@msgid "No username configured"
msgstr "Nenhum nome de usuário configurado"
+#: tortoisehg/hgqt/commit.py:939
+#, python-format
+msgid "%s - commit"
+msgstr "%s - consolidação"
+
#: tortoisehg/hgqt/compress.py:38
msgid "Compress changesets up to and including"
msgstr "Comprime revisões até (e inclusive)"
@@ -1010,7 +1041,7 @@msgid "Compress"
msgstr "Comprimir"
-#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:264
+#: tortoisehg/hgqt/compress.py:69 tortoisehg/hgqt/merge.py:269
#: tortoisehg/hgqt/rebase.py:105
msgid "Checking..."
msgstr "Verificando..."
@@ -1040,20 +1071,20 @@msgid "Compress is complete, old history untouched"
msgstr "A compressão foi completada; o histórico antigo foi preservado"
-#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:362
-#: tortoisehg/hgqt/merge.py:396 tortoisehg/hgqt/merge.py:460
+#: tortoisehg/hgqt/compress.py:149 tortoisehg/hgqt/merge.py:367
+#: tortoisehg/hgqt/merge.py:401 tortoisehg/hgqt/merge.py:465
#: tortoisehg/hgqt/rebase.py:220 tortoisehg/hgqt/settings.py:770
#: tortoisehg/hgqt/update.py:225 tortoisehg/hgtk/thgconfig.py:775
#: tortoisehg/hgtk/update.py:233
msgid "&Discard"
msgstr "&Descartar"
-#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:462
+#: tortoisehg/hgqt/compress.py:151 tortoisehg/hgqt/merge.py:467
#: tortoisehg/hgqt/rebase.py:222
msgid "Confirm Discard"
msgstr "Confirmação de Descarte"
-#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:463
+#: tortoisehg/hgqt/compress.py:152 tortoisehg/hgqt/merge.py:468
#: tortoisehg/hgqt/rebase.py:223
msgid "Discard outstanding changes to working directory?"
msgstr "Descartar mudanças pendentes do diretório de trabalho?"
@@ -1067,7 +1098,7 @@msgstr "'type' deve ser especificado no estilo"
#: tortoisehg/hgqt/csinfo.py:106 tortoisehg/hgqt/postreview_ui.py:165
-#: tortoisehg/hgqt/qfold.py:86 tortoisehg/hgqt/qreorder.py:88
+#: tortoisehg/hgqt/qfold.py:86 tortoisehg/hgqt/qreorder.py:89
#: tortoisehg/hgtk/csinfo.py:212
msgid "Summary:"
msgstr "Sumário:"
@@ -1135,107 +1166,115 @@msgid "Output Log"
msgstr "Log de Saída"
-#: tortoisehg/hgqt/filedialogs.py:193 tortoisehg/hgqt/workbench.py:300
+#: tortoisehg/hgqt/filedialogs.py:194 tortoisehg/hgqt/workbench.py:300
msgid "Back"
msgstr "Voltar"
-#: tortoisehg/hgqt/filedialogs.py:195 tortoisehg/hgqt/workbench.py:303
+#: tortoisehg/hgqt/filedialogs.py:196 tortoisehg/hgqt/workbench.py:303
msgid "Forward"
msgstr "Avançar"
-#: tortoisehg/hgqt/filelistview.py:209 tortoisehg/hgqt/manifestdialog.py:285
+#: tortoisehg/hgqt/filedialogs.py:377
+msgid "Next diff"
+msgstr "Diff seguinte"
+
+#: tortoisehg/hgqt/filedialogs.py:381
+msgid "Previous diff"
+msgstr "Diff anterior"
+
+#: tortoisehg/hgqt/filelistview.py:212 tortoisehg/hgqt/manifestdialog.py:285
#, python-format
msgid "Hg file log viewer - %s"
msgstr "Visualizador de arquivo de log do hg - %s"
-#: tortoisehg/hgqt/filelistview.py:223
+#: tortoisehg/hgqt/filelistview.py:226
msgid "Cannot open subrepository"
msgstr "Não é possível abrir o sub-repositório"
-#: tortoisehg/hgqt/filelistview.py:224
-msgid "The selected subrepository does not exist on the working directory"
+#: tortoisehg/hgqt/filelistview.py:227
+msgid "The selected subrepository does not exist in the working directory"
msgstr "O sub-repositório selecionado não existe no diretório de trabalho"
-#: tortoisehg/hgqt/filelistview.py:234
+#: tortoisehg/hgqt/filelistview.py:241
msgid "Show All"
msgstr "Mostrar Todos"
-#: tortoisehg/hgqt/filelistview.py:236
+#: tortoisehg/hgqt/filelistview.py:243
msgid "Toggle display of all files and the direction they were merged"
msgstr ""
"Alternar a exibição de todos os arquivos e da direção em que foram mesclados"
-#: tortoisehg/hgqt/filelistview.py:239
+#: tortoisehg/hgqt/filelistview.py:246
msgid "Other"
msgstr "Outros"
-#: tortoisehg/hgqt/filelistview.py:241
+#: tortoisehg/hgqt/filelistview.py:248
msgid "Toggle display of diffs to second (other) parent"
msgstr "Alternar exibição dos diffs do segundo (outro) pai"
-#: tortoisehg/hgqt/filelistview.py:248 tortoisehg/hgqt/manifestdialog.py:197
+#: tortoisehg/hgqt/filelistview.py:255 tortoisehg/hgqt/manifestdialog.py:197
msgid "File history"
msgstr "Histórico de arquivo"
-#: tortoisehg/hgqt/filelistview.py:249 tortoisehg/hgqt/manifestdialog.py:198
+#: tortoisehg/hgqt/filelistview.py:256 tortoisehg/hgqt/manifestdialog.py:198
msgid "Show the history of the selected file"
msgstr "Exibe o histórico do arquivo selecionado"
-#: tortoisehg/hgqt/filelistview.py:250 tortoisehg/hgqt/manifestdialog.py:199
+#: tortoisehg/hgqt/filelistview.py:257 tortoisehg/hgqt/manifestdialog.py:199
msgid "Compare file revisions"
msgstr "Comparar revisões de arquivo"
-#: tortoisehg/hgqt/filelistview.py:251 tortoisehg/hgqt/manifestdialog.py:200
+#: tortoisehg/hgqt/filelistview.py:258 tortoisehg/hgqt/manifestdialog.py:200
msgid "Compare revisions of the selected file"
msgstr "Compara revisões do arquivo selecionado"
-#: tortoisehg/hgqt/filelistview.py:252 tortoisehg/hgqt/grep.py:547
+#: tortoisehg/hgqt/filelistview.py:259 tortoisehg/hgqt/grep.py:547
#: tortoisehg/hgqt/manifestdialog.py:201 tortoisehg/util/menuthg.py:76
msgid "Visual Diff"
msgstr "Diferença visual"
-#: tortoisehg/hgqt/filelistview.py:253 tortoisehg/hgqt/manifestdialog.py:202
+#: tortoisehg/hgqt/filelistview.py:260 tortoisehg/hgqt/manifestdialog.py:202
msgid "View file changes in external diff tool"
msgstr "Visualiza mudanças de arquivo em uma ferramenta de diff externa"
-#: tortoisehg/hgqt/filelistview.py:254 tortoisehg/hgqt/manifestdialog.py:203
+#: tortoisehg/hgqt/filelistview.py:261 tortoisehg/hgqt/manifestdialog.py:203
msgid "Visual Diff to Local"
msgstr "Diferença Visual com Local"
-#: tortoisehg/hgqt/filelistview.py:255 tortoisehg/hgqt/manifestdialog.py:204
+#: tortoisehg/hgqt/filelistview.py:262 tortoisehg/hgqt/manifestdialog.py:204
msgid "View changes to current in external diff tool"
msgstr ""
"Visualiza diferenças com o estado atual em uma ferramenta de diff externa"
-#: tortoisehg/hgqt/filelistview.py:257 tortoisehg/hgqt/manifestdialog.py:206
+#: tortoisehg/hgqt/filelistview.py:264 tortoisehg/hgqt/manifestdialog.py:206
msgid "View at Revision"
msgstr "Ver na Revisão"
-#: tortoisehg/hgqt/filelistview.py:258 tortoisehg/hgqt/manifestdialog.py:207
+#: tortoisehg/hgqt/filelistview.py:265 tortoisehg/hgqt/manifestdialog.py:207
msgid "View file as it appeared at this revision"
msgstr "Visualiza o conteúdo do arquivo correspondente a esta revisão"
-#: tortoisehg/hgqt/filelistview.py:259 tortoisehg/hgqt/manifestdialog.py:208
+#: tortoisehg/hgqt/filelistview.py:266 tortoisehg/hgqt/manifestdialog.py:208
msgid "Edit Local"
msgstr "Edita Local"
-#: tortoisehg/hgqt/filelistview.py:260 tortoisehg/hgqt/manifestdialog.py:209
+#: tortoisehg/hgqt/filelistview.py:267 tortoisehg/hgqt/manifestdialog.py:209
msgid "Edit current file in working copy"
msgstr "Edita o arquivo atual na cópia de trabalho"
-#: tortoisehg/hgqt/filelistview.py:261 tortoisehg/hgqt/manifestdialog.py:210
+#: tortoisehg/hgqt/filelistview.py:268 tortoisehg/hgqt/manifestdialog.py:210
msgid "Revert to Revision"
msgstr "Reverte para Revisão"
-#: tortoisehg/hgqt/filelistview.py:262 tortoisehg/hgqt/manifestdialog.py:211
+#: tortoisehg/hgqt/filelistview.py:269 tortoisehg/hgqt/manifestdialog.py:211
msgid "Revert file(s) to contents at this revision"
msgstr "Reverte os arquivos para seus conteúdos nesta revisão"
-#: tortoisehg/hgqt/filelistview.py:264
+#: tortoisehg/hgqt/filelistview.py:271
msgid "Open subrepository"
msgstr "Abrir sub-repositório"
-#: tortoisehg/hgqt/filelistview.py:265
+#: tortoisehg/hgqt/filelistview.py:272
msgid "Open the selected subrepository"
msgstr "Abre o sub-repositório selecionado"
@@ -1260,6 +1299,14 @@msgid "View change in context, annotate with revision number"
msgstr "Visualiza mudança no contexto, faz annotate com o número da revisão"
+#: tortoisehg/hgqt/fileview.py:164
+msgid "Next diff (alt+down)"
+msgstr "Diff seguinte (alt+seta para baixo)"
+
+#: tortoisehg/hgqt/fileview.py:168
+msgid "Previous diff (alt+up)"
+msgstr "Diff anterior (alt+seta para cima)"
+
#: tortoisehg/hgqt/fileview.py:176
msgid "Toggle display of text search bar"
msgstr "Alternar exibição da barra de busca de texto"
@@ -1268,16 +1315,16 @@msgid "Open shelve tool"
msgstr "Abre ferramenta de adiamento (shelve)"
-#: tortoisehg/hgqt/fileview.py:582 tortoisehg/hgqt/fileview.py:738
+#: tortoisehg/hgqt/fileview.py:582 tortoisehg/hgqt/fileview.py:771
#, python-format
msgid "exec mode has been <font color='red'>%s</font>"
msgstr "modo exec foi <font color='red'>%s</font>"
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:734
+#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:767
msgid "set"
msgstr "definido"
-#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:736
+#: tortoisehg/hgqt/fileview.py:583 tortoisehg/hgqt/fileview.py:769
msgid "unset"
msgstr "não definido"
@@ -1285,86 +1332,104 @@msgid " <i>(is a symlink)</i>"
msgstr " <i>(é um link simbólico)</i>"
-#: tortoisehg/hgqt/fileview.py:615
+#: tortoisehg/hgqt/fileview.py:623
+msgid "Subrepo created and set to initial revision."
+msgstr "Sub-repositório criado e posicionado na revisão inicial."
+
+#: tortoisehg/hgqt/fileview.py:627
msgid "Subrepo initialized to revision:"
msgstr "Sub-repositório inicializado para a revisão:"
-#: tortoisehg/hgqt/fileview.py:618
+#: tortoisehg/hgqt/fileview.py:630
msgid "Subrepo removed from repository."
msgstr "Sub-repositório removido do repositório."
-#: tortoisehg/hgqt/fileview.py:622
+#: tortoisehg/hgqt/fileview.py:635
msgid "Revision has changed from:"
msgstr "A revisão mudou de:"
-#: tortoisehg/hgqt/fileview.py:626 tortoisehg/hgqt/hgemail_ui.py:245
+#: tortoisehg/hgqt/fileview.py:637 tortoisehg/hgqt/fileview.py:645
+#, python-format
+msgid "changeset: %s"
+msgstr "revisão: %s"
+
+#: tortoisehg/hgqt/fileview.py:643 tortoisehg/hgqt/hgemail_ui.py:245
#: tortoisehg/hgtk/hgemail.py:76
msgid "To:"
msgstr "Para:"
-#: tortoisehg/hgqt/fileview.py:632
+#: tortoisehg/hgqt/fileview.py:646
+msgid "Subrepository not found in working directory."
+msgstr "Sub-repositório não encontrado no diretório de trabalho."
+
+#: tortoisehg/hgqt/fileview.py:647
+msgid "Further subrepository revision information cannot be retrieved."
+msgstr ""
+"Não podem ser obtidas informações adicionais de revisão do sub-repositório."
+
+#: tortoisehg/hgqt/fileview.py:655
msgid "Initial revision"
msgstr "Revisão inicial"
-#: tortoisehg/hgqt/fileview.py:643
+#: tortoisehg/hgqt/fileview.py:672
msgid "Not a Mercurial subrepo, not previewable"
msgstr "Não é um sub-repositório do Mercurial, não pode ser pré-visualizado"
-#: tortoisehg/hgqt/fileview.py:655
+#: tortoisehg/hgqt/fileview.py:687
msgid "File Status:"
msgstr "Status de Arquivo:"
-#: tortoisehg/hgqt/fileview.py:675
+#: tortoisehg/hgqt/fileview.py:708
msgid "(is a changed sub-repository)"
msgstr "(é um sub-repositório modificado)"
-#: tortoisehg/hgqt/fileview.py:676
+#: tortoisehg/hgqt/fileview.py:709
msgid "(is a dirty sub-repository)"
msgstr "(é um sub-repositório sujo)"
-#: tortoisehg/hgqt/fileview.py:677
+#: tortoisehg/hgqt/fileview.py:710
msgid "(is a new sub-repository)"
msgstr "(é um novo sub-repositório)"
-#: tortoisehg/hgqt/fileview.py:678
+#: tortoisehg/hgqt/fileview.py:711
msgid "(is a removed sub-repository)"
msgstr "(é um sub-repositório removido)"
-#: tortoisehg/hgqt/fileview.py:679
+#: tortoisehg/hgqt/fileview.py:712
msgid "(is a changed and dirty sub-repository)"
msgstr "(é um sub-repositório modificado e sujo)"
-#: tortoisehg/hgqt/fileview.py:680
+#: tortoisehg/hgqt/fileview.py:713
msgid "(is a new and dirty sub-repository)"
msgstr "(é um sub-repositório novo e sujo)"
-#: tortoisehg/hgqt/fileview.py:684
+#: tortoisehg/hgqt/fileview.py:717
#, python-format
msgid " <a href=\"subrepo:%s\">open...</a>"
msgstr " <a href=\"subrepo:%s\">abrir...</a>"
-#: tortoisehg/hgqt/fileview.py:687
+#: tortoisehg/hgqt/fileview.py:720
#, python-format
msgid "Error previewing subrepo: %s"
msgstr "Erro ao pré-visualizar sub-repositório: %s"
-#: tortoisehg/hgqt/fileview.py:707
+#: tortoisehg/hgqt/fileview.py:740
msgid " <i>(was deleted)</i>"
msgstr " <i>(foi apagado)</i>"
-#: tortoisehg/hgqt/fileview.py:709
+#: tortoisehg/hgqt/fileview.py:742
msgid " <i>(was added, now missing)</i>"
msgstr " <i>(foi adicionado, atualmente ausente)</i>"
-#: tortoisehg/hgqt/fileview.py:722
+#: tortoisehg/hgqt/fileview.py:755
msgid " <i>(is unversioned)</i>"
msgstr " <i>(não versionado)</i>"
-#: tortoisehg/hgqt/fileview.py:744 tortoisehg/hgqt/fileview.py:754
+#: tortoisehg/hgqt/fileview.py:777 tortoisehg/hgqt/fileview.py:787
msgid " <i>(was added)</i>"
msgstr " <i>(foi adicionado)</i>"
-#: tortoisehg/hgqt/fileview.py:749
+#: tortoisehg/hgqt/fileview.py:782
#, python-format
msgid " <i>(renamed from %s)</i>"
msgstr " <i>(renomeado de %s)</i>"
@@ -1380,8 +1445,7 @@msgstr "Ignorar maiúsculas / minúsculas"
#: tortoisehg/hgqt/grep.py:49 tortoisehg/hgqt/qscilib.py:313
-#: tortoisehg/hgqt/qscilib.py:336 tortoisehg/hgqt/repowidget.py:175
-#: tortoisehg/hgtk/datamine.py:310
+#: tortoisehg/hgqt/qscilib.py:336 tortoisehg/hgtk/datamine.py:310
msgid "Search"
msgstr "Pesquisar"
@@ -1401,10 +1465,6 @@msgid "Follow copies and renames"
msgstr "Seguir cópias e renomeações"
-#: tortoisehg/hgqt/grep.py:69
-msgid "Recurse into subrepos"
-msgstr "Executa recursivamente em sub-repositórios"
-
#: tortoisehg/hgqt/grep.py:79 tortoisehg/hgtk/datamine.py:313
msgid "Includes:"
msgstr "Inclui:"
@@ -1836,11 +1896,11 @@msgid "Invalid regexp expression"
msgstr "Expressão regular inválida"
-#: tortoisehg/hgqt/hgignore.py:229 tortoisehg/hgqt/hgignore.py:236
+#: tortoisehg/hgqt/hgignore.py:241 tortoisehg/hgqt/hgignore.py:248
msgid "Unable to read repository status"
msgstr "Não é possível ler o status do repositório"
-#: tortoisehg/hgqt/hgignore.py:272 tortoisehg/hgtk/hgignore.py:261
+#: tortoisehg/hgqt/hgignore.py:275 tortoisehg/hgtk/hgignore.py:261
msgid "Unable to write .hgignore file"
msgstr "Incapaz de escrever arquivo .hgignore"
@@ -1972,37 +2032,37 @@msgid "&Exit"
msgstr "&Sair"
-#: tortoisehg/hgqt/merge.py:225 tortoisehg/hgqt/repomodel.py:544
+#: tortoisehg/hgqt/merge.py:230 tortoisehg/hgqt/repomodel.py:544
#: tortoisehg/hgqt/revpanel.py:156 tortoisehg/hgtk/merge.py:73
msgid "Not a head revision!"
msgstr "Não é uma revisão de cabeça!"
-#: tortoisehg/hgqt/merge.py:232
+#: tortoisehg/hgqt/merge.py:237
msgid "Merge from (other revision)"
msgstr "Mesclar com (a outra revisão; segundo pai)"
-#: tortoisehg/hgqt/merge.py:240 tortoisehg/hgtk/merge.py:47
+#: tortoisehg/hgqt/merge.py:245 tortoisehg/hgtk/merge.py:47
#: tortoisehg/hgtk/merge.py:60
msgid "Unable to merge"
msgstr "Não é possível mesclar"
-#: tortoisehg/hgqt/merge.py:241
+#: tortoisehg/hgqt/merge.py:246
msgid "Merge revision not specified or not found"
msgstr "Revisão de mesclagem não especificada ou não encontrada"
-#: tortoisehg/hgqt/merge.py:246
+#: tortoisehg/hgqt/merge.py:251
msgid "Merge to (working directory)"
msgstr "Mesclar em (o diretório de trabalho; primeiro pai)"
-#: tortoisehg/hgqt/merge.py:255
+#: tortoisehg/hgqt/merge.py:260
msgid "Working directory status"
msgstr "Status do diretório de trabalho"
-#: tortoisehg/hgqt/merge.py:271
+#: tortoisehg/hgqt/merge.py:276
msgid "<a href=\"view\">View changes...</a>"
msgstr "<a href=\"view\">Visualizar mudanças...</a>"
-#: tortoisehg/hgqt/merge.py:277
+#: tortoisehg/hgqt/merge.py:282
msgid ""
"The working directory is already <b>merged</b>. <a "
"href=\"skip\"><b>Continue</b></a> or <a href=\"discard\"><b>discard</b></a> "
@@ -2012,7 +2072,7 @@"href=\"skip\"><b>Continue</b></a> ou <a href=\"discard\"><b>descarte</b></a> "
"a mesclagem atual."
-#: tortoisehg/hgqt/merge.py:286
+#: tortoisehg/hgqt/merge.py:291
msgid ""
"Before merging, you must <a href=\"commit\"><b>commit</b></a>, <a "
"href=\"shelve\"><b>shelve</b></a> to patch, or <a "
@@ -2022,32 +2082,32 @@"href=\"shelve\"><b>adiar</b></a> para um patch, ou <a "
"href=\"discard\"><b>descartar</b></a> as mudanças."
-#: tortoisehg/hgqt/merge.py:299
+#: tortoisehg/hgqt/merge.py:304
msgid "Or use:"
msgstr "Ou use:"
-#: tortoisehg/hgqt/merge.py:302
+#: tortoisehg/hgqt/merge.py:307
msgid "Force a merge with outstanding changes (-f/--force)"
msgstr "Forçar mesclagem com mudanças pendentes (-f/--force)"
-#: tortoisehg/hgqt/merge.py:323 tortoisehg/hgtk/merge.py:118
+#: tortoisehg/hgqt/merge.py:328 tortoisehg/hgtk/merge.py:118
msgid "Discard all changes from merge target (other) revision"
msgstr "Descartar todas as mudanças da revisão alvo da mesclagem (outra)"
-#: tortoisehg/hgqt/merge.py:343 tortoisehg/hgqt/update.py:229
+#: tortoisehg/hgqt/merge.py:348 tortoisehg/hgqt/update.py:229
#: tortoisehg/hgtk/update.py:237
msgid "&Merge"
msgstr "&Mesclar"
-#: tortoisehg/hgqt/merge.py:347
+#: tortoisehg/hgqt/merge.py:352
msgid "Merge another revision to the working directory"
msgstr "Mesclar o diretório de trabalho com uma outra revisão"
-#: tortoisehg/hgqt/merge.py:364 tortoisehg/hgtk/merge.py:215
+#: tortoisehg/hgqt/merge.py:369 tortoisehg/hgtk/merge.py:215
msgid "Confirm Discard Changes"
msgstr "Confirma o Descarte de Mudanças"
-#: tortoisehg/hgqt/merge.py:365 tortoisehg/hgtk/merge.py:216
+#: tortoisehg/hgqt/merge.py:370 tortoisehg/hgtk/merge.py:216
#, python-format
msgid ""
"The changes from revision %s and all unmerged parents will be discarded.\n"
@@ -2059,51 +2119,51 @@"\n"
"Você tem certeza de que é isso o que você deseja fazer?"
-#: tortoisehg/hgqt/merge.py:375
+#: tortoisehg/hgqt/merge.py:380
msgid "Merging..."
msgstr "Mesclando..."
-#: tortoisehg/hgqt/merge.py:376
+#: tortoisehg/hgqt/merge.py:381
msgid "All conflicting files will be marked unresolved."
msgstr "Todos os arquivos conflitantes serão marcados como não-resolvidos."
-#: tortoisehg/hgqt/merge.py:393
+#: tortoisehg/hgqt/merge.py:398
msgid "Cancel merge and discard changes?"
msgstr "Cancelar mesclagem e descartar mudanças?"
-#: tortoisehg/hgqt/merge.py:395
+#: tortoisehg/hgqt/merge.py:400
msgid "Discard local changes and restart merge?"
msgstr "Descartar mudanças locais e reiniciar a mesclagem?"
-#: tortoisehg/hgqt/merge.py:398
+#: tortoisehg/hgqt/merge.py:403
msgid "Confirm Clean Up"
msgstr "Confirmar Limpeza"
-#: tortoisehg/hgqt/merge.py:401
+#: tortoisehg/hgqt/merge.py:406
msgid "Canceling merge...\n"
msgstr "Cancelando mesclagem...\n"
-#: tortoisehg/hgqt/merge.py:402
+#: tortoisehg/hgqt/merge.py:407
msgid "(Please close any running merge tools)\n"
msgstr "(Por favor feche todas as ferramentas de mesclagem em execução)\n"
-#: tortoisehg/hgqt/merge.py:422
+#: tortoisehg/hgqt/merge.py:427
msgid "Merge failed"
msgstr "A mesclagem falhou"
-#: tortoisehg/hgqt/merge.py:422
+#: tortoisehg/hgqt/merge.py:427
msgid "Returning to first page"
msgstr "Retornando à primeira página"
-#: tortoisehg/hgqt/merge.py:478
+#: tortoisehg/hgqt/merge.py:483
msgid "Rename Patch"
msgstr "Renomear Patch"
-#: tortoisehg/hgqt/merge.py:479
+#: tortoisehg/hgqt/merge.py:484
msgid "Input a new patch name:"
msgstr "Insira um novo nome do patch:"
-#: tortoisehg/hgqt/merge.py:487
+#: tortoisehg/hgqt/merge.py:492
#, python-format
msgid ""
"The patch <b>%(old)s</b> is renamed to <b>%(new)s</b>. <a "
@@ -2112,65 +2172,66 @@"O patch <b>%(old)s</b> foi renomeado para <b>%(new)s</b>. <a "
"href=\"rename:%(new)s\"><b>Renomear</b></a> novamente?"
-#: tortoisehg/hgqt/merge.py:542
+#: tortoisehg/hgqt/merge.py:547
msgid "<b>Uncommitted local changes are detected</b>"
msgstr "<b>Detectadas mudanças locais não consolidadas</b>"
-#: tortoisehg/hgqt/merge.py:547 tortoisehg/hgtk/recovery.py:52
+#: tortoisehg/hgqt/merge.py:552
+msgctxt "working dir state"
msgid "Clean"
msgstr "Limpo"
-#: tortoisehg/hgqt/merge.py:576 tortoisehg/hgtk/commit.py:237
+#: tortoisehg/hgqt/merge.py:581 tortoisehg/hgtk/commit.py:237
#: tortoisehg/hgtk/history.py:66 tortoisehg/hgtk/history.py:481
#: tortoisehg/hgtk/history.py:1223
msgid "Parents"
msgstr "Pais"
-#: tortoisehg/hgqt/merge.py:580 tortoisehg/hgqt/repomodel.py:538
+#: tortoisehg/hgqt/merge.py:585 tortoisehg/hgqt/repomodel.py:538
#: tortoisehg/hgqt/repomodel.py:540 tortoisehg/hgqt/shelve.py:24
#: tortoisehg/hgqt/thgimport.py:87
msgid "Working Directory"
msgstr "Diretório de Trabalho"
-#: tortoisehg/hgqt/merge.py:618
+#: tortoisehg/hgqt/merge.py:623
msgid "Working Directory (merged)"
msgstr "Diretório de Trabalho (mesclado)"
-#: tortoisehg/hgqt/merge.py:627
+#: tortoisehg/hgqt/merge.py:632
msgid "Commit message"
msgstr "Mensagem de consolidação"
-#: tortoisehg/hgqt/merge.py:637 tortoisehg/hgtk/commit.py:823
+#: tortoisehg/hgqt/merge.py:642 tortoisehg/hgtk/commit.py:823
msgid "Merge "
msgstr "Mesclagem "
-#: tortoisehg/hgqt/merge.py:641
+#: tortoisehg/hgqt/merge.py:646
#, python-format
msgid "Merge with %s"
msgstr "Mesclagem com %s"
-#: tortoisehg/hgqt/merge.py:667 tortoisehg/hgqt/workbench.py:240
+#: tortoisehg/hgqt/merge.py:672 tortoisehg/hgqt/workbench.py:240
msgid "&Commit"
msgstr "&Commit (consolidar)"
-#: tortoisehg/hgqt/merge.py:673 tortoisehg/hgqt/qscilib.py:174
+#: tortoisehg/hgqt/merge.py:678 tortoisehg/hgqt/qscilib.py:174
#: tortoisehg/hgtk/merge.py:137
msgid "Undo"
msgstr "Desfazer"
-#: tortoisehg/hgqt/merge.py:683
+#: tortoisehg/hgqt/merge.py:688
msgid "Commit merged files"
msgstr "Consolidar os arquivos mesclados"
-#: tortoisehg/hgqt/merge.py:687
+#: tortoisehg/hgqt/merge.py:692
msgid "Committing..."
msgstr "Consolidando..."
-#: tortoisehg/hgqt/merge.py:688
+#: tortoisehg/hgqt/merge.py:693
msgid "Please wait while committing merged files."
msgstr "Por favor aguarde enquanto os arquivos mesclados são consolidados."
-#: tortoisehg/hgqt/merge.py:703
+#: tortoisehg/hgqt/merge.py:714
msgid ""
"There were <b>merge conflicts</b> that must be <a "
"href=\"resolve\"><b>resolved</b></a>"
@@ -2178,11 +2239,11 @@"Houve <b>conflitos de mesclagem</b> que precisam ser <a "
"href=\"resolve\"><b>resolvidos</b></a>"
-#: tortoisehg/hgqt/merge.py:708
+#: tortoisehg/hgqt/merge.py:719
msgid "No merge conflicts, ready to commit"
msgstr "Nenhum conflito de mesclagem, pronto para consolidar"
-#: tortoisehg/hgqt/merge.py:763
+#: tortoisehg/hgqt/merge.py:774
msgid "Merge changeset"
msgstr "Revisão de mesclagem"
@@ -2200,7 +2261,7 @@
#: tortoisehg/hgqt/mq.py:95
msgid "Apply selected patch next (change queue order)"
-msgstr "Aplicar o patch selecionado em seguida (muda a ordem da fila)"
+msgstr "Aplicar o patch selecionado logo em seguida (muda a ordem da fila)"
#: tortoisehg/hgqt/mq.py:98
msgid "Delete selected patches"
@@ -2222,7 +2283,7 @@msgid "Manage queues"
msgstr "Gerenciar filas"
-#: tortoisehg/hgqt/mq.py:162 tortoisehg/hgqt/mq.py:680
+#: tortoisehg/hgqt/mq.py:162 tortoisehg/hgqt/mq.py:695
#: tortoisehg/hgtk/commit.py:661
msgid "QRefresh"
msgstr "QRefresh"
@@ -2235,83 +2296,87 @@msgid "TortoiseHg Patch Queue"
msgstr "Fila de Patches do TortoiseHg"
-#: tortoisehg/hgqt/mq.py:264
+#: tortoisehg/hgqt/mq.py:269
#, python-format
msgid "%s had rejected chunks, edit patched file together with rejects?"
msgstr ""
"%s tem trechos rejeitados, editar o arquivo alterado junto com os rejeitos?"
-#: tortoisehg/hgqt/mq.py:355
+#: tortoisehg/hgqt/mq.py:360
msgid "Configure guards"
msgstr "Configurar guardas"
-#: tortoisehg/hgqt/mq.py:356
+#: tortoisehg/hgqt/mq.py:361
#, python-format
msgid "Input new guards for %s:"
msgstr "Entre com novas guardas para %s:"
-#: tortoisehg/hgqt/mq.py:366
+#: tortoisehg/hgqt/mq.py:371
msgid "Guards must begin with \"+\" or \"-\""
msgstr "Guardas devem começar por \"+\" ou \"-\""
-#: tortoisehg/hgqt/mq.py:482
+#: tortoisehg/hgqt/mq.py:497
msgid "Patch Name Required"
msgstr "Exigido Nome de Patch"
-#: tortoisehg/hgqt/mq.py:483
+#: tortoisehg/hgqt/mq.py:498
msgid "You must enter a patch name"
msgstr "Você deve colocar um nome de patch"
-#: tortoisehg/hgqt/mq.py:606
+#: tortoisehg/hgqt/mq.py:621
msgid "no guards"
msgstr "nenhuma guarda"
-#: tortoisehg/hgqt/mq.py:634
+#: tortoisehg/hgqt/mq.py:649
msgid "QCommit"
msgstr "QCommit"
-#: tortoisehg/hgqt/mq.py:636
+#: tortoisehg/hgqt/mq.py:651
msgid "Create MQ repo"
msgstr "Criar Repositório MQ"
-#: tortoisehg/hgqt/mq.py:670 tortoisehg/hgtk/commit.py:658
+#: tortoisehg/hgqt/mq.py:685 tortoisehg/hgtk/commit.py:658
msgid "QNew"
msgstr "QNew"
-#: tortoisehg/hgqt/mq.py:767
+#: tortoisehg/hgqt/mq.py:782
#, python-format
msgid "Guards: %d/%d"
msgstr "Guardas: %d/%d"
-#: tortoisehg/hgqt/mq.py:865
+#: tortoisehg/hgqt/mq.py:880
msgid "Patch commit messages..."
msgstr "Mensagens de consolidação do patch..."
-#: tortoisehg/hgqt/mq.py:891
+#: tortoisehg/hgqt/mq.py:900
+msgid "MQ options"
+msgstr "Opções MQ"
+
+#: tortoisehg/hgqt/mq.py:906
msgid "Force use of git extended diff format (--git)"
msgstr "Forçar uso do formato git extended diff (--git)"
-#: tortoisehg/hgqt/mq.py:895
+#: tortoisehg/hgqt/mq.py:910
msgid "Force push or pop (--force)"
msgstr "Força push ou pop (--force)"
-#: tortoisehg/hgqt/mq.py:899
+#: tortoisehg/hgqt/mq.py:914
msgid "Apply patch to its recorded parent (--exact)"
msgstr "Aplica o patch em seu pai armazenado (--exact)"
-#: tortoisehg/hgqt/mq.py:903
+#: tortoisehg/hgqt/mq.py:918
msgid "Update date field with current date (--currentdate)"
msgstr "Atualizar campo data com a data atual (--currentdate)"
-#: tortoisehg/hgqt/mq.py:907
+#: tortoisehg/hgqt/mq.py:922
msgid "Specify an explicit date:"
msgstr "Especificar uma data:"
-#: tortoisehg/hgqt/mq.py:910
+#: tortoisehg/hgqt/mq.py:925
msgid "Update author field with current user (--currentuser)"
msgstr "Atualizar campo autor com o usuário atual (--currentuser)"
-#: tortoisehg/hgqt/mq.py:914
+#: tortoisehg/hgqt/mq.py:929
msgid "Specify an explicit author:"
msgstr "Especificar um autor:"
@@ -2390,11 +2455,11 @@msgid "&Goto (update workdir)"
msgstr "&Ir Para (atualiza diretório de trabalho)"
-#: tortoisehg/hgqt/pbranch.py:441
+#: tortoisehg/hgqt/pbranch.py:447
msgid "No editor found"
msgstr "Nenhum editor encontrado"
-#: tortoisehg/hgqt/pbranch.py:442
+#: tortoisehg/hgqt/pbranch.py:448
msgid ""
"Mercurial was unable to find an editor. Please configure Mercurial to use an "
"editor installed on your system."
@@ -2524,6 +2589,11 @@msgid "Preserve files beginning with .hg"
msgstr "Preservar arquivos iniciados por .hg"
+#: tortoisehg/hgqt/purge.py:70
+#, python-format
+msgid "%s - purge"
+msgstr "%s - purge"
+
#: tortoisehg/hgqt/purge.py:75 tortoisehg/hgqt/purge.py:107
msgid "Checking"
msgstr "Checando"
@@ -2532,48 +2602,54 @@msgid "Ready to purge."
msgstr "Pronto para remover arquivos."
-#: tortoisehg/hgqt/purge.py:114
-#, python-format
-msgid "Delete %d unknown files"
-msgstr "Apagar %d arquivos desconhecidos"
-
-#: tortoisehg/hgqt/purge.py:118
-#, python-format
-msgid "Delete %d ignored files"
-msgstr "Apagar %d arquivos ignorados"
-
-#: tortoisehg/hgqt/purge.py:122
-#, python-format
-msgid "Delete %d files in .hg/Trashcan"
-msgstr "Apagar %d arquivos em .hg/Trashcan (lixeira)"
-
-#: tortoisehg/hgqt/purge.py:146
+#: tortoisehg/hgqt/purge.py:115
+#, python-format
+msgid "Delete %d unknown file"
+msgid_plural "Delete %d unknown files"
+msgstr[0] "Apagar %d arquivo desconhecido"
+msgstr[1] "Apagar %d arquivos desconhecidos"
+
+#: tortoisehg/hgqt/purge.py:121
+#, python-format
+msgid "Delete %d ignored file"
+msgid_plural "Delete %d ignored files"
+msgstr[0] "Apagar %d arquivo ignorado"
+msgstr[1] "Apagar %d arquivos ignorados"
+
+#: tortoisehg/hgqt/purge.py:127
+#, python-format
+msgid "Delete %d file in .hg/Trashcan"
+msgid_plural "Delete %d files in .hg/Trashcan"
+msgstr[0] "Apagar %d arquivo em .hg/Trashcan (lixeira)"
+msgstr[1] "Apagar %d arquivos em .hg/Trashcan (lixeira)"
+
+#: tortoisehg/hgqt/purge.py:151
msgid "Confirm file deletions"
msgstr "Confirmar remoção de arquivos"
-#: tortoisehg/hgqt/purge.py:147
+#: tortoisehg/hgqt/purge.py:152
msgid "Are you sure you want to delete these files and/or folders?"
msgstr "Tem certeza de que deseja apagar estes arquivos e/ou pastas?"
-#: tortoisehg/hgqt/purge.py:153
+#: tortoisehg/hgqt/purge.py:159
msgid "Deletion failures"
msgstr "Falhas ao apagar"
-#: tortoisehg/hgqt/purge.py:154
+#: tortoisehg/hgqt/purge.py:160
#, python-format
msgid "Unable to delete %d files or folders"
msgstr "Não é possível apagar %d arquivos ou pastas"
-#: tortoisehg/hgqt/purge.py:192
+#: tortoisehg/hgqt/purge.py:198
msgid "Deleting trash folder..."
msgstr "Apagando lixeira..."
-#: tortoisehg/hgqt/purge.py:231
+#: tortoisehg/hgqt/purge.py:237
#, python-format
msgid "Deleted %d files"
msgstr "Apagados %d arquivos"
-#: tortoisehg/hgqt/purge.py:241
+#: tortoisehg/hgqt/purge.py:247
#, python-format
msgid "Deleted %d files and %d folders"
msgstr "Apagados %d arquivos e %d pastas"
@@ -2688,7 +2764,7 @@"arquivos!</p><p>Você realmente deseja remover completamente a fila de "
"patches '%s' ?</p>"
-#: tortoisehg/hgqt/qqueue.py:346 tortoisehg/hgqt/qreorder.py:223
+#: tortoisehg/hgqt/qqueue.py:343 tortoisehg/hgqt/qreorder.py:226
msgid "Please enable the MQ extension first."
msgstr "Por favor habilite primeiro a extensão MQ."
@@ -2702,19 +2778,48 @@msgid "Rename patch <b>%s</b> to:"
msgstr "Renomear patch <b>%s</b> para:"
+#: tortoisehg/hgqt/qrename.py:84
+msgid "Could not rename existing patchfile"
+msgstr "Não foi possível renomear arquivo de patch existente"
+
+#: tortoisehg/hgqt/qrename.py:94
+msgid "Could not delete existing patchfile"
+msgstr "Não foi possível apagar arquivo de patch existente"
+
+#: tortoisehg/hgqt/qrename.py:110
+msgid "QRename - Check patchname"
+msgstr "QRename - Verifique o nome do patch"
+
+#: tortoisehg/hgqt/qrename.py:119
+#, python-format
+msgid "Patch name <b>%s</b> already exists:"
+msgstr "O nome de patch <b>%s</b> já existe:"
+
+#: tortoisehg/hgqt/qrename.py:124
+msgid "Add .OLD extension to existing patchfile"
+msgstr "Adicionar extensão .OLD ao arquivo de patch existente"
+
+#: tortoisehg/hgqt/qrename.py:126
+msgid "Overwrite existing patchfile"
+msgstr "Sobrescrever arquivo de patch existente"
+
+#: tortoisehg/hgqt/qrename.py:128
+msgid "Go back and change new patchname"
+msgstr "Voltar e mudar o novo nome do patch"
+
#: tortoisehg/hgqt/qreorder.py:27
msgid "Reorder Unapplied Patches"
msgstr "Reordenar Patches Não-Aplicados"
-#: tortoisehg/hgqt/qreorder.py:67
+#: tortoisehg/hgqt/qreorder.py:68
msgid "Unapplied Patches - drag to reorder"
msgstr "Patches Não-Aplicados - arraste para reordenar"
-#: tortoisehg/hgqt/qreorder.py:78
+#: tortoisehg/hgqt/qreorder.py:79
msgid "Applied Patches"
msgstr "Patches Aplicados"
-#: tortoisehg/hgqt/qreorder.py:118
+#: tortoisehg/hgqt/qreorder.py:119
msgid "Rename patch"
msgstr "Renomear patch"
@@ -2787,11 +2892,11 @@msgid "Unable to read/write config file"
msgstr "Incapaz de ler/escrever arquivo de configuração"
-#: tortoisehg/hgqt/qtlib.py:78
+#: tortoisehg/hgqt/qtlib.py:79
msgid "Unable to create a config file"
msgstr "Não é possível criar um arquivo de configurações"
-#: tortoisehg/hgqt/qtlib.py:79
+#: tortoisehg/hgqt/qtlib.py:80
msgid "Insufficient access rights."
msgstr "Permissões de acesso insuficientes."
@@ -2828,12 +2933,17 @@msgid "Checkmark files to remove"
msgstr "Marque arquivos para remover"
-#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:475
+#: tortoisehg/hgqt/quickop.py:23 tortoisehg/hgqt/sync.py:476
#: tortoisehg/hgqt/webconf_ui.py:80 tortoisehg/hgtk/bookmark.py:47
#: tortoisehg/hgtk/quickop.py:22 tortoisehg/hgtk/tagadd.py:40
msgid "Remove"
msgstr "Remover"
+#: tortoisehg/hgqt/quickop.py:44
+#, python-format
+msgid "%s - hg %s"
+msgstr "%s - hg %s"
+
#: tortoisehg/hgqt/quickop.py:78 tortoisehg/hgtk/quickop.py:133
msgid "Do not save backup files (*.orig)"
msgstr "Não salvar cópias de segurança (*.orig)"
@@ -3250,7 +3360,7 @@msgid "Clone Repository"
msgstr "Clonar repositório"
-#: tortoisehg/hgqt/reporegistry.py:111 tortoisehg/hgqt/sync.py:473
+#: tortoisehg/hgqt/reporegistry.py:111 tortoisehg/hgqt/sync.py:474
#: tortoisehg/hgqt/workbench.py:288
msgid "Explore"
msgstr "Explorar"
@@ -3259,7 +3369,7 @@msgid "Open the repository in Windows Explorer"
msgstr "Abre o repositório no Windows Explorer"
-#: tortoisehg/hgqt/reporegistry.py:113 tortoisehg/hgqt/sync.py:474
+#: tortoisehg/hgqt/reporegistry.py:113 tortoisehg/hgqt/sync.py:475
#: tortoisehg/hgqt/workbench.py:291
msgid "Terminal"
msgstr "Terminal"
@@ -3303,8 +3413,8 @@msgid "default"
msgstr "padrão"
-#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:394
-#: tortoisehg/hgqt/sync.py:199 tortoisehg/hgqt/webconf.py:266
+#: tortoisehg/hgqt/repotreemodel.py:143 tortoisehg/hgqt/resolve.py:399
+#: tortoisehg/hgqt/sync.py:200 tortoisehg/hgqt/webconf.py:266
msgid "Path"
msgstr "Caminho"
@@ -3344,26 +3454,37 @@msgstr "Rejeita revisões de entrada"
#: tortoisehg/hgqt/repowidget.py:159
+msgctxt "tab tooltip"
msgid "Revision details"
msgstr "Detalhes da revisão"
-#: tortoisehg/hgqt/repowidget.py:167 tortoisehg/hgtk/gdialog.py:495
-#: tortoisehg/hgtk/thgconfig.py:170 tortoisehg/util/menuthg.py:52
+#: tortoisehg/hgqt/repowidget.py:163
+msgctxt "tab tooltip"
+msgid "Commit"
+msgstr "Consolidação"
+
+#: tortoisehg/hgqt/repowidget.py:167
+msgctxt "tab tooltip"
msgid "Synchronize"
-msgstr "Sincronizar"
+msgstr "Sincronização"
#: tortoisehg/hgqt/repowidget.py:171
+msgctxt "tab tooltip"
msgid "Manifest"
msgstr "Manifesto"
-#: tortoisehg/hgqt/repowidget.py:180 tortoisehg/hgtk/commit.py:227
-#: tortoisehg/hgtk/commit.py:309 tortoisehg/hgtk/history.py:258
-#: tortoisehg/hgtk/history.py:368 tortoisehg/hgtk/thgimport.py:111
+#: tortoisehg/hgqt/repowidget.py:175
+msgctxt "tab tooltip"
+msgid "Search"
+msgstr "Pesquisa"
+
+#: tortoisehg/hgqt/repowidget.py:180
+msgctxt "tab tooltip"
msgid "Patch Queue"
msgstr "Fila de Patches"
-#: tortoisehg/hgqt/repowidget.py:188 tortoisehg/hgtk/history.py:266
-#: tortoisehg/hgtk/history.py:385
+#: tortoisehg/hgqt/repowidget.py:188
+msgctxt "tab tooltip"
msgid "Patch Branch"
msgstr "Ramo de Patches"
@@ -3372,56 +3493,56 @@msgid "%s <incoming>"
msgstr "%s <incoming>"
-#: tortoisehg/hgqt/repowidget.py:493
+#: tortoisehg/hgqt/repowidget.py:505
#, python-format
msgid "%s - verify repository"
msgstr "%s - verificar repositório"
-#: tortoisehg/hgqt/repowidget.py:500
+#: tortoisehg/hgqt/repowidget.py:512
#, python-format
msgid "%s - recover repository"
msgstr "%s - recuperar repositório"
-#: tortoisehg/hgqt/repowidget.py:516
+#: tortoisehg/hgqt/repowidget.py:528
msgid "No transaction available"
msgstr "Nenhuma transação disponível"
-#: tortoisehg/hgqt/repowidget.py:517
+#: tortoisehg/hgqt/repowidget.py:529
msgid "There is no rollback transaction available"
msgstr "Não há registro de transação disponível para o rollback"
-#: tortoisehg/hgqt/repowidget.py:520 tortoisehg/hgtk/commit.py:1035
+#: tortoisehg/hgqt/repowidget.py:532 tortoisehg/hgtk/commit.py:1035
msgid "Undo last commit?"
msgstr "Desfazer a última consolidação?"
-#: tortoisehg/hgqt/repowidget.py:521
+#: tortoisehg/hgqt/repowidget.py:533
#, python-format
msgid "Undo most recent commit (%d), preserving file changes?"
msgstr ""
"Desfazer a consolidação mais recente (%d), preservando mudanças nos arquivos?"
-#: tortoisehg/hgqt/repowidget.py:525
+#: tortoisehg/hgqt/repowidget.py:537
msgid "Undo last transaction?"
msgstr "Desfazer a última transação?"
-#: tortoisehg/hgqt/repowidget.py:526
+#: tortoisehg/hgqt/repowidget.py:538
#, python-format
msgid "Rollback to revision %d (undo %s)?"
msgstr "Executar rollback para revisão %d (desfazendo o comando %s)?"
-#: tortoisehg/hgqt/repowidget.py:532 tortoisehg/hgqt/run.py:466
+#: tortoisehg/hgqt/repowidget.py:544 tortoisehg/hgqt/run.py:466
msgid "Repository Error"
msgstr "Erro de Repositório"
-#: tortoisehg/hgqt/repowidget.py:533
+#: tortoisehg/hgqt/repowidget.py:545
msgid "Unable to determine working copy revision\n"
msgstr "Não é possível determinar a cópia de trabalho da revisão\n"
-#: tortoisehg/hgqt/repowidget.py:537
+#: tortoisehg/hgqt/repowidget.py:549
msgid "Remove current working revision?"
msgstr "Remover a revisão de trabalho atual?"
-#: tortoisehg/hgqt/repowidget.py:538
+#: tortoisehg/hgqt/repowidget.py:550
#, python-format
msgid ""
"Your current working revision (%d) will be removed by this rollback, leaving "
@@ -3432,174 +3553,174 @@"mudanças não consolidadas.\n"
" Continuar?"
-#: tortoisehg/hgqt/repowidget.py:655
+#: tortoisehg/hgqt/repowidget.py:668
msgid "Repository stripped, incoming preview cleared"
msgstr ""
"Revisões foram removidas do repositório, a pré-visualização de incoming foi "
"desativada"
-#: tortoisehg/hgqt/repowidget.py:660
+#: tortoisehg/hgqt/repowidget.py:673
msgid "Repository stripped, revision set cleared"
msgstr ""
"Revisões foram removidas do repositório, conjunto de revisões desativado"
-#: tortoisehg/hgqt/repowidget.py:776
+#: tortoisehg/hgqt/repowidget.py:789
msgid "Commit tab cannot exit"
msgstr "Aba de commit não pode sair"
-#: tortoisehg/hgqt/repowidget.py:780
+#: tortoisehg/hgqt/repowidget.py:793
msgid "Sync tab cannot exit"
msgstr "Aba de sync não pode sair"
-#: tortoisehg/hgqt/repowidget.py:784
+#: tortoisehg/hgqt/repowidget.py:797
msgid "MQ tab cannot exit"
msgstr "Aba MQ não pode sair"
-#: tortoisehg/hgqt/repowidget.py:788
+#: tortoisehg/hgqt/repowidget.py:801
msgid "Search tab cannot exit"
msgstr "Aba de busca não pode sair"
-#: tortoisehg/hgqt/repowidget.py:791
+#: tortoisehg/hgqt/repowidget.py:804
msgid "Repository command still running"
msgstr "Um comando do repositório ainda está em execução"
-#: tortoisehg/hgqt/repowidget.py:946 tortoisehg/util/menuthg.py:58
+#: tortoisehg/hgqt/repowidget.py:959 tortoisehg/util/menuthg.py:58
msgid "Update..."
msgstr "Update... (obter revisão)"
-#: tortoisehg/hgqt/repowidget.py:949 tortoisehg/hgqt/repowidget.py:1173
+#: tortoisehg/hgqt/repowidget.py:962 tortoisehg/hgqt/repowidget.py:1186
msgid "Visual diff..."
msgstr "Diff visual..."
-#: tortoisehg/hgqt/repowidget.py:951
+#: tortoisehg/hgqt/repowidget.py:964
msgid "Diff to local..."
msgstr "Diff com local..."
-#: tortoisehg/hgqt/repowidget.py:953
+#: tortoisehg/hgqt/repowidget.py:966
msgid "Browse at rev..."
msgstr "Ver na revisão..."
-#: tortoisehg/hgqt/repowidget.py:956
+#: tortoisehg/hgqt/repowidget.py:969
msgid "Merge with local..."
msgstr "Mesclar com local..."
-#: tortoisehg/hgqt/repowidget.py:959
+#: tortoisehg/hgqt/repowidget.py:972
msgid "Tag..."
msgstr "Tag... (etiqueta)"
-#: tortoisehg/hgqt/repowidget.py:961
+#: tortoisehg/hgqt/repowidget.py:974
msgid "Bookmark..."
msgstr "Bookmark... (marcador)"
-#: tortoisehg/hgqt/repowidget.py:964 tortoisehg/hgtk/history.py:1290
+#: tortoisehg/hgqt/repowidget.py:977 tortoisehg/hgtk/history.py:1290
msgid "Backout..."
msgstr "Backout... (anular)"
-#: tortoisehg/hgqt/repowidget.py:968 tortoisehg/hgtk/history.py:1293
+#: tortoisehg/hgqt/repowidget.py:981 tortoisehg/hgtk/history.py:1293
msgid "Export"
msgstr "Exportar"
-#: tortoisehg/hgqt/repowidget.py:969
+#: tortoisehg/hgqt/repowidget.py:982
msgid "Export patch..."
msgstr "Exportar patch..."
-#: tortoisehg/hgqt/repowidget.py:971
+#: tortoisehg/hgqt/repowidget.py:984
msgid "Email patch..."
msgstr "Enviar patch por e-mail..."
-#: tortoisehg/hgqt/repowidget.py:973
+#: tortoisehg/hgqt/repowidget.py:986
msgid "Archive..."
msgstr "Archive... (empacotar)"
-#: tortoisehg/hgqt/repowidget.py:975 tortoisehg/hgqt/wctxactions.py:46
+#: tortoisehg/hgqt/repowidget.py:988 tortoisehg/hgqt/wctxactions.py:46
msgid "Copy patch"
msgstr "Copiar patch"
-#: tortoisehg/hgqt/repowidget.py:979
+#: tortoisehg/hgqt/repowidget.py:992
msgid "Copy hash"
msgstr "Copiar hash"
-#: tortoisehg/hgqt/repowidget.py:983
+#: tortoisehg/hgqt/repowidget.py:996
msgid "Transplant to local"
msgstr "Transplantar para local"
-#: tortoisehg/hgqt/repowidget.py:987
+#: tortoisehg/hgqt/repowidget.py:1000
msgid "Modify history"
msgstr "Modificar histórico"
-#: tortoisehg/hgqt/repowidget.py:988 tortoisehg/hgqt/repowidget.py:1127
+#: tortoisehg/hgqt/repowidget.py:1001 tortoisehg/hgqt/repowidget.py:1140
msgid "QGoto"
msgstr "QGoto"
-#: tortoisehg/hgqt/repowidget.py:990
+#: tortoisehg/hgqt/repowidget.py:1003
msgid "Import to MQ"
msgstr "Importar para MQ"
-#: tortoisehg/hgqt/repowidget.py:992
+#: tortoisehg/hgqt/repowidget.py:1005
msgid "Finish patch"
msgstr "Terminar patch (qfinish)"
-#: tortoisehg/hgqt/repowidget.py:995
+#: tortoisehg/hgqt/repowidget.py:1008
msgid "Rebase..."
msgstr "Rebase..."
-#: tortoisehg/hgqt/repowidget.py:998
+#: tortoisehg/hgqt/repowidget.py:1011
msgid "Strip..."
msgstr "Strip... (remover revisões)"
-#: tortoisehg/hgqt/repowidget.py:1001
+#: tortoisehg/hgqt/repowidget.py:1014
msgid "Post to Review Board..."
msgstr "Postar para a Review Board..."
-#: tortoisehg/hgqt/repowidget.py:1056
+#: tortoisehg/hgqt/repowidget.py:1069
msgid "Unable to compress history"
msgstr "Não é possível comprimir o histórico"
-#: tortoisehg/hgqt/repowidget.py:1057
+#: tortoisehg/hgqt/repowidget.py:1070
msgid "Selected changeset pair not related"
msgstr "O par de revisões selecionado não é relacionado"
-#: tortoisehg/hgqt/repowidget.py:1065
+#: tortoisehg/hgqt/repowidget.py:1078
msgid "Visual Diff..."
msgstr "Diff Visual..."
-#: tortoisehg/hgqt/repowidget.py:1066 tortoisehg/hgqt/repowidget.py:1148
+#: tortoisehg/hgqt/repowidget.py:1079 tortoisehg/hgqt/repowidget.py:1161
msgid "Export Selected..."
msgstr "Exportar Selecionado..."
-#: tortoisehg/hgqt/repowidget.py:1067 tortoisehg/hgqt/repowidget.py:1149
+#: tortoisehg/hgqt/repowidget.py:1080 tortoisehg/hgqt/repowidget.py:1162
msgid "Email Selected..."
msgstr "Enviar Selecionados por E-mail..."
-#: tortoisehg/hgqt/repowidget.py:1068
+#: tortoisehg/hgqt/repowidget.py:1081
msgid "Export DAG Range..."
msgstr "Exportar Faixa do DAG..."
-#: tortoisehg/hgqt/repowidget.py:1069
+#: tortoisehg/hgqt/repowidget.py:1082
msgid "Email DAG Range..."
msgstr "Enviar por E-mail Intervalo do DAG..."
-#: tortoisehg/hgqt/repowidget.py:1070
+#: tortoisehg/hgqt/repowidget.py:1083
msgid "Bisect - Good, Bad..."
msgstr "Biseccionar - Boa, Ruim..."
-#: tortoisehg/hgqt/repowidget.py:1071
+#: tortoisehg/hgqt/repowidget.py:1084
msgid "Bisect - Bad, Good..."
msgstr "Biseccionar - Ruim, Boa..."
-#: tortoisehg/hgqt/repowidget.py:1072
+#: tortoisehg/hgqt/repowidget.py:1085
msgid "Compress History..."
msgstr "Comprimir Histórico..."
-#: tortoisehg/hgqt/repowidget.py:1081 tortoisehg/hgqt/repowidget.py:1158
+#: tortoisehg/hgqt/repowidget.py:1094 tortoisehg/hgqt/repowidget.py:1171
msgid "Transplant Selected to local"
msgstr "Transplantar Selecionadas para a local"
-#: tortoisehg/hgqt/repowidget.py:1087 tortoisehg/hgqt/repowidget.py:1164
+#: tortoisehg/hgqt/repowidget.py:1100 tortoisehg/hgqt/repowidget.py:1177
msgid "Post Selected to Review Board..."
msgstr "Postar Selecionados para a Review Board..."
-#: tortoisehg/hgqt/repowidget.py:1106
+#: tortoisehg/hgqt/repowidget.py:1119
msgid ""
"<p>ATTENTION!<br>Guard or comment found.<br>Reordering patches will destroy "
"them.<br><br>Continue?</p>"
@@ -3607,35 +3728,35 @@"<p>ATENÇÃO!<br>Guarda ou comentário encontrados.<br>Reordenar patches irá "
"destruí-los. <br><br>Continuar?</p>"
-#: tortoisehg/hgqt/repowidget.py:1128
+#: tortoisehg/hgqt/repowidget.py:1141
msgid "QPush --move"
msgstr "QPush --move"
-#: tortoisehg/hgqt/repowidget.py:1129
+#: tortoisehg/hgqt/repowidget.py:1142
msgid "Fold patches..."
msgstr "Combinar patches..."
-#: tortoisehg/hgqt/repowidget.py:1130
+#: tortoisehg/hgqt/repowidget.py:1143
msgid "Delete patches..."
msgstr "Apagar patches..."
-#: tortoisehg/hgqt/repowidget.py:1131
+#: tortoisehg/hgqt/repowidget.py:1144
msgid "Reorder patches..."
msgstr "Reordenar patches..."
-#: tortoisehg/hgqt/repowidget.py:1172
+#: tortoisehg/hgqt/repowidget.py:1185
msgid "Pull to here..."
msgstr "Pull até aqui..."
-#: tortoisehg/hgqt/repowidget.py:1185
+#: tortoisehg/hgqt/repowidget.py:1198
msgid "Export patch"
msgstr "Exportar patch"
-#: tortoisehg/hgqt/repowidget.py:1350
+#: tortoisehg/hgqt/repowidget.py:1363
msgid "Unable to start"
msgstr "Incapaz de iniciar"
-#: tortoisehg/hgqt/repowidget.py:1351
+#: tortoisehg/hgqt/repowidget.py:1364
msgid "Previous command is still running"
msgstr "O comando anterior ainda está em execução"
@@ -3744,11 +3865,11 @@msgid "Command output"
msgstr "Saída do comando"
-#: tortoisehg/hgqt/resolve.py:242
+#: tortoisehg/hgqt/resolve.py:247
msgid "Unable to show subrepository files"
msgstr "Não é possível mostrar arquivos do sub-repositório"
-#: tortoisehg/hgqt/resolve.py:243
+#: tortoisehg/hgqt/resolve.py:248
msgid ""
"Visual diffs are not supported for files in subrepositories. They will not "
"be shown."
@@ -3756,48 +3877,48 @@"Diffs visuais de arquivos em sub-repositórios não são suportados. Eles não "
"serão exibidos."
-#: tortoisehg/hgqt/resolve.py:337
+#: tortoisehg/hgqt/resolve.py:342
msgid "There are merge <b>conflicts</b> to be resolved"
msgstr "Há <b>conflitos</b> de mesclagem que devem ser resolvidos"
-#: tortoisehg/hgqt/resolve.py:339
+#: tortoisehg/hgqt/resolve.py:344
msgid "All conflicts are resolved."
msgstr "Todos os conflitos estão resolvidos."
-#: tortoisehg/hgqt/resolve.py:341
+#: tortoisehg/hgqt/resolve.py:346
msgid "There are no conflicting file merges."
msgstr "Não há mesclagens de arquivos conflitantes."
-#: tortoisehg/hgqt/resolve.py:348
+#: tortoisehg/hgqt/resolve.py:353
msgid "Exit without finishing resolve?"
msgstr "Sair sem terminar o resolve?"
-#: tortoisehg/hgqt/resolve.py:349
+#: tortoisehg/hgqt/resolve.py:354
msgid "Unresolved conflicts remain. Are you sure?"
msgstr "Os conflitos permanecem não-resolvidos. Tem certeza?"
-#: tortoisehg/hgqt/resolve.py:350 tortoisehg/hgqt/workbench.py:199
+#: tortoisehg/hgqt/resolve.py:355 tortoisehg/hgqt/workbench.py:199
msgid "E&xit"
msgstr "&Sair"
-#: tortoisehg/hgqt/resolve.py:394
+#: tortoisehg/hgqt/resolve.py:399
msgid "Ext"
msgstr "Ext"
-#: tortoisehg/hgqt/resolve.py:394 tortoisehg/hgqt/thgimport.py:85
+#: tortoisehg/hgqt/resolve.py:399 tortoisehg/hgqt/thgimport.py:85
#: tortoisehg/hgtk/thgimport.py:110
msgid "Repository"
msgstr "Repositório"
-#: tortoisehg/hgqt/resolve.py:437
+#: tortoisehg/hgqt/resolve.py:442
msgid "<default>"
msgstr "<padrão>"
-#: tortoisehg/hgqt/revdetails.py:89
+#: tortoisehg/hgqt/revdetails.py:90
msgid "File List Toolbar"
msgstr "Barra de Lista de Arquivos"
-#: tortoisehg/hgqt/revdetails.py:187
+#: tortoisehg/hgqt/revdetails.py:188
msgid "Update to this revision"
msgstr "Atualiza para esta revisão"
@@ -4201,19 +4322,15 @@"\n"
"apelidos: %s\n"
-#: tortoisehg/hgqt/run.py:780 tortoisehg/hgqt/run.py:845
-#: tortoisehg/hgtk/hgtk.py:583 tortoisehg/hgtk/hgtk.py:648
-msgid "(No help text available)"
-msgstr "(sem texto de ajuda disponível)"
+#: tortoisehg/hgqt/run.py:780 tortoisehg/hgqt/run.py:812
+#: tortoisehg/hgqt/run.py:845 tortoisehg/hgtk/hgtk.py:615
+msgid "(no help text available)"
+msgstr "(nenhum texto de ajuda disponível)"
#: tortoisehg/hgqt/run.py:788 tortoisehg/hgtk/hgtk.py:591
msgid "options:\n"
msgstr "opções:\n"
-#: tortoisehg/hgqt/run.py:812 tortoisehg/hgtk/hgtk.py:615
-msgid "(no help text available)"
-msgstr "(nenhum texto de ajuda disponível)"
-
#: tortoisehg/hgqt/run.py:817 tortoisehg/hgtk/hgtk.py:620
msgid "no commands defined\n"
msgstr "sem comandos definidos\n"
@@ -4970,7 +5087,12 @@"a \"pull --update\", \"fetch\" equivale à extensão \"fetch\", \"rebase\" "
"equivale a \"pull --rebase\". Padrão: \"none\" (nenhuma)"
-#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgqt/sync.py:1158
+#: tortoisehg/hgqt/settings.py:366
+msgctxt "config item"
+msgid "Commit"
+msgstr "Consolidação"
+
+#: tortoisehg/hgqt/settings.py:367 tortoisehg/hgqt/sync.py:1165
#: tortoisehg/hgtk/thgconfig.py:90
msgid "Username"
msgstr "Nome de Usuário"
@@ -5111,7 +5233,7 @@msgstr ""
"Lista de formatos de arquivos separados por vírgulas permitidos para download"
-#: tortoisehg/hgqt/settings.py:412 tortoisehg/hgqt/sync.py:188
+#: tortoisehg/hgqt/settings.py:412 tortoisehg/hgqt/sync.py:189
#: tortoisehg/hgtk/thgconfig.py:195 tortoisehg/hgtk/thgconfig.py:368
msgid "Port"
msgstr "Porta"
@@ -5239,7 +5361,7 @@msgstr "Opcional. Nome de usuário para autenticação no servidor proxy"
#: tortoisehg/hgqt/settings.py:452 tortoisehg/hgqt/settings.py:565
-#: tortoisehg/hgqt/sync.py:1166 tortoisehg/hgtk/thgconfig.py:234
+#: tortoisehg/hgqt/sync.py:1173 tortoisehg/hgtk/thgconfig.py:234
#: tortoisehg/hgtk/thgconfig.py:370
msgid "Password"
msgstr "Senha"
@@ -5778,8 +5900,8 @@msgid "Refresh Toolbar"
msgstr "Atualizar Barra de Ferramentas"
-#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:232
-#: tortoisehg/hgqt/status.py:243 tortoisehg/hgtk/commit.py:241
+#: tortoisehg/hgqt/shelve.py:135 tortoisehg/hgqt/status.py:233
+#: tortoisehg/hgqt/status.py:244 tortoisehg/hgtk/commit.py:241
#: tortoisehg/hgtk/hgignore.py:142 tortoisehg/hgtk/history.py:404
msgid "Refresh"
msgstr "Reler"
@@ -5809,60 +5931,60 @@msgid "TortoiseHg Shelve - %s"
msgstr "TortoiseHg Shelve (Adiamento) - %s"
-#: tortoisehg/hgqt/shelve.py:249
+#: tortoisehg/hgqt/shelve.py:253
msgid "TortoiseHg New Shelf Name"
msgstr "TortoiseHg: Novo Nome de Adiamento"
-#: tortoisehg/hgqt/shelve.py:250
+#: tortoisehg/hgqt/shelve.py:254
msgid "Specify name of new shelf"
msgstr "Especifica nome do novo adiamento"
-#: tortoisehg/hgqt/shelve.py:259
+#: tortoisehg/hgqt/shelve.py:263
msgid "File already exists"
msgstr "O arquivo já existe"
-#: tortoisehg/hgqt/shelve.py:260
+#: tortoisehg/hgqt/shelve.py:264
msgid "A shelf file of that name already exists"
msgstr "Um arquivo de adiamento com tal nome já existe"
-#: tortoisehg/hgqt/shelve.py:263
+#: tortoisehg/hgqt/shelve.py:267
msgid "New shelf created"
msgstr "Novo adiamento criado"
-#: tortoisehg/hgqt/shelve.py:274 tortoisehg/hgqt/shelve.py:287
-#: tortoisehg/hgqt/shelve.py:300 tortoisehg/hgqt/shelve.py:315
-#: tortoisehg/hgqt/shelve.py:329
+#: tortoisehg/hgqt/shelve.py:278 tortoisehg/hgqt/shelve.py:291
+#: tortoisehg/hgqt/shelve.py:304 tortoisehg/hgqt/shelve.py:319
+#: tortoisehg/hgqt/shelve.py:333
msgid "Are you sure?"
msgstr "Você tem certeza?"
-#: tortoisehg/hgqt/shelve.py:275 tortoisehg/hgqt/shelve.py:316
+#: tortoisehg/hgqt/shelve.py:279 tortoisehg/hgqt/shelve.py:320
#, python-format
msgid "Delete shelf file %s?"
msgstr "Apagar o arquivo de adiamento %s?"
-#: tortoisehg/hgqt/shelve.py:279 tortoisehg/hgqt/shelve.py:320
+#: tortoisehg/hgqt/shelve.py:283 tortoisehg/hgqt/shelve.py:324
msgid "Shelf deleted"
msgstr "Adiamento removida"
-#: tortoisehg/hgqt/shelve.py:288
+#: tortoisehg/hgqt/shelve.py:292
msgid "Revert all working copy changes?"
msgstr "Reverter todas as mudanças da cópia de trabalho?"
-#: tortoisehg/hgqt/shelve.py:301 tortoisehg/hgqt/shelve.py:330
+#: tortoisehg/hgqt/shelve.py:305 tortoisehg/hgqt/shelve.py:334
#, python-format
msgid "Clear contents of shelf file %s?"
msgstr "Limpar o conteúdo do arquivo de adiamento %s?"
-#: tortoisehg/hgqt/shelve.py:306 tortoisehg/hgqt/shelve.py:335
+#: tortoisehg/hgqt/shelve.py:310 tortoisehg/hgqt/shelve.py:339
msgid "Shelf cleared"
msgstr "Adiamento sem conteúdo"
-#: tortoisehg/hgqt/shelve.py:370
+#: tortoisehg/hgqt/shelve.py:374
#, python-format
msgid "Shelf: %s"
msgstr "Adiamento: %s"
-#: tortoisehg/hgqt/shelve.py:373
+#: tortoisehg/hgqt/shelve.py:377
#, python-format
msgid "Patch: %s"
msgstr "Patch: %s"
@@ -5891,98 +6013,98 @@msgid "Uncheck all files"
msgstr "Desmarcar todos os arquivos"
-#: tortoisehg/hgqt/status.py:198
+#: tortoisehg/hgqt/status.py:199
#, python-format
msgid "%s - status (selection filtered)"
msgstr "%s - status (selecão filtrada)"
-#: tortoisehg/hgqt/status.py:200
+#: tortoisehg/hgqt/status.py:201
#, python-format
msgid "%s - status"
msgstr "%s - status"
-#: tortoisehg/hgqt/status.py:232 tortoisehg/hgtk/browse.py:112
+#: tortoisehg/hgqt/status.py:233 tortoisehg/hgtk/browse.py:112
#: tortoisehg/hgtk/quickop.py:106 tortoisehg/hgtk/status.py:95
msgid "status"
msgstr "status"
-#: tortoisehg/hgqt/status.py:258 tortoisehg/hgtk/quickop.py:186
+#: tortoisehg/hgqt/status.py:259 tortoisehg/hgtk/quickop.py:186
msgid "No appropriate files"
msgstr "Nenhum arquivo apropriado"
-#: tortoisehg/hgqt/status.py:259 tortoisehg/hgtk/quickop.py:187
+#: tortoisehg/hgqt/status.py:260 tortoisehg/hgtk/quickop.py:187
msgid "No files found for this operation"
msgstr "Nenhum arquivo encontrado para esta operação"
-#: tortoisehg/hgqt/status.py:306
+#: tortoisehg/hgqt/status.py:307
#, python-format
msgid "Checked count: %d"
msgstr "Marcados: %d"
-#: tortoisehg/hgqt/status.py:535
+#: tortoisehg/hgqt/status.py:548
msgid "Stat"
msgstr "Stat"
-#: tortoisehg/hgqt/status.py:535
+#: tortoisehg/hgqt/status.py:548
msgid "M"
msgstr "M"
-#: tortoisehg/hgqt/status.py:535 tortoisehg/hgtk/datamine.py:140
+#: tortoisehg/hgqt/status.py:548 tortoisehg/hgtk/datamine.py:140
msgid "Filename"
msgstr "Nome do arquivo"
-#: tortoisehg/hgqt/status.py:536 tortoisehg/hgtk/thgconfig.py:414
+#: tortoisehg/hgqt/status.py:549 tortoisehg/hgtk/thgconfig.py:414
msgid "Type"
msgstr "Tipo"
-#: tortoisehg/hgqt/status.py:536
+#: tortoisehg/hgqt/status.py:549
msgid "Size (KB)"
msgstr "Tamanho (KB)"
-#: tortoisehg/hgqt/status.py:718
+#: tortoisehg/hgqt/status.py:731
msgid ", resolved merge"
msgstr ", mesclagem resolvida"
-#: tortoisehg/hgqt/status.py:720
+#: tortoisehg/hgqt/status.py:733
msgid ", unresolved merge"
msgstr ", mesclagem não resolvida"
-#: tortoisehg/hgqt/status.py:732
+#: tortoisehg/hgqt/status.py:745
#, python-format
msgid "%s is modified"
msgstr "%s é modificado"
-#: tortoisehg/hgqt/status.py:734
+#: tortoisehg/hgqt/status.py:747
#, python-format
msgid "%s is added"
msgstr "%s é adicionado"
-#: tortoisehg/hgqt/status.py:736
+#: tortoisehg/hgqt/status.py:749
#, python-format
msgid "%s is removed"
msgstr "%s é removido"
-#: tortoisehg/hgqt/status.py:738
+#: tortoisehg/hgqt/status.py:751
#, python-format
msgid "%s is not tracked (unknown)"
msgstr "%s é não-rastreado (desconhecido)"
-#: tortoisehg/hgqt/status.py:740
+#: tortoisehg/hgqt/status.py:753
#, python-format
msgid "%s is missing!"
msgstr "%s é ausente!"
-#: tortoisehg/hgqt/status.py:742
+#: tortoisehg/hgqt/status.py:755
#, python-format
msgid "%s is ignored"
msgstr "%s é ignorado"
-#: tortoisehg/hgqt/status.py:744
+#: tortoisehg/hgqt/status.py:757
#, python-format
msgid "%s is not modified (clean)"
msgstr "%s é não-modificado (limpo)"
-#: tortoisehg/hgqt/status.py:746
+#: tortoisehg/hgqt/status.py:759
#, python-format
msgid "%s is a dirty subrepo"
msgstr "%s é um sub-repositório sujo"
@@ -5991,146 +6113,146 @@msgid "Malformed ssh URL"
msgstr "URL ssh malformada"
-#: tortoisehg/hgqt/sync.py:88
+#: tortoisehg/hgqt/sync.py:89
msgid "TortoiseHg Sync"
msgstr "TortoiseHg Sync"
-#: tortoisehg/hgqt/sync.py:106
+#: tortoisehg/hgqt/sync.py:107
msgid "Preview incoming changesets from remote repository"
msgstr "incoming: visualiza revisões de entrada do repositório remoto"
-#: tortoisehg/hgqt/sync.py:109
+#: tortoisehg/hgqt/sync.py:110
msgid "Pull incoming changesets from remote repository"
msgstr "pull: traz revisões do repositório remoto"
-#: tortoisehg/hgqt/sync.py:112
+#: tortoisehg/hgqt/sync.py:113
msgid "Filter outgoing changesets to remote repository"
msgstr "outgoing: filtra revisões a serem enviadas ao repositório remoto"
-#: tortoisehg/hgqt/sync.py:115
+#: tortoisehg/hgqt/sync.py:116
msgid "Push outgoing changesets to remote repository"
msgstr "push: envia revisões para o repositório remoto"
-#: tortoisehg/hgqt/sync.py:117
+#: tortoisehg/hgqt/sync.py:118
msgid "Email outgoing changesets for remote repository"
msgstr "Enviar por e-mail revisões destinadas ao repositório remoto"
-#: tortoisehg/hgqt/sync.py:122
+#: tortoisehg/hgqt/sync.py:123
msgid "Manage pending perforce changelists"
msgstr "Gerenciar changelists pendentes do perforce"
-#: tortoisehg/hgqt/sync.py:129
+#: tortoisehg/hgqt/sync.py:130
msgid "Stop current operation"
msgstr "Interrompe a operação atual"
-#: tortoisehg/hgqt/sync.py:143 tortoisehg/hgqt/update.py:68
+#: tortoisehg/hgqt/sync.py:144 tortoisehg/hgqt/update.py:68
#: tortoisehg/hgtk/update.py:78
msgid "Target:"
msgstr "Alvo:"
-#: tortoisehg/hgqt/sync.py:155
+#: tortoisehg/hgqt/sync.py:156
msgid "<b>Remote Repository:</b>"
msgstr "<b>Repositório Remoto:</b>"
-#: tortoisehg/hgqt/sync.py:174
+#: tortoisehg/hgqt/sync.py:175
msgid "Manage HTTPS connection security and user authentication"
msgstr "Gerencia segurança da conexão HTTPS e autenticação de usuário"
-#: tortoisehg/hgqt/sync.py:178
+#: tortoisehg/hgqt/sync.py:179
msgid "Hostname"
msgstr "Servidor"
-#: tortoisehg/hgqt/sync.py:204
+#: tortoisehg/hgqt/sync.py:205
msgid "Save current URL under an alias"
msgstr "Salva a URL atual sob um apelido"
-#: tortoisehg/hgqt/sync.py:218
+#: tortoisehg/hgqt/sync.py:219
msgid "Paths in Repository Settings:"
msgstr "Caminhos nas Configurações do Repositório:"
-#: tortoisehg/hgqt/sync.py:233
+#: tortoisehg/hgqt/sync.py:234
msgid "Related Paths:"
msgstr "Caminhos Relacionados:"
-#: tortoisehg/hgqt/sync.py:267
+#: tortoisehg/hgqt/sync.py:268
#, python-format
msgid "Preview incoming changesets from %s"
msgstr "Visualiza revisões a serem recebidas de %s"
-#: tortoisehg/hgqt/sync.py:268
+#: tortoisehg/hgqt/sync.py:269
#, python-format
msgid "Pull incoming changesets from %s"
msgstr "Traz revisões de entrada de %s"
-#: tortoisehg/hgqt/sync.py:269
+#: tortoisehg/hgqt/sync.py:270
#, python-format
msgid "Filter outgoing changesets to %s"
msgstr "Filtrar revisões a serem enviadas para %s"
-#: tortoisehg/hgqt/sync.py:270
+#: tortoisehg/hgqt/sync.py:271
#, python-format
msgid "Push outgoing changesets to %s"
msgstr "Envia revisões de saída para %s"
-#: tortoisehg/hgqt/sync.py:277
+#: tortoisehg/hgqt/sync.py:278
#, python-format
msgid "rev: %d (%s)"
msgstr "rev: %d (%s)"
-#: tortoisehg/hgqt/sync.py:282 tortoisehg/hgtk/commit.py:792
+#: tortoisehg/hgqt/sync.py:283 tortoisehg/hgtk/commit.py:792
msgid "branch: "
msgstr "ramo: "
-#: tortoisehg/hgqt/sync.py:288
+#: tortoisehg/hgqt/sync.py:289
msgid "bookmark: "
msgstr "marcador: "
-#: tortoisehg/hgqt/sync.py:340 tortoisehg/hgtk/synch.py:157
+#: tortoisehg/hgqt/sync.py:341 tortoisehg/hgtk/synch.py:157
msgid "Post Pull: "
msgstr "Após Pull: "
-#: tortoisehg/hgqt/sync.py:501
+#: tortoisehg/hgqt/sync.py:502
msgid "Repository not local"
msgstr "O repositório não é local"
-#: tortoisehg/hgqt/sync.py:502
+#: tortoisehg/hgqt/sync.py:503
msgid "A terminal shell cannot be opened for remote"
msgstr "Um shell de terminal não pode ser aberto para um repositório remoto"
-#: tortoisehg/hgqt/sync.py:511
+#: tortoisehg/hgqt/sync.py:512
msgid "Repository not found"
msgstr "Repositório não encontrado"
-#: tortoisehg/hgqt/sync.py:516 tortoisehg/hgqt/workbench.py:696
+#: tortoisehg/hgqt/sync.py:517 tortoisehg/hgqt/workbench.py:696
msgid "No shell configured"
msgstr "Nenhum shell configurado"
-#: tortoisehg/hgqt/sync.py:517 tortoisehg/hgqt/workbench.py:697
+#: tortoisehg/hgqt/sync.py:518 tortoisehg/hgqt/workbench.py:697
msgid "A terminal shell must be configured"
msgstr "Um shell de terminal deve estar configurado"
-#: tortoisehg/hgqt/sync.py:519 tortoisehg/hgqt/sync.py:1277
+#: tortoisehg/hgqt/sync.py:520 tortoisehg/hgqt/sync.py:1284
msgid "Confirm path delete"
msgstr "Confirmação de remoção de caminho"
-#: tortoisehg/hgqt/sync.py:520 tortoisehg/hgqt/sync.py:1278
+#: tortoisehg/hgqt/sync.py:521 tortoisehg/hgqt/sync.py:1285
#, python-format
msgid "Delete %s from your repo configuration file?"
msgstr "Remover %s de seu arquivo de configuração de repositório?"
-#: tortoisehg/hgqt/sync.py:600
+#: tortoisehg/hgqt/sync.py:601
msgid "No URL selected"
msgstr "Nenhuma URL selecionada"
-#: tortoisehg/hgqt/sync.py:601
+#: tortoisehg/hgqt/sync.py:602
msgid "An URL must be selected for this operation."
msgstr "Uma URL deve estar selecionada para esta operação"
-#: tortoisehg/hgqt/sync.py:616
+#: tortoisehg/hgqt/sync.py:617
msgid "Redundant authentication info"
msgstr "Informações de autenticação redundantes"
-#: tortoisehg/hgqt/sync.py:617
+#: tortoisehg/hgqt/sync.py:618
msgid ""
"You have authentication info configured for this host and inside this URL. "
"Remove authentication info from this URL?"
@@ -6138,116 +6260,116 @@"Você possui informações de autenticação configuradas para este servidor e "
"passadas dentro da URL. Retirar informações de autenticação desta URL?"
-#: tortoisehg/hgqt/sync.py:636 tortoisehg/hgqt/sync.py:642
-#: tortoisehg/hgqt/sync.py:648 tortoisehg/hgqt/sync.py:654
-#: tortoisehg/hgqt/sync.py:661
+#: tortoisehg/hgqt/sync.py:637 tortoisehg/hgqt/sync.py:643
+#: tortoisehg/hgqt/sync.py:649 tortoisehg/hgqt/sync.py:655
+#: tortoisehg/hgqt/sync.py:662
msgid "sync command already running"
msgstr "comando sync já está em execução"
-#: tortoisehg/hgqt/sync.py:679
+#: tortoisehg/hgqt/sync.py:680
#, python-format
msgid "Getting incoming changesets from %s..."
msgstr "Recebendo revisões de %s..."
-#: tortoisehg/hgqt/sync.py:684 tortoisehg/hgqt/sync.py:702
+#: tortoisehg/hgqt/sync.py:685 tortoisehg/hgqt/sync.py:703
#, python-format
msgid "Found incoming changesets from %s"
msgstr "Encontradas revisões provenientes de %s"
-#: tortoisehg/hgqt/sync.py:687 tortoisehg/hgqt/sync.py:704
+#: tortoisehg/hgqt/sync.py:688 tortoisehg/hgqt/sync.py:705
#, python-format
msgid "No incoming changesets from %s"
msgstr "Nenhuma revisão proveniente de %s"
-#: tortoisehg/hgqt/sync.py:689 tortoisehg/hgqt/sync.py:706
+#: tortoisehg/hgqt/sync.py:690 tortoisehg/hgqt/sync.py:707
#, python-format
msgid "Incoming from %s aborted, ret %d"
msgstr "Incoming de %s abortado, retornou %d"
-#: tortoisehg/hgqt/sync.py:716
+#: tortoisehg/hgqt/sync.py:717
#, python-format
msgid "Pull from %s completed"
msgstr "Pull de %s completado"
-#: tortoisehg/hgqt/sync.py:718
+#: tortoisehg/hgqt/sync.py:719
#, python-format
msgid "Pull from %s aborted, ret %d"
msgstr "Pull de %s abortado, retornou %d"
-#: tortoisehg/hgqt/sync.py:729 tortoisehg/hgqt/update.py:310
+#: tortoisehg/hgqt/sync.py:731 tortoisehg/hgqt/update.py:310
msgid "Merge caused file conflicts"
msgstr "A mesclagem causou conflitos de arquivos"
-#: tortoisehg/hgqt/sync.py:730 tortoisehg/hgqt/update.py:311
+#: tortoisehg/hgqt/sync.py:732 tortoisehg/hgqt/update.py:311
msgid "File conflicts need to be resolved"
msgstr "Conflitos de arquivos precisam ser resolvidos"
-#: tortoisehg/hgqt/sync.py:736
+#: tortoisehg/hgqt/sync.py:738
#, python-format
msgid "Pulling from %s..."
msgstr "Fazendo pull de %s..."
-#: tortoisehg/hgqt/sync.py:751
+#: tortoisehg/hgqt/sync.py:753
#, python-format
msgid "Finding outgoing changesets to %s..."
msgstr "Localizando revisões de saída para %s..."
-#: tortoisehg/hgqt/sync.py:758
+#: tortoisehg/hgqt/sync.py:765
#, python-format
msgid "%d outgoing changesets to %s"
msgstr "%d revisões de saída para %s"
-#: tortoisehg/hgqt/sync.py:761
+#: tortoisehg/hgqt/sync.py:768
#, python-format
msgid "No outgoing changesets to %s"
msgstr "Nenhuma revisão de saída para %s"
-#: tortoisehg/hgqt/sync.py:763
+#: tortoisehg/hgqt/sync.py:770
#, python-format
msgid "Outgoing to %s aborted, ret %d"
msgstr "Comando outgoing para %s abortado, retornou %d"
-#: tortoisehg/hgqt/sync.py:788 tortoisehg/hgtk/history.py:584
+#: tortoisehg/hgqt/sync.py:795 tortoisehg/hgtk/history.py:584
#, python-format
msgid "%s (submitted)"
msgstr "%s (enviada)"
-#: tortoisehg/hgqt/sync.py:790 tortoisehg/hgtk/history.py:586
+#: tortoisehg/hgqt/sync.py:797 tortoisehg/hgtk/history.py:586
#: tortoisehg/hgtk/history.py:592
#, python-format
msgid "%s (pending)"
msgstr "%s (pendente)"
-#: tortoisehg/hgqt/sync.py:795 tortoisehg/hgtk/history.py:595
+#: tortoisehg/hgqt/sync.py:802 tortoisehg/hgtk/history.py:595
msgid "Unable to parse p4pending output"
msgstr "Incapaz de decodificar a saída de p4pending"
-#: tortoisehg/hgqt/sync.py:797 tortoisehg/hgtk/history.py:597
+#: tortoisehg/hgqt/sync.py:804 tortoisehg/hgtk/history.py:597
#, python-format
msgid "%d pending changelists found"
msgstr "%d changelists pendentes encontradas"
-#: tortoisehg/hgqt/sync.py:799 tortoisehg/hgtk/history.py:599
+#: tortoisehg/hgqt/sync.py:806 tortoisehg/hgtk/history.py:599
msgid "No pending Perforce changelists"
msgstr "Nenhuma changelist do Perforce pendente"
-#: tortoisehg/hgqt/sync.py:801 tortoisehg/hgtk/history.py:601
+#: tortoisehg/hgqt/sync.py:808 tortoisehg/hgtk/history.py:601
msgid "Aborted p4pending"
msgstr "p4pending abortado"
-#: tortoisehg/hgqt/sync.py:803 tortoisehg/hgtk/history.py:603
+#: tortoisehg/hgqt/sync.py:810 tortoisehg/hgtk/history.py:603
msgid "Unable to determine pending changesets"
msgstr "Incapaz de determinar revisões pendentes"
-#: tortoisehg/hgqt/sync.py:813
+#: tortoisehg/hgqt/sync.py:820
msgid "Perforce pending..."
msgstr "Perforce pendente..."
-#: tortoisehg/hgqt/sync.py:820 tortoisehg/hgtk/history.py:2623
+#: tortoisehg/hgqt/sync.py:827 tortoisehg/hgtk/history.py:2623
msgid "Confirm Push to remote Repository"
msgstr "Confirmação de Push para o Repositório Remoto"
-#: tortoisehg/hgqt/sync.py:821 tortoisehg/hgtk/history.py:2624
+#: tortoisehg/hgqt/sync.py:828 tortoisehg/hgtk/history.py:2624
#, python-format
msgid ""
"Push to remote repository\n"
@@ -6258,110 +6380,110 @@"%s\n"
"?"
-#: tortoisehg/hgqt/sync.py:824
+#: tortoisehg/hgqt/sync.py:831
#, python-format
msgid "Push to %s aborted"
msgstr "Push para %s abortado"
-#: tortoisehg/hgqt/sync.py:827
+#: tortoisehg/hgqt/sync.py:834
#, python-format
msgid "Pushing to %s..."
msgstr "Fazendo push para %s..."
-#: tortoisehg/hgqt/sync.py:830
+#: tortoisehg/hgqt/sync.py:837
#, python-format
msgid "Push to %s completed"
msgstr "Push para %s completado"
-#: tortoisehg/hgqt/sync.py:832
+#: tortoisehg/hgqt/sync.py:839
#, python-format
msgid "Push to %s aborted, ret %d"
msgstr "Push para %s abortado, retornou %d"
-#: tortoisehg/hgqt/sync.py:844
+#: tortoisehg/hgqt/sync.py:851
msgid "Determining outgoing changesets to email..."
msgstr "Determinando revisões de saída para enviar por e-mail..."
-#: tortoisehg/hgqt/sync.py:848 tortoisehg/hgtk/history.py:2021
+#: tortoisehg/hgqt/sync.py:855 tortoisehg/hgtk/history.py:2021
#, python-format
msgid "%d outgoing changesets"
msgstr "%d revisões a serem enviadas"
-#: tortoisehg/hgqt/sync.py:858 tortoisehg/hgtk/history.py:2025
+#: tortoisehg/hgqt/sync.py:865 tortoisehg/hgtk/history.py:2025
msgid "No outgoing changesets"
msgstr "Nenhuma revisão de saída"
-#: tortoisehg/hgqt/sync.py:860
+#: tortoisehg/hgqt/sync.py:867
#, python-format
msgid "Outgoing aborted, ret %d"
msgstr "Outgoing abortado, retornou %d"
-#: tortoisehg/hgqt/sync.py:872
+#: tortoisehg/hgqt/sync.py:879
msgid "Unable to remove URL"
msgstr "Incapaz de remover URL"
-#: tortoisehg/hgqt/sync.py:894
+#: tortoisehg/hgqt/sync.py:901
msgid "Post Pull Behavior"
msgstr "Ação Após Pull"
-#: tortoisehg/hgqt/sync.py:898
+#: tortoisehg/hgqt/sync.py:905
msgid "Select post-pull operation for this repository"
msgstr ""
"Selecione a operação a ser feita automaticamente após um pull para este "
"repositório"
-#: tortoisehg/hgqt/sync.py:901
+#: tortoisehg/hgqt/sync.py:908
msgid "None - simply pull changesets"
msgstr "Nenhuma - apenas traz as revisões"
-#: tortoisehg/hgqt/sync.py:902
+#: tortoisehg/hgqt/sync.py:909
msgid "Update - pull, then try to update"
msgstr "Atualizar - traz as revisões, e atualiza em seguida"
-#: tortoisehg/hgqt/sync.py:908
+#: tortoisehg/hgqt/sync.py:915
msgid "Fetch - use fetch (auto merge pulled changes)"
msgstr ""
"Fetch - usa a extensão fetch (mesclagem automática das revisões trazidas)"
-#: tortoisehg/hgqt/sync.py:910
+#: tortoisehg/hgqt/sync.py:917
msgid "Fetch - use fetch extension (fetch is not active!)"
msgstr "Fetch - usa a extensão fetch (fetch não está ativa!)"
-#: tortoisehg/hgqt/sync.py:917
+#: tortoisehg/hgqt/sync.py:924
msgid "Rebase - rebase local commits above pulled changes"
msgstr "Rebase - rebaseia revisões locais sobre as revisões trazidas"
-#: tortoisehg/hgqt/sync.py:919
+#: tortoisehg/hgqt/sync.py:926
msgid "Rebase - use rebase extension (rebase is not active!)"
msgstr "Rebase - usa a extensão rebase (rebase não está ativa!)"
-#: tortoisehg/hgqt/sync.py:937
+#: tortoisehg/hgqt/sync.py:944
msgid "<a href=\"config\">Launch settings tool...</a>"
msgstr "<a href=\"config\">Executa ferramenta de configuração...</a>"
-#: tortoisehg/hgqt/sync.py:970
+#: tortoisehg/hgqt/sync.py:977
msgid "Unable to save post pull operation"
msgstr "Incapaz de salvar operação a ser feita após o pull"
-#: tortoisehg/hgqt/sync.py:994
+#: tortoisehg/hgqt/sync.py:1001
msgid "Save Path"
msgstr "Salvar Caminho"
-#: tortoisehg/hgqt/sync.py:1004 tortoisehg/hgqt/sync.py:1321
+#: tortoisehg/hgqt/sync.py:1011 tortoisehg/hgqt/sync.py:1328
#: tortoisehg/hgtk/thgconfig.py:371 tortoisehg/hgtk/thgconfig.py:954
msgid "Alias"
msgstr "Apelido"
-#: tortoisehg/hgqt/sync.py:1007 tortoisehg/hgqt/sync.py:1321
+#: tortoisehg/hgqt/sync.py:1014 tortoisehg/hgqt/sync.py:1328
#: tortoisehg/hgtk/thgconfig.py:368
msgid "URL"
msgstr "URL"
-#: tortoisehg/hgqt/sync.py:1016
+#: tortoisehg/hgqt/sync.py:1023
msgid "Remove authentication data from URL"
msgstr "Remover dados de autenticação desta URL"
-#: tortoisehg/hgqt/sync.py:1018
+#: tortoisehg/hgqt/sync.py:1025
msgid ""
"User authentication data should be associated with the hostname using the "
"security dialog."
@@ -6369,57 +6491,57 @@"Dados de autenticação de usuário devem ser associados a este nome de "
"servidor usando a caixa de diálogo de segurança."
-#: tortoisehg/hgqt/sync.py:1040
+#: tortoisehg/hgqt/sync.py:1047
msgid "Unable to save an URL"
msgstr "Incapaz de salvar uma URL"
-#: tortoisehg/hgqt/sync.py:1051
+#: tortoisehg/hgqt/sync.py:1058
msgid "Confirm URL replace"
msgstr "Confirmar substituição de URL"
-#: tortoisehg/hgqt/sync.py:1052
+#: tortoisehg/hgqt/sync.py:1059
#, python-format
msgid "%s already exists, replace URL?"
msgstr "%s já existe, substituir URL?"
-#: tortoisehg/hgqt/sync.py:1076
+#: tortoisehg/hgqt/sync.py:1083
msgid "Certificate Query Error"
msgstr "Erro de Consulta de Certificado"
-#: tortoisehg/hgqt/sync.py:1089
+#: tortoisehg/hgqt/sync.py:1096
msgid "Security: "
msgstr "Segurança: "
-#: tortoisehg/hgqt/sync.py:1104
+#: tortoisehg/hgqt/sync.py:1111
#, python-format
msgid "<b>Host:</b> %s"
msgstr "<b>Servidor:</b> %s"
-#: tortoisehg/hgqt/sync.py:1106
+#: tortoisehg/hgqt/sync.py:1113
msgid "Secure HTTPS Connection"
msgstr "Conexão HTTPS Segura"
-#: tortoisehg/hgqt/sync.py:1113
+#: tortoisehg/hgqt/sync.py:1120
msgid "Verify with Certificate Authority certificates (best)"
msgstr "Verifica usando uma Autoridade Certificadora (melhor)"
-#: tortoisehg/hgqt/sync.py:1115
+#: tortoisehg/hgqt/sync.py:1122
msgid "Verify with stored host fingerprint (good)"
msgstr "Verifica usando uma impressão digital armazenada (boa)"
-#: tortoisehg/hgqt/sync.py:1117
+#: tortoisehg/hgqt/sync.py:1124
msgid "No host validation, but still encrypted (bad)"
msgstr "Conexão encriptada, mas sem validação de servidor (ruim)"
-#: tortoisehg/hgqt/sync.py:1128
+#: tortoisehg/hgqt/sync.py:1135
msgid "Query"
msgstr "Consultar"
-#: tortoisehg/hgqt/sync.py:1147
+#: tortoisehg/hgqt/sync.py:1154
msgid "User Authentication"
msgstr "Autenticação de Usuário"
-#: tortoisehg/hgqt/sync.py:1154
+#: tortoisehg/hgqt/sync.py:1161
msgid ""
"Optional. Username to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -6432,7 +6554,7 @@"ambiente são expandidas no nome de usuário, para que você possa usar\n"
"foo.username = $USER."
-#: tortoisehg/hgqt/sync.py:1163
+#: tortoisehg/hgqt/sync.py:1170
msgid ""
"Optional. Password to authenticate with. If not given, and the remote\n"
"site requires basic or digest authentication, the user will be prompted for\n"
@@ -6442,7 +6564,7 @@"exigir autenticação básica ou por digest, o usuário será consultado\n"
"para fornecê-la."
-#: tortoisehg/hgqt/sync.py:1170
+#: tortoisehg/hgqt/sync.py:1177
msgid ""
"Mercurial keyring extension is enabled. Passwords will be stored in a "
"platform-native secure method."
@@ -6450,7 +6572,7 @@"A extensão Mercurial keyring está habilitada. Senhas serão gravadas usando "
"um método seguro nativo da plataforma."
-#: tortoisehg/hgqt/sync.py:1176
+#: tortoisehg/hgqt/sync.py:1183
msgid ""
"Optional. PEM encoded client certificate key file. Environment variables\n"
"are expanded in the filename."
@@ -6458,11 +6580,11 @@"Opcional. Arquivo de chaves de certificado de cliente, em formato PEM.\n"
"Variáveis de ambiente no nome do arquivo serão expandidas."
-#: tortoisehg/hgqt/sync.py:1178
+#: tortoisehg/hgqt/sync.py:1185
msgid "User Certificate Key File"
msgstr "Arquivo de Chaves de Certificado do Usuário"
-#: tortoisehg/hgqt/sync.py:1182
+#: tortoisehg/hgqt/sync.py:1189
msgid ""
"Optional. PEM encoded client certificate chain file. Environment variables\n"
"are expanded in the filename."
@@ -6470,31 +6592,32 @@"Opcional. Arquivo de cadeia de cerificados de cliente, em formato PEM.\n"
"Variáveis de ambiente no nome do arquivo serão expandidas."
-#: tortoisehg/hgqt/sync.py:1184
+#: tortoisehg/hgqt/sync.py:1191
msgid "User Certificate Chain File"
msgstr "Arquivo de Cadeia de Certificados de Usuário"
-#: tortoisehg/hgqt/sync.py:1204
+#: tortoisehg/hgqt/sync.py:1211
msgid "Unable to save authentication"
msgstr "Não é possível gravar a autenticação"
#: tortoisehg/hgqt/sync.py:1372
+#, python-format
+msgid "%s - sync options"
+msgstr "%s - opções de sincronização"
+
+#: tortoisehg/hgqt/sync.py:1379
msgid "Allow push of a new branch (--new-branch)"
msgstr "Permite que um novo ramo nomeado seja enviado (--new-branch)"
-#: tortoisehg/hgqt/sync.py:1377
+#: tortoisehg/hgqt/sync.py:1384
msgid "Force push or pull (override safety checks, --force)"
msgstr "Força push ou pull (sobrepõe checagens de segurança, --force)"
-#: tortoisehg/hgqt/sync.py:1382
-msgid "Recurse into subrepositories (--subrepos)"
-msgstr "Executa recursivamente em sub-repositórios (--subrepos)"
-
-#: tortoisehg/hgqt/sync.py:1387
+#: tortoisehg/hgqt/sync.py:1394
msgid "Temporarily disable configured HTTP proxy"
msgstr "Desabilitar temporariamente o proxy HTTP configurado"
-#: tortoisehg/hgqt/sync.py:1394
+#: tortoisehg/hgqt/sync.py:1401
msgid "Emit debugging output (--debug)"
msgstr "Emitir saída de depuração (--debug)"
@@ -7471,6 +7594,10 @@msgid "Failed to archive"
msgstr "Falha ao criar pacote"
+#: tortoisehg/hgtk/archive.py:183
+msgid "Compressed zip archives"
+msgstr "Arquivos zip comprimidos"
+
#: tortoisehg/hgtk/archive.py:203
msgid "All Files (*.*)"
msgstr "Todos os Arquivos (*.*)"
@@ -7798,6 +7925,12 @@msgid " - commit"
msgstr " - commit (nova revisão)"
+#: tortoisehg/hgtk/commit.py:227 tortoisehg/hgtk/commit.py:309
+#: tortoisehg/hgtk/history.py:258 tortoisehg/hgtk/history.py:368
+#: tortoisehg/hgtk/thgimport.py:111
+msgid "Patch Queue"
+msgstr "Fila de Patches"
+
#: tortoisehg/hgtk/commit.py:232 tortoisehg/hgtk/history.py:391
msgid "_View"
msgstr "E_xibir"
@@ -7913,6 +8046,13 @@msgid "Commit Preview"
msgstr "Pré-Visualização da Consolidação"
+#: tortoisehg/hgtk/commit.py:654 tortoisehg/hgtk/commit.py:951
+#: tortoisehg/hgtk/commit.py:1015 tortoisehg/hgtk/commit.py:1264
+#: tortoisehg/hgtk/gdialog.py:485 tortoisehg/hgtk/history.py:279
+#: tortoisehg/hgtk/merge.py:136 tortoisehg/hgtk/thgconfig.py:89
+msgid "Commit"
+msgstr "Commit (consolidar)"
+
#: tortoisehg/hgtk/commit.py:659
msgid "create new MQ patch"
msgstr "criar novo patch MQ"
@@ -8318,6 +8458,11 @@msgid "Shelve"
msgstr "Adiar"
+#: tortoisehg/hgtk/gdialog.py:495 tortoisehg/hgtk/thgconfig.py:170
+#: tortoisehg/util/menuthg.py:52
+msgid "Synchronize"
+msgstr "Sincronizar"
+
#: tortoisehg/hgtk/gdialog.py:500
msgid "_Help"
msgstr "_Ajuda"
@@ -8691,6 +8836,10 @@msgid "use \"hgtk -v help %s\" to show global options"
msgstr "use \"hgtk -v help %s\" para mostrar as opções globais"
+#: tortoisehg/hgtk/hgtk.py:583 tortoisehg/hgtk/hgtk.py:648
+msgid "(No help text available)"
+msgstr "(sem texto de ajuda disponível)"
+
#: tortoisehg/hgtk/hgtk.py:672
msgid "Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n"
msgstr "Hgtk - utilitários GUI do TortoiseHg para o SCM Mercurial (Hg)\n"
@@ -8952,6 +9101,10 @@msgid "Reset revision marks"
msgstr "Remove marcações das revisões"
+#: tortoisehg/hgtk/history.py:266 tortoisehg/hgtk/history.py:385
+msgid "Patch Branch"
+msgstr "Ramo de Patches"
+
#: tortoisehg/hgtk/history.py:268
msgid "Show/Hide Patch Branch"
msgstr "Mostrar/Ocultar Ramo de Patches"
@@ -9939,6 +10092,10 @@msgid "Stop the hg operation"
msgstr "Parar a operação do hg"
+#: tortoisehg/hgtk/recovery.py:52
+msgid "Clean"
+msgstr "Limpo"
+
#: tortoisehg/hgtk/recovery.py:54
msgid "Clean checkout, undo all changes"
msgstr "Obtenção limpa, anula todas as alterações"
@@ -11597,6 +11754,63 @@msgid "perfarce is incompatible with hgsubversion"
msgstr "perfarce é incompatível com hgsubversion"
+#: tortoisehg/util/hglib.py:504
+#, python-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d ano atrás"
+msgstr[1] "%d anos atrás"
+
+#: tortoisehg/util/hglib.py:505
+#, python-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d mês atrás"
+msgstr[1] "%d meses atrás"
+
+#: tortoisehg/util/hglib.py:506
+#, python-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d semana atrás"
+msgstr[1] "%d semanas atrás"
+
+#: tortoisehg/util/hglib.py:507
+#, python-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dia atrás"
+msgstr[1] "%d dias atrás"
+
+#: tortoisehg/util/hglib.py:508
+#, python-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hora atrás"
+msgstr[1] "%d horas atrás"
+
+#: tortoisehg/util/hglib.py:509
+#, python-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minuto atrás"
+msgstr[1] "%d minutos atrás"
+
+#: tortoisehg/util/hglib.py:510
+#, python-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d segundo atrás"
+msgstr[1] "%d segundos atrás"
+
+#: tortoisehg/util/hglib.py:520
+msgid "in the future"
+msgstr "no futuro"
+
+#: tortoisehg/util/hglib.py:524
+msgid "now"
+msgstr "agora"
+
#: tortoisehg/util/hgshelve.py:48
#, python-format
msgid "Unsupported line endings type: %s"
@@ -13279,6 +13493,14 @@#~ msgstr " <i>(é um sub-repositório sujo)</i>"
#, python-format
+#~ msgid "Delete %d ignored files"
+#~ msgstr "Apagar %d arquivos ignorados"
+
+#, python-format
+#~ msgid "Delete %d unknown files"
+#~ msgstr "Apagar %d arquivos desconhecidos"
+
+#, python-format
#~ msgid "<b>Remove patches from queue?<ul><li>%s</ul></b>"
#~ msgstr "<b>Remover patches da fila?<ul><li>%s</ul></b>"
@@ -13340,6 +13562,13 @@#~ msgid "Add checked untracked files?"
#~ msgstr "Adicionar os arquivos não-rastreados marcados?"
+#, python-format
+#~ msgid "Delete %d files in .hg/Trashcan"
+#~ msgstr "Apagar %d arquivos em .hg/Trashcan (lixeira)"
+
+#~ msgid "Revision details"
+#~ msgstr "Detalhes da revisão"
+
#~ msgid "Merge with selected merge tool"
#~ msgstr "Mesclar com a ferramenta de mesclagem selecionada"
@@ -13391,6 +13620,9 @@#~ msgid "Check for incoming changes from default pull target"
#~ msgstr "Checar por mudanças vindas do alvo padrão de pull"
+#~ msgid "Recurse into subrepositories (--subrepos)"
+#~ msgstr "Executa recursivamente em sub-repositórios (--subrepos)"
+
#~ msgid "Export Selected"
#~ msgstr "Exportar Selecionados"
@@ -13417,6 +13649,9 @@#~ msgid "Abort is recommended before exit."
#~ msgstr "É recomendado abortar antes de sair."
+#~ msgid "Manifest"
+#~ msgstr "Manifesto"
+
#~ msgid "Post Pair to Review Board..."
#~ msgstr "Postar Par para a Review Board..."
@@ -13440,3 +13675,55 @@#, python-format
#~ msgid "Please report this bug to our %s bug tracker %s"
#~ msgstr "Por favor informe sobre este problema em nosso %s bug tracker %s"
+
+#~ msgid "Recurse into subrepos"
+#~ msgstr "Executa recursivamente em sub-repositórios"
+
+#~ msgid "The selected subrepository does not exist on the working directory"
+#~ msgstr "O sub-repositório selecionado não existe no diretório de trabalho"
+
+#, python-format
+#~ msgid "%d minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "%d minuto"
+#~ msgstr[1] "%d minutos"
+
+#, python-format
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d semana"
+#~ msgstr[1] "%d semanas"
+
+#, python-format
+#~ msgid "%d day"
+#~ msgid_plural "%d days"
+#~ msgstr[0] "%d dia"
+#~ msgstr[1] "%d dias"
+
+#, python-format
+#~ msgid "%d hour"
+#~ msgid_plural "%d hours"
+#~ msgstr[0] "%d hora"
+#~ msgstr[1] "%d horas"
+
+#, python-format
+#~ msgid "%d month"
+#~ msgid_plural "%d months"
+#~ msgstr[0] "%d mês"
+#~ msgstr[1] "%d meses"
+
+#, python-format
+#~ msgid "%d year"
+#~ msgid_plural "%d years"
+#~ msgstr[0] "%d ano"
+#~ msgstr[1] "%d anos"
+
+#, python-format
+#~ msgid "%d second"
+#~ msgid_plural "%d seconds"
+#~ msgstr[0] "%d segundo"
+#~ msgstr[1] "%d segundos"
+
+#, python-format
+#~ msgid "%s ago"
+#~ msgstr "%s"
|
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
|
This file's diff was not loaded because this changeset is very large. Load changes Loading... |
||
Add a tag
Loading...