GNOME.org
 

[meld] Updated Galician translation

commit 89710326002f5b63b22dc286de35f0376462f12d
Author: Enrique Estévez <keko gl gmail com>
Date:   Fri Mar 5 15:00:35 2010 +0100

    Updated Galician translation

 po/gl.po | 1424 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 754 insertions(+), 670 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index b07d35e..925473c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,127 +4,444 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Enrique Estévez <keko gl gmail com>, 2009.
-# Fran Diéguez <fran dieguez glug es>, 2009.
 # Antón Méixome <meixome mancomun org>, 2009.
+# Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: meld_gl_ES(jaunty)\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2009-05-22 18:26+0200\n"
-"PO-Revision-Date: 2009-05-13 13:52+0200\n"
-"Last-Translator: Antón Méixome <meixome mancomun org>\n"
-"Language-Team: Galician <gnome mancomun org>\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&component=general\n"
+"POT-Creation-Date: 2010-03-03 17:39+0000\n"
+"PO-Revision-Date: 2010-03-04 14:46+0100\n"
+"Last-Translator: Fran Diéguez <frandieguez ubuntu com>\n"
+"Language-Team: Galician <gnome g11n net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: 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"
 
-#: ../dirdiff.py:173 ../vcview.py:125
+#: ../bin/meld:77
+msgid "Cannot import: "
+msgstr "Non é posíbel importar: "
+
+#: ../bin/meld:80
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld require %s ou superior."
+
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "Compare e combine os seus ficheiros"
+
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "Visualizador Diff"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:20
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:4
+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/filediff.glade.h:3
+msgid "Copy to Clipboard"
+msgstr "Copiar ao portapapeis"
+
+#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:180
+msgid "Create Patch"
+msgstr "Crear parche"
+
+#: ../data/ui/filediff.glade.h:5
+msgid "Save modified files?"
+msgstr "Gardar os ficheiros modificados?"
+
+#: ../data/ui/filediff.glade.h:6
+msgid "_Discard Changes"
+msgstr "_Rexeitar os cambios"
+
+#: ../data/ui/filediff.glade.h:7
+msgid "_Save Selected"
+msgstr "Gardar os _seleccionados"
+
+#: ../data/ui/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "E_xpresión regular"
+
+#: ../data/ui/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "Substituír _todo"
+
+#: ../data/ui/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "Substituír _con"
+
+#: ../data/ui/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "Pa_labra completa"
+
+#: ../data/ui/findbar.glade.h:5
+msgid "_Match Case"
+msgstr "Diferenciar _maiúsculas de minúsculas"
+
+#: ../data/ui/findbar.glade.h:6
+msgid "_Next"
+msgstr "Segui_nte"
+
+#: ../data/ui/findbar.glade.h:7
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:443
+msgid "_Replace"
+msgstr "Substituí_r"
+
+#: ../data/ui/findbar.glade.h:9
+msgid "_Search for"
+msgstr "Bu_scar por:"
+
+#: ../data/ui/meldapp.glade.h:1
+msgid "<b>Edit Menu</b>"
+msgstr "<b>Menú editar</b>"
+
+#: ../data/ui/meldapp.glade.h:2
+msgid "<b>Font</b>"
+msgstr "<b>Tipo de letra</b>"
+
+#: ../data/ui/meldapp.glade.h:3
+msgid "<b>Loading</b>"
+msgstr "<b>Cargando</b>"
+
+#: ../data/ui/meldapp.glade.h:4
+msgid "<b>Misc</b>"
+msgstr "<b>Outros</b>"
+
+#: ../data/ui/meldapp.glade.h:5
+msgid "Automatically supply missing newline at end of file"
+msgstr ""
+"Proporcionar automaticamente as novas liñas que faltan ao final de ficheiro"
+
+#: ../data/ui/meldapp.glade.h:6
+msgid "Choose Files"
+msgstr "Escoller ficheiros"
+
+#: ../data/ui/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
+
+#: ../data/ui/meldapp.glade.h:8
+msgid "Custom command"
+msgstr "Orde personalizada"
+
+#: ../data/ui/meldapp.glade.h:9
+msgid "Directory"
+msgstr "Cartafol"
+
+#: ../data/ui/meldapp.glade.h:10
+msgid "Edit files with:"
+msgstr "Editar ficheiros con:"
+
+#: ../data/ui/meldapp.glade.h:11
+msgid "Editor"
+msgstr "Editor"
+
+#: ../data/ui/meldapp.glade.h:12
+msgid "Encoding"
+msgstr "Codificación"
+
+#: ../data/ui/meldapp.glade.h:13
+msgid "File Filters"
+msgstr "Filtros de ficheiro"
+
+#: ../data/ui/meldapp.glade.h:14
+msgid "Gnome default editor"
+msgstr "Editor predefinido de GNOME"
+
+#: ../data/ui/meldapp.glade.h:15
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Ignorar os cambios que insiran ou borren liñas en branco"
+
+#: ../data/ui/meldapp.glade.h:16
+msgid "Ignore symbolic links"
+msgstr "Ignorar as ligazóns simbólicas"
+
+#: ../data/ui/meldapp.glade.h:17
+msgid "Insert spaces instead of tabs"
+msgstr "Inserir espazos en lugar de tabulacións"
+
+#: ../data/ui/meldapp.glade.h:18
+msgid "Internal editor"
+msgstr "Editor interno"
+
+#: ../data/ui/meldapp.glade.h:19
+msgid "Line Wrapping "
+msgstr "Axuste de liñas "
+
+#: ../data/ui/meldapp.glade.h:21
+msgid "Mine"
+msgstr "Meu"
+
+#: ../data/ui/meldapp.glade.h:22
+msgid "Original"
+msgstr "Orixinal"
+
+#: ../data/ui/meldapp.glade.h:23
+msgid "Other"
+msgstr "Outro"
+
+#: ../data/ui/meldapp.glade.h:24
+msgid "Preferences : Meld"
+msgstr "Preferencias: Meld"
+
+#: ../data/ui/meldapp.glade.h:25
+msgid "Show line numbers"
+msgstr "Mostrar os números de liña"
+
+#: ../data/ui/meldapp.glade.h:26
+msgid "Tab width"
+msgstr "Largura da tabulación"
+
+#: ../data/ui/meldapp.glade.h:27
+msgid "Text Filters"
+msgstr "Filtros de texto"
+
+#: ../data/ui/meldapp.glade.h:28
+msgid "Three way directory"
+msgstr "Cartafol a tres bandas"
+
+#: ../data/ui/meldapp.glade.h:29
+msgid "Three way file"
+msgstr "Ficheiro a tres bandas"
+
+#: ../data/ui/meldapp.glade.h:30
+msgid "Two way directory"
+msgstr "Cartafol a dúas bandas"
+
+#: ../data/ui/meldapp.glade.h:31
+msgid "Two way file"
+msgstr "Ficheiro a dúas bandas"
+
+#: ../data/ui/meldapp.glade.h:32
+msgid "Use GNOME monospace font"
+msgstr "Usar o tipo de letra monoespazado de GNOME"
+
+#: ../data/ui/meldapp.glade.h:33
+msgid "Use custom font"
+msgstr "Usar tipo de letra personalizado"
+
+#: ../data/ui/meldapp.glade.h:34
+msgid "Use syntax highlighting"
+msgstr "Usar realzado de sintaxe"
+
+#: ../data/ui/meldapp.glade.h:35
+msgid "Version control view"
+msgstr "Mostrar control de versións"
+
+#: ../data/ui/meldapp.glade.h:36
+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/meldapp.glade.h:37
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"Ao realizar a comparación de cartafoles, pode filtrar a saída de ficheiros e "
+"cartafoles polo nome. Cada patrón é unha lista de comodíns de shell "
+"separados por espazos."
+
+#: ../data/ui/meldapp.glade.h:38
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"Ao realizar a comparación de ficheiros, pode ignorar certo tipo de cambios. "
+"Aquí cada patrón é unha expresión regular de python que substitúe o texto "
+"coincidente coa cadea baleira antes de que a comparación sexa levada a cabo. "
+"Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de "
+"usuario para máis detalles."
+
+#: ../data/ui/meldapp.glade.h:39
+msgid "_Character"
+msgstr "_Carácter"
+
+#: ../data/ui/meldapp.glade.h:40
+msgid "_Directory Comparison"
+msgstr "Comparación _de cartafoles"
+
+#: ../data/ui/meldapp.glade.h:41
+msgid "_File Comparison"
+msgstr "Comparación de _ficheiros"
+
+#: ../data/ui/meldapp.glade.h:42
+msgid "_None"
+msgstr "_Ningún"
+
+#: ../data/ui/meldapp.glade.h:43
+msgid "_Three Way Compare"
+msgstr "Comparación a _tres bandas"
+
+#: ../data/ui/meldapp.glade.h:44
+msgid "_Version Control Browser"
+msgstr "Navegador do Control de _versións"
+
+#: ../data/ui/meldapp.glade.h:45
+msgid "_Word"
+msgstr "_Palabra"
+
+#: ../data/ui/vcview.glade.h:1
+msgid "Commit Files"
+msgstr "Remitir os ficheiros"
+
+#: ../data/ui/vcview.glade.h:2
+msgid "Compare Options"
+msgstr "Opcións de comparación"
+
+#: ../data/ui/vcview.glade.h:3
+msgid "Date"
+msgstr "Data"
+
+#: ../data/ui/vcview.glade.h:4
+msgid "Local copy against other remote revision"
+msgstr "Copia local contra unha revisión remota"
+
+#: ../data/ui/vcview.glade.h:5
+msgid "Local copy against same remote revision"
+msgstr "Copia local contra a mesma revisión remota"
+
+#: ../data/ui/vcview.glade.h:6
+msgid "Log Message"
+msgstr "Mensaxe de rexistro"
+
+#: ../data/ui/vcview.glade.h:7
+msgid "Previous Logs"
+msgstr "Rexistros anteriores"
+
+#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: ../data/ui/vcview.glade.h:9
+msgid "VC Log"
+msgstr "Rexistro CV"
+
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../dirdiff.py:173 ../vcview.py:125
+#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../dirdiff.py:174
+#: ../meld/dirdiff.py:185
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../dirdiff.py:174 ../filediff.py:125
+#: ../meld/dirdiff.py:185 ../meld/filediff.py:187
 msgid "Copy To Left"
 msgstr "Copiar á esquerda"
 
-#: ../dirdiff.py:175
+#: ../meld/dirdiff.py:186
 msgid "Right"
 msgstr "Dereita"
 
-#: ../dirdiff.py:175 ../filediff.py:126
+#: ../meld/dirdiff.py:186 ../meld/filediff.py:188
 msgid "Copy To Right"
 msgstr "Copiar á dereita"
 
-#: ../dirdiff.py:176
+#: ../meld/dirdiff.py:187
 msgid "Delete selected"
 msgstr "Borrar o seleccionado"
 
-#: ../dirdiff.py:177
-#, fuzzy
+#: ../meld/dirdiff.py:188 ../meld/filediff.py:759
 msgid "Hide"
-msgstr "Ocultar %s"
+msgstr "Ocultar"
 
-#: ../dirdiff.py:177
+#: ../meld/dirdiff.py:188
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../dirdiff.py:179 ../filediff.py:123 ../vcview.py:126
-#, fuzzy
+#: ../meld/dirdiff.py:190 ../meld/filediff.py:179 ../meld/vcview.py:126
 msgid "Open selected"
-msgstr "Ocultar o seleccionado"
+msgstr "Abrir seleccionados"
 
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
 msgid "Case"
 msgstr "Capitalización"
 
-#: ../dirdiff.py:183
+#: ../meld/dirdiff.py:194
 msgid "Ignore case of entries"
 msgstr "Ignorar maiúsculas e minúsculas das entradas"
 
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
 msgid "Same"
 msgstr "Iguais"
 
-#: ../dirdiff.py:184
+#: ../meld/dirdiff.py:195
 msgid "Show identical"
-msgstr "Amosar idénticos"
+msgstr "Mostrar idénticos"
 
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
 msgid "New"
 msgstr "Novo"
 
-#: ../dirdiff.py:185
+#: ../meld/dirdiff.py:196
 msgid "Show new"
-msgstr "Amosar novo"
+msgstr "Mostrar novo"
 
-#: ../dirdiff.py:186
+#: ../meld/dirdiff.py:197
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../dirdiff.py:186 ../vcview.py:139
+#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
 msgid "Show modified"
-msgstr "Amosar modificados"
+msgstr "Mostrar modificados"
 
-#: ../dirdiff.py:188
-#, fuzzy
+#: ../meld/dirdiff.py:199
 msgid "Filters"
-msgstr "Filtros de ficheiro"
+msgstr "Filtros"
 
-#: ../dirdiff.py:188
-#, fuzzy
+#: ../meld/dirdiff.py:199
 msgid "Set active filters"
-msgstr "Filtros de ficheiro"
+msgstr "Estabelecer filtros activos"
 
-#: ../dirdiff.py:241 ../dirdiff.py:287
+#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
-msgstr "Erro ao converter o patrón '%s' nunha expresión regular"
+msgstr "Produciuse un erro ao converter o patrón '%s' nunha expresión regular"
 
-#: ../dirdiff.py:298
+#: ../meld/dirdiff.py:309
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
+#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
+#: ../meld/vcview.py:300
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../dirdiff.py:422
+#: ../meld/dirdiff.py:433
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' oculto por '%s'"
 
-#: ../dirdiff.py:428
+#: ../meld/dirdiff.py:439
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -136,12 +453,12 @@ msgstr ""
 "ficheiros non están visíbeis:\n"
 "%s"
 
-#: ../dirdiff.py:501
+#: ../meld/dirdiff.py:516
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../dirdiff.py:547
+#: ../meld/dirdiff.py:562
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -150,19 +467,19 @@ msgstr ""
 "'%s' existe.\n"
 "Sobrescribir?"
 
-#: ../dirdiff.py:554
+#: ../meld/dirdiff.py:569
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
 "\n"
 "%s."
 msgstr ""
-"Erro ao copiar '%s' a '%s'\n"
+"Produciuse un erro ao copiar '%s' a '%s'\n"
 "\n"
 "%s."
 
-#: ../dirdiff.py:572 ../vcview.py:464
-#, fuzzy, python-format
+#: ../meld/dirdiff.py:587 ../meld/vcview.py:464
+#, python-format
 msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
@@ -170,95 +487,135 @@ msgstr ""
 "'%s' é un cartafol.\n"
 "Eliminar recursivamente?"
 
-#: ../dirdiff.py:579 ../vcview.py:469
+#: ../meld/dirdiff.py:594 ../meld/vcview.py:469
 #, python-format
 msgid ""
 "Error removing %s\n"
 "\n"
 "%s."
 msgstr ""
-"Erro ao eliminar %s\n"
+"Produciuse un erro ao eliminar %s\n"
 "\n"
 "%s."
 
-#: ../dirdiff.py:590
+#: ../meld/dirdiff.py:606
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../dirdiff.py:591
+#: ../meld/dirdiff.py:607
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../dirdiff.py:592
+#: ../meld/dirdiff.py:608
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../dirdiff.py:593
+#: ../meld/dirdiff.py:609
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i día"
 msgstr[1] "%i días"
 
-#: ../dirdiff.py:594
+#: ../meld/dirdiff.py:610
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../dirdiff.py:595
+#: ../meld/dirdiff.py:611
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../dirdiff.py:596
+#: ../meld/dirdiff.py:612
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../filediff.py:124 ../glade2/filediff.glade.h:4
-msgid "Create Patch"
-msgstr "Crear parche"
-
-#: ../filediff.py:124
-#, fuzzy
+#: ../meld/filediff.py:180
 msgid "Create a patch"
-msgstr "Crear parche"
+msgstr "Crear un parche"
+
+#: ../meld/filediff.py:181
+msgid "Push to left"
+msgstr "Empurrar á esquerda"
+
+#: ../meld/filediff.py:181
+msgid "Push current change to the left"
+msgstr "Empurrar o cambio actual á esquerda"
+
+#: ../meld/filediff.py:182
+msgid "Push to right"
+msgstr "Empurrar á dereita"
+
+#: ../meld/filediff.py:182
+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
+msgid "Pull from left"
+msgstr "Traer desde á esquerda"
+
+#: ../meld/filediff.py:184
+msgid "Pull change from the left"
+msgstr "Traer o cambio desde á esquerda"
+
+#: ../meld/filediff.py:185
+msgid "Pull from right"
+msgstr "Traer desde á dereita"
+
+#: ../meld/filediff.py:185
+msgid "Pull change from the right"
+msgstr "Traer o cambio desde á dereita"
 
-#: ../filediff.py:125
+#: ../meld/filediff.py:186
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../meld/filediff.py:186
+msgid "Delete change"
+msgstr "Borrar o cambio"
+
+#: ../meld/filediff.py:187
 msgid "Copy all changes from right pane to left pane"
-msgstr ""
+msgstr "Copiar todos os cambios do panel da dereita ao panel da esquerda"
 
-#: ../filediff.py:126
+#: ../meld/filediff.py:188
 msgid "Copy all changes from left pane to right pane"
-msgstr ""
+msgstr "Copiar todos os cambios do panel da esquerda ao panel da dereita"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:255
+msgid "INS"
+msgstr "INS"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:179
-msgid "INS,OVR"
-msgstr "INS,SOB"
+#: ../meld/filediff.py:255
+msgid "OVR"
+msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:181
+#: ../meld/filediff.py:257
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../filediff.py:238
+#: ../meld/filediff.py:386
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -267,49 +624,55 @@ 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."
 
-#: ../filediff.py:507
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:483
+msgid "<unnamed>"
+msgstr "<sen nome>"
+
+#: ../meld/filediff.py:664
 #, python-format
 msgid "[%s] Set num panes"
-msgstr "[%s] Establecer o número de paneis"
+msgstr "[%s] Estabelecer número de paneis"
 
-#: ../filediff.py:513
+#: ../meld/filediff.py:670
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../filediff.py:531 ../filediff.py:545 ../filediff.py:561 ../filediff.py:568
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "Non se puido ler desde '%s'"
+#: ../meld/filediff.py:676 ../meld/filediff.py:763
+msgid "Hi_de"
+msgstr "Ocu_ltar"
 
-#: ../filediff.py:532 ../filediff.py:569
-msgid "The error was:"
-msgstr "O erro foi:"
+#: ../meld/filediff.py:697 ../meld/filediff.py:708 ../meld/filediff.py:721
+#: ../meld/filediff.py:727
+msgid "Could not read file"
+msgstr "Non foi posíbel ler o ficheiro"
 
-#: ../filediff.py:537
+#: ../meld/filediff.py:700
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../filediff.py:546
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr ""
-"Contén ASCII nulos.\n"
-"Talvez sexa un ficheiro binario."
+#: ../meld/filediff.py:709
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "%s semella ser un ficheiro binario."
 
-#: ../filediff.py:562
+#: ../meld/filediff.py:722
 #, python-format
-msgid "I tried encodings %s."
-msgstr "Tentei as codificacións %s."
+msgid "%s is not in encodings: %s"
+msgstr "%s non está na codificación: %s"
 
-#: ../filediff.py:589
+#: ../meld/filediff.py:747
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../filediff.py:716
+#: ../meld/filediff.py:758
+msgid "Files are identical"
+msgstr "Os ficheiros son idénticos"
+
+#: ../meld/filediff.py:913
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -318,23 +681,23 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../filediff.py:729
+#: ../meld/filediff.py:926
 #, python-format
 msgid ""
 "Error writing to %s\n"
 "\n"
 "%s."
 msgstr ""
-"Erro ao escribir en %s\n"
+"Produciuse un erro ao escribir en %s\n"
 "\n"
 "%s."
 
-#: ../filediff.py:738
+#: ../meld/filediff.py:935
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o búfer %i."
 
-#: ../filediff.py:752
+#: ../meld/filediff.py:949
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -343,23 +706,23 @@ msgid ""
 msgstr ""
 "Este ficheiro '%s' contén unha mistura de finais de liña.\n"
 "\n"
-"Que formato quere empregar?"
+"Que formato quere usar?"
 
-#: ../filediff.py:768
+#: ../meld/filediff.py:965
 #, 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 codificables con '%s'\n"
+"'%s' contén caracteres non codificábeis con '%s'\n"
 "Quere gardar como UTF-8?"
 
 #. save as
-#: ../filediff.py:808
+#: ../meld/filediff.py:1003
 msgid "Save patch as..."
 msgstr "Gardar parche como..."
 
-#: ../filediff.py:875
+#: ../meld/filediff.py:1061
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -370,814 +733,467 @@ msgstr ""
 "Ao recargar rexeitará os cambios en:\n"
 "%s\n"
 "\n"
-"Non se pode desfacer esta operación."
-
-#: ../findbar.py:120
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Erro na expresión regular\n"
-"'%s'"
+"Non é posíbel desfacer esta operación."
 
-#: ../glade2/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>"
-
-#: ../glade2/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "Copiar ao portapapeis"
-
-#: ../glade2/filediff.glade.h:5
-msgid "Save modified files?"
-msgstr "Gardar os ficheiros modificados?"
-
-#: ../glade2/filediff.glade.h:6
-msgid "_Discard Changes"
-msgstr ""
-
-#: ../glade2/filediff.glade.h:7
-#, fuzzy
-msgid "_Save Selected"
-msgstr "Borrar o selecciona_do"
-
-#: ../glade2/findbar.glade.h:1
-#, fuzzy
-msgid "Regular E_xpression"
-msgstr "E_xpresión regular"
-
-#: ../glade2/findbar.glade.h:2
-msgid "Replace _All"
-msgstr ""
-
-#: ../glade2/findbar.glade.h:3
-msgid "Replace _With"
-msgstr ""
-
-#: ../glade2/findbar.glade.h:4
-msgid "Who_le word"
-msgstr ""
-
-#: ../glade2/findbar.glade.h:5
-#, fuzzy
-msgid "_Match Case"
-msgstr "Diferenciar _maiúsculas e minúsculas"
-
-#: ../glade2/findbar.glade.h:6
-msgid "_Next"
-msgstr ""
-
-#: ../glade2/findbar.glade.h:7
-#, fuzzy
-msgid "_Previous"
-msgstr "Rexistros anteriores"
-
-#: ../glade2/findbar.glade.h:8 ../meldapp.py:525
-msgid "_Replace"
-msgstr ""
-
-#: ../glade2/findbar.glade.h:9
-#, fuzzy
-msgid "_Search for"
-msgstr "Buscar por:"
-
-#: ../glade2/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Menú Editar</b>"
-
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>Tipo de letra</b>"
-
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>Cargando</b>"
-
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>Outros</b>"
-
-#: ../glade2/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr ""
-"Proporcionar automaticamente as novas liñas que faltan ao final de ficheiro"
-
-#: ../glade2/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "Escoller ficheiros"
-
-#: ../glade2/meldapp.glade.h:7
-#, fuzzy
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Copyright (C) 2002-2006 Stephen Kennedy"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "Orde personalizada"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "Directory"
-msgstr "Cartafol"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "Editar ficheiros con:"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "Editor"
-msgstr "Editor"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "Codificación"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "Filtros de ficheiro"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "Editor predeterminado de Gnome"
-
-#: ../glade2/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Ignorar os cambios que insiran ou borren liñas en branco"
-
-#: ../glade2/meldapp.glade.h:16
-msgid "Ignore symbolic links"
-msgstr "Ignorar as ligazóns simbólicas"
-
-#: ../glade2/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr ""
-
-#: ../glade2/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "Editor interno"
-
-#: ../glade2/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "Axuste de liñas "
-
-#: ../glade2/meldapp.glade.h:20
-msgid "Meld"
-msgstr "Meld"
-
-#: ../glade2/meldapp.glade.h:21
-msgid "Mine"
-msgstr "Meu"
-
-#: ../glade2/meldapp.glade.h:22
-msgid "Original"
-msgstr "Orixinal"
-
-#: ../glade2/meldapp.glade.h:23
-msgid "Other"
-msgstr "Outro"
-
-#: ../glade2/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "Preferencias: Meld"
-
-#: ../glade2/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "Amosar os números de liña"
-
-#: ../glade2/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "Largura da tabulación"
-
-#: ../glade2/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "Filtros de texto"
-
-#: ../glade2/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "Directorio a tres bandas"
-
-#: ../glade2/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "Ficheiro a tres bandas"
-
-#: ../glade2/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "Directorio a dúas bandas"
-
-#: ../glade2/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "Ficheiro a dúas bandas"
-
-#: ../glade2/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr ""
-"Empregar o tipo de letra monoespazado\n"
-"de GNOME"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "Usar tipo de letra personalizado"
-
-#: ../glade2/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "Empregar realzado de sintaxe"
-
-#: ../glade2/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "Amosar control de versións"
-
-#: ../glade2/meldapp.glade.h:36
-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)"
-
-#: ../glade2/meldapp.glade.h:37
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"Ao realizar a comparación de cartafoles, pode filtrar a saída de ficheiros e "
-"cartafoles polo nome. Cada patrón é unha lista de comodíns de shell "
-"separados por espazos."
-
-#: ../glade2/meldapp.glade.h:38
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"Ao realizar a comparación de ficheiros, pode ignorar certo tipo de cambios. "
-"Aquí cada patrón é unha expresión regular de python que reempraza o texto "
-"coincidente coa cadea baleira antes de que a comparación sexa levada a cabo. "
-"Se a expresión contén grupos, só os grupos son substituídos. Ver o manual de "
-"usuario para máis detalles."
-
-#: ../glade2/meldapp.glade.h:39
-msgid "_Character"
-msgstr ""
-
-#: ../glade2/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "Comparación _de cartafoles"
-
-#: ../glade2/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "Comparación de _ficheiros"
-
-#: ../glade2/meldapp.glade.h:42
-#, fuzzy
-msgid "_None"
-msgstr "[Ningún]"
-
-#: ../glade2/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "Comparación a _tres bandas"
-
-#: ../glade2/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "Navegador do Control de _Versións"
-
-#: ../glade2/meldapp.glade.h:45
-msgid "_Word"
-msgstr ""
-
-#: ../glade2/vcview.glade.h:1
-msgid "Commit Files"
-msgstr "Remitir ficheiros"
-
-#: ../glade2/vcview.glade.h:2
-msgid "Compare Options"
-msgstr "Opcións de comparación"
-
-#: ../glade2/vcview.glade.h:3
-msgid "Date"
-msgstr "Data"
-
-#: ../glade2/vcview.glade.h:4
-msgid "Local copy against other remote revision"
-msgstr "Copia local contra unha revisión remota"
-
-#: ../glade2/vcview.glade.h:5
-msgid "Local copy against same remote revision"
-msgstr "Copia local contra a mesma revisión remota"
-
-#: ../glade2/vcview.glade.h:6
-msgid "Log Message"
-msgstr "Mensaxe de rexistro"
-
-#: ../glade2/vcview.glade.h:7
-msgid "Previous Logs"
-msgstr "Rexistros anteriores"
-
-#: ../glade2/vcview.glade.h:8 ../vcview.py:183
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: ../glade2/vcview.glade.h:9
-msgid "VC Log"
-msgstr "Rexistro CV"
-
-#: ../historyentry.py:248
-msgid "_Browse..."
-msgstr ""
-
-#: ../historyentry.py:256
-msgid "Path"
-msgstr ""
-
-#: ../historyentry.py:257
-msgid "Path to file"
-msgstr ""
-
-#: ../historyentry.py:258
-msgid "Pop up a file selector to choose a file"
-msgstr ""
-
-#: ../historyentry.py:378
-#, fuzzy
-msgid "Select directory"
-msgstr "Directorio a tres bandas"
-
-#: ../historyentry.py:382
-#, fuzzy
-msgid "Select file"
-msgstr "Antes seleccione algúns ficheiros."
-
-#: ../meld:47
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld require %s ou superior."
-
-#: ../meld:64 ../meld:71
-msgid "Cannot import: "
-msgstr ""
-
-#: ../meld.desktop.in.h:1
-#, fuzzy
-msgid "Compare and merge your files"
-msgstr "Compare e combine os seus ficheiros."
-
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Visualizador Diff Meld"
-
-#: ../meldapp.py:153
+#: ../meld/meldapp.py:151
 msgid "label"
 msgstr "etiqueta"
 
-#: ../meldapp.py:153
+#: ../meld/meldapp.py:151
 msgid "pattern"
 msgstr "patrón"
 
-#: ../meldapp.py:221
-#, fuzzy
+#: ../meld/meldapp.py:219
 msgid "Only available if you have gnome-python-desktop installed"
-msgstr ""
-"Os números de liña só están dispoñíbeis se ten instalado gnome-python-"
-"desktop."
+msgstr "Só está dispoñíbel se ten instalado gnome-python-desktop"
 
 #. file filters
 #. text filters
-#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:163
+#: ../meld/meldapp.py:229 ../meld/meldapp.py:234 ../meld/vcview.py:163
 msgid "Name"
 msgstr "Nome"
 
-#: ../meldapp.py:231 ../meldapp.py:236
+#: ../meld/meldapp.py:229 ../meld/meldapp.py:234
 msgid "Active"
 msgstr "Activo"
 
-#: ../meldapp.py:231
+#: ../meld/meldapp.py:229
 msgid "Pattern"
 msgstr "Patrón"
 
-#: ../meldapp.py:236
+#: ../meld/meldapp.py:234
 msgid "Regex"
 msgstr "Expresión regular"
 
-#: ../meldapp.py:340
-msgid "Close tab"
-msgstr ""
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:412
+#: ../meld/meldapp.py:341
 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
-#: ../meldapp.py:414
-#, fuzzy, python-format
+#: ../meld/meldapp.py:343
+#, python-format
 msgid "Version Control\t1\t%s\n"
-msgstr "Navegador do Control de _Versións"
+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
-#: ../meldapp.py:416
+#: ../meld/meldapp.py:345
 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
-#: ../meldapp.py:418
+#: ../meld/meldapp.py:347
 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
-#: ../meldapp.py:420
+#: ../meld/meldapp.py:349
 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
-#: ../meldapp.py:422
+#: ../meld/meldapp.py:351
 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
-#: ../meldapp.py:424
+#: ../meld/meldapp.py:353
 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
-#: ../meldapp.py:426
+#: ../meld/meldapp.py:355
 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
-#: ../meldapp.py:428
+#: ../meld/meldapp.py:357
 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
-#: ../meldapp.py:430
+#: ../meld/meldapp.py:359
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
-#: ../meldapp.py:511
+#: ../meld/meldapp.py:428
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ../meld/meldapp.py:429
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meldapp.py:511
+#: ../meld/meldapp.py:429
 msgid "Start a new comparison"
-msgstr ""
+msgstr "Comezar unha nova comparación"
 
-#: ../meldapp.py:512
+#: ../meld/meldapp.py:430
 msgid "Save the current file"
-msgstr ""
+msgstr "Gardar o ficheiro actual"
 
-#: ../meldapp.py:514
+#: ../meld/meldapp.py:432
 msgid "Close the current file"
-msgstr ""
+msgstr "Pechar o ficheiro actual"
 
-#: ../meldapp.py:515
+#: ../meld/meldapp.py:433
 msgid "Quit the program"
-msgstr ""
+msgstr "Saír do programa"
 
-#: ../meldapp.py:518
+#: ../meld/meldapp.py:435
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../meld/meldapp.py:436
 msgid "Undo the last action"
-msgstr ""
+msgstr "Desfacer a última acción"
 
-#: ../meldapp.py:519
+#: ../meld/meldapp.py:437
 msgid "Redo the last undone action"
-msgstr ""
+msgstr "Refacer a última acción desfeita"
 
-#: ../meldapp.py:520
+#: ../meld/meldapp.py:438
 msgid "Cut the selection"
-msgstr ""
+msgstr "Cortar a selección"
 
-#: ../meldapp.py:521
-#, fuzzy
+#: ../meld/meldapp.py:439
 msgid "Copy the selection"
-msgstr "Comparar o seleccionado"
+msgstr "Copiar a selección"
 
-#: ../meldapp.py:522
-#, fuzzy
+#: ../meld/meldapp.py:440
 msgid "Paste the clipboard"
-msgstr "Copiar ao portapapeis"
+msgstr "Pegar o contido do portapapeis"
 
-#: ../meldapp.py:523
-#, fuzzy
+#: ../meld/meldapp.py:441
 msgid "Search for text"
-msgstr "Buscar por:"
+msgstr "Buscar texto"
 
-#: ../meldapp.py:524
+#: ../meld/meldapp.py:442
 msgid "Find Ne_xt"
 msgstr "Buscar a _seguinte"
 
-#: ../meldapp.py:524
+#: ../meld/meldapp.py:442
 msgid "Search forwards for the same text"
-msgstr ""
+msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meldapp.py:525
+#: ../meld/meldapp.py:443
 msgid "Find and replace text"
-msgstr ""
+msgstr "Buscar e substituír texto"
 
-#: ../meldapp.py:526
-#, fuzzy
+#: ../meld/meldapp.py:444
 msgid "Go to the next difference"
-msgstr "[%s] Obtendo as diferenzas"
+msgstr "Ir á seguinte diferenza"
 
-#: ../meldapp.py:527
+#: ../meld/meldapp.py:445
 msgid "Go to the previous difference"
-msgstr ""
+msgstr "Ir á diferenza anterior"
 
-#: ../meldapp.py:528
-#, fuzzy
+#: ../meld/meldapp.py:446
 msgid "Prefere_nces"
-msgstr "Preferencias: Meld"
+msgstr "Prefere_ncias"
 
-#: ../meldapp.py:528
+#: ../meld/meldapp.py:446
 msgid "Configure the application"
-msgstr ""
+msgstr "Configurar o aplicativo"
+
+#: ../meld/meldapp.py:448
+msgid "_View"
+msgstr "_Ver"
 
-#: ../meldapp.py:534
+#: ../meld/meldapp.py:449
+msgid "File status"
+msgstr "Estado do ficheiro"
+
+#: ../meld/meldapp.py:450
+msgid "Version status"
+msgstr "Estado da versión"
+
+#: ../meld/meldapp.py:451
+msgid "File filters"
+msgstr "Filtros de ficheiro"
+
+#: ../meld/meldapp.py:452
 msgid "Stop the current action"
-msgstr ""
+msgstr "Deter a acción actual"
 
-#: ../meldapp.py:535
-#, fuzzy
+#: ../meld/meldapp.py:453
 msgid "Refresh the view"
-msgstr "Actualizar"
+msgstr "Actualizar a visualización"
 
-#: ../meldapp.py:536
+#: ../meld/meldapp.py:454
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../meldapp.py:536
-#, fuzzy
+#: ../meld/meldapp.py:454
 msgid "Reload the comparison"
-msgstr "Comparación de _ficheiros"
+msgstr "Recargar a comparación"
+
+#: ../meld/meldapp.py:456
+msgid "_Help"
+msgstr "A_xuda"
 
-#: ../meldapp.py:539
+#: ../meld/meldapp.py:457
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../meldapp.py:539
+#: ../meld/meldapp.py:457
 msgid "Open the Meld manual"
-msgstr ""
+msgstr "Abrir o manual do Meld"
 
-#: ../meldapp.py:540
+#: ../meld/meldapp.py:458
 msgid "Report _Bug"
 msgstr "_Informar dun erro"
 
-#: ../meldapp.py:540
+#: ../meld/meldapp.py:458
 msgid "Report a bug in Meld"
-msgstr ""
+msgstr "Informe dun erro en Meld"
 
-#: ../meldapp.py:541
+#: ../meld/meldapp.py:459
 msgid "About this program"
-msgstr ""
+msgstr "Sobre este aplicativo"
 
-#: ../meldapp.py:546
+#: ../meld/meldapp.py:462
 msgid "Full Screen"
-msgstr ""
+msgstr "Pantalla completa"
 
-#: ../meldapp.py:546
+#: ../meld/meldapp.py:462
 msgid "View the comparison in full screen"
-msgstr ""
+msgstr "Ver a comparación a pantalla completa"
 
-#: ../meldapp.py:547
+#: ../meld/meldapp.py:463
 msgid "_Toolbar"
-msgstr ""
+msgstr "Barra de ferramen_tas"
 
-#: ../meldapp.py:547
+#: ../meld/meldapp.py:463
 msgid "Show or hide the toolbar"
-msgstr ""
+msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meldapp.py:548
-#, fuzzy
+#: ../meld/meldapp.py:464
 msgid "_Statusbar"
-msgstr "Estado"
+msgstr "Barra de e_stado"
 
-#: ../meldapp.py:548
+#: ../meld/meldapp.py:464
 msgid "Show or hide the statusbar"
-msgstr ""
+msgstr "Mostrar ou ocultar a barra de estado"
 
-#: ../meldapp.py:890
+#. exit at first non found directory + file
+#: ../meld/meldapp.py:816
 msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Non se pode comparar unha mestura de ficheiros e cartafoles.\n"
+msgstr "Non é posíbel comparar unha mestura de ficheiros e cartafoles.\n"
+
+#: ../meld/meldapp.py:870
+msgid "wrong number of arguments supplied to --diff"
+msgstr "número incorrecto de argumentos proporcionado a --diff"
+
+#: ../meld/meldapp.py:874
+msgid "Start with an empty window"
+msgstr "Comezar cunha xanela baleira"
 
-#: ../meldapp.py:933 ../meldapp.py:941
-#, fuzzy
+#: ../meld/meldapp.py:875 ../meld/meldapp.py:876 ../meld/meldapp.py:878
 msgid "file"
-msgstr "_Ficheiro"
+msgstr "ficheiro"
 
-#: ../meldapp.py:934 ../meldapp.py:940
-#, fuzzy
+#: ../meld/meldapp.py:875 ../meld/meldapp.py:877 ../meld/meldapp.py:878
 msgid "dir"
-msgstr "Editor"
+msgstr "cartafol"
 
-#: ../meldapp.py:939
-msgid "Start with no window open"
-msgstr ""
+#: ../meld/meldapp.py:875
+msgid "Start a version control comparison"
+msgstr "Comezar unha comparación no control de versións"
 
-#: ../meldapp.py:940
-#, fuzzy, python-format
-msgid "Start with Version Control browser in '%s'"
-msgstr "Navegador do Control de _Versións"
+#: ../meld/meldapp.py:876
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Comezar unha comparación de ficheiros a 2 ou 3 bandas"
 
-#: ../meldapp.py:941
-#, python-format
-msgid "Start with Version Control diff of '%s'"
-msgstr ""
+#: ../meld/meldapp.py:877
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "Comezar unha comparación de cartafol a 2 ou 3 bandas"
 
-#: ../meldapp.py:942
-msgid "Start with 2 or 3 way file comparison"
-msgstr ""
-
-#: ../meldapp.py:943
-msgid "Start with 2 or 3 way directory comparison"
-msgstr ""
+#: ../meld/meldapp.py:878
+msgid "Start a comparison between file and dir/file"
+msgstr "Comezar unha comparación entre ficheiro e dir/file"
 
-#: ../meldapp.py:950
+#: ../meld/meldapp.py:884
 msgid "Meld is a file and directory comparison tool."
-msgstr ""
+msgstr "Meld é un ferramenta de comparación de ficheiros e cartafoles."
 
-#: ../meldapp.py:953
+#: ../meld/meldapp.py:887
 msgid "Set label to use instead of file name"
-msgstr "Establecer a etiqueta a empregar en vez do nome do ficheiro"
+msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
 
-#: ../meldapp.py:955
+#: ../meld/meldapp.py:889
 msgid "Automatically compare all differing files on startup"
-msgstr ""
+msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
 
-#: ../meldapp.py:956 ../meldapp.py:957 ../meldapp.py:958 ../meldapp.py:959
+#: ../meld/meldapp.py:890 ../meld/meldapp.py:891 ../meld/meldapp.py:892
+#: ../meld/meldapp.py:893
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meldapp.py:962
+#: ../meld/meldapp.py:896
 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"
 
-#: ../meldapp.py:966
-#, fuzzy
-msgid "Invalid number of arguments supplied for --diff."
-msgstr "Número incorrecto de argumentos (Obtívose %i)"
-
-#: ../meldapp.py:969
+#: ../meld/meldapp.py:899
 #, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "Número incorrecto de argumentos (Obtívose %i)"
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "demasiados argumentos (buscábanse 0-4, obtivéronse %d)"
 
-#: ../melddoc.py:46
+#: ../meld/melddoc.py:48
 msgid "untitled"
 msgstr "sen título"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:191
+#: ../meld/misc.py:189
 msgid "[None]"
 msgstr "[Ningún]"
 
-#: ../vcview.py:127
+#: ../meld/vcview.py:127
 msgid "_Commit"
-msgstr "A_ctualizar"
+msgstr "Re_mitir"
 
-#: ../vcview.py:127
+#: ../meld/vcview.py:127
 msgid "Commit"
 msgstr "Remitir"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:128
+#: ../meld/vcview.py:128
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../vcview.py:128
+#: ../meld/vcview.py:128
 msgid "Update"
 msgstr "Actualizar"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:129
+#: ../meld/vcview.py:129
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../vcview.py:129
+#: ../meld/vcview.py:129
 msgid "Add to VC"
 msgstr "Engadir a CV"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:130
+#: ../meld/vcview.py:130
 msgid "Add _Binary"
 msgstr "Engadir _binario"
 
-#: ../vcview.py:130
-#, fuzzy
+#: ../meld/vcview.py:130
 msgid "Add binary to VC"
-msgstr "Engadir a CV"
+msgstr "Engadir binario a CV"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:131
-#, fuzzy
+#: ../meld/vcview.py:131
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../vcview.py:131
+#: ../meld/vcview.py:131
 msgid "Remove from VC"
 msgstr "Eliminar de CV"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:132
-#, fuzzy
+#: ../meld/vcview.py:132
 msgid "_Resolved"
-msgstr "Elimina_r"
+msgstr "Soluciona_do"
 
-#: ../vcview.py:132
+#: ../meld/vcview.py:132
 msgid "Mark as resolved for VC"
-msgstr ""
+msgstr "Marcar como solucionado para o CV"
 
-#: ../vcview.py:133
+#: ../meld/vcview.py:133
 msgid "Revert to original"
-msgstr "Recuperar o orixinal"
+msgstr "Reverter ao orixinal"
 
-#: ../vcview.py:134
+#: ../meld/vcview.py:134
 msgid "Delete locally"
 msgstr "Borrar localmente"
 
-#: ../vcview.py:138
+#: ../meld/vcview.py:138
 msgid "_Flatten"
-msgstr "Igual_ar"
+msgstr "Apl_anar"
 
-#: ../vcview.py:138
+#: ../meld/vcview.py:138
 msgid "Flatten directories"
-msgstr "Igualar cartafoles"
+msgstr "Rasar cartafoles"
 
-#: ../vcview.py:139
+#: ../meld/vcview.py:139
 msgid "_Modified"
 msgstr "_Modificado"
 
-#: ../vcview.py:140
+#: ../meld/vcview.py:140
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../vcview.py:140
+#: ../meld/vcview.py:140
 msgid "Show normal"
-msgstr "Amosar normal"
+msgstr "Mostrar normal"
 
-#: ../vcview.py:141
+#: ../meld/vcview.py:141
 msgid "Non _VC"
 msgstr "Sen C_V"
 
-#: ../vcview.py:141
+#: ../meld/vcview.py:141
 msgid "Show unversioned files"
-msgstr "Amosar ficheiros sen versión"
+msgstr "Mostrar ficheiros sen versión"
 
-#: ../vcview.py:142
+#: ../meld/vcview.py:142
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../vcview.py:142
+#: ../meld/vcview.py:142
 msgid "Show ignored files"
-msgstr "Amosar ficheiros ignorados"
+msgstr "Mostrar ficheiros ignorados"
 
-#: ../vcview.py:180
+#: ../meld/vcview.py:180
 msgid "Location"
 msgstr "Localización"
 
-#: ../vcview.py:181
+#: ../meld/vcview.py:181
 msgid "Status"
 msgstr "Estado"
 
-#: ../vcview.py:182
+#: ../meld/vcview.py:182
 msgid "Rev"
 msgstr "Rev"
 
-#: ../vcview.py:184
+#: ../meld/vcview.py:184
 msgid "Options"
 msgstr "Opcións"
 
-#: ../vcview.py:230
-#, fuzzy
+#: ../meld/vcview.py:230
 msgid "Choose one Version Control"
-msgstr "Amosar control de versións"
+msgstr "Escoller un control de versións"
 
-#: ../vcview.py:231
+#: ../meld/vcview.py:231
 msgid "Only one Version Control in this directory"
-msgstr ""
+msgstr "Só control de versións neste cartafol"
 
-#: ../vcview.py:316
+#: ../meld/vcview.py:316
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../vcview.py:349
+#: ../meld/vcview.py:349
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Obtendo as diferenzas"
 
-#: ../vcview.py:356
+#: ../meld/vcview.py:356
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Aplicando o parche"
 
-#: ../vcview.py:360
+#: ../meld/vcview.py:360
 msgid "No differences found."
 msgstr "Non se encontrou ningunha diferenza."
 
-#: ../vcview.py:439
+#: ../meld/vcview.py:439
 msgid "Select some files first."
 msgstr "Antes seleccione algúns ficheiros."
 
-#: ../vcview.py:505
+#: ../meld/vcview.py:505
 #, python-format
 msgid ""
 "\n"
@@ -1196,11 +1212,75 @@ msgid ""
 "                    - source control software version: 'X.Y.Z'\n"
 "                    - the output of '%s somefile.txt'\n"
 "                    - patch command: '%s'\n"
+"                    (no need to actually run it, just provide\n"
+"                    the command line) \n"
+"                    \n"
+"                    Replace 'X.Y.Z' by the actual version for the\n"
+"                    source control software you use.\n"
 "                    "
 msgstr ""
+"\n"
+"                    Produciuse un fallo ao invocar a 'patch'.\n"
+"                    \n"
+"                    Pode ser que non estea instalado 'GNU Patch'\n"
+"                    ou vostede usa unha versión non probada de %s.\n"
+"                    \n"
+"                    Envíe un informe de erro por correo electrónico a:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Contendo a seguinte información:\n"
+"                    \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"
+"                    (non necesita executa-la, xa lla proporciona\n"
+"                    a liña de ordes) \n"
+"                    \n"
+"                    Substitúe 'X.Y.Z', pola versión real para o\n"
+"                    software de control de código que vostede usa.\n"
+"                    "
+
+#: ../meld/ui/findbar.py:119
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Erro na expresión regular\n"
+"'%s'"
+
+#: ../meld/ui/historyentry.py:248
+msgid "_Browse..."
+msgstr "_Buscar..."
+
+#: ../meld/ui/historyentry.py:256
+msgid "Path"
+msgstr "Camiño"
+
+#: ../meld/ui/historyentry.py:257
+msgid "Path to file"
+msgstr "Camiño ao ficheiro"
+
+#: ../meld/ui/historyentry.py:258
+msgid "Pop up a file selector to choose a file"
+msgstr "Mostrar un selector para escoller un ficheiro"
+
+#: ../meld/ui/historyentry.py:379
+msgid "Select directory"
+msgstr "Seleccionar cartafol"
+
+#: ../meld/ui/historyentry.py:383
+msgid "Select file"
+msgstr "Seleccionar ficheiro"
+
+#: ../meld/ui/notebooklabel.py:61
+msgid "Close tab"
+msgstr "Pechar o separador"
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:39
+#: ../meld/vc/_vc.py:40
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
 "Missing"
@@ -1208,17 +1288,30 @@ msgstr ""
 "Ignored:Unversioned:::Erro::Novos engadidos:Modificados:<b>Conflito</b>:"
 "Eliminadas:Que faltan"
 
-#: ../vc/cvs.py:151
+#: ../meld/vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
 "The pattern was '%s'\n"
 "The error was '%s'"
 msgstr ""
-"Erro ao converter a unha expresión regular\n"
+"Produciuse un erro ao converter a unha expresión regular\n"
 "O patrón era '%s'\n"
 "O erro foi '%s'"
 
+#~ msgid "The error was:"
+#~ msgstr "O erro foi:"
+
+#~ msgid ""
+#~ "It contains ascii nulls.\n"
+#~ "Perhaps it is a binary file."
+#~ msgstr ""
+#~ "Contén ASCII nulos.\n"
+#~ "Talvez sexa un ficheiro binario."
+
+#~ msgid "Wrong number of arguments (Got %i)"
+#~ msgstr "Número incorrecto de argumentos (Obtívose %i)"
+
 #~ msgid "(gnome-default-editor)"
 #~ msgstr "(gnome-predeterminado-editor)"
 
@@ -1427,12 +1520,6 @@ msgstr ""
 #~ msgid "_Down"
 #~ msgstr "Abai_xo"
 
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_Help"
-#~ msgstr "A_xuda"
-
 #~ msgid "_Logo"
 #~ msgstr "_Logotipo"
 
@@ -1445,8 +1532,5 @@ msgstr ""
 #~ msgid "_Up"
 #~ msgstr "_Arriba"
 
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
 #~ msgid "_Wrap around"
 #~ msgstr "Dar a _volta"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]