[meld] Updated Galician translations

[Francisco DiÃguez Souto <frandieguez src gnome org>]

commit e8af98667f71210ad64ac8041222c93e791ca751
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Fri Oct 12 00:55:34 2012 +0200

    Updated Galician translations

 po/gl.po |  132 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 69 insertions(+), 63 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 76efaa8..3c62e8a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,29 +1,27 @@
 # Galician translations for meld.
 # Copyright (C) 2012 Leandro Regueiro.
 # This file is distributed under the same license as the meld package.
-#
 # Proxecto Trasno - AdaptaciÃn do software libre à lingua galega:  Se desexas
 # colaborar connosco, podes atopar mÃis informaciÃn en http://www.trasno.net
-#
 # Enrique EstÃvez <keko gl gmail com>, 2009.
 # AntÃn MÃixome <meixome mancomun org>, 2009.
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro regueiro gmail com>, 2012.
+# Fran Dieguez <frandieguez gnome org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-04 20:32+0000\n"
-"PO-Revision-Date: 2012-09-02 19:31+0200\n"
-"Last-Translator: Leandro Regueiro <leandro regueiro gmail com>\n"
-"Language-Team: Galician <gnome-l10n-gl gnome org>\n"
+"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
+"POT-Creation-Date: 2012-10-12 00:53+0200\n"
+"PO-Revision-Date: 2012-10-12 00:55+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
+"Language-Team: 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"
-"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Galician\n"
 
 #: ../bin/meld:103
@@ -429,7 +427,7 @@ msgstr "Copiar à dereita"
 msgid "Delete selected"
 msgstr "Eliminar o seleccionado"
 
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1106
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -486,37 +484,37 @@ msgstr "Estabelecer filtros activos"
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
 #: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:614
+#: ../meld/dirdiff.py:620
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:618
+#: ../meld/dirdiff.py:624
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ProducÃronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:619
+#: ../meld/dirdiff.py:625
 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:621
+#: ../meld/dirdiff.py:627
 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:623
+#: ../meld/dirdiff.py:629
 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:625
+#: ../meld/dirdiff.py:631
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -525,16 +523,16 @@ msgstr ""
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
 "ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:636
+#: ../meld/dirdiff.py:642
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "Â%s agochado por Â%sÂ"
 
-#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
+#: ../meld/dirdiff.py:667 ../meld/filediff.py:943 ../meld/filediff.py:1110
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:711
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -543,7 +541,7 @@ msgstr ""
 "Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:724
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -554,7 +552,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -563,7 +561,7 @@ msgstr ""
 "Â%s à un cartafol.\n"
 "Retirar recursivamente?"
 
-#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -574,49 +572,49 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:827
+#: ../meld/dirdiff.py:833
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:829
+#: ../meld/dirdiff.py:835
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:836
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:837
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:838
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -786,42 +784,42 @@ msgstr ""
 "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."
 
-#: ../meld/filediff.py:925
+#: ../meld/filediff.py:931
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:931
+#: ../meld/filediff.py:937
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
-#: ../meld/filediff.py:984
+#: ../meld/filediff.py:961 ../meld/filediff.py:971 ../meld/filediff.py:984
+#: ../meld/filediff.py:990
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:956
+#: ../meld/filediff.py:962
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:972
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:979
+#: ../meld/filediff.py:985
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1016
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1097
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -829,15 +827,15 @@ msgstr ""
 "Se estÃn usando filtros de texto, e poden estar agochando diferenzas entre "
 "ficheiros. Quere comparar os ficheiros non filtrados?"
 
-#: ../meld/filediff.py:1098
+#: ../meld/filediff.py:1103
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1113
 msgid "Show without filters"
 msgstr "Mostrar sen filtros"
 
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1306
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -846,7 +844,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1319
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -857,12 +855,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1320
+#: ../meld/filediff.py:1328
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1343
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -873,7 +871,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1359
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -882,7 +880,7 @@ msgstr ""
 "Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1416
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -895,7 +893,7 @@ msgstr ""
 "\n"
 "Non à posÃbel desfacer esta operaciÃn."
 
-#: ../meld/filemerge.py:82
+#: ../meld/filemerge.py:47
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Combinando os ficheiros"
@@ -956,22 +954,30 @@ msgstr "Ignorado para compatibilidade"
 msgid "Set the target file for saving a merge result"
 msgstr "Definir o ficheiro de destino para gardar o resultado da combinaciÃn"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:180
+msgid "Automatically merge files"
+msgstr "Combinar ficheiros automaticamente"
+
+#: ../meld/meldapp.py:183
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 "Crea unha lapela coas diferenzas de ata 3 directorios ou ficheiros "
 "fornecidos."
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 #, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "demasiados argumentos (buscÃbanse 0-3, obtivÃronse %d)"
 
-#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
-msgid "can't compare more than three directories"
-msgstr "non à posÃbel comparar mÃis de tres directorios"
+#: ../meld/meldapp.py:188
+msgid "can't auto-merge less than 3 files"
+msgstr "non à posÃbel autocombinar menos de 3 ficheiros"
 
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:190
+msgid "can't auto-merge directories"
+msgstr "non à posÃbel autocombinar cartafoles"
+
+#: ../meld/meldapp.py:196
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Erro de D-Bus; as comparaciÃns abriranse nunha nova xanela."
 
@@ -1215,7 +1221,7 @@ msgid "Switch to this tab"
 msgstr "Cambiar a esta lapela"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:669
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles.\n"
 
@@ -1542,15 +1548,12 @@ msgstr "Pechar a lapela"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
-#, fuzzy
-#| msgid ""
-#| "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
 "Not present"
 msgstr ""
-"Ignored:Unversioned:::Erro::Novas adiciÃns:Modificados:<b>Conflito</b>:"
-"Retiradas:Que faltan"
+"Ignorado:Non Versionado:::Erro::Novas "
+"adiciÃns:Modificado:Conflito:Eliminado:Que falta:Non presente"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
@@ -1563,6 +1566,9 @@ msgstr ""
 "O patrÃn era Â%sÂ\n"
 "O erro foi Â%sÂ"
 
+#~ msgid "can't compare more than three directories"
+#~ msgstr "non à posÃbel comparar mÃis de tres directorios"
+
 #~ msgid "Case"
 #~ msgstr "CapitalizaciÃn"