[meld] Updated Galician translations



commit a843a5539d617b87ccabee737838cf90aeaa722d
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Thu Aug 30 04:13:58 2012 +0200

    Updated Galician translations

 po/gl.po |  439 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 242 insertions(+), 197 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index fdaa198..1636a11 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2012-04-30 16:39+0200\n"
-"PO-Revision-Date: 2012-04-30 16:40+0200\n"
+"POT-Creation-Date: 2012-08-30 04:11+0200\n"
+"PO-Revision-Date: 2012-08-30 04:13+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Gtranslator 2.91.5\n"
 "X-Poedit-Language: Galician\n"
 
 #: ../bin/meld:103
@@ -117,7 +117,7 @@ msgstr "_Rexeitar os cambios"
 msgid "_Save Selected"
 msgstr "Gardar os _seleccionados"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
 msgid "_Replace"
 msgstr "SubstituÃ_r"
 
@@ -162,49 +162,76 @@ msgstr ""
 "Copyright &#xA9; 2009-2012 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
+msgid ""
+"Meld is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation, either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details. \n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Meld à software libre, vostede pode redistribuÃlo e/ou modificalo baixo os "
+"termos da Licenza PÃblica Xeral de GNU publicada pola Free Software "
+"Foundation, tanto a versioÌn 2 como as posteriores.\n"
+"\n"
+"Este programa distribÃese coa esperanza de que lle sexa Ãtil, pero SEN "
+"GARANTÃA NINGUNHA, incluso sen a garantÃa de MERCANTIBILIDADE ou ADECUACIÃN "
+"A UN PROPÃSITO EN PARTICULAR. Vexa a Licenza  PÃblica Xeral para ter mÃis "
+"detalles.\n"
+"\n"
+"Debeu recibir unha copia da Licenza PÃblica Xeral de GNU con este programa, "
+"se non foi asà vexa http://www.gnu.org/licenses/.";
+
+#: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
 msgstr "Fran Dieguez <frandieguez gnome org>, 2011."
 
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
 msgstr "Escoller ficheiros"
 
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "ComparaciÃn a _tres bandas"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:13
 msgid "Mine"
 msgstr "Meu"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:15
 msgid "Original"
 msgstr "Orixinal"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:17
 msgid "Other"
 msgstr "Outro"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:18
 msgid "_File Comparison"
 msgstr "ComparaciÃn de _ficheiros"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:19
 msgid "_Directory Comparison"
 msgstr "ComparaciÃn _de cartafoles"
 
-#: ../data/ui/meldapp.ui.h:15
+#: ../data/ui/meldapp.ui.h:20
 msgid "Select VC Directory"
 msgstr "Seleccionar cartafol VC"
 
-#: ../data/ui/meldapp.ui.h:16
+#: ../data/ui/meldapp.ui.h:21
 msgid "Directory"
 msgstr "Cartafol"
 
-#: ../data/ui/meldapp.ui.h:17
+#: ../data/ui/meldapp.ui.h:22
 msgid "_Version Control Browser"
 msgstr "Navegador do Control de _versiÃns"
 
@@ -368,118 +395,122 @@ msgstr "Rexistros anteriores"
 msgid "Log Message"
 msgstr "Mensaxe de rexistro"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
 msgid "Copy _Left"
 msgstr "Copiar à _esquerda"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
 msgid "Copy to left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
 msgid "Copy _Right"
 msgstr "Copiar à _dereita"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
 msgid "Copy to right"
 msgstr "Copiar à dereita"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:233
 msgid "Delete selected"
 msgstr "Borrar o seleccionado"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
+#: ../meld/dirdiff.py:234 ../meld/filediff.py:1083
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:234
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "CapitalizaciÃn"
+#: ../meld/dirdiff.py:238
+msgid "Ignore filename case"
+msgstr "Ignorar maiÃsculas e minÃsculas do nome do ficheiro"
 
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "Ignorar maiÃsculas e minÃsculas das entradas"
+#: ../meld/dirdiff.py:238
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Considerar casos diferentes os nomes de ficheiro que de outro modo serÃan "
+"idÃnticos"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
 msgid "Show identical"
 msgstr "Mostrar idÃnticos"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
 msgid "Show new"
 msgstr "Mostrar novo"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:241
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "Mostrar modificados"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
 msgid "Set active filters"
 msgstr "Estabelecer filtros activos"
 
-#: ../meld/dirdiff.py:362
+#: ../meld/dirdiff.py:363
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/dirdiff.py:467 ../meld/dirdiff.py:480 ../meld/vcview.py:323
 #: ../meld/vcview.py:347
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:579
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:582
+#: ../meld/dirdiff.py:583
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ProducÃronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:584
 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:585
+#: ../meld/dirdiff.py:586
 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:587
+#: ../meld/dirdiff.py:588
 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:589
+#: ../meld/dirdiff.py:590
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -488,16 +519,16 @@ msgstr ""
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
 "ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:600
+#: ../meld/dirdiff.py:601
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "Â%s agochado por Â%sÂ"
 
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
+#: ../meld/dirdiff.py:626 ../meld/filediff.py:925 ../meld/filediff.py:1087
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:675
+#: ../meld/dirdiff.py:676
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -506,7 +537,7 @@ msgstr ""
 "Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:682
+#: ../meld/dirdiff.py:683
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -517,7 +548,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:701 ../meld/vcview.py:536
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -526,7 +557,7 @@ msgstr ""
 "Â%s à un cartafol.\n"
 "Eliminar recursivamente?"
 
-#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:708 ../meld/vcview.py:541
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -537,210 +568,210 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:791
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:792
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:793
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:794
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:795
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:746
+#: ../meld/dirdiff.py:796
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:747
+#: ../meld/dirdiff.py:797
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:205
 msgid "Format as patch..."
 msgstr "Formatar o parche comoâ"
 
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:205
 msgid "Create a patch using differences between files"
 msgstr "Crear un parche usando as diferenzas entre os ficheiros"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:206
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:206
 msgid "Go to the previous conflict"
 msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:207
 msgid "Next conflict"
 msgstr "Seguinte conflito"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:207
 msgid "Go to the next conflict"
 msgstr "Ir ao seguinte conflito"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:208
 msgid "Push to left"
 msgstr "Empurrar à esquerda"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:208
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:209
 msgid "Push to right"
 msgstr "Empurrar à dereita"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:209
 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:301
+#: ../meld/filediff.py:211
 msgid "Pull from left"
 msgstr "Traer desde à esquerda"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:211
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde à esquerda"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:212
 msgid "Pull from right"
 msgstr "Traer desde à dereita"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:212
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde à dereita"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:213
 msgid "Copy above left"
 msgstr "Copiar por enriba da esquerda"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:213
 msgid "Copy change above the left chunk"
 msgstr "Copiar o cambio por enriba da parte esquerda"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:214
 msgid "Copy below left"
 msgstr "Copiar por debaixo da esquerda"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:214
 msgid "Copy change below the left chunk"
 msgstr "Copiar o cambio por embaixo da parte esquerda"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:215
 msgid "Copy above right"
 msgstr "Copiar por enriba da dereita"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:215
 msgid "Copy change above the right chunk"
 msgstr "Copiar o cambio por enriba da parte dereita"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:216
 msgid "Copy below right"
 msgstr "Copiar por debaixo da dereita"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:216
 msgid "Copy change below the right chunk"
 msgstr "Copiar o cambio por embaixo da parte dereita"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:217
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:217
 msgid "Delete change"
 msgstr "Borrar o cambio"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:218
 msgid "Merge all changes from left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:218
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:219
 msgid "Merge all changes from right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:219
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:220
 msgid "Merge all non-conflicting"
 msgstr "Combinar todos os cambios non conflitivos"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:220
 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:311
+#: ../meld/filediff.py:221
 msgid "Cycle through documents"
 msgstr "Cambiar entre documentos"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:221
 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:315
+#: ../meld/filediff.py:225
 msgid "Lock scrolling"
 msgstr "Bloquear o desprazamento"
 
-#: ../meld/filediff.py:316
+#: ../meld/filediff.py:226
 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:396
+#: ../meld/filediff.py:306
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:306
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/filediff.py:308
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:722
+#: ../meld/filediff.py:632
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -749,47 +780,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."
 
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
-msgstr "<sen nome>"
-
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:913
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:919
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
-#: ../meld/filediff.py:1055
+#: ../meld/filediff.py:943 ../meld/filediff.py:952 ../meld/filediff.py:964
+#: ../meld/filediff.py:970
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:944
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:1038
+#: ../meld/filediff.py:953
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:1050
+#: ../meld/filediff.py:965
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
+#: ../meld/filediff.py:996 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1074
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -797,15 +823,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:1164
+#: ../meld/filediff.py:1080
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1090
 msgid "Show without filters"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/filediff.py:1363
+#: ../meld/filediff.py:1279
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -814,7 +840,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1292
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -825,12 +851,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1301
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1316
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -841,7 +867,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1332
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -850,7 +876,7 @@ msgstr ""
 "Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1389
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -909,268 +935,281 @@ msgid "Set label to use instead of file name"
 msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
 
 #: ../meld/meldapp.py:171
+msgid "Open a new tab in an already running instance"
+msgstr "Abre unha nova lapela nunha instancia en execuciÃn"
+
+#: ../meld/meldapp.py:173
 msgid "Automatically compare all differing files on startup"
 msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:175
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
 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:179
+#: ../meld/meldapp.py:181
 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:182
+#: ../meld/meldapp.py:184
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
 
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
+#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
 msgid "can't compare more than three directories"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles."
 
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/meldapp.py:192
+msgid "D-Bus error; comparisons will open in a new window."
+msgstr "Erro de D-Bus; as comparaciÃns abriranse nunha nova xanela."
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:83
+msgid "<unnamed>"
+msgstr "<sen nome>"
+
+#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
 msgid "untitled"
 msgstr "sen tÃtulo"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
 msgid "Start a new comparison"
 msgstr "Comezar unha nova comparaciÃn"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
 msgid "Quit the program"
 msgstr "SaÃr do programa"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:139
 msgid "Undo the last action"
 msgstr "Desfacer a Ãltima acciÃn"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãltima acciÃn desfeita"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
 msgid "Find Ne_xt"
 msgstr "Buscar a _seguinte"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
 msgid "Search forwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
 msgid "Find _Previous"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
 msgid "Search backwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:147
 msgid "Find and replace text"
 msgstr "Buscar e substituÃr texto"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
 msgid "Configure the application"
 msgstr "Configurar o aplicativo"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
 msgid "Next change"
 msgstr "Seguinte cambio"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
 msgid "Go to the next change"
 msgstr "Ir ao seguinte cambio"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
 msgid "Previous change"
 msgstr "Anterior cambio"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
 msgid "Go to the previous change"
 msgstr "Ir ao cambio anterior"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
 msgid "Open externally"
 msgstr "Abrir externamente"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 "Abrir o ficheiro ou cartafol seleccionado no aplicativo externo "
 "predeterminado"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
 msgid "_View"
 msgstr "_Ver"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
 msgid "File status"
 msgstr "Estado do ficheiro"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
 msgid "Version status"
 msgstr "Estado da versiÃn"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:158
 msgid "File filters"
 msgstr "Filtros de ficheiro"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:159
 msgid "Stop the current action"
 msgstr "Deter a acciÃn actual"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
 msgid "Refresh the view"
 msgstr "Actualizar a visualizaciÃn"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
 msgid "Reload the comparison"
 msgstr "Recargar a comparaciÃn"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:163
 msgid "_Tabs"
 msgstr "_Lapelas"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
 msgid "_Previous Tab"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
 msgid "Activate previous tab"
 msgstr "Ir ao cambio anterior"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
 msgid "_Next Tab"
 msgstr "Segui_nte"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
 msgid "Activate next tab"
 msgstr "Activar a seguinte lapela"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
 msgid "Move Tab _Left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
 msgid "Move current tab to left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
 msgid "Move Tab _Right"
 msgstr "Copiar à dereita"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
 msgid "Move current tab to right"
 msgstr "Empurrar o cambio actual à dereita"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:169
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
 msgid "Open the Meld manual"
 msgstr "Abrir o manual do Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
 msgid "Report _Bug"
 msgstr "_Informar dun erro"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
 msgid "Report a bug in Meld"
 msgstr "Informe dun erro en Meld"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:172
 msgid "About this program"
 msgstr "Sobre este aplicativo"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
 msgid "View the comparison in full screen"
 msgstr "Ver a comparaciÃn a pantalla completa"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
 msgid "_Toolbar"
 msgstr "Barra de ferramen_tas"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
 msgid "Show or hide the toolbar"
 msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
 msgid "_Statusbar"
 msgstr "Barra de e_stado"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
 msgid "Show or hide the statusbar"
 msgstr "Mostrar ou ocultar a barra de estado"
 
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:563
 msgid "Switch to this tab"
 msgstr "Cambiar a esta lapela"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:639
+#: ../meld/meldwindow.py:664
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles.\n"
 
@@ -1196,12 +1235,12 @@ msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Sà està dispoÃÃbel se ten instalado gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
+#: ../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:236
+#: ../meld/preferences.py:235
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1210,48 +1249,48 @@ msgstr ""
 "V100 .Trashes Thumbs.db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:237
 #, 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:240
-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"
+#: ../meld/preferences.py:239
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+msgstr "Binarios\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#: ../meld/preferences.py:241
+msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
+#: ../meld/preferences.py:243
 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:246
+#: ../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:248
+#: ../meld/preferences.py:247
 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:250
+#: ../meld/preferences.py:249
 msgid "All whitespace\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:252
+#: ../meld/preferences.py:251
 msgid "Leading whitespace\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:254
+#: ../meld/preferences.py:253
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
@@ -1514,6 +1553,12 @@ msgstr ""
 "O patrÃn era Â%sÂ\n"
 "O erro foi Â%sÂ"
 
+#~ msgid "Case"
+#~ msgstr "CapitalizaciÃn"
+
+#~ msgid "Ignore case of entries"
+#~ msgstr "Ignorar maiÃsculas e minÃsculas das entradas"
+
 #~ msgid "_Search for"
 #~ msgstr "Bu_scar por:"
 



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