[meld] Updated Galician translations

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

commit ad7092f2ed90d41690021f575b21e113e1227167
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Thu Dec 27 00:57:51 2012 +0100

    Updated Galician translations

 po/gl.po |  572 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 304 insertions(+), 268 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 13b7e5e..1c194b6 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-11-11 19:03+0100\n"
-"PO-Revision-Date: 2012-11-11 19:09+0200\n"
+"POT-Creation-Date: 2012-12-27 00:55+0100\n"
+"PO-Revision-Date: 2012-12-27 00:57+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -24,11 +24,11 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../bin/meld:104
+#: ../bin/meld:113
 msgid "Cannot import: "
 msgstr "Non à posÃbel importar: "
 
-#: ../bin/meld:107
+#: ../bin/meld:116
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld require %s ou superior."
@@ -57,7 +57,7 @@ msgstr "Editar lista"
 msgid "Active"
 msgstr "Activo"
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:165
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:200
 msgid "Name"
 msgstr "Nome"
 
@@ -69,7 +69,7 @@ msgstr "PatrÃn"
 msgid "Add new filter"
 msgstr "Engadir novo filtro"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:163
 msgid "_Add"
 msgstr "Eng_adir"
 
@@ -77,7 +77,7 @@ msgstr "Eng_adir"
 msgid "Remove selected filter"
 msgstr "Retirar o filtro seleccionado"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:130
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:164
 msgid "_Remove"
 msgstr "_Retirar"
 
@@ -98,26 +98,35 @@ msgid "Move _Down"
 msgstr "_Baixar"
 
 #: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Gardar os ficheiros modificados?"
+msgid "Save changes to documents before closing?"
+msgstr "Desexa gardar cambios nos documentos antes de gardar?"
 
 #: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
-msgstr ""
-"AlgÃns ficheiros foron modificados.\n"
-"Cales quere gardar?"
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Se non os garda, os seus cambios perderanse permanentemente."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without saving"
+msgstr "Pechar _sen gardar"
 
 #: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Rexeitar os cambios"
+msgid "_Cancel"
+msgstr "_Cancelar"
 
 #: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "Gardar os _seleccionados"
+msgid "_Save"
+msgstr "_Gardar"
+
+#: ../data/ui/filediff.ui.h:6
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Este ficheiro non se pode sobrescribir. Pode premer aquà para desbloquear "
+"este ficheiro e facer cambios de todas formas, aÃnda asà os cambios debe "
+"gardalos nun ficheiro novo."
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:127
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
 msgid "_Replace"
 msgstr "SubstituÃ_r"
 
@@ -403,47 +412,47 @@ msgstr "Rexistros anteriores"
 msgid "Log Message"
 msgstr "Mensaxe de rexistro"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Comparar"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
 msgid "Compare selected"
 msgstr "Comparar o seleccionado"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:234
 msgid "Copy _Left"
 msgstr "Copiar à _esquerda"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:234
 msgid "Copy to left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:235
 msgid "Copy _Right"
 msgstr "Copiar à _dereita"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:235
 msgid "Copy to right"
 msgstr "Copiar à dereita"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:236
 msgid "Delete selected"
 msgstr "Eliminar o seleccionado"
 
-#: ../meld/dirdiff.py:234 ../meld/filediff.py:1217
+#: ../meld/dirdiff.py:237 ../meld/filediff.py:1247
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:237
 msgid "Hide selected"
 msgstr "Ocultar o seleccionado"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:241
 msgid "Ignore filename case"
 msgstr "Ignorar maiÃsculas e minÃsculas do nome do ficheiro"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:241
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -451,35 +460,35 @@ msgstr ""
 "Considerar casos diferentes os nomes de ficheiro que de outro modo serÃan "
 "idÃnticos"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "Same"
 msgstr "Iguais"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "Show identical"
 msgstr "Mostrar idÃnticos"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:243
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:243
 msgid "Show new"
 msgstr "Mostrar novo"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:244
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../meld/dirdiff.py:241 ../meld/vcview.py:138
+#: ../meld/dirdiff.py:244 ../meld/vcview.py:172
 msgid "Show modified"
 msgstr "Mostrar modificados"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:246
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:246
 msgid "Set active filters"
 msgstr "Estabelecer filtros activos"
 
@@ -488,37 +497,37 @@ msgstr "Estabelecer filtros activos"
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:511 ../meld/dirdiff.py:530 ../meld/vcview.py:327
-#: ../meld/vcview.py:351
+#: ../meld/dirdiff.py:521 ../meld/dirdiff.py:540 ../meld/vcview.py:370
+#: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:629
+#: ../meld/dirdiff.py:639
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:633
+#: ../meld/dirdiff.py:644
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ProducÃronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:634
+#: ../meld/dirdiff.py:645
 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:636
+#: ../meld/dirdiff.py:647
 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:638
+#: ../meld/dirdiff.py:649
 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:640
+#: ../meld/dirdiff.py:651
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -527,17 +536,17 @@ msgstr ""
 "sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
 "ficheiros non estÃn visÃbeis:"
 
-#: ../meld/dirdiff.py:651
+#: ../meld/dirdiff.py:662
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "Â%s agochado por Â%sÂ"
 
-#: ../meld/dirdiff.py:676 ../meld/filediff.py:980 ../meld/filediff.py:1221
-#: ../meld/vcview.py:573 ../meld/vcview.py:615
+#: ../meld/dirdiff.py:687 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/vcview.py:620 ../meld/vcview.py:662
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -546,7 +555,7 @@ msgstr ""
 "Â%s existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:733
+#: ../meld/dirdiff.py:726
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -557,7 +566,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:751 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:744 ../meld/vcview.py:594
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -566,7 +575,7 @@ msgstr ""
 "Â%s à un cartafol.\n"
 "Retirar recursivamente?"
 
-#: ../meld/dirdiff.py:758 ../meld/vcview.py:552
+#: ../meld/dirdiff.py:751 ../meld/vcview.py:599
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -577,210 +586,210 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:851
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:852
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:845
+#: ../meld/dirdiff.py:853
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:854
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i dÃa"
 msgstr[1] "%i dÃas"
 
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:855
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:856
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:849
+#: ../meld/dirdiff.py:857
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:228
 msgid "Format as patch..."
 msgstr "Formatar o parche comoâ"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:228
 msgid "Create a patch using differences between files"
 msgstr "Crear un parche usando as diferenzas entre os ficheiros"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:229
 msgid "Previous conflict"
 msgstr "Conflito anterior"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:229
 msgid "Go to the previous conflict"
 msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:230
 msgid "Next conflict"
 msgstr "Seguinte conflito"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:230
 msgid "Go to the next conflict"
 msgstr "Ir ao seguinte conflito"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:231
 msgid "Push to left"
 msgstr "Empurrar à esquerda"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:231
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual à esquerda"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:232
 msgid "Push to right"
 msgstr "Empurrar à dereita"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:232
 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:221
+#: ../meld/filediff.py:234
 msgid "Pull from left"
 msgstr "Traer desde à esquerda"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:234
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde à esquerda"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:235
 msgid "Pull from right"
 msgstr "Traer desde à dereita"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:235
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde à dereita"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:236
 msgid "Copy above left"
 msgstr "Copiar por enriba da esquerda"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:236
 msgid "Copy change above the left chunk"
 msgstr "Copiar o cambio por enriba da parte esquerda"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:237
 msgid "Copy below left"
 msgstr "Copiar por debaixo da esquerda"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:237
 msgid "Copy change below the left chunk"
 msgstr "Copiar o cambio por embaixo da parte esquerda"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:238
 msgid "Copy above right"
 msgstr "Copiar por enriba da dereita"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:238
 msgid "Copy change above the right chunk"
 msgstr "Copiar o cambio por enriba da parte dereita"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:239
 msgid "Copy below right"
 msgstr "Copiar por debaixo da dereita"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:239
 msgid "Copy change below the right chunk"
 msgstr "Copiar o cambio por embaixo da parte dereita"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:240
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:240
 msgid "Delete change"
 msgstr "Eliminar o cambio"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:241
 msgid "Merge all changes from left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:241
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:242
 msgid "Merge all changes from right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:242
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:243
 msgid "Merge all non-conflicting"
 msgstr "Combinar todos os cambios non conflitivos"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:243
 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:231
+#: ../meld/filediff.py:244
 msgid "Cycle through documents"
 msgstr "Cambiar entre documentos"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:244
 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:235
+#: ../meld/filediff.py:248
 msgid "Lock scrolling"
 msgstr "Bloquear o desprazamento"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:249
 msgid "Lock scrolling of all panes"
 msgstr "Bloquear o desprazamento de todos os paneis"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:354
+#: ../meld/filediff.py:365
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:354
+#: ../meld/filediff.py:365
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:356
+#: ../meld/filediff.py:367
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:683
+#: ../meld/filediff.py:703
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -789,42 +798,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:968
+#: ../meld/filediff.py:998
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer nÃmero de paneis"
 
-#: ../meld/filediff.py:974
+#: ../meld/filediff.py:1004
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:998 ../meld/filediff.py:1008 ../meld/filediff.py:1021
-#: ../meld/filediff.py:1027
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
 msgid "Could not read file"
 msgstr "Non foi posÃbel ler o ficheiro"
 
-#: ../meld/filediff.py:999
+#: ../meld/filediff.py:1029
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:1009
+#: ../meld/filediff.py:1039
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:1022
+#: ../meld/filediff.py:1052
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non està na codificaciÃn: %s"
 
-#: ../meld/filediff.py:1053
+#: ../meld/filediff.py:1083
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1208
+#: ../meld/filediff.py:1238
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -832,15 +841,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:1214
+#: ../meld/filediff.py:1244
 msgid "Files are identical"
 msgstr "Os ficheiros son idÃnticos"
 
-#: ../meld/filediff.py:1224
+#: ../meld/filediff.py:1254
 msgid "Show without filters"
 msgstr "Mostrar sen filtros"
 
-#: ../meld/filediff.py:1348
+#: ../meld/filediff.py:1378
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -849,7 +858,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1361
+#: ../meld/filediff.py:1391
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -860,12 +869,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1370
+#: ../meld/filediff.py:1400
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Escolla un nome para o bÃfer %i."
 
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1416
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -876,7 +885,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1401
+#: ../meld/filediff.py:1432
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -885,109 +894,109 @@ msgstr ""
 "Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1458
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
-msgstr ""
-"Ao recargar rexeitarà os cambios en:\n"
-"%s\n"
-"\n"
-"Non à posÃbel desfacer esta operaciÃn."
+#: ../meld/filediff.py:1497
+msgid "Save changes to documents before reloading?"
+msgstr "Desexa gardar cambios nos documentos antes de recargar?"
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:53
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Combinando os ficheiros"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:93
 msgid "wrong number of arguments supplied to --diff"
 msgstr "nÃmero incorrecto de argumentos proporcionado a --diff"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:97
 msgid "Start with an empty window"
 msgstr "Comezar cunha xanela baleira"
 
-#: ../meld/meldapp.py:158 ../meld/meldapp.py:159 ../meld/meldapp.py:161
+#: ../meld/meldapp.py:98 ../meld/meldapp.py:99 ../meld/meldapp.py:101
 msgid "file"
 msgstr "ficheiro"
 
-#: ../meld/meldapp.py:158 ../meld/meldapp.py:160 ../meld/meldapp.py:161
+#: ../meld/meldapp.py:98 ../meld/meldapp.py:100 ../meld/meldapp.py:101
 msgid "dir"
 msgstr "cartafol"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:98
 msgid "Start a version control comparison"
 msgstr "Comezar unha comparaciÃn no control de versiÃns"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:99
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Comezar unha comparaciÃn de ficheiros a 2 ou 3 bandas"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Comezar unha comparaciÃn de cartafol a 2 ou 3 bandas"
 
-#: ../meld/meldapp.py:161
+#: ../meld/meldapp.py:101
 msgid "Start a comparison between file and dir/file"
 msgstr "Comezar unha comparaciÃn entre ficheiro e dir/file"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:107
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld à un ferramenta de comparaciÃn de ficheiros e cartafoles."
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:110
 msgid "Set label to use instead of file name"
 msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
 
-#: ../meld/meldapp.py:172
+#: ../meld/meldapp.py:112
 msgid "Open a new tab in an already running instance"
 msgstr "Abre unha nova lapela nunha instancia en execuciÃn"
 
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:114
 msgid "Automatically compare all differing files on startup"
 msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:116
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:119
 msgid "Set the target file for saving a merge result"
 msgstr "Definir o ficheiro de destino para gardar o resultado da combinaciÃn"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:121
 msgid "Automatically merge files"
 msgstr "Combinar ficheiros automaticamente"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:124
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr ""
+"Cargar unha comparaciÃn gardada desde un ficheiro de comparaciÃn de Meld"
+
+#: ../meld/meldapp.py:127
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 "Crea unha lapela coas diferenzas de ata 3 directorios ou ficheiros "
 "fornecidos."
 
-#: ../meld/meldapp.py:187
+#: ../meld/meldapp.py:130
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "demasiados argumentos (buscÃbanse 0-3, obtivÃronse %d)"
 
-#: ../meld/meldapp.py:189
+#: ../meld/meldapp.py:132
 msgid "can't auto-merge less than 3 files"
 msgstr "non à posÃbel autocombinar menos de 3 ficheiros"
 
-#: ../meld/meldapp.py:191
+#: ../meld/meldapp.py:134
 msgid "can't auto-merge directories"
 msgstr "non à posÃbel autocombinar cartafoles"
 
-#: ../meld/meldapp.py:197
+#: ../meld/meldapp.py:140
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Erro de D-Bus; as comparaciÃns abriranse nunha nova xanela."
 
+#: ../meld/meldapp.py:158
+msgid "Error reading saved comparison file"
+msgstr "Produciuse un erro ao ler o ficheiro de comparaciÃn gardado"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:84
+#: ../meld/meldbuffer.py:89
 msgid "<unnamed>"
 msgstr "<sen nome>"
 
@@ -995,247 +1004,255 @@ msgstr "<sen nome>"
 msgid "untitled"
 msgstr "sen tÃtulo"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:116
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:117
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:117
 msgid "Start a new comparison"
 msgstr "Comezar unha nova comparaciÃn"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:118
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:120
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:121
 msgid "Quit the program"
 msgstr "SaÃr do programa"
 
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:123
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:124
 msgid "Undo the last action"
 msgstr "Desfacer a Ãltima acciÃn"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:125
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãltima acciÃn desfeita"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:126
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:127
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:128
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:129
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:130
 msgid "Find Ne_xt"
 msgstr "Buscar a _seguinte"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:130
 msgid "Search forwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:131
 msgid "Find _Previous"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:131
 msgid "Search backwards for the same text"
 msgstr "Buscar cara a adiante o mesmo texto"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:132
 msgid "Find and replace text"
 msgstr "Buscar e substituÃr texto"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:133
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:133
 msgid "Configure the application"
 msgstr "Configurar o aplicativo"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:135
 msgid "_Changes"
 msgstr "_Cambios"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:136
 msgid "Next change"
 msgstr "Seguinte cambio"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:136
 msgid "Go to the next change"
 msgstr "Ir ao seguinte cambio"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:137
 msgid "Previous change"
 msgstr "Anterior cambio"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:137
 msgid "Go to the previous change"
 msgstr "Ir ao cambio anterior"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:138
 msgid "Open externally"
 msgstr "Abrir externamente"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:138
 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:135
+#: ../meld/meldwindow.py:140
 msgid "_View"
 msgstr "_Ver"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:141
 msgid "File status"
 msgstr "Estado do ficheiro"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:142
 msgid "Version status"
 msgstr "Estado da versiÃn"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:143
 msgid "File filters"
 msgstr "Filtros de ficheiro"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:144
 msgid "Stop the current action"
 msgstr "Deter a acciÃn actual"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:145
 msgid "Refresh the view"
 msgstr "Actualizar a vista"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:146
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:146
 msgid "Reload the comparison"
 msgstr "Recargar a comparaciÃn"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:148
 msgid "_Tabs"
 msgstr "_Lapelas"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:149
 msgid "_Previous Tab"
 msgstr "_Anterior"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:149
 msgid "Activate previous tab"
 msgstr "Ir à lapela anterior"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:150
 msgid "_Next Tab"
 msgstr "Segui_nte"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:150
 msgid "Activate next tab"
 msgstr "Activar a seguinte lapela"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:151
 msgid "Move Tab _Left"
 msgstr "Copiar à esquerda"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:151
 msgid "Move current tab to left"
 msgstr "Mover a lapela actual à esquerda"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:152
 msgid "Move Tab _Right"
 msgstr "Copiar à dereita"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:152
 msgid "Move current tab to right"
 msgstr "Mover a lapela actual à dereita"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:154
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:155
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:155
 msgid "Open the Meld manual"
 msgstr "Abrir o manual do Meld"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:156
 msgid "Report _Bug"
 msgstr "_Informar dun fallo"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:156
 msgid "Report a bug in Meld"
 msgstr "Informe dun fallo en Meld"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:157
 msgid "About this program"
 msgstr "Sobre este programa"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:160
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:160
 msgid "View the comparison in full screen"
 msgstr "Ver a comparaciÃn a pantalla completa"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:161
 msgid "_Toolbar"
 msgstr "Barra de ferramen_tas"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:161
 msgid "Show or hide the toolbar"
 msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:162
 msgid "_Statusbar"
 msgstr "Barra de e_stado"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:162
 msgid "Show or hide the statusbar"
 msgstr "Mostrar ou ocultar a barra de estado"
 
-#: ../meld/meldwindow.py:547
+#: ../meld/meldwindow.py:170
+msgid "Open Recent"
+msgstr "Abrir recentes"
+
+#: ../meld/meldwindow.py:171
+msgid "Open recent files"
+msgstr "Abrir ficheiros recentes"
+
+#: ../meld/meldwindow.py:569
 msgid "Switch to this tab"
 msgstr "Cambiar a esta lapela"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:652
+#: ../meld/meldwindow.py:674
 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:178
+#: ../meld/misc.py:180
 msgid "[None]"
 msgstr "[NingÃn]"
 
-#: ../meld/patchdialog.py:123
+#: ../meld/patchdialog.py:124
 msgid "Save Patch As..."
 msgstr "Gardar parche como..."
 
@@ -1311,157 +1328,153 @@ msgstr "Espazo en branco ao inicio\t0\t^[ \\t\\r\\f\\v]*\n"
 msgid "Script comment\t0\t#.*"
 msgstr "Comentario de script\t0\t#.*"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:161
 msgid "Co_mmit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:161
 msgid "Commit"
 msgstr "Remitir"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:162
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:162
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:163
 msgid "Add to VC"
 msgstr "Engadir a CV"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:164
 msgid "Remove from VC"
 msgstr "Retirar de CV"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:165
 msgid "_Resolved"
 msgstr "Soluciona_do"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:165
 msgid "Mark as resolved for VC"
 msgstr "Marcar como solucionado para o CV"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:166
 msgid "Revert to original"
 msgstr "Reverter ao orixinal"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:167
 msgid "Delete locally"
 msgstr "Eliminar localmente"
 
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:171
 msgid "_Flatten"
 msgstr "Apl_anar"
 
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:171
 msgid "Flatten directories"
 msgstr "Rasar cartafoles"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:172
 msgid "_Modified"
 msgstr "_Modificado"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:173
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:173
 msgid "Show normal"
 msgstr "Mostrar normal"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:174
 msgid "Non _VC"
 msgstr "Sen C_V"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:174
 msgid "Show unversioned files"
 msgstr "Mostrar ficheiros sen versiÃn"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:175
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:175
 msgid "Show ignored files"
 msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/vcview.py:191 ../meld/vcview.py:323
+#: ../meld/vcview.py:226 ../meld/vcview.py:366
 msgid "Location"
 msgstr "LocalizaciÃn"
 
-#: ../meld/vcview.py:192
+#: ../meld/vcview.py:227
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:228
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:229
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ../meld/vcview.py:195
+#: ../meld/vcview.py:230
 msgid "Options"
 msgstr "OpciÃns"
 
-#: ../meld/vcview.py:253
+#: ../meld/vcview.py:292
 msgid "Choose one Version Control"
 msgstr "Escoller un control de versiÃns"
 
-#: ../meld/vcview.py:254
+#: ../meld/vcview.py:293
 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:267
+#: ../meld/vcview.py:306
 #, 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:271
+#: ../meld/vcview.py:310
 msgid "Invalid Repository"
 msgstr "O repositorio non à vÃlido"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:319
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:323
+#: ../meld/vcview.py:366
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:367
+#: ../meld/vcview.py:409
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../meld/vcview.py:405
+#: ../meld/vcview.py:441
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Obtendo as diferenzas"
 
-#: ../meld/vcview.py:419
+#: ../meld/vcview.py:454
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Aplicando o parche"
 
-#: ../meld/vcview.py:523
-msgid "Select some files first."
-msgstr "Antes seleccione algÃns ficheiros."
-
-#: ../meld/vcview.py:566
+#: ../meld/vcview.py:613
 msgid "Patch tool not found"
 msgstr "Ferramenta de parches non atopada"
 
-#: ../meld/vcview.py:567
+#: ../meld/vcview.py:614
 #, python-format
 msgid ""
 "Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1470,25 +1483,24 @@ msgstr ""
 "Meld precisa que estea instalada a ferramenta <i>patch</i> para levar a cabo "
 "comparaciÃns en repositorios %s. Instale <i>patch</i> e tÃnteo de novo."
 
-#: ../meld/vcview.py:607
+#: ../meld/vcview.py:654
 msgid "Error fetching original comparison file"
 msgstr "Produciuse un erro ao obter o ficheiro de comparaciÃn orixinal"
 
-#: ../meld/vcview.py:608
+#: ../meld/vcview.py:655
 msgid ""
 "Meld couldn't obtain the original version of your comparison file. If you "
 "are using the most recent version of Meld, please report a bug, including as "
 "many details as possible."
 msgstr ""
 "Meld non puido obter a versiÃn orixinal do seu ficheiro de comparaciÃn. Se "
-"està usando a versiÃn Ãltima de Meld, informe do erro, incluÃndo os "
-"detalles."
+"està usando a versiÃn Ãltima de Meld, informe do erro, incluÃndo os detalles."
 
-#: ../meld/vcview.py:616
+#: ../meld/vcview.py:663
 msgid "Report a bug"
 msgstr "Informar dun fallo"
 
-#: ../meld/ui/findbar.py:143
+#: ../meld/ui/findbar.py:145
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1497,27 +1509,27 @@ msgstr ""
 "Erro na expresiÃn regular\n"
 "Â%sÂ"
 
-#: ../meld/ui/historyentry.py:294
+#: ../meld/ui/historyentry.py:296
 msgid "_Browse..."
 msgstr "E_xaminar..."
 
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:304
 msgid "Path"
 msgstr "Ruta"
 
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:305
 msgid "Path to file"
 msgstr "Ruta ao ficheiro"
 
-#: ../meld/ui/historyentry.py:304
+#: ../meld/ui/historyentry.py:306
 msgid "Pop up a file selector to choose a file"
 msgstr "Mostrar un selector para escoller un ficheiro"
 
-#: ../meld/ui/historyentry.py:442
+#: ../meld/ui/historyentry.py:444
 msgid "Select directory"
 msgstr "Seleccionar cartafol"
 
-#: ../meld/ui/historyentry.py:446
+#: ../meld/ui/historyentry.py:448
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
@@ -1534,7 +1546,7 @@ msgstr ""
 "Ignorado:Non Versionado:::Erro::Novas adiciÃns:Modificado:Conflito:Eliminado:"
 "Que falta:Non presente"
 
-#: ../meld/vc/cvs.py:161
+#: ../meld/vc/cvs.py:165
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1545,11 +1557,41 @@ msgstr ""
 "O patrÃn era Â%sÂ\n"
 "O erro foi Â%sÂ"
 
-#: ../meld/vc/git.py:152
+#: ../meld/vc/git.py:181
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo cambiado desde %s a %s"
 
+#~ msgid "Save modified files?"
+#~ msgstr "Gardar os ficheiros modificados?"
+
+#~ msgid ""
+#~ "Some files have been modified.\n"
+#~ "Which ones would you like to save?"
+#~ msgstr ""
+#~ "AlgÃns ficheiros foron modificados.\n"
+#~ "Cales quere gardar?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Rexeitar os cambios"
+
+#~ msgid "_Save Selected"
+#~ msgstr "Gardar os _seleccionados"
+
+#~ msgid ""
+#~ "Reloading will discard changes in:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You cannot undo this operation."
+#~ msgstr ""
+#~ "Ao recargar rexeitarà os cambios en:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Non à posÃbel desfacer esta operaciÃn."
+
+#~ msgid "Select some files first."
+#~ msgstr "Antes seleccione algÃns ficheiros."
+
 #~ msgid "Add _Binary"
 #~ msgstr "Engadir _binario"
 
@@ -1627,9 +1669,6 @@ msgstr "Modo cambiado desde %s a %s"
 #~ msgid "Local copy against same remote revision"
 #~ msgstr "Copia local contra a mesma revisiÃn remota"
 
-#~ msgid "Open selected"
-#~ msgstr "Abrir seleccionados"
-
 #~ msgid "Copyright  2002-2009 Stephen Kennedy"
 #~ msgstr "Copyright  2002-2009 Stephen Kennedy"
 
@@ -1915,9 +1954,6 @@ msgstr "Modo cambiado desde %s a %s"
 #~ msgid "_Logo"
 #~ msgstr "_Logotipo"
 
-#~ msgid "_Save"
-#~ msgstr "_Gardar"
-
 #~ msgid "_Stop"
 #~ msgstr "_Deter"