[meld] Updated Galician translations

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

commit e46a0c05e1f2a12335e20a36d7e2a37a34271144
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Sat Mar 24 00:09:44 2012 +0100

    Updated Galician translations

 po/gl.po |  673 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 339 insertions(+), 334 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 84e0b6e..fdaf0ae 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,14 +6,14 @@
 # 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.
+# Fran Dieguez <frandieguez gnome org>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2011-09-25 13:19+0200\n"
-"PO-Revision-Date: 2011-09-25 13:20+0200\n"
+"POT-Creation-Date: 2012-03-24 00:09+0100\n"
+"PO-Revision-Date: 2012-03-24 00:09+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -24,78 +24,78 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../bin/meld:96
+#: ../bin/meld:97
 msgid "Cannot import: "
 msgstr "Non à posÃbel importar: "
 
-#: ../bin/meld:99
+#: ../bin/meld:100
 #, 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:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "Visualizador Diff"
 
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "Meld"
-
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:3
 msgid "Meld Diff Viewer"
 msgstr "Visualizador Diff Meld"
 
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "Compare e combine os seus ficheiros"
+
 #: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "Activo"
+msgid "Editable List"
+msgstr "Editar lista"
 
 #: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "Engadir novo filtro"
+msgid "Active"
+msgstr "Activo"
 
-#: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "Editar lista"
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
+msgid "Name"
+msgstr "Nome"
 
 #: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "_Baixar"
+msgid "Pattern"
+msgstr "PatrÃn"
 
 #: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "S_ubir"
+msgid "Add new filter"
+msgstr "Engadir novo filtro"
 
-#: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "Mover o elemento cara abaixo"
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "Eng_adir"
 
 #: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "Mover o elemento cara arriba"
+msgid "Remove selected filter"
+msgstr "Eliminar o filtro seleccionado"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:156
-msgid "Name"
-msgstr "Nome"
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "Elimina_r"
 
 #: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "PatrÃn"
+msgid "Move item up"
+msgstr "Mover o elemento cara arriba"
 
 #: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "Eliminar o filtro seleccionado"
+msgid "Move _Up"
+msgstr "S_ubir"
 
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:121
-msgid "_Add"
-msgstr "Eng_adir"
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "Mover o elemento cara abaixo"
 
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:123
-msgid "_Remove"
-msgstr "Elimina_r"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "_Baixar"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
@@ -117,109 +117,109 @@ msgstr "_Rexeitar os cambios"
 msgid "_Save Selected"
 msgstr "Gardar os _seleccionados"
 
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "E_xpresiÃn regular"
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "SubstituÃ_r"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "SubstituÃr _todo"
 
 #: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "SubstituÃr _con"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "Pa_labra completa"
+msgid "_Next"
+msgstr "Segui_nte"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "Diferenciar _maiÃsculas de minÃsculas"
+msgid "_Search for"
+msgstr "Bu_scar por:"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "Segui_nte"
+msgid "Replace _With"
+msgstr "SubstituÃr _con"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "_Match Case"
+msgstr "Diferenciar _maiÃsculas de minÃsculas"
 
-#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "SubstituÃ_r"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "Pa_labra completa"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "Bu_scar por:"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "Escoller ficheiros"
+msgid "Regular E_xpression"
+msgstr "E_xpresiÃn regular"
 
 #: ../data/ui/meldapp.ui.h:2
 msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2010 Kai Willadsen"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
 msgstr ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2010 Kai Willadsen"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "Cartafol"
+msgid "translator-credits"
+msgstr "Fran Dieguez <frandieguez gnome org>, 2011."
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "Escoller ficheiros"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "ComparaciÃn a _tres bandas"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
 msgid "Mine"
 msgstr "Meu"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
 msgid "Original"
 msgstr "Orixinal"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
 msgid "Other"
 msgstr "Outro"
 
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "Seleccionar cartafol VC"
-
 #: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "ComparaciÃn _de cartafoles"
-
-#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "ComparaciÃn de _ficheiros"
 
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "ComparaciÃn _de cartafoles"
+
 #: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "ComparaciÃn a _tres bandas"
+msgid "Select VC Directory"
+msgstr "Seleccionar cartafol VC"
 
 #: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "Navegador do Control de _versiÃns"
+msgid "Directory"
+msgstr "Cartafol"
 
 #: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr "Fran Dieguez <frandieguez gnome org>, 2011."
+msgid "_Version Control Browser"
+msgstr "Navegador do Control de _versiÃns"
 
 #: ../data/ui/patch-dialog.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "Copiar ao portapapeis"
-
-#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create Patch"
 msgstr "Crear parche"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create a patch"
 msgstr "Crear un parche"
 
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "Usar as diferencias entre:"
+
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
 msgstr "Paneis esquerdo e do medio"
@@ -229,90 +229,78 @@ msgid "Middle and right panes"
 msgstr "Paneis dereito e do medio"
 
 #: ../data/ui/patch-dialog.ui.h:6
-msgid "Use differences between:"
-msgstr "Usar as diferencias entre:"
-
-#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "DirecciÃn _inversa do parche"
 
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "Copiar ao portapapeis"
+
 #: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "Pantalla"
+msgid "Meld Preferences"
+msgstr "Preferencias de Meld"
 
 #: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "Non _dividir as palabras en dÃas liÃas"
+msgid "Font"
+msgstr "Tipo de letra"
 
 #: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "Orde do edito_r:"
+msgid "_Use the system fixed width font"
+msgstr "Usar o tipo de letra de ancho fixo do sistema"
 
 #: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "Editor"
+msgid "_Editor font:"
+msgstr "Tipo de letra do _editor: "
 
 #: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "Activar o a_xuste de texto"
+msgid "Display"
+msgstr "Pantalla"
 
 #: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "CodificaciÃn"
+msgid "_Tab width:"
+msgstr "Ancho do _tabulador:"
 
 #: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "Editor externo"
+msgid "_Insert spaces instead of tabs"
+msgstr "Insertar e_spazos no lugar de tabuladores"
 
 #: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "Filtros de ficheiro"
+msgid "Enable text _wrapping"
+msgstr "Activar o a_xuste de texto"
 
 #: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "Tipo de letra"
+msgid "Do not _split words over two lines"
+msgstr "Non _dividir as palabras en dÃas liÃas"
 
 #: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Ignorar os cambios que insiran ou borren liÃas en branco"
+msgid "Show _line numbers"
+msgstr "Mostrar os nuÌmeros de _liÃa"
 
 #: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "Ignorar as ligazÃns simbÃlicas"
+msgid "Show w_hitespace"
+msgstr "Mostrar espazos en _branco"
 
 #: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "Cargando"
+msgid "Use s_yntax highlighting"
+msgstr "Usar resaltado de _sintaxis"
 
 #: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "Preferencias de Meld"
+msgid "External editor"
+msgstr "Editor externo"
 
 #: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "Mostrar os nuÌmeros de _liÃa"
+msgid "Use _default system editor"
+msgstr "Usar o editor pre_definido do sistema"
 
 #: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "Mostrar espazos en _branco"
+msgid "Edito_r command:"
+msgstr "Orde do edito_r:"
 
 #: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "Filtros de texto"
+msgid "Editor"
+msgstr "Editor"
 
 #: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "Usar o editor pre_definido do sistema"
-
-#: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "Usar resaltado de _sintaxis"
-
-#: ../data/ui/preferences.ui.h:19
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Ao cargar, tentar en orde estas codificaciÃns. (p.ex. utf8, iso8859)"
-
-#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -322,7 +310,15 @@ msgstr ""
 "cartafoles polo nome. Cada patrÃn à unha lista de comodÃns de shell "
 "separados por espazos."
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Ignorar as ligazÃns simbÃlicas"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "Filtros de ficheiro"
+
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -336,170 +332,154 @@ msgstr ""
 "Se a expresiÃn contÃn grupos, sà o grupos son substituÃdos. Ver o manual de "
 "usuario para mÃis detalles."
 
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Ignorar os cambios que insiran ou borren liÃas en branco"
+
 #: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "Tipo de letra do _editor: "
+msgid "Text Filters"
+msgstr "Filtros de texto"
 
 #: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "Insertar e_spazos no lugar de tabuladores"
+msgid "Loading"
+msgstr "Cargando"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "_Tab width:"
-msgstr "Ancho do _tabulador:"
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "Ao cargar, tentar en orde estas codificaciÃns. (p.ex. utf8, iso8859)"
 
 #: ../data/ui/preferences.ui.h:25
-msgid "_Use the system fixed width font"
-msgstr "Usar o tipo de letra de ancho fixo do sistema"
+msgid "Encoding"
+msgstr "CodificaciÃn"
 
 #: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "Remitir os ficheiros"
+msgid "VC Log"
+msgstr "Rexistro CV"
 
 #: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "OpciÃns de comparaciÃn"
+msgid "Commit Files"
+msgstr "Remitir os ficheiros"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "Data"
+msgid "Previous Logs"
+msgstr "Rexistros anteriores"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "Copia local contra unha revisiÃn remota"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "Copia local contra a mesma revisiÃn remota"
-
-#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "Mensaxe de rexistro"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "Previous Logs"
-msgstr "Rexistros anteriores"
-
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: ../data/ui/vcview.ui.h:9
-msgid "VC Log"
-msgstr "Rexistro CV"
-
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy _Left"
 msgstr "Copiar à _esquerda"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy to left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy _Right"
 msgstr "Copiar à _dereita"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy to right"
 msgstr "Copiar à dereita"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
 msgstr "Borrar o seleccionado"
 
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1146
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1165
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:240
 msgid "Case"
 msgstr "CapitalizaciÃn"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:240
 msgid "Ignore case of entries"
 msgstr "Ignorar maiÃsculas e minÃsculas das entradas"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:241
 msgid "Show identical"
 msgstr "Mostrar idÃnticos"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
 msgid "Show new"
 msgstr "Mostrar novo"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../meld/dirdiff.py:238 ../meld/vcview.py:131
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "Mostrar modificados"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
 msgid "Set active filters"
 msgstr "Estabelecer filtros activos"
 
-#: ../meld/dirdiff.py:357
+#: ../meld/dirdiff.py:362
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:460 ../meld/dirdiff.py:473 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
+#: ../meld/vcview.py:346
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:577
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:581
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ProducÃronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:577
+#: ../meld/dirdiff.py:582
 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:579
+#: ../meld/dirdiff.py:584
 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:581
+#: ../meld/dirdiff.py:586
 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:583
+#: ../meld/dirdiff.py:588
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -508,16 +488,16 @@ msgstr ""
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
 "ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:594
+#: ../meld/dirdiff.py:599
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "Â%s agochado por Â%sÂ"
 
-#: ../meld/dirdiff.py:619 ../meld/filediff.py:1009 ../meld/filediff.py:1150
+#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1169
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:669
+#: ../meld/dirdiff.py:674
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -526,7 +506,7 @@ msgstr ""
 "Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:676
+#: ../meld/dirdiff.py:681
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -537,7 +517,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:694 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:699 ../meld/vcview.py:535
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -546,7 +526,7 @@ msgstr ""
 "Â%s à un cartafol.\n"
 "Eliminar recursivamente?"
 
-#: ../meld/dirdiff.py:701 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:706 ../meld/vcview.py:540
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -557,210 +537,210 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:713
+#: ../meld/dirdiff.py:740
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:714
+#: ../meld/dirdiff.py:741
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:742
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:743
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:744
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:745
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:746
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:294
 msgid "Format as patch..."
 msgstr "Formatar o parche comoâ"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:294
 msgid "Create a patch using differences between files"
 msgstr "Crear un parche usando as diferenzas entre os ficheiros"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:295
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:295
 msgid "Go to the previous conflict"
 msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:296
 msgid "Next conflict"
 msgstr "Seguinte conflito"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:296
 msgid "Go to the next conflict"
 msgstr "Ir ao seguinte conflito"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:297
 msgid "Push to left"
 msgstr "Empurrar à esquerda"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:297
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:298
 msgid "Push to right"
 msgstr "Empurrar à dereita"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:298
 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:304
+#: ../meld/filediff.py:300
 msgid "Pull from left"
 msgstr "Traer desde à esquerda"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:300
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde à esquerda"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:301
 msgid "Pull from right"
 msgstr "Traer desde à dereita"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:301
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde à dereita"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:302
 msgid "Copy above left"
 msgstr "Copiar por enriba da esquerda"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:302
 msgid "Copy change above the left chunk"
 msgstr "Copiar o cambio por enriba da parte esquerda"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:303
 msgid "Copy below left"
 msgstr "Copiar por debaixo da esquerda"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:303
 msgid "Copy change below the left chunk"
 msgstr "Copiar o cambio por embaixo da parte esquerda"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:304
 msgid "Copy above right"
 msgstr "Copiar por enriba da dereita"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:304
 msgid "Copy change above the right chunk"
 msgstr "Copiar o cambio por enriba da parte dereita"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:305
 msgid "Copy below right"
 msgstr "Copiar por debaixo da dereita"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:305
 msgid "Copy change below the right chunk"
 msgstr "Copiar o cambio por embaixo da parte dereita"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:306
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:306
 msgid "Delete change"
 msgstr "Borrar o cambio"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:307
 msgid "Merge all changes from left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:307
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:312
+#: ../meld/filediff.py:308
 msgid "Merge all changes from right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:312
+#: ../meld/filediff.py:308
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:313
+#: ../meld/filediff.py:309
 msgid "Merge all non-conflicting"
 msgstr "Combinar todos os cambios non conflitivos"
 
-#: ../meld/filediff.py:313
+#: ../meld/filediff.py:309
 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:314
+#: ../meld/filediff.py:310
 msgid "Cycle through documents"
 msgstr "Cambiar entre documentos"
 
-#: ../meld/filediff.py:314
+#: ../meld/filediff.py:310
 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:318
+#: ../meld/filediff.py:314
 msgid "Lock scrolling"
 msgstr "Bloquear o desprazamento"
 
-#: ../meld/filediff.py:319
+#: ../meld/filediff.py:315
 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:411
+#: ../meld/filediff.py:396
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:411
+#: ../meld/filediff.py:396
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:413
+#: ../meld/filediff.py:398
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:723
+#: ../meld/filediff.py:722
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -770,46 +750,46 @@ msgstr ""
 "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:810
+#: ../meld/filediff.py:809
 msgid "<unnamed>"
 msgstr "<sen nome>"
 
-#: ../meld/filediff.py:997
+#: ../meld/filediff.py:996
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:1003
+#: ../meld/filediff.py:1002
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:1027 ../meld/filediff.py:1036 ../meld/filediff.py:1048
-#: ../meld/filediff.py:1054
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:1028
+#: ../meld/filediff.py:1027
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:1037
+#: ../meld/filediff.py:1036
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:1049
+#: ../meld/filediff.py:1048
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:1079 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1137
+#: ../meld/filediff.py:1156
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -817,15 +797,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:1143
+#: ../meld/filediff.py:1162
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1172
 msgid "Show without filters"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/filediff.py:1343
+#: ../meld/filediff.py:1361
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -834,7 +814,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1356
+#: ../meld/filediff.py:1374
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -845,12 +825,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1383
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1380
+#: ../meld/filediff.py:1398
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -861,7 +841,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1396
+#: ../meld/filediff.py:1414
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -870,7 +850,7 @@ msgstr ""
 "Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1473
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -888,74 +868,74 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Combinando os ficheiros"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
 msgid "wrong number of arguments supplied to --diff"
 msgstr "nÃmero incorrecto de argumentos proporcionado a --diff"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
 msgid "Start with an empty window"
 msgstr "Comezar cunha xanela baleira"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
 msgid "file"
 msgstr "ficheiro"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
 msgid "dir"
 msgstr "cartafol"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
 msgid "Start a version control comparison"
 msgstr "Comezar unha comparaciÃn no control de versiÃns"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Comezar unha comparaciÃn de ficheiros a 2 ou 3 bandas"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Comezar unha comparaciÃn de cartafol a 2 ou 3 bandas"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
 msgid "Start a comparison between file and dir/file"
 msgstr "Comezar unha comparaciÃn entre ficheiro e dir/file"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld à un ferramenta de comparaciÃn de ficheiros e cartafoles."
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
 msgid "Set label to use instead of file name"
 msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
 msgid "Automatically compare all differing files on startup"
 msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
 msgid "Set the target file for saving a merge result"
 msgstr "Estabelecer o ficheiro de destino para gardar o resultado do cambio"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:179
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 "Crea un separador coas diferenzas dos 3 cartafoles ou ficheiros "
 "proporcionados"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:182
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "demasiados argumentos (buscÃbanse 0-4, obtivÃronse %d)"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
 msgid "can't compare more than three directories"
 msgstr "Non à posÃbel comparar unha mestura de ficheiros e cartafoles."
 
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
 msgid "untitled"
 msgstr "sen tÃtulo"
 
@@ -1211,212 +1191,225 @@ msgstr "etiqueta"
 msgid "pattern"
 msgstr "patrÃn"
 
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
 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:234
 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:236
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr ""
+"Metadatos especÃficos do sistema operativo\t0\t.DS_Store ._* .Spotlight-"
+"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
 #, 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:237
+#: ../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"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
+#: ../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}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:241
+#: ../meld/preferences.py:244
 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:243
+#: ../meld/preferences.py:246
 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:245
+#: ../meld/preferences.py:248
 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:250
 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:249
+#: ../meld/preferences.py:252
 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:251
+#: ../meld/preferences.py:254
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Co_mmit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Commit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:130
 msgid "Add to VC"
 msgstr "Engadir a CV"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add _Binary"
 msgstr "Engadir _binario"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add binary to VC"
 msgstr "Engadir binario a CV"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:132
 msgid "Remove from VC"
 msgstr "Eliminar de CV"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "_Resolved"
 msgstr "Soluciona_do"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "Mark as resolved for VC"
 msgstr "Marcar como solucionado para o CV"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:134
 msgid "Revert to original"
 msgstr "Reverter ao orixinal"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:135
 msgid "Delete locally"
 msgstr "Borrar localmente"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "_Flatten"
 msgstr "Apl_anar"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "Flatten directories"
 msgstr "Rasar cartafoles"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:140
 msgid "_Modified"
 msgstr "_Modificado"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "Show normal"
 msgstr "Mostrar normal"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Non _VC"
 msgstr "Sen C_V"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Show unversioned files"
 msgstr "Mostrar ficheiros sen versiÃn"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Show ignored files"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:186 ../meld/vcview.py:318
 msgid "Location"
 msgstr "LocalizaciÃn"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:187
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:188
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "OpciÃns"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:249
 msgid "Choose one Version Control"
 msgstr "Escoller un control de versiÃns"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:250
 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:246
+#: ../meld/vcview.py:263
 #, 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:250
+#: ../meld/vcview.py:267
 msgid "Invalid Repository"
 msgstr "O repositorio non à vÃlido"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:276
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:318
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:362
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:400
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Obtendo as diferenzas"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:408
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Aplicando o parche"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:510
 msgid "Select some files first."
 msgstr "Antes seleccione algÃns ficheiros."
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:583
 #, python-format
 msgid ""
 "\n"
@@ -1521,6 +1514,18 @@ msgstr ""
 "O patrÃn era Â%sÂ\n"
 "O erro foi Â%sÂ"
 
+#~ msgid "Compare Options"
+#~ msgstr "OpciÃns de comparaciÃn"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "Copia local contra unha revisiÃn remota"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "Copia local contra a mesma revisiÃn remota"
+
 #~ msgid "Open selected"
 #~ msgstr "Abrir seleccionados"