GNOME.org
 

[meld] Updated Galician translations

commit ec185d36dd5e89f4bba7e66fdd2f4d15ad12e687
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Tue Sep 4 23:23:19 2012 +0200

    Updated Galician translations

 po/gl.po |  528 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 269 insertions(+), 259 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 1636a11..76efaa8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,27 +1,29 @@
-# translation of meld_gl_ES(jaunty).po to Galician
-# Galician translations for PACKAGE package.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# 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.
-# Fran Dieguez <frandieguez gnome org>, 2011, 2012.
-#
+# Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
+# Leandro Regueiro <leandro regueiro gmail com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\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"
+"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"
 "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: Gtranslator 2.91.5\n"
+"X-Generator: Lokalize 1.0\n"
 "X-Poedit-Language: Galician\n"
 
 #: ../bin/meld:103
@@ -69,17 +71,17 @@ msgstr "PatrÃn"
 msgid "Add new filter"
 msgstr "Engadir novo filtro"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
 msgid "_Add"
 msgstr "Eng_adir"
 
 #: ../data/ui/EditableList.ui.h:7
 msgid "Remove selected filter"
-msgstr "Eliminar o filtro seleccionado"
+msgstr "Retirar o filtro seleccionado"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:131
 msgid "_Remove"
-msgstr "Elimina_r"
+msgstr "_Retirar"
 
 #: ../data/ui/EditableList.ui.h:9
 msgid "Move item up"
@@ -117,7 +119,7 @@ msgstr "_Rexeitar os cambios"
 msgid "_Save Selected"
 msgstr "Gardar os _seleccionados"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
 msgid "_Replace"
 msgstr "SubstituÃ_r"
 
@@ -190,7 +192,11 @@ msgstr ""
 
 #: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
-msgstr "Fran Dieguez <frandieguez gnome org>, 2011."
+msgstr ""
+"Leandro Regueiro <leandro regueiro gmail com>, 2012\n"
+"Fran DiÃguez <frandieguez gnome org>, 2011\n"
+"Proxecto Trasno - TraduciÃn de software libre ao galego <proxecto trasno "
+"net>, 1999-2012"
 
 #: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
@@ -309,7 +315,7 @@ msgstr "Mostrar espazos en _branco"
 
 #: ../data/ui/preferences.ui.h:12
 msgid "Use s_yntax highlighting"
-msgstr "Usar resaltado de _sintaxis"
+msgstr "Usar realce de _sintaxe"
 
 #: ../data/ui/preferences.ui.h:13
 msgid "External editor"
@@ -333,8 +339,8 @@ msgid ""
 "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 "
+"Ao realizar a comparaciÃn de directorios, 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/preferences.ui.h:18
@@ -361,7 +367,7 @@ msgstr ""
 
 #: ../data/ui/preferences.ui.h:21
 msgid "Ignore changes which insert or delete blank lines"
-msgstr "Ignorar os cambios que insiran ou borren liÃas en branco"
+msgstr "Ignorar os cambios que insiran ou eliminen liÃas en branco"
 
 #: ../data/ui/preferences.ui.h:22
 msgid "Text Filters"
@@ -395,47 +401,47 @@ msgstr "Rexistros anteriores"
 msgid "Log Message"
 msgstr "Mensaxe de rexistro"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy _Left"
 msgstr "Copiar à _esquerda"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy to left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy _Right"
 msgstr "Copiar à _dereita"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy to right"
 msgstr "Copiar à dereita"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:232
 msgid "Delete selected"
-msgstr "Borrar o seleccionado"
+msgstr "Eliminar o seleccionado"
 
-#: ../meld/dirdiff.py:234 ../meld/filediff.py:1083
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:233
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid "Ignore filename case"
 msgstr "Ignorar maiÃsculas e minÃsculas do nome do ficheiro"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -443,74 +449,74 @@ msgstr ""
 "Considerar casos diferentes os nomes de ficheiro que de outro modo serÃan "
 "idÃnticos"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "Mostrar idÃnticos"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "Mostrar novo"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
 msgid "Show modified"
 msgstr "Mostrar modificados"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Estabelecer filtros activos"
 
-#: ../meld/dirdiff.py:363
+#: ../meld/dirdiff.py:398
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:467 ../meld/dirdiff.py:480 ../meld/vcview.py:323
-#: ../meld/vcview.py:347
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:579
+#: ../meld/dirdiff.py:614
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:618
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ProducÃronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:584
+#: ../meld/dirdiff.py:619
 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:586
+#: ../meld/dirdiff.py:621
 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:588
+#: ../meld/dirdiff.py:623
 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:590
+#: ../meld/dirdiff.py:625
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -519,16 +525,16 @@ msgstr ""
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
 "ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:601
+#: ../meld/dirdiff.py:636
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "Â%s agochado por Â%sÂ"
 
-#: ../meld/dirdiff.py:626 ../meld/filediff.py:925 ../meld/filediff.py:1087
+#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:676
+#: ../meld/dirdiff.py:711
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -537,7 +543,7 @@ msgstr ""
 "Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:683
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -548,230 +554,230 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:701 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
 msgstr ""
 "Â%s à un cartafol.\n"
-"Eliminar recursivamente?"
+"Retirar recursivamente?"
 
-#: ../meld/dirdiff.py:708 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
 "\n"
 "%s."
 msgstr ""
-"Produciuse un erro ao eliminar %s\n"
+"Produciuse un erro ao retirar %s\n"
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:791
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:792
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:793
+#: ../meld/dirdiff.py:828
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:794
+#: ../meld/dirdiff.py:829
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:795
+#: ../meld/dirdiff.py:830
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:796
+#: ../meld/dirdiff.py:831
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:797
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:187
 msgid "Format as patch..."
 msgstr "Formatar o parche comoâ"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:187
 msgid "Create a patch using differences between files"
 msgstr "Crear un parche usando as diferenzas entre os ficheiros"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:188
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:188
 msgid "Go to the previous conflict"
 msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:189
 msgid "Next conflict"
 msgstr "Seguinte conflito"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:189
 msgid "Go to the next conflict"
 msgstr "Ir ao seguinte conflito"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:190
 msgid "Push to left"
 msgstr "Empurrar à esquerda"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:190
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/filediff.py:209
+#: ../meld/filediff.py:191
 msgid "Push to right"
 msgstr "Empurrar à dereita"
 
-#: ../meld/filediff.py:209
+#: ../meld/filediff.py:191
 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:211
+#: ../meld/filediff.py:193
 msgid "Pull from left"
 msgstr "Traer desde à esquerda"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:193
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde à esquerda"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:194
 msgid "Pull from right"
 msgstr "Traer desde à dereita"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:194
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde à dereita"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:195
 msgid "Copy above left"
 msgstr "Copiar por enriba da esquerda"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:195
 msgid "Copy change above the left chunk"
 msgstr "Copiar o cambio por enriba da parte esquerda"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:196
 msgid "Copy below left"
 msgstr "Copiar por debaixo da esquerda"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:196
 msgid "Copy change below the left chunk"
 msgstr "Copiar o cambio por embaixo da parte esquerda"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:197
 msgid "Copy above right"
 msgstr "Copiar por enriba da dereita"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:197
 msgid "Copy change above the right chunk"
 msgstr "Copiar o cambio por enriba da parte dereita"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:198
 msgid "Copy below right"
 msgstr "Copiar por debaixo da dereita"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:198
 msgid "Copy change below the right chunk"
 msgstr "Copiar o cambio por embaixo da parte dereita"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:199
 msgid "Delete"
-msgstr "Borrar"
+msgstr "Eliminar"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:199
 msgid "Delete change"
-msgstr "Borrar o cambio"
+msgstr "Eliminar o cambio"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:200
 msgid "Merge all changes from left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:200
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:201
 msgid "Merge all changes from right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:201
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:202
 msgid "Merge all non-conflicting"
 msgstr "Combinar todos os cambios non conflitivos"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:202
 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:221
+#: ../meld/filediff.py:203
 msgid "Cycle through documents"
 msgstr "Cambiar entre documentos"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:203
 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:225
+#: ../meld/filediff.py:207
 msgid "Lock scrolling"
 msgstr "Bloquear o desprazamento"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:208
 msgid "Lock scrolling of all panes"
-msgstr "Bloquear o desprazamento de tÃdolos paneis"
+msgstr "Bloquear o desprazamento de todos os paneis"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:318
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:318
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:320
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:632
+#: ../meld/filediff.py:644
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -780,42 +786,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:913
+#: ../meld/filediff.py:925
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:919
+#: ../meld/filediff.py:931
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:943 ../meld/filediff.py:952 ../meld/filediff.py:964
-#: ../meld/filediff.py:970
+#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
+#: ../meld/filediff.py:984
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:944
+#: ../meld/filediff.py:956
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:953
+#: ../meld/filediff.py:966
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:965
+#: ../meld/filediff.py:979
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:996 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1074
+#: ../meld/filediff.py:1092
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -823,15 +829,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:1080
+#: ../meld/filediff.py:1098
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1108
 msgid "Show without filters"
-msgstr "Mostrar ficheiros ignorados"
+msgstr "Mostrar sen filtros"
 
-#: ../meld/filediff.py:1279
+#: ../meld/filediff.py:1298
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -840,7 +846,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1292
+#: ../meld/filediff.py:1311
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -851,12 +857,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1301
+#: ../meld/filediff.py:1320
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1316
+#: ../meld/filediff.py:1335
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -867,7 +873,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1332
+#: ../meld/filediff.py:1351
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -876,7 +882,7 @@ msgstr ""
 "Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1389
+#: ../meld/filediff.py:1408
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -948,13 +954,13 @@ msgstr "Ignorado para compatibilidade"
 
 #: ../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"
+msgstr "Definir o ficheiro de destino para gardar o resultado da combinaciÃn"
 
 #: ../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"
+"Crea unha lapela coas diferenzas de ata 3 directorios ou ficheiros "
+"fornecidos."
 
 #: ../meld/meldapp.py:184
 #, python-format
@@ -963,7 +969,7 @@ msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
 
 #: ../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."
+msgstr "non à posÃbel comparar mÃis de tres directorios"
 
 #: ../meld/meldapp.py:192
 msgid "D-Bus error; comparisons will open in a new window."
@@ -978,243 +984,243 @@ msgstr "<sen nome>"
 msgid "untitled"
 msgstr "sen tÃtulo"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Start a new comparison"
 msgstr "Comezar unha nova comparaciÃn"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:134
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:136
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:137
 msgid "Quit the program"
 msgstr "SaÃr do programa"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:139
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:140
 msgid "Undo the last action"
 msgstr "Desfacer a Ãltima acciÃn"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:141
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãltima acciÃn desfeita"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:143
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:144
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:145
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Find Ne_xt"
 msgstr "Buscar a _seguinte"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Search forwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Find _Previous"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Search backwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:148
 msgid "Find and replace text"
 msgstr "Buscar e substituÃr texto"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Configure the application"
 msgstr "Configurar o aplicativo"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Next change"
 msgstr "Seguinte cambio"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Go to the next change"
 msgstr "Ir ao seguinte cambio"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Previous change"
 msgstr "Anterior cambio"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Go to the previous change"
 msgstr "Ir ao cambio anterior"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Open externally"
 msgstr "Abrir externamente"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 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:155
+#: ../meld/meldwindow.py:156
 msgid "_View"
 msgstr "_Ver"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
 msgid "File status"
 msgstr "Estado do ficheiro"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
 msgid "Version status"
 msgstr "Estado da versiÃn"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "File filters"
 msgstr "Filtros de ficheiro"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
 msgid "Stop the current action"
 msgstr "Deter a acciÃn actual"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
 msgid "Refresh the view"
-msgstr "Actualizar a visualizaciÃn"
+msgstr "Actualizar a vista"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload the comparison"
 msgstr "Recargar a comparaciÃn"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
 msgid "_Tabs"
 msgstr "_Lapelas"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "_Previous Tab"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "Activate previous tab"
-msgstr "Ir ao cambio anterior"
+msgstr "Ir à lapela anterior"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "_Next Tab"
 msgstr "Segui_nte"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "Activate next tab"
 msgstr "Activar a seguinte lapela"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move Tab _Left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move current tab to left"
-msgstr "Empurrar o cambio actual à esquerda"
+msgstr "Mover a lapela actual à esquerda"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move Tab _Right"
 msgstr "Copiar à dereita"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move current tab to right"
-msgstr "Empurrar o cambio actual à dereita"
+msgstr "Mover a lapela actual à dereita"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "Open the Meld manual"
 msgstr "Abrir o manual do Meld"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report _Bug"
-msgstr "_Informar dun erro"
+msgstr "_Informar dun fallo"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report a bug in Meld"
-msgstr "Informe dun erro en Meld"
+msgstr "Informe dun fallo en Meld"
 
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:173
 msgid "About this program"
-msgstr "Sobre este aplicativo"
+msgstr "Sobre este programa"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "View the comparison in full screen"
 msgstr "Ver a comparaciÃn a pantalla completa"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "_Toolbar"
 msgstr "Barra de ferramen_tas"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "Show or hide the toolbar"
 msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "_Statusbar"
 msgstr "Barra de e_stado"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "Show or hide the statusbar"
 msgstr "Mostrar ou ocultar a barra de estado"
 
-#: ../meld/meldwindow.py:563
+#: ../meld/meldwindow.py:564
 msgid "Switch to this tab"
 msgstr "Cambiar a esta lapela"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:664
+#: ../meld/meldwindow.py:665
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles.\n"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
+#: ../meld/misc.py:177
 msgid "[None]"
 msgstr "[NingÃn]"
 
@@ -1235,12 +1241,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:233
+#: ../meld/preferences.py:228
 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:235
+#: ../meld/preferences.py:230
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1249,206 +1255,206 @@ 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:237
+#: ../meld/preferences.py:232
 #, 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:239
+#: ../meld/preferences.py:234
 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:241
+#: ../meld/preferences.py:236
 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:243
+#: ../meld/preferences.py:238
 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:245
+#: ../meld/preferences.py:240
 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:247
+#: ../meld/preferences.py:242
 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:249
+#: ../meld/preferences.py:244
 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:251
+#: ../meld/preferences.py:246
 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:253
+#: ../meld/preferences.py:248
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Co_mmit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Commit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:129
 msgid "Add to VC"
 msgstr "Engadir a CV"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add _Binary"
 msgstr "Engadir _binario"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add binary to VC"
 msgstr "Engadir binario a CV"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
 msgid "Remove from VC"
-msgstr "Eliminar de CV"
+msgstr "Retirar de CV"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "_Resolved"
 msgstr "Soluciona_do"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "Mark as resolved for VC"
 msgstr "Marcar como solucionado para o CV"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
 msgid "Revert to original"
 msgstr "Reverter ao orixinal"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:134
 msgid "Delete locally"
-msgstr "Borrar localmente"
+msgstr "Eliminar localmente"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "_Flatten"
 msgstr "Apl_anar"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "Flatten directories"
 msgstr "Rasar cartafoles"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:139
 msgid "_Modified"
 msgstr "_Modificado"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "Show normal"
 msgstr "Mostrar normal"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Non _VC"
 msgstr "Sen C_V"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Show unversioned files"
 msgstr "Mostrar ficheiros sen versiÃn"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Show ignored files"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:319
+#: ../meld/vcview.py:192 ../meld/vcview.py:325
 msgid "Location"
 msgstr "LocalizaciÃn"
 
-#: ../meld/vcview.py:187
+#: ../meld/vcview.py:193
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:188
+#: ../meld/vcview.py:194
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:189
+#: ../meld/vcview.py:195
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ../meld/vcview.py:190
+#: ../meld/vcview.py:196
 msgid "Options"
 msgstr "OpciÃns"
 
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:255
 msgid "Choose one Version Control"
 msgstr "Escoller un control de versiÃns"
 
-#: ../meld/vcview.py:250
+#: ../meld/vcview.py:256
 msgid "Only one Version Control in this directory"
 msgstr "SÃ control de versiÃns neste cartafol"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:269
 #, python-format
 msgid "%s Not Installed"
 msgstr "%s non està instalado"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
+#: ../meld/vcview.py:273
 msgid "Invalid Repository"
 msgstr "O repositorio non à vÃlido"
 
-#: ../meld/vcview.py:276
+#: ../meld/vcview.py:282
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:319
+#: ../meld/vcview.py:325
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:363
+#: ../meld/vcview.py:369
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:407
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Obtendo as diferenzas"
 
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:415
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Aplicando o parche"
 
-#: ../meld/vcview.py:511
+#: ../meld/vcview.py:517
 msgid "Select some files first."
 msgstr "Antes seleccione algÃns ficheiros."
 
-#: ../meld/vcview.py:584
+#: ../meld/vcview.py:590
 #, python-format
 msgid ""
 "\n"
@@ -1475,26 +1481,26 @@ msgid ""
 "                    "
 msgstr ""
 "\n"
-"                    Produciuse un fallo ao invocar a 'patch'.\n"
+"                    Produciuse un erro 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"
+"                    EnvÃe un informe de fallo por correo electrÃnico a:\n"
 "                    meld-list gnome org\n"
 "                    \n"
 "                    Contendo a seguinte informaciÃn:\n"
 "                    \n"
-"                    - meld versiÃn: Â%sÂ\n"
+"                    - versiÃn de meld: Â%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"
+"                    - orde (patch): Â%sÂ\n"
+"                    (non necesita executala, xa lla fornece\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"
+"                    SubstitÃa 'X.Y.Z', pola versiÃn real para o\n"
+"                    software de control de cÃdigo que usa vostede.\n"
 "                    "
 
 #: ../meld/ui/findbar.py:140
@@ -1508,15 +1514,15 @@ msgstr ""
 
 #: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
-msgstr "_Buscar..."
+msgstr "E_xaminar..."
 
 #: ../meld/ui/historyentry.py:301
 msgid "Path"
-msgstr "CamiÃo"
+msgstr "Ruta"
 
 #: ../meld/ui/historyentry.py:302
 msgid "Path to file"
-msgstr "CamiÃo ao ficheiro"
+msgstr "Ruta ao ficheiro"
 
 #: ../meld/ui/historyentry.py:303
 msgid "Pop up a file selector to choose a file"
@@ -1532,15 +1538,19 @@ msgstr "Seleccionar ficheiro"
 
 #: ../meld/ui/notebooklabel.py:60
 msgid "Close tab"
-msgstr "Pechar o separador"
+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"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
+"Not present"
 msgstr ""
-"Ignored:Unversioned:::Erro::Novos engadidos:Modificados:<b>Conflito</b>:"
-"Eliminadas:Que faltan"
+"Ignored:Unversioned:::Erro::Novas adiciÃns:Modificados:<b>Conflito</b>:"
+"Retiradas:Que faltan"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]