[meld] Updated Brazilian Portuguese translation



commit 595ba2885005aaeb9458d9c2c1eefa5b2b127573
Author: Enrico Nicoletto <liverig gmail com>
Date:   Sun Feb 10 00:11:54 2013 -0200

    Updated Brazilian Portuguese translation

 po/pt_BR.po |  528 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 305 insertions(+), 223 deletions(-)
---
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 922d42a..ec04663 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,14 +8,16 @@
 # Leonardo Ferreira Fontenelle <leonardof gnome org>, 2008.
 # Gabriel Speckhahn <gabspeck gmail com>, 2011.
 # FlorÃncio Neves <florencioneves gmail com>, 2012.
+# Enrico Nicoletto <liverig gmail com>, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-24 00:15+0000\n"
-"PO-Revision-Date: 2012-12-04 21:02-0500\n"
-"Last-Translator: FlorÃncio Neves <florencioneves gmail com>\n"
+"POT-Creation-Date: 2013-02-09 22:18+0000\n"
+"PO-Revision-Date: 2013-02-10 00:09-0300\n"
+"Last-Translator: Enrico Nicoletto <liverig gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -58,46 +60,52 @@ msgstr "Lista editÃvel"
 msgid "Active"
 msgstr "Ativo"
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:200
-msgid "Name"
-msgstr "Nome"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "PadrÃo"
-
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Adicionar novo filtro"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column name"
+msgstr "Nome da coluna"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Remove o filtro selecionado"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
 msgid "Move item up"
 msgstr "Move o item para cima"
 
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
 msgid "Move _Up"
 msgstr "Mover para _cima"
 
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
 msgid "Move item down"
 msgstr "Move o item para baixo"
 
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
 msgid "Move _Down"
 msgstr "Mover para _baixo"
 
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:325
+#: ../meld/vcview.py:200
+msgid "Name"
+msgstr "Nome"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "PadrÃo"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Adicionar novo filtro"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Remove o filtro selecionado"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save changes to documents before closing?"
 msgstr "Salvar mudanÃas em documentos antes de fechar?"
@@ -127,7 +135,7 @@ msgstr ""
 "esse arquivo e fazer as mudanÃas de qualquer forma, mas elas devem ser "
 "salvas em um novo arquivo."
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -212,50 +220,8 @@ msgstr ""
 "FabrÃcio Godoy <skarllot gmail com>\n"
 "Leonardo Ferreira Fontenelle <leonardof gnome org>\n"
 "Gabriel Speckhahn <gabspeck gmail com>\n"
-"FlorÃncio Neves <florencioneves gmail com>"
-
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Escolher arquivos"
-
-#: ../data/ui/meldapp.ui.h:11
-msgid "_Three Way Compare"
-msgstr "ComparaÃÃo de _trÃs vias"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:13
-msgid "Mine"
-msgstr "Meu"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "Original"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "Outro"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "ComparaÃÃo de _arquivos"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "ComparaÃÃo de _diretÃrios"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Selecionar diretÃrio do controle de versÃo"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "DiretÃrio"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "Navegador do controle de _versÃes"
+"FlorÃncio Neves <florencioneves gmail com>\n"
+"Enrico Nicoletto <liverig gmail com>"
 
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Create Patch"
@@ -350,6 +316,34 @@ msgid "Editor"
 msgstr "Editor"
 
 #: ../data/ui/preferences.ui.h:17
+msgid "Shallow comparison"
+msgstr "ComparaÃÃo superficial"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "C_ompare files based only on size and timestamp"
+msgstr "C_omparar arquivos baseando-se apenas no tamanho e marca de tempo"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "_Timestamp resolution:"
+msgstr "ResoluÃÃo da marca de _tempo:"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Symbolic links"
+msgstr "LigaÃÃes simbÃlicas"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore symbolic links"
+msgstr "Ignorar ligaÃÃes simbÃlicas"
+
+#: ../data/ui/preferences.ui.h:22
+msgid "Visible columns"
+msgstr "Colunas visÃveis"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "Folder comparisons"
+msgstr "ComparaÃÃo de pastas"
+
+#: ../data/ui/preferences.ui.h:24
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -359,15 +353,11 @@ msgstr ""
 "arquivos e diretÃrios por nome. Cada padrÃo à um lista com caracteres "
 "curingas (* ou ?) separados por espaÃos."
 
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Ignorar ligaÃÃes simbÃlicas"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:25
 msgid "File Filters"
 msgstr "Filtros de arquivos"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:26
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -381,26 +371,82 @@ msgstr ""
 "da comparaÃÃo. Se a expressÃo contÃm grupos, somente os grupos sÃo "
 "substituÃdos. Veja o manual do usuÃrio para maiores detalhes."
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:27
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Ignorar alteraÃÃes que inserem ou excluem linhas vazias"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:28
 msgid "Text Filters"
 msgstr "Filtros de texto"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:29
 msgid "Loading"
 msgstr "Carregando"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:30
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr "Ao carregar, tentar esses codecs, em ordem. (p.ex. utf8, iso8859)"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:31
 msgid "Encoding"
 msgstr "CodificaÃÃo"
 
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:604
+msgid "New comparison"
+msgstr "Nova comparaÃÃo"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "ComparaÃÃo de arquivos"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "ComparaÃÃo de diretÃrios"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "VisÃo de controle de versÃes"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "ComparaÃÃo em _3 modos"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Selecione o terceiro arquivo"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Selecione o segundo arquivo"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Selecione o primeiro arquivo"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Selecione a primeira pasta"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "Selecione a segunda pasta"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "Selecione a terceira pasta"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Selecione uma pasta com controle de versÃes"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "_Limpar comparaÃÃo"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "_Comparar"
+
 #: ../data/ui/vcview.ui.h:1
 msgid "VC Log"
 msgstr "Log do controle de versÃo"
@@ -417,121 +463,136 @@ msgstr "Logs anteriores"
 msgid "Log Message"
 msgstr "Mensagens de log"
 
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
 msgid "Compare selected"
 msgstr "Compara os selecionados"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:256
 msgid "Copy _Left"
 msgstr "Copiar para a _esquerda"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:256
 msgid "Copy to left"
 msgstr "Copia para a esquerda"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:257
 msgid "Copy _Right"
 msgstr "Copiar para a _direita"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:257
 msgid "Copy to right"
 msgstr "Copia para a direita"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:258
 msgid "Delete selected"
 msgstr "Exclui os selecionados"
 
-#: ../meld/dirdiff.py:237 ../meld/filediff.py:1247
+#: ../meld/dirdiff.py:259 ../meld/filediff.py:1247
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:259
 msgid "Hide selected"
 msgstr "Oculta os selecionados"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:263
 msgid "Ignore filename case"
 msgstr "Ignorar maiÃsculas/minÃsculas em nomes de arquivos"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:263
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
 msgstr "NÃo distingue nomes de arquivo que diferem apenas pela maiusculizaÃÃo"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:264
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:264
 msgid "Show identical"
 msgstr "Mostra os iguais"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:265
 msgid "New"
 msgstr "Novos"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:265
 msgid "Show new"
 msgstr "Mostra os novos"
 
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:266
 msgid "Modified"
 msgstr "Modificados"
 
-#: ../meld/dirdiff.py:244 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:266 ../meld/vcview.py:172
 msgid "Show modified"
 msgstr "Mostrar os modificados"
 
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:268
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:268
 msgid "Set active filters"
 msgstr "Definir filtros ativos"
 
-#: ../meld/dirdiff.py:407
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:342
+msgid "Size"
+msgstr "Tamanho"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:349
+msgid "Modification time"
+msgstr "Hora da modificaÃÃo"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:356
+msgid "Permissions"
+msgstr "PermissÃes"
+
+#: ../meld/dirdiff.py:481
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:521 ../meld/dirdiff.py:540 ../meld/vcview.py:370
+#: ../meld/dirdiff.py:595 ../meld/dirdiff.py:614 ../meld/vcview.py:370
 #: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Varrendo %s"
 
-#: ../meld/dirdiff.py:639
+#: ../meld/dirdiff.py:713
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] ConcluÃdo"
 
-#: ../meld/dirdiff.py:644
+#: ../meld/dirdiff.py:718
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vÃrios erros ao varrer este diretÃrio"
 
-#: ../meld/dirdiff.py:645
+#: ../meld/dirdiff.py:719
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificaÃÃes invÃlidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:647
+#: ../meld/dirdiff.py:721
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificaÃÃo incorreta. Os nomes sÃo algo "
 "como:"
 
-#: ../meld/dirdiff.py:649
+#: ../meld/dirdiff.py:723
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparaÃÃo nÃo sensÃvel a maiusculizaÃÃo"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:651
+#: ../meld/dirdiff.py:725
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -540,17 +601,17 @@ msgstr ""
 "minÃsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretÃrio ficam ocultos:"
 
-#: ../meld/dirdiff.py:662
+#: ../meld/dirdiff.py:736
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" ocultado por \"%s\""
 
-#: ../meld/dirdiff.py:687 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/dirdiff.py:761 ../meld/filediff.py:1010 ../meld/filediff.py:1251
 #: ../meld/vcview.py:620 ../meld/vcview.py:662
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:793
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -559,7 +620,7 @@ msgstr ""
 "\"%s\" jà existe.\n"
 "SobrescrevÃ-lo?"
 
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:800
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -570,7 +631,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:744 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:818 ../meld/vcview.py:594
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -579,7 +640,7 @@ msgstr ""
 "\"%s\" Ã um diretÃrio.\n"
 "Remover recursivamente?"
 
-#: ../meld/dirdiff.py:751 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:825 ../meld/vcview.py:599
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -590,49 +651,49 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:925
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:852
+#: ../meld/dirdiff.py:926
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:927
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:854
+#: ../meld/dirdiff.py:928
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dia"
 msgstr[1] "%i dias"
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:929
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:856
+#: ../meld/dirdiff.py:930
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mÃs"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:857
+#: ../meld/dirdiff.py:931
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -906,92 +967,92 @@ msgstr "Salvar as mudanÃas a documentos antes de recarregar"
 msgid "[%s] Merging files"
 msgstr "[%s] Mesclando arquivos"
 
-#: ../meld/meldapp.py:93
+#: ../meld/meldapp.py:95
 msgid "wrong number of arguments supplied to --diff"
 msgstr "nÃmero incorreto de argumentos fornecidos para --diff"
 
-#: ../meld/meldapp.py:97
+#: ../meld/meldapp.py:99
 msgid "Start with an empty window"
 msgstr "Iniciar com a janela vazia"
 
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:99 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
 msgid "file"
 msgstr "arquivo"
 
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:100 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
 msgid "dir"
 msgstr "dir"
 
-#: ../meld/meldapp.py:98
+#: ../meld/meldapp.py:101
 msgid "Start a version control comparison"
 msgstr "Inicia uma comparaÃÃo de controle de versÃo"
 
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:103
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inicia uma comparaÃÃo de arquivo em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:100
+#: ../meld/meldapp.py:105
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Inicia uma comparaÃÃo de diretÃrio em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:107
 msgid "Start a comparison between file and dir/file"
 msgstr "Iniciar uma comparaÃÃo entre arquivo e diretÃrio/arquivo"
 
-#: ../meld/meldapp.py:107
+#: ../meld/meldapp.py:114
 msgid "Meld is a file and directory comparison tool."
 msgstr "O Meld à uma ferramenta de comparaÃÃo de arquivos e diretÃrios."
 
-#: ../meld/meldapp.py:110
+#: ../meld/meldapp.py:117
 msgid "Set label to use instead of file name"
 msgstr "Definir rÃtulo para usar no lugar do nome do arquivo"
 
-#: ../meld/meldapp.py:112
+#: ../meld/meldapp.py:119
 msgid "Open a new tab in an already running instance"
 msgstr "Abrir em uma nova aba de uma instÃncia existente"
 
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:122
 msgid "Automatically compare all differing files on startup"
 msgstr "Compara automaticamente todos os arquivos diferentes na inicializaÃÃo"
 
-#: ../meld/meldapp.py:116
+#: ../meld/meldapp.py:124
 msgid "Ignored for compatibility"
 msgstr "Ignorado por questÃo de compatibilidade"
 
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:127
 msgid "Set the target file for saving a merge result"
 msgstr "Define o arquivo destino para salvar um resultado de mesclagem"
 
-#: ../meld/meldapp.py:121
+#: ../meld/meldapp.py:129
 msgid "Automatically merge files"
 msgstr "Mesclar arquivos automaticamente"
 
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:132
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carrega uma comparaÃÃo salva de um arquivo de comparaÃÃo"
 
-#: ../meld/meldapp.py:127
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "Cria uma aba de diff para atà 3 arquivos ou diretÃrios fornecidos."
+#: ../meld/meldapp.py:135
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Cria uma aba de diff para os arquivos e pastas fornecidos"
 
-#: ../meld/meldapp.py:130
+#: ../meld/meldapp.py:138
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "muitos argumentos (esperava 0-3, obteve %d)"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:141
 msgid "can't auto-merge less than 3 files"
 msgstr "nÃo à possÃvel mesclar automaticamente menos que 3 arquivos"
 
-#: ../meld/meldapp.py:134
+#: ../meld/meldapp.py:143
 msgid "can't auto-merge directories"
 msgstr "nÃo à possÃvel mesclar diretÃrios automaticamente"
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:149
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Erro D-Bus; comparaÃÃes irÃo abrir em nova janela"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:167
 msgid "Error reading saved comparison file"
 msgstr "Erro ao ler arquivo de comparaÃÃo salvo"
 
@@ -1004,245 +1065,245 @@ msgstr "<sem nome>"
 msgid "untitled"
 msgstr "sem-tÃtulo"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:62
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../meld/meldwindow.py:117
-msgid "_New..."
-msgstr "_Novo..."
+#: ../meld/meldwindow.py:63
+msgid "_New comparison"
+msgstr "_Nova comparaÃÃo"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:63
 msgid "Start a new comparison"
 msgstr "Inicia uma nova comparaÃÃo"
 
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:64
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:66
 msgid "Close the current file"
 msgstr "Fecha o arquivo atual"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:67
 msgid "Quit the program"
 msgstr "Sai do programa"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:69
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:70
 msgid "Undo the last action"
 msgstr "Desfaz a Ãltima aÃÃo"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:71
 msgid "Redo the last undone action"
 msgstr "Refaz a Ãltima aÃÃo desfeita"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:72
 msgid "Cut the selection"
 msgstr "Recortar a seleÃÃo"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:73
 msgid "Copy the selection"
 msgstr "Copiar a seleÃÃo"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Colar da Ãrea de transferÃncia"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:75
 msgid "Search for text"
 msgstr "Pesquisa por texto"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
 msgid "Find Ne_xt"
 msgstr "Localizar prÃ_ximo"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
 msgid "Search forwards for the same text"
 msgstr "Pesquisa pelo mesmo texto em frente"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
 msgid "Find _Previous"
 msgstr "Localizar _anterior"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
 msgid "Search backwards for the same text"
 msgstr "Pesquisa o mesmo texto para trÃs"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:78
 msgid "Find and replace text"
 msgstr "Localizar e substituir texto"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
 msgid "Prefere_nces"
 msgstr "PreferÃ_ncias"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
 msgid "Configure the application"
 msgstr "Configura o aplicativo"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:81
 msgid "_Changes"
 msgstr "_AlteraÃÃes"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
 msgid "Next change"
 msgstr "PrÃxima alteraÃÃo"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
 msgid "Go to the next change"
 msgstr "Vai à prÃxima alteraÃÃo"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
 msgid "Previous change"
 msgstr "AlteraÃÃo anterior"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
 msgid "Go to the previous change"
 msgstr "Vai à alteraÃÃo anterior"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
 msgid "Open externally"
 msgstr "Abrir externamente"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 "Abrir o arquivo ou diretÃrio selecionado com o aplicativo externo padrÃo"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:86
 msgid "_View"
 msgstr "E_xibir"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:87
 msgid "File status"
 msgstr "Status do arquivo"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:88
 msgid "Version status"
 msgstr "Status da versÃo"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:89
 msgid "File filters"
 msgstr "Filtros de arquivos"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:90
 msgid "Stop the current action"
 msgstr "PÃra a aÃÃo atual"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
 msgid "Refresh the view"
 msgstr "Atualiza a visÃo"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
 msgid "Reload the comparison"
 msgstr "Recarrega a comparaÃÃo"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:94
 msgid "_Tabs"
 msgstr "A_bas"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
 msgid "_Previous Tab"
 msgstr "Aba _anterior"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
 msgid "Activate previous tab"
 msgstr "Ativa a aba anterior"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
 msgid "_Next Tab"
 msgstr "Aba _seguinte"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
 msgid "Activate next tab"
 msgstr "Ativa a aba seguinte"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
 msgid "Move Tab _Left"
 msgstr "Mover aba para a _esquerda"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
 msgid "Move current tab to left"
 msgstr "Move a aba atual para a esquerda"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
 msgid "Move Tab _Right"
 msgstr "Mover aba para a _direita"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
 msgid "Move current tab to right"
 msgstr "Move a aba atual para a direita"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:100
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
 msgid "_Contents"
 msgstr "S_umÃrio"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
 msgid "Open the Meld manual"
 msgstr "Abre o manual do Meld"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
 msgid "Report _Bug"
 msgstr "Relatar _erro"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
 msgid "Report a bug in Meld"
 msgstr "Relata um erro no Meld"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:103
 msgid "About this program"
 msgstr "Sobre este programa"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
 msgid "Full Screen"
 msgstr "Tela cheia"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
 msgid "View the comparison in full screen"
 msgstr "Visualiza a comparaÃÃo em tela cheia"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
 msgid "_Toolbar"
 msgstr "Barra de _ferramentas"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
 msgid "Show or hide the toolbar"
 msgstr "Mostra ou oculta a barra de ferramentas"
 
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
 msgid "_Statusbar"
 msgstr "Barra de _status"
 
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
 msgid "Show or hide the statusbar"
 msgstr "Mostra ou oculta a barra de status"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:116
 msgid "Open Recent"
 msgstr "Abrir recente"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:117
 msgid "Open recent files"
 msgstr "Abre arquivos recentes"
 
-#: ../meld/meldwindow.py:569
+#: ../meld/meldwindow.py:526
 msgid "Switch to this tab"
 msgstr "Alternar para esta aba"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:674
+#: ../meld/meldwindow.py:652
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "NÃo foi possÃvel comparar uma mistura de arquivos e diretÃrios.\n"
 
@@ -1255,25 +1316,25 @@ msgstr "[Nenhum]"
 msgid "Save Patch As..."
 msgstr "Salvar patch como..."
 
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
 msgid "label"
 msgstr "rÃtulo"
 
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:44
 msgid "pattern"
 msgstr "padrÃo"
 
-#: ../meld/preferences.py:112
+#: ../meld/preferences.py:160
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Somente està disponÃvel se vocà tiver o gnome-python-desktop instalado"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:229
+#: ../meld/preferences.py:306
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:231
+#: ../meld/preferences.py:308
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1282,48 +1343,48 @@ msgstr ""
 "Thumbs.db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:310
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Controle de versÃo\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:235
+#: ../meld/preferences.py:312
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 msgstr "BinÃrios\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:237
+#: ../meld/preferences.py:314
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 msgstr "MÃdia\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
+#: ../meld/preferences.py:316
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "Palavras-chave do CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:241
+#: ../meld/preferences.py:318
 msgid "C++ comment\t0\t//.*\n"
 msgstr "ComentÃrio C++\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:243
+#: ../meld/preferences.py:320
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "ComentÃrio C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:245
+#: ../meld/preferences.py:322
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Todo espaÃo em branco\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:247
+#: ../meld/preferences.py:324
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "EspaÃo em branco no comeÃo\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:249
+#: ../meld/preferences.py:326
 msgid "Script comment\t0\t#.*"
 msgstr "ComentÃrio de script\t0\t#.*"
 
@@ -1562,6 +1623,30 @@ msgstr ""
 msgid "Mode changed from %s to %s"
 msgstr "Modo modificado de %s para %s"
 
+#~ msgid "Choose Files"
+#~ msgstr "Escolher arquivos"
+
+#~ msgid "_Three Way Compare"
+#~ msgstr "ComparaÃÃo de _trÃs vias"
+
+#~ msgid "Mine"
+#~ msgstr "Meu"
+
+#~ msgid "Original"
+#~ msgstr "Original"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "Select VC Directory"
+#~ msgstr "Selecionar diretÃrio do controle de versÃo"
+
+#~ msgid "Directory"
+#~ msgstr "DiretÃrio"
+
+#~ msgid "_New..."
+#~ msgstr "_Novo..."
+
 #~ msgid "Save modified files?"
 #~ msgstr "Salvar arquivos modificados?"
 
@@ -1710,9 +1795,6 @@ msgstr "Modo modificado de %s para %s"
 #~ msgid "Use custom font"
 #~ msgstr "Usar uma fonte personalizada"
 
-#~ msgid "Version control view"
-#~ msgstr "VisÃo de controle de versÃes"
-
 #~ msgid "_Character"
 #~ msgstr "_Caractere"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]