GNOME.org
 

[meld] Updated Galician translations

commit 38e3a16cc60d13568e0ac929388679d30bc8d7f6
Author: Fran Dieguez <fran openhost es>
Date:   Tue Aug 16 22:53:33 2011 +0200

    Updated Galician translations

 po/gl.po | 1121 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 676 insertions(+), 445 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 06b04cf..eb9d781 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,28 +5,29 @@
 #
 # Enrique EstÃvez <keko gl gmail com>, 2009.
 # AntÃn MÃixome <meixome mancomun org>, 2009.
-# Fran DiÃguez <frandieguez ubuntu com>, 2009, 2010.
+# Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2010-06-21 11:13+0200\n"
-"PO-Revision-Date: 2010-06-21 11:16+0200\n"
-"Last-Translator: Fran DiÃguez <frandieguez ubuntu com>\n"
-"Language-Team: Galician <gnome g11 net>\n"
+"POT-Creation-Date: 2011-08-16 22:56+0200\n"
+"PO-Revision-Date: 2011-08-16 22:53+0200\n"
+"Last-Translator: Fran DiÃguez <frandieguez gnome org>\n"
+"Language-Team: Galician <gnome-l10n-gl gnome org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../bin/meld:77
+#: ../bin/meld:96
 msgid "Cannot import: "
 msgstr "Non à posÃbel importar: "
 
-#: ../bin/meld:80
+#: ../bin/meld:99
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld require %s ou superior."
@@ -39,7 +40,7 @@ msgstr "Compare e combine os seus ficheiros"
 msgid "Diff Viewer"
 msgstr "Visualizador Diff"
 
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:4
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
 msgid "Meld"
 msgstr "Meld"
 
@@ -47,203 +48,270 @@ msgstr "Meld"
 msgid "Meld Diff Viewer"
 msgstr "Visualizador Diff Meld"
 
-#: ../data/ui/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">AlgÃns ficheiros foron modificados.\n"
-"Cales quere gardar?</span>"
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "Activo"
 
-#: ../data/ui/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "Copiar ao portapapeis"
+#: ../data/ui/EditableList.ui.h:2
+msgid "Add new filter"
+msgstr "Engadir novo filtro"
 
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
-msgid "Create Patch"
-msgstr "Crear parche"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr "Editar lista"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Move _Down"
+msgstr "_Baixar"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr "S_ubir"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "Mover o elemento cara abaixo"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr "Mover o elemento cara arriba"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+msgid "Name"
+msgstr "Nome"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "PatrÃn"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Remove selected filter"
+msgstr "Eliminar o filtro seleccionado"
 
-#: ../data/ui/filediff.glade.h:5
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
+msgid "_Add"
+msgstr "Eng_adir"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "Elimina_r"
+
+#: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "Gardar os ficheiros modificados?"
 
-#: ../data/ui/filediff.glade.h:6
+#: ../data/ui/filediff.ui.h:2
+msgid ""
+"Some files have been modified.\n"
+"Which ones would you like to save?"
+msgstr ""
+"AlgÃns ficheiros foron modificados.\n"
+"Cales quere gardar?"
+
+#: ../data/ui/filediff.ui.h:4
 msgid "_Discard Changes"
 msgstr "_Rexeitar os cambios"
 
-#: ../data/ui/filediff.glade.h:7
+#: ../data/ui/filediff.ui.h:5
 msgid "_Save Selected"
 msgstr "Gardar os _seleccionados"
 
-#: ../data/ui/findbar.glade.h:1
+#: ../data/ui/findbar.ui.h:1
 msgid "Regular E_xpression"
 msgstr "E_xpresiÃn regular"
 
-#: ../data/ui/findbar.glade.h:2
+#: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "SubstituÃr _todo"
 
-#: ../data/ui/findbar.glade.h:3
+#: ../data/ui/findbar.ui.h:3
 msgid "Replace _With"
 msgstr "SubstituÃr _con"
 
-#: ../data/ui/findbar.glade.h:4
+#: ../data/ui/findbar.ui.h:4
 msgid "Who_le word"
 msgstr "Pa_labra completa"
 
-#: ../data/ui/findbar.glade.h:5
+#: ../data/ui/findbar.ui.h:5
 msgid "_Match Case"
 msgstr "Diferenciar _maiÃsculas de minÃsculas"
 
-#: ../data/ui/findbar.glade.h:6
+#: ../data/ui/findbar.ui.h:6
 msgid "_Next"
 msgstr "Segui_nte"
 
-#: ../data/ui/findbar.glade.h:7
+#: ../data/ui/findbar.ui.h:7
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:154
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
 msgid "_Replace"
 msgstr "SubstituÃ_r"
 
-#: ../data/ui/findbar.glade.h:9
+#: ../data/ui/findbar.ui.h:9
 msgid "_Search for"
 msgstr "Bu_scar por:"
 
-#: ../data/ui/meldapp.glade.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Choose Files"
 msgstr "Escoller ficheiros"
 
-#: ../data/ui/meldapp.glade.h:2
-msgid "Copyright  2002-2009 Stephen Kennedy"
-msgstr "Copyright  2002-2009 Stephen Kennedy"
+#: ../data/ui/meldapp.ui.h:2
+msgid ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
+msgstr ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
 
-#: ../data/ui/meldapp.glade.h:3
+#: ../data/ui/meldapp.ui.h:4
 msgid "Directory"
 msgstr "Cartafol"
 
-#: ../data/ui/meldapp.glade.h:5
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
 msgid "Mine"
 msgstr "Meu"
 
-#: ../data/ui/meldapp.glade.h:6
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
 msgid "Original"
 msgstr "Orixinal"
 
-#: ../data/ui/meldapp.glade.h:7
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
 msgid "Other"
 msgstr "Outro"
 
-#: ../data/ui/meldapp.glade.h:8
-msgid "Three way directory"
-msgstr "Cartafol a tres bandas"
-
-#: ../data/ui/meldapp.glade.h:9
-msgid "Three way file"
-msgstr "Ficheiro a tres bandas"
-
-#: ../data/ui/meldapp.glade.h:10
-msgid "Two way directory"
-msgstr "Cartafol a dÃas bandas"
-
-#: ../data/ui/meldapp.glade.h:11
-msgid "Two way file"
-msgstr "Ficheiro a dÃas bandas"
-
-#: ../data/ui/meldapp.glade.h:12
-msgid "Version control view"
-msgstr "Mostrar control de versiÃns"
+#: ../data/ui/meldapp.ui.h:12
+msgid "Select VC Directory"
+msgstr "Seleccionar cartafol VC"
 
-#: ../data/ui/meldapp.glade.h:13
+#: ../data/ui/meldapp.ui.h:13
 msgid "_Directory Comparison"
 msgstr "ComparaciÃn _de cartafoles"
 
-#: ../data/ui/meldapp.glade.h:14
+#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "ComparaciÃn de _ficheiros"
 
-#: ../data/ui/meldapp.glade.h:15
+#: ../data/ui/meldapp.ui.h:15
 msgid "_Three Way Compare"
 msgstr "ComparaciÃn a _tres bandas"
 
-#: ../data/ui/meldapp.glade.h:16
+#: ../data/ui/meldapp.ui.h:16
 msgid "_Version Control Browser"
 msgstr "Navegador do Control de _versiÃns"
 
-#: ../data/ui/preferences.glade.h:1
-msgid "<b>Display</b>"
-msgstr "<b>Mostrar</b>"
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr "Fran Dieguez <frandieguez gnome org>, 2011."
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "Copiar ao portapapeis"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Crear parche"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "Crear un parche"
 
-#: ../data/ui/preferences.glade.h:2
-msgid "<b>External editor</b>"
-msgstr "<b>Editor externo</b>"
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "Paneis esquerdo e do medio"
 
-#: ../data/ui/preferences.glade.h:3
-msgid "<b>Font</b>"
-msgstr "<b>Tipo de letra</b>"
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "Paneis dereito e do medio"
 
-#: ../data/ui/preferences.glade.h:4
-msgid "<b>Loading</b>"
-msgstr "<b>Cargando</b>"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "Usar as diferencias entre:"
 
-#: ../data/ui/preferences.glade.h:5
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "DirecciÃn _inversa do parche"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "Pantalla"
+
+#: ../data/ui/preferences.ui.h:2
 msgid "Do not _split words over two lines"
 msgstr "Non _dividir as palabras en dÃas liÃas"
 
-#: ../data/ui/preferences.glade.h:6
+#: ../data/ui/preferences.ui.h:3
 msgid "Edito_r command:"
 msgstr "Orde do edito_r:"
 
-#: ../data/ui/preferences.glade.h:7
+#: ../data/ui/preferences.ui.h:4
 msgid "Editor"
 msgstr "Editor"
 
-#: ../data/ui/preferences.glade.h:8
+#: ../data/ui/preferences.ui.h:5
 msgid "Enable text _wrapping"
 msgstr "Activar o a_xuste de texto"
 
-#: ../data/ui/preferences.glade.h:9
+#: ../data/ui/preferences.ui.h:6
 msgid "Encoding"
 msgstr "CodificaciÃn"
 
-#: ../data/ui/preferences.glade.h:10
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "Editor externo"
+
+#: ../data/ui/preferences.ui.h:8
 msgid "File Filters"
 msgstr "Filtros de ficheiro"
 
-#: ../data/ui/preferences.glade.h:11
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "Tipo de letra"
+
+#: ../data/ui/preferences.ui.h:10
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Ignorar os cambios que insiran ou borren liÃas en branco"
 
-#: ../data/ui/preferences.glade.h:12
+#: ../data/ui/preferences.ui.h:11
 msgid "Ignore symbolic links"
 msgstr "Ignorar as ligazÃns simbÃlicas"
 
-#: ../data/ui/preferences.glade.h:13
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "Cargando"
+
+#: ../data/ui/preferences.ui.h:13
 msgid "Meld Preferences"
 msgstr "Preferencias de Meld"
 
-#: ../data/ui/preferences.glade.h:14
+#: ../data/ui/preferences.ui.h:14
 msgid "Show _line numbers"
 msgstr "Mostrar os nuÌmeros de _liÃa"
 
-#: ../data/ui/preferences.glade.h:15
+#: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr "Mostrar espazos en _branco"
+
+#: ../data/ui/preferences.ui.h:16
 msgid "Text Filters"
 msgstr "Filtros de texto"
 
-#: ../data/ui/preferences.glade.h:16
+#: ../data/ui/preferences.ui.h:17
 msgid "Use _default system editor"
 msgstr "Usar o editor pre_definido do sistema"
 
-#: ../data/ui/preferences.glade.h:17
+#: ../data/ui/preferences.ui.h:18
 msgid "Use s_yntax highlighting"
 msgstr "Usar resaltado de _sintaxis"
 
-#: ../data/ui/preferences.glade.h:18
+#: ../data/ui/preferences.ui.h:19
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr "Ao cargar, tentar en orde estas codificaciÃns. (p.ex. utf8, iso8859)"
 
-#: ../data/ui/preferences.glade.h:19
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -253,7 +321,7 @@ msgstr ""
 "cartafoles polo nome. Cada patrÃn à unha lista de comodÃns de shell "
 "separados por espazos."
 
-#: ../data/ui/preferences.glade.h:20
+#: ../data/ui/preferences.ui.h:21
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -267,210 +335,221 @@ msgstr ""
 "Se a expresiÃn contÃn grupos, sà o grupos son substituÃdos. Ver o manual de "
 "usuario para mÃis detalles."
 
-#: ../data/ui/preferences.glade.h:21
-msgid "_Automatically supply missing newline at end of file"
-msgstr "Escribir _automaticamente unha liÃa nova ao final do ficheiro"
-
-#: ../data/ui/preferences.glade.h:22
+#: ../data/ui/preferences.ui.h:22
 msgid "_Editor font:"
 msgstr "Tipo de letra do _editor: "
 
-#: ../data/ui/preferences.glade.h:23
+#: ../data/ui/preferences.ui.h:23
 msgid "_Insert spaces instead of tabs"
 msgstr "Insertar e_spazos no lugar de tabuladores"
 
-#: ../data/ui/preferences.glade.h:24
+#: ../data/ui/preferences.ui.h:24
 msgid "_Tab width:"
 msgstr "Ancho do _tabulador:"
 
-#: ../data/ui/preferences.glade.h:25
+#: ../data/ui/preferences.ui.h:25
 msgid "_Use the system fixed width font"
 msgstr "Usar o tipo de letra de ancho fixo do sistema"
 
-#: ../data/ui/vcview.glade.h:1
+#: ../data/ui/vcview.ui.h:1
 msgid "Commit Files"
 msgstr "Remitir os ficheiros"
 
-#: ../data/ui/vcview.glade.h:2
+#: ../data/ui/vcview.ui.h:2
 msgid "Compare Options"
 msgstr "OpciÃns de comparaciÃn"
 
-#: ../data/ui/vcview.glade.h:3
+#: ../data/ui/vcview.ui.h:3
 msgid "Date"
 msgstr "Data"
 
-#: ../data/ui/vcview.glade.h:4
+#: ../data/ui/vcview.ui.h:4
 msgid "Local copy against other remote revision"
 msgstr "Copia local contra unha revisiÃn remota"
 
-#: ../data/ui/vcview.glade.h:5
+#: ../data/ui/vcview.ui.h:5
 msgid "Local copy against same remote revision"
 msgstr "Copia local contra a mesma revisiÃn remota"
 
-#: ../data/ui/vcview.glade.h:6
+#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "Mensaxe de rexistro"
 
-#: ../data/ui/vcview.glade.h:7
+#: ../data/ui/vcview.ui.h:7
 msgid "Previous Logs"
 msgstr "Rexistros anteriores"
 
-#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ../data/ui/vcview.glade.h:9
+#: ../data/ui/vcview.ui.h:9
 msgid "VC Log"
 msgstr "Rexistro CV"
 
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../meld/dirdiff.py:185
-msgid "Left"
-msgstr "Esquerda"
+#: ../meld/dirdiff.py:228
+msgid "Copy _Left"
+msgstr "Copiar à _esquerda"
 
-#: ../meld/dirdiff.py:185
-msgid "Copy To Left"
+#: ../meld/dirdiff.py:228
+msgid "Copy to left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/dirdiff.py:186
-msgid "Right"
-msgstr "Dereita"
+#: ../meld/dirdiff.py:229
+msgid "Copy _Right"
+msgstr "Copiar à _dereita"
 
-#: ../meld/dirdiff.py:186
-msgid "Copy To Right"
+#: ../meld/dirdiff.py:229
+msgid "Copy to right"
 msgstr "Copiar à dereita"
 
-#: ../meld/dirdiff.py:187
+#: ../meld/dirdiff.py:230
 msgid "Delete selected"
 msgstr "Borrar o seleccionado"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:842
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1138
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:188
+#: ../meld/dirdiff.py:231
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:287 ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Abrir seleccionados"
 
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:237
 msgid "Case"
 msgstr "CapitalizaciÃn"
 
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:237
 msgid "Ignore case of entries"
 msgstr "Ignorar maiÃsculas e minÃsculas das entradas"
 
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "Mostrar idÃnticos"
 
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "Mostrar novo"
 
-#: ../meld/dirdiff.py:197
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "Mostrar modificados"
 
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Estabelecer filtros activos"
 
-#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "Produciuse un erro ao converter o patrÃn '%s' nunha expresiÃn regular"
-
-#: ../meld/dirdiff.py:309
+#: ../meld/dirdiff.py:359
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:276
-#: ../meld/vcview.py:304
+#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
+#: ../meld/vcview.py:333
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:433
+#: ../meld/dirdiff.py:574
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "'%s' oculto por '%s'"
+msgid "[%s] Done"
+msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:439
-#, python-format
+#: ../meld/dirdiff.py:578
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "ProducÃronse varios erros ao analizar este cartafol"
+
+#: ../meld/dirdiff.py:579
+msgid "Files with invalid encodings found"
+msgstr "AtopÃronse ficheiros con modificaciÃns non vÃlidas"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:581
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+"AlgÃns ficheiros teÃen unha codificaciÃn incorrecta. Os nomes son como isto:"
+
+#: ../meld/dirdiff.py:583
+msgid "Files hidden by case insensitive comparison"
+msgstr "Ficheiros agochados por unha comparaciÃn non sensÃbel a capitalizaciÃn"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:585
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
-"Està executando unha comparaciÃn sen distinguir maiÃsculas de minÃsculas nun "
+"Està facendo unha comparaciÃn sen distinguir maiÃsculas de minÃsculas nun "
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
-"ficheiros non estÃn visÃbeis:\n"
-"%s"
+"ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:516
+#: ../meld/dirdiff.py:596
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] Feito"
+msgid "'%s' hidden by '%s'"
+msgstr "Â%s agochado por Â%sÂ"
+
+#: ../meld/dirdiff.py:621 ../meld/filediff.py:1001 ../meld/filediff.py:1142
+msgid "Hi_de"
+msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:562
+#: ../meld/dirdiff.py:671
 #, python-format
 msgid ""
 "'%s' exists.\n"
 "Overwrite?"
 msgstr ""
-"'%s' existe.\n"
+"Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:678
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
 "\n"
 "%s."
 msgstr ""
-"Produciuse un erro ao copiar '%s' a '%s'\n"
+"Produciuse un erro ao copiar Â%s a Â%sÂ\n"
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:463
+#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
 msgstr ""
-"'%s' Ã un cartafol.\n"
+"Â%s à un cartafol.\n"
 "Eliminar recursivamente?"
 
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:468
+#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -481,199 +560,275 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:606
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:607
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:608
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:609
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:610
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:611
+#: ../meld/dirdiff.py:720
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:612
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:180
-msgid "Create a patch"
-msgstr "Crear un parche"
+#: ../meld/filediff.py:288
+msgid "Format as patch..."
+msgstr "Formatar o parche comoâ"
+
+#: ../meld/filediff.py:288
+msgid "Create a patch using differences between files"
+msgstr "Crear un parche usando as diferenzas entre os ficheiros"
+
+#: ../meld/filediff.py:289
+msgid "Previous conflict"
+msgstr "Conflito anterior"
+
+#: ../meld/filediff.py:289
+msgid "Go to the previous conflict"
+msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:290
+msgid "Next conflict"
+msgstr "Seguinte conflito"
+
+#: ../meld/filediff.py:290
+msgid "Go to the next conflict"
+msgstr "Ir ao seguinte conflito"
+
+#: ../meld/filediff.py:291
 msgid "Push to left"
 msgstr "Empurrar à esquerda"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:291
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:292
 msgid "Push to right"
 msgstr "Empurrar à dereita"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:292
 msgid "Push current change to the right"
 msgstr "Empurrar o cambio actual à dereita"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:294
 msgid "Pull from left"
 msgstr "Traer desde à esquerda"
 
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:294
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde à esquerda"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:295
 msgid "Pull from right"
 msgstr "Traer desde à dereita"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:295
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde à dereita"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:296
+msgid "Copy above left"
+msgstr "Copiar por enriba da esquerda"
+
+#: ../meld/filediff.py:296
+msgid "Copy change above the left chunk"
+msgstr "Copiar o cambio por enriba da parte esquerda"
+
+#: ../meld/filediff.py:297
+msgid "Copy below left"
+msgstr "Copiar por debaixo da esquerda"
+
+#: ../meld/filediff.py:297
+msgid "Copy change below the left chunk"
+msgstr "Copiar o cambio por embaixo da parte esquerda"
+
+#: ../meld/filediff.py:298
+msgid "Copy above right"
+msgstr "Copiar por enriba da dereita"
+
+#: ../meld/filediff.py:298
+msgid "Copy change above the right chunk"
+msgstr "Copiar o cambio por enriba da parte dereita"
+
+#: ../meld/filediff.py:299
+msgid "Copy below right"
+msgstr "Copiar por debaixo da dereita"
+
+#: ../meld/filediff.py:299
+msgid "Copy change below the right chunk"
+msgstr "Copiar o cambio por embaixo da parte dereita"
+
+#: ../meld/filediff.py:300
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:300
 msgid "Delete change"
 msgstr "Borrar o cambio"
 
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:301
 msgid "Merge all changes from left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:301
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:302
 msgid "Merge all changes from right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:302
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:303
 msgid "Merge all non-conflicting"
 msgstr "Combinar todos os cambios non conflitivos"
 
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:303
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr ""
 "Combinar todos os cambios non conflitivos desde os paneis da esquerda e "
 "dereita"
 
+#: ../meld/filediff.py:304
+msgid "Cycle through documents"
+msgstr "Cambiar entre documentos"
+
+#: ../meld/filediff.py:304
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Mover o foco do teclado ao seguinte documento desta comparaciÃn"
+
+#: ../meld/filediff.py:308
+msgid "Lock scrolling"
+msgstr "Bloquear o desprazamento"
+
+#: ../meld/filediff.py:309
+msgid "Lock scrolling of all panes"
+msgstr "Bloquear o desprazamento de tÃdolos paneis"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:401
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:401
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:403
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:432
+#: ../meld/filediff.py:713
 #, python-format
 msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
 msgstr ""
-"A expresiÃn regular '%s' cambiou o nÃmero de liÃas no ficheiro. A "
-"comparaciÃn serà incorrecta. Ver o manual de usuario para mÃis detalles."
+"O filtro Â%s cambiou o nÃmero de liÃas no ficheiro. A comparaciÃn serà "
+"incorrecta. Ver o manual de usuario para mÃis detalles."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:529
+#: ../meld/filediff.py:800
 msgid "<unnamed>"
 msgstr "<sen nome>"
 
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:989
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:715
+#: ../meld/filediff.py:995
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:721 ../meld/filediff.py:846
-msgid "Hi_de"
-msgstr "Ocu_ltar"
-
-#: ../meld/filediff.py:742 ../meld/filediff.py:753 ../meld/filediff.py:766
-#: ../meld/filediff.py:772
+#: ../meld/filediff.py:1019 ../meld/filediff.py:1028 ../meld/filediff.py:1040
+#: ../meld/filediff.py:1046
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:745
+#: ../meld/filediff.py:1020
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:754
+#: ../meld/filediff.py:1029
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:767
+#: ../meld/filediff.py:1041
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:792 ../meld/filemerge.py:70
+#: ../meld/filediff.py:1071 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:1129
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+"Se estÃn usando filtros de texto, e poden estar agochando diferenzas entre "
+"ficheiros. Quere comparar os ficheiros non filtrados?"
+
+#: ../meld/filediff.py:1135
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:974
+#: ../meld/filediff.py:1145
+msgid "Show without filters"
+msgstr "Mostrar ficheiros ignorados"
+
+#: ../meld/filediff.py:1299
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -682,7 +837,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:987
+#: ../meld/filediff.py:1312
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -693,37 +848,32 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1321
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1010
+#: ../meld/filediff.py:1336
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
 "\n"
 "Which format would you like to use?"
 msgstr ""
-"Este ficheiro '%s' contÃn unha mistura de finais de liÃa.\n"
+"Este ficheiro Â%s contÃn unha mistura de finais de liÃa.\n"
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1352
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"'%s' contÃn caracteres non codificÃbeis con '%s'\n"
+"Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#. save as
-#: ../meld/filediff.py:1064
-msgid "Save patch as..."
-msgstr "Gardar parche como..."
-
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1411
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -736,482 +886,530 @@ msgstr ""
 "\n"
 "Non à posÃbel desfacer esta operaciÃn."
 
-#: ../meld/filemerge.py:78
+#: ../meld/filemerge.py:82
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Combinando os ficheiros"
 
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "nÃmero incorrecto de argumentos proporcionado a --diff"
+
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "Comezar cunha xanela baleira"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr "ficheiro"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+msgid "dir"
+msgstr "cartafol"
+
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "Comezar unha comparaciÃn no control de versiÃns"
+
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Comezar unha comparaciÃn de ficheiros a 2 ou 3 bandas"
+
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "Comezar unha comparaciÃn de cartafol a 2 ou 3 bandas"
+
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "Comezar unha comparaciÃn entre ficheiro e dir/file"
+
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld à un ferramenta de comparaciÃn de ficheiros e cartafoles."
+
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
+
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
+
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "Ignorado para compatibilidade"
+
+#: ../meld/meldapp.py:173
+msgid "Set the target file for saving a merge result"
+msgstr "Estabelecer o ficheiro de destino para gardar o resultado do cambio"
+
+#: ../meld/meldapp.py:176
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr ""
+"Crea un separador coas diferenzas dos 3 cartafoles ou ficheiros "
+"proporcionados"
+
+#: ../meld/meldapp.py:179
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
+
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+msgid "can't compare more than three directories"
+msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles."
+
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "sen tÃtulo"
+
+#: ../meld/meldwindow.py:125
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldwindow.py:126
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldwindow.py:126
 msgid "Start a new comparison"
 msgstr "Comezar unha nova comparaciÃn"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldwindow.py:127
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldwindow.py:129
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../meld/meldapp.py:144
+#: ../meld/meldwindow.py:130
 msgid "Quit the program"
 msgstr "SaÃr do programa"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldwindow.py:132
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldwindow.py:133
 msgid "Undo the last action"
 msgstr "Desfacer a Ãltima acciÃn"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldwindow.py:134
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãltima acciÃn desfeita"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldwindow.py:135
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
-#: ../meld/meldapp.py:150
+#: ../meld/meldwindow.py:136
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldwindow.py:137
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldwindow.py:138
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldwindow.py:139
 msgid "Find Ne_xt"
 msgstr "Buscar a _seguinte"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldwindow.py:139
 msgid "Search forwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "_Anterior"
+
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "Buscar cara a adiante o mesmo texto"
+
+#: ../meld/meldwindow.py:141
 msgid "Find and replace text"
 msgstr "Buscar e substituÃr texto"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldwindow.py:142
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldwindow.py:142
 msgid "Configure the application"
 msgstr "Configurar o aplicativo"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldwindow.py:144
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldwindow.py:145
 msgid "Next change"
 msgstr "Seguinte cambio"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldwindow.py:145
 msgid "Go to the next change"
 msgstr "Ir ao seguinte cambio"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldwindow.py:146
 msgid "Previous change"
 msgstr "Anterior cambio"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldwindow.py:146
 msgid "Go to the previous change"
 msgstr "Ir ao cambio anterior"
 
-#: ../meld/meldapp.py:161
+#: ../meld/meldwindow.py:148
 msgid "_View"
 msgstr "_Ver"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldwindow.py:149
 msgid "File status"
 msgstr "Estado do ficheiro"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldwindow.py:150
 msgid "Version status"
 msgstr "Estado da versiÃn"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldwindow.py:151
 msgid "File filters"
 msgstr "Filtros de ficheiro"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldwindow.py:152
 msgid "Stop the current action"
 msgstr "Deter a acciÃn actual"
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldwindow.py:153
 msgid "Refresh the view"
 msgstr "Actualizar a visualizaciÃn"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldwindow.py:154
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldwindow.py:154
 msgid "Reload the comparison"
 msgstr "Recargar a comparaciÃn"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldwindow.py:156
+msgid "_Tabs"
+msgstr "_Lapelas"
+
+#: ../meld/meldwindow.py:157
+msgid "_Previous Tab"
+msgstr "_Anterior"
+
+#: ../meld/meldwindow.py:157
+msgid "Activate previous tab"
+msgstr "Ir ao cambio anterior"
+
+#: ../meld/meldwindow.py:158
+msgid "_Next Tab"
+msgstr "Segui_nte"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate next tab"
+msgstr "Activar a seguinte lapela"
+
+#: ../meld/meldwindow.py:159
+msgid "Move Tab _Left"
+msgstr "Copiar à esquerda"
+
+#: ../meld/meldwindow.py:159
+msgid "Move current tab to left"
+msgstr "Empurrar o cambio actual à esquerda"
+
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Right"
+msgstr "Copiar à dereita"
+
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to right"
+msgstr "Empurrar o cambio actual à dereita"
+
+#: ../meld/meldwindow.py:162
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:163
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:163
 msgid "Open the Meld manual"
 msgstr "Abrir o manual do Meld"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldwindow.py:164
 msgid "Report _Bug"
 msgstr "_Informar dun erro"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldwindow.py:164
 msgid "Report a bug in Meld"
 msgstr "Informe dun erro en Meld"
 
-#: ../meld/meldapp.py:172
+#: ../meld/meldwindow.py:165
 msgid "About this program"
 msgstr "Sobre este aplicativo"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldwindow.py:168
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldwindow.py:168
 msgid "View the comparison in full screen"
 msgstr "Ver a comparaciÃn a pantalla completa"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldwindow.py:169
 msgid "_Toolbar"
 msgstr "Barra de ferramen_tas"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldwindow.py:169
 msgid "Show or hide the toolbar"
 msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldwindow.py:170
 msgid "_Statusbar"
 msgstr "Barra de e_stado"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldwindow.py:170
 msgid "Show or hide the statusbar"
 msgstr "Mostrar ou ocultar a barra de estado"
 
+#: ../meld/meldwindow.py:534
+msgid "Switch to this tab"
+msgstr "Cambiar a esta lapela"
+
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:533
+#: ../meld/meldwindow.py:625
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles.\n"
 
-#: ../meld/meldapp.py:587
-msgid "wrong number of arguments supplied to --diff"
-msgstr "nÃmero incorrecto de argumentos proporcionado a --diff"
-
-#: ../meld/meldapp.py:591
-msgid "Start with an empty window"
-msgstr "Comezar cunha xanela baleira"
-
-#: ../meld/meldapp.py:592 ../meld/meldapp.py:593 ../meld/meldapp.py:595
-msgid "file"
-msgstr "ficheiro"
-
-#: ../meld/meldapp.py:592 ../meld/meldapp.py:594 ../meld/meldapp.py:595
-msgid "dir"
-msgstr "cartafol"
-
-#: ../meld/meldapp.py:592
-msgid "Start a version control comparison"
-msgstr "Comezar unha comparaciÃn no control de versiÃns"
-
-#: ../meld/meldapp.py:593
-msgid "Start a 2- or 3-way file comparison"
-msgstr "Comezar unha comparaciÃn de ficheiros a 2 ou 3 bandas"
-
-#: ../meld/meldapp.py:594
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "Comezar unha comparaciÃn de cartafol a 2 ou 3 bandas"
-
-#: ../meld/meldapp.py:595
-msgid "Start a comparison between file and dir/file"
-msgstr "Comezar unha comparaciÃn entre ficheiro e dir/file"
-
-#: ../meld/meldapp.py:601
-msgid "Meld is a file and directory comparison tool."
-msgstr "Meld à un ferramenta de comparaciÃn de ficheiros e cartafoles."
-
-#: ../meld/meldapp.py:604
-msgid "Set label to use instead of file name"
-msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
-
-#: ../meld/meldapp.py:606
-msgid "Automatically compare all differing files on startup"
-msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
-
-#: ../meld/meldapp.py:607 ../meld/meldapp.py:608 ../meld/meldapp.py:609
-#: ../meld/meldapp.py:610
-msgid "Ignored for compatibility"
-msgstr "Ignorado para compatibilidade"
-
-#: ../meld/meldapp.py:613
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr ""
-"Crea un separador coas diferenzas dos 3 cartafoles ou ficheiros "
-"proporcionados"
-
-#: ../meld/meldapp.py:616
-#, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
-
-#: ../meld/melddoc.py:48
-msgid "untitled"
-msgstr "sen tÃtulo"
-
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:174
 msgid "[None]"
 msgstr "[NingÃn]"
 
-#: ../meld/preferences.py:81
+#: ../meld/patchdialog.py:122
+msgid "Save Patch As..."
+msgstr "Gardar parche como..."
+
+#: ../meld/preferences.py:37
 msgid "label"
 msgstr "etiqueta"
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "pattern"
 msgstr "patrÃn"
 
-#: ../meld/preferences.py:143
+#: ../meld/preferences.py:105
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Sà està dispoÃÃbel se ten instalado gnome-python-desktop"
 
-#. file filters
-#. text filters
-#: ../meld/preferences.py:166 ../meld/preferences.py:171 ../meld/vcview.py:163
-msgid "Name"
-msgstr "Nome"
-
-#: ../meld/preferences.py:166 ../meld/preferences.py:171
-msgid "Active"
-msgstr "Activo"
-
-#: ../meld/preferences.py:166
-msgid "Pattern"
-msgstr "PatrÃn"
-
-#: ../meld/preferences.py:171
-msgid "Regex"
-msgstr "ExpresiÃn regular"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:268
+#: ../meld/preferences.py:233
 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:270
+#: ../meld/preferences.py:235
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Control de versiÃns\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:272
+#: ../meld/preferences.py:237
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "Binarios\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:274
+#: ../meld/preferences.py:239
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:276
+#: ../meld/preferences.py:241
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "Palabras chave 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:278
+#: ../meld/preferences.py:243
 msgid "C++ comment\t0\t//.*\n"
 msgstr "Comentario C++ \t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:280
+#: ../meld/preferences.py:245
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "Comentario C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:282
+#: ../meld/preferences.py:247
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "Todos os espazos en branco\t0\t[ \\t\r\\f\\v]*\n"
+msgstr "Todos os espazos en 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:284
+#: ../meld/preferences.py:249
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "Espazo en branco ao inicio\t0\t^[ \\t\r\\f\\v]*\n"
+msgstr "Espazo en branco ao inicio\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:286
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
-#: ../meld/vcview.py:127
-msgid "_Commit"
-msgstr "Re_mitir"
+#: ../meld/vcview.py:120
+msgid "Co_mmit"
+msgstr "Remitir"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:120
 msgid "Commit"
 msgstr "Remitir"
 
-#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:121
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:121
 msgid "Update"
 msgstr "Actualizar"
 
-#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:129
-msgid "_Add"
-msgstr "Eng_adir"
-
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:122
 msgid "Add to VC"
 msgstr "Engadir a CV"
 
-#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:123
 msgid "Add _Binary"
 msgstr "Engadir _binario"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:123
 msgid "Add binary to VC"
 msgstr "Engadir binario a CV"
 
-#. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:131
-msgid "_Remove"
-msgstr "Elimina_r"
-
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:124
 msgid "Remove from VC"
 msgstr "Eliminar de CV"
 
-#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:125
 msgid "_Resolved"
 msgstr "Soluciona_do"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:125
 msgid "Mark as resolved for VC"
 msgstr "Marcar como solucionado para o CV"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:126
 msgid "Revert to original"
 msgstr "Reverter ao orixinal"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:127
 msgid "Delete locally"
 msgstr "Borrar localmente"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:131
 msgid "_Flatten"
 msgstr "Apl_anar"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:131
 msgid "Flatten directories"
 msgstr "Rasar cartafoles"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:132
 msgid "_Modified"
 msgstr "_Modificado"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:133
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:133
 msgid "Show normal"
 msgstr "Mostrar normal"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:134
 msgid "Non _VC"
 msgstr "Sen C_V"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:134
 msgid "Show unversioned files"
 msgstr "Mostrar ficheiros sen versiÃn"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:135
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:135
 msgid "Show ignored files"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:177 ../meld/vcview.py:301
 msgid "Location"
 msgstr "LocalizaciÃn"
 
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:178
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:179
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:184
+#: ../meld/vcview.py:181
 msgid "Options"
 msgstr "OpciÃns"
 
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:233
 msgid "Choose one Version Control"
 msgstr "Escoller un control de versiÃns"
 
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:234
 msgid "Only one Version Control in this directory"
 msgstr "SÃ control de versiÃns neste cartafol"
 
-#: ../meld/vcview.py:320
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:247
+#, python-format
+msgid "%s Not Installed"
+msgstr "%s non està instalado"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:251
+msgid "Invalid Repository"
+msgstr "O repositorio non à vÃlido"
+
+#: ../meld/vcview.py:260
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:301
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../meld/vcview.py:349
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../meld/vcview.py:353
+#: ../meld/vcview.py:387
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Obtendo as diferenzas"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:395
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Aplicando o parche"
 
-#: ../meld/vcview.py:364
-msgid "No differences found."
-msgstr "Non se encontrou ningunha diferenza."
-
-#: ../meld/vcview.py:438
+#: ../meld/vcview.py:480
 msgid "Select some files first."
 msgstr "Antes seleccione algÃns ficheiros."
 
-#: ../meld/vcview.py:504
+#: ../meld/vcview.py:553
 #, python-format
 msgid ""
 "\n"
@@ -1248,11 +1446,11 @@ msgstr ""
 "                    \n"
 "                    Contendo a seguinte informaciÃn:\n"
 "                    \n"
-"                    - meld versiÃn: '%s'\n"
-"                    - tipo de software de control de cÃdigo: '%s'\n"
+"                    - meld versiÃn: Â%sÂ\n"
+"                    - tipo de software de control de cÃdigo: Â%sÂ\n"
 "                    - versiÃn do software de control de cÃdigo: 'X.Y.Z'\n"
 "                    - a saÃda de'%s algunficheiro.txt'\n"
-"                    - camiÃo da orde (path): '%s'\n"
+"                    - camiÃo da orde (path): Â%sÂ\n"
 "                    (non necesita executa-la, xa lla proporciona\n"
 "                    a liÃa de ordes) \n"
 "                    \n"
@@ -1260,53 +1458,52 @@ msgstr ""
 "                    software de control de cÃdigo que vostede usa.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:119
+#: ../meld/ui/findbar.py:127
 #, python-format
 msgid ""
 "Regular expression error\n"
 "'%s'"
 msgstr ""
 "Erro na expresiÃn regular\n"
-"'%s'"
+"Â%sÂ"
 
-#: ../meld/ui/historyentry.py:248
+#: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
 msgstr "_Buscar..."
 
-#: ../meld/ui/historyentry.py:256
+#: ../meld/ui/historyentry.py:301
 msgid "Path"
 msgstr "CamiÃo"
 
-#: ../meld/ui/historyentry.py:257
+#: ../meld/ui/historyentry.py:302
 msgid "Path to file"
 msgstr "CamiÃo ao ficheiro"
 
-#: ../meld/ui/historyentry.py:258
+#: ../meld/ui/historyentry.py:303
 msgid "Pop up a file selector to choose a file"
 msgstr "Mostrar un selector para escoller un ficheiro"
 
-#: ../meld/ui/historyentry.py:379
+#: ../meld/ui/historyentry.py:441
 msgid "Select directory"
 msgstr "Seleccionar cartafol"
 
-#: ../meld/ui/historyentry.py:383
+#: ../meld/ui/historyentry.py:445
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:60
 msgid "Close tab"
 msgstr "Pechar o separador"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgstr ""
 "Ignored:Unversioned:::Erro::Novos engadidos:Modificados:<b>Conflito</b>:"
 "Eliminadas:Que faltan"
 
-#: ../meld/vc/cvs.py:151
+#: ../meld/vc/cvs.py:163
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1314,8 +1511,51 @@ msgid ""
 "The error was '%s'"
 msgstr ""
 "Produciuse un erro ao converter a unha expresiÃn regular\n"
-"O patrÃn era '%s'\n"
-"O erro foi '%s'"
+"O patrÃn era Â%sÂ\n"
+"O erro foi Â%sÂ"
+
+#~ msgid "Copyright  2002-2009 Stephen Kennedy"
+#~ msgstr "Copyright  2002-2009 Stephen Kennedy"
+
+#~ msgid "Three way directory"
+#~ msgstr "Cartafol a tres bandas"
+
+#~ msgid "Three way file"
+#~ msgstr "Ficheiro a tres bandas"
+
+#~ msgid "Two way directory"
+#~ msgstr "Cartafol a dÃas bandas"
+
+#~ msgid "Two way file"
+#~ msgstr "Ficheiro a dÃas bandas"
+
+#~ msgid "Version control view"
+#~ msgstr "Mostrar control de versiÃns"
+
+#~ msgid "<b>Display</b>"
+#~ msgstr "<b>Mostrar</b>"
+
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>Tipo de letra</b>"
+
+#~ msgid "_Automatically supply missing newline at end of file"
+#~ msgstr "Escribir _automaticamente unha liÃa nova ao final do ficheiro"
+
+#~ msgid "Left"
+#~ msgstr "Esquerda"
+
+#~ msgid "Right"
+#~ msgstr "Dereita"
+
+#~ msgid "Error converting pattern '%s' to regular expression"
+#~ msgstr ""
+#~ "Produciuse un erro ao converter o patrÃn '%s' nunha expresiÃn regular"
+
+#~ msgid "Regex"
+#~ msgstr "ExpresiÃn regular"
+
+#~ msgid "_Commit"
+#~ msgstr "Re_mitir"
 
 #~ msgid "Copy all changes from right pane to left pane"
 #~ msgstr "Copiar todos os cambios do panel da dereita ao panel da esquerda"
@@ -1323,9 +1563,6 @@ msgstr ""
 #~ msgid "<b>Edit Menu</b>"
 #~ msgstr "<b>Menà editar</b>"
 
-#~ msgid "Edit files with:"
-#~ msgstr "Editar ficheiros con:"
-
 #~ msgid "Line Wrapping "
 #~ msgstr "Axuste de liÃas "
 
@@ -1430,9 +1667,6 @@ msgstr ""
 #~ msgid "Curved: Filled Curves"
 #~ msgstr "Curvado: Curvas cheas"
 
-#~ msgid "Display"
-#~ msgstr "Pantalla"
-
 #~ msgid "Down"
 #~ msgstr "Abaixo"
 
@@ -1565,9 +1799,6 @@ msgstr ""
 #~ msgid "Yes"
 #~ msgstr "Si"
 
-#~ msgid "_Down"
-#~ msgstr "Abai_xo"
-
 #~ msgid "_Logo"
 #~ msgstr "_Logotipo"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]