[meld] Updated Galician translations

From: Francisco Diéguez Souto <frandieguez src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Galician translations
Date: Mon, 7 Oct 2013 11:46:25 +0000 (UTC)
commit dd344ab4bf1592c6047d6e9184d93f029b5b2eb2
Author: Fran Diéguez <fran dieguez mabishu com>
Date:   Mon Oct 7 13:46:05 2013 +0200

    Updated Galician translations

 po/gl.po |  668 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 332 insertions(+), 336 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 62ac952..fa73f50 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: 2013-09-23 01:13+0200\n"
-"PO-Revision-Date: 2013-09-23 01:13+0200\n"
+"POT-Creation-Date: 2013-10-07 13:44+0200\n"
+"PO-Revision-Date: 2013-10-07 13:46+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -53,6 +53,86 @@ msgstr "Compare e combine os seus ficheiros"
 msgid "Meld comparison description"
 msgstr "Descrición da comparación do Meld"
 
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Comparar"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Comparar ficheiros seleccionados"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy _Left"
+msgstr "Copiar á _esquerda"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Copiar á esquerda"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy _Right"
+msgstr "Copiar á _dereita"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Copiar á dereita"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Eliminar o seleccionado"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1379
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Ocultar o seleccionado"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro"
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Considerar casos diferentes os nomes de ficheiro que de outro modo serían "
+"idénticos"
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Iguais"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Mostrar idénticos"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Novo"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Mostrar novo"
+
+#: ../data/ui/dirdiff.ui.h:16
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Mostrar modificados"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtros"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Estabelecer filtros activos"
+
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
 msgstr "Editar lista"
@@ -65,11 +145,12 @@ msgstr "Activo"
 msgid "Column Name"
 msgstr "Nome da columna"
 
-#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:172
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:175 ../meld/vcview.py:715
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:644
 msgid "_Remove"
 msgstr "_Retirar"
 
@@ -90,8 +171,8 @@ msgid "Move _Down"
 msgstr "_Baixar"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:343
-#: ../meld/vcview.py:231
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:324
+#: ../meld/vcview.py:174
 msgid "Name"
 msgstr "Nome"
 
@@ -145,7 +226,7 @@ msgstr ""
 "este ficheiro e facer cambios de todas formas, aínda así os cambios debe "
 "gardalos nun ficheiro novo."
 
-#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:295
+#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:299
 msgid "Lock scrolling of all panes"
 msgstr "Bloquear o desprazamento de todos os paneis"
 
@@ -492,169 +573,181 @@ msgstr "Comparación _baleira"
 msgid "C_ompare"
 msgstr "C_omparar"
 
-#: ../data/ui/vcview.ui.h:1
-msgid "Commit"
-msgstr "Remitir"
-
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
-msgstr "Remitir os ficheiros"
-
 #: ../data/ui/vcview.ui.h:3
-msgid "Log Message"
-msgstr "Mensaxe de rexistro"
+msgid "Co_mmit..."
+msgstr "Re_mitir…"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Previous logs:"
-msgstr "Rexistros anteriores:"
+msgid "Commit changes to version control"
+msgstr "Remitir cambios ao control de versións"
 
 #: ../data/ui/vcview.ui.h:5
-msgid "Co_mmit"
-msgstr "Remitir"
+msgid "_Update"
+msgstr "Act_ualizar"
 
 #: ../data/ui/vcview.ui.h:6
-msgid "Push local commits to remote?"
-msgstr "Remitir cambios locais ao remoto?"
+msgid "Update working copy from version control"
+msgstr "Actualizar a copia local desde o sistema de control de versións"
 
 #: ../data/ui/vcview.ui.h:7
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
-"As remisións a enviar determínaas o seu sistema de control de versións."
+msgid "_Push"
+msgstr "_Enviar"
 
 #: ../data/ui/vcview.ui.h:8
-msgid "_Push commits"
-msgstr "_Enviar remisións"
+msgid "Push local changes to remote"
+msgstr "Enviar cambios locais ao remoto"
 
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:160
-msgid "_Compare"
-msgstr "_Comparar"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Engadir ao control de versións"
 
-#: ../meld/dirdiff.py:269
-msgid "Compare selected"
-msgstr "Comparar o seleccionado"
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "Eliminar do control de versións"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy _Left"
-msgstr "Copiar á _esquerda"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "Marc_ar como solucionado"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy to left"
-msgstr "Copiar á esquerda"
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "Marcar como solucionado no control de versións"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy _Right"
-msgstr "Copiar á _dereita"
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "Re_verter"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy to right"
-msgstr "Copiar á dereita"
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "Reverter a copia local ao seu estado orixinal"
 
-#: ../meld/dirdiff.py:272
-msgid "Delete selected"
-msgstr "Eliminar o seleccionado"
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Eliminar desde a copia local"
 
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403
-msgid "Hide"
-msgstr "Ocultar"
+#: ../data/ui/vcview.ui.h:18
+msgid "_Flatten"
+msgstr "Apl_anar"
 
-#: ../meld/dirdiff.py:273
-msgid "Hide selected"
-msgstr "Ocultar o seleccionado"
+#: ../data/ui/vcview.ui.h:19
+msgid "Flatten directories"
+msgstr "Rasar cartafoles"
 
-#: ../meld/dirdiff.py:277
-msgid "Ignore Filename Case"
-msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Modified"
+msgstr "_Modificado"
 
-#: ../meld/dirdiff.py:277
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Considerar casos diferentes os nomes de ficheiro que de outro modo serían "
-"idénticos"
+#: ../data/ui/vcview.ui.h:21
+msgid "Show modified files"
+msgstr "Mostrar ficheiros modificados"
 
-#: ../meld/dirdiff.py:278
-msgid "Same"
-msgstr "Iguais"
+#: ../data/ui/vcview.ui.h:22
+msgid "_Normal"
+msgstr "_Normal"
 
-#: ../meld/dirdiff.py:278
-msgid "Show identical"
-msgstr "Mostrar idénticos"
+#: ../data/ui/vcview.ui.h:23
+msgid "Show normal files"
+msgstr "Mostrar ficheiros normais"
 
-#: ../meld/dirdiff.py:279
-msgid "New"
-msgstr "Novo"
+#: ../data/ui/vcview.ui.h:24
+msgid "Un_versioned"
+msgstr "Sen _versión"
 
-#: ../meld/dirdiff.py:279
-msgid "Show new"
-msgstr "Mostrar novo"
+#: ../data/ui/vcview.ui.h:25
+msgid "Show unversioned files"
+msgstr "Mostrar ficheiros sen versión"
 
-#: ../meld/dirdiff.py:280
-msgid "Modified"
-msgstr "Modificado"
+#: ../data/ui/vcview.ui.h:26
+msgid "Ignored"
+msgstr "Ignorado"
 
-#: ../meld/dirdiff.py:280
-msgid "Show modified"
-msgstr "Mostrar modificados"
+#: ../data/ui/vcview.ui.h:27
+msgid "Show ignored files"
+msgstr "Mostrar ficheiros ignorados"
 
-#: ../meld/dirdiff.py:282
-msgid "Filters"
-msgstr "Filtros"
+#: ../data/ui/vcview.ui.h:28
+msgid "Commit"
+msgstr "Remitir"
 
-#: ../meld/dirdiff.py:282
-msgid "Set active filters"
-msgstr "Estabelecer filtros activos"
+#: ../data/ui/vcview.ui.h:29
+msgid "Commit Files"
+msgstr "Remitir os ficheiros"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Log Message"
+msgstr "Mensaxe de rexistro"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Previous logs:"
+msgstr "Rexistros anteriores:"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Co_mmit"
+msgstr "Remitir"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Push local commits to remote?"
+msgstr "Remitir cambios locais ao remoto?"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"As remisións a enviar determínaas o seu sistema de control de versións."
+
+#: ../data/ui/vcview.ui.h:35
+msgid "_Push commits"
+msgstr "_Enviar remisións"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:361
+#: ../meld/dirdiff.py:342
 msgid "Size"
 msgstr "Tamaño"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:369
+#: ../meld/dirdiff.py:350
 msgid "Modification time"
 msgstr "Hora de modificación"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:377
+#: ../meld/dirdiff.py:358
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../meld/dirdiff.py:511
+#: ../meld/dirdiff.py:492
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:637 ../meld/dirdiff.py:656
+#: ../meld/dirdiff.py:618 ../meld/dirdiff.py:637
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analizando %s"
 
-#: ../meld/dirdiff.py:756
+#: ../meld/dirdiff.py:737
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Feito"
 
-#: ../meld/dirdiff.py:762
+#: ../meld/dirdiff.py:743
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Producíronse varios erros ao analizar este cartafol"
 
-#: ../meld/dirdiff.py:763
+#: ../meld/dirdiff.py:744
 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:765
+#: ../meld/dirdiff.py:746
 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:767
+#: ../meld/dirdiff.py:748
 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:769
+#: ../meld/dirdiff.py:750
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -663,17 +756,17 @@ msgstr ""
 "sistema de ficheiros que diferencia maiúsculas de minúsculas. Algúns "
 "ficheiros non están visíbeis:"
 
-#: ../meld/dirdiff.py:780
+#: ../meld/dirdiff.py:761
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» agochado por «%s»"
 
-#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372
-#: ../meld/filediff.py:1405
+#: ../meld/dirdiff.py:786 ../meld/filediff.py:1095 ../meld/filediff.py:1381
+#: ../meld/filediff.py:1411 ../meld/filediff.py:1413
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:817
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -682,264 +775,255 @@ msgstr ""
 "«%s» existe.\n"
 "Sobrescribir?"
 
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:825
+msgid "Error copying file"
+msgstr "Produciuse un erro ao copiar o ficheiro"
+
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid ""
-"Error copying '%s' to '%s'\n"
+"Couldn't copy %s\n"
+"to %s.\n"
 "\n"
-"%s."
+"%s"
 msgstr ""
-"Produciuse un erro ao copiar «%s» a «%s»\n"
+"Non foi posíbel copiar «%s»\n"
+"en «%s»\n"
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:862 ../meld/vcview.py:745
+#: ../meld/dirdiff.py:849
 #, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
-msgstr ""
-"«%s» é un cartafol.\n"
-"Retirar recursivamente?"
+msgid "Error deleting %s"
+msgstr "Produciuse un erro ao eliminar %s"
 
-#: ../meld/dirdiff.py:869 ../meld/vcview.py:750
-#, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr ""
-"Produciuse un erro ao retirar %s\n"
-"\n"
-"%s."
-
-#: ../meld/dirdiff.py:1000
+#: ../meld/dirdiff.py:980
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i segundo"
 msgstr[1] "%i segundos"
 
-#: ../meld/dirdiff.py:1001
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuto"
 msgstr[1] "%i minutos"
 
-#: ../meld/dirdiff.py:1002
+#: ../meld/dirdiff.py:982
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i hora"
 msgstr[1] "%i horas"
 
-#: ../meld/dirdiff.py:1003
+#: ../meld/dirdiff.py:983
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i día"
 msgstr[1] "%i días"
 
-#: ../meld/dirdiff.py:1004
+#: ../meld/dirdiff.py:984
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i semana"
 msgstr[1] "%i semanas"
 
-#: ../meld/dirdiff.py:1005
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mes"
 msgstr[1] "%i meses"
 
-#: ../meld/dirdiff.py:1006
+#: ../meld/dirdiff.py:986
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i ano"
 msgstr[1] "%i anos"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:227
 msgid "Format as Patch..."
 msgstr "Formatar como parche…"
 
-#: ../meld/filediff.py:224
+#: ../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:226
+#: ../meld/filediff.py:230
 msgid "Save A_ll"
 msgstr "G_ardar todo"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:231
 msgid "Save all files in the current comparison"
 msgstr "Garda todos os ficheiros na comparación actual"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:234
 msgid "Revert files to their saved versions"
 msgstr "Reverte os ficheiros ás súas versións gardadas"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:236
 msgid "Add Synchronization Point"
 msgstr "Engadir punto de sincronización"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:237
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Engade un punto de sincronización manual dos cambios entre ficheiros"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:240
 msgid "Clear Synchronization Points"
 msgstr "Limpar puntos de sincronización"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:241
 msgid "Clear manual change sychronization points"
 msgstr "Limpar os puntos de sincronización de cambios manuais"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:243
 msgid "Previous Conflict"
 msgstr "Conflito anterior"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:244
 msgid "Go to the previous conflict"
 msgstr "Ir ao conflito anterior"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:246
 msgid "Next Conflict"
 msgstr "Seguinte conflito"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:247
 msgid "Go to the next conflict"
 msgstr "Ir ao seguinte conflito"
 
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:249
 msgid "Push to Left"
 msgstr "Empurrar á esquerda"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:250
 msgid "Push current change to the left"
 msgstr "Empurrar o cambio actual á esquerda"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:253
 msgid "Push to Right"
 msgstr "Empurrar á dereita"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:254
 msgid "Push current change to the right"
 msgstr "Empurrar o cambio actual á dereita"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:258
 msgid "Pull from Left"
 msgstr "Traer desde á esquerda"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:259
 msgid "Pull change from the left"
 msgstr "Traer o cambio desde á esquerda"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:262
 msgid "Pull from Right"
 msgstr "Traer desde á dereita"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:263
 msgid "Pull change from the right"
 msgstr "Traer o cambio desde á dereita"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:265
 msgid "Copy Above Left"
 msgstr "Copiar por enriba da esquerda"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:266
 msgid "Copy change above the left chunk"
 msgstr "Copiar o cambio por enriba da parte esquerda"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:268
 msgid "Copy Below Left"
 msgstr "Copiar por debaixo da esquerda"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:269
 msgid "Copy change below the left chunk"
 msgstr "Copiar o cambio por embaixo da parte esquerda"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:271
 msgid "Copy Above Right"
 msgstr "Copiar por enriba da dereita"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:272
 msgid "Copy change above the right chunk"
 msgstr "Copiar o cambio por enriba da parte dereita"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:274
 msgid "Copy Below Right"
 msgstr "Copiar por debaixo da dereita"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:275
 msgid "Copy change below the right chunk"
 msgstr "Copiar o cambio por embaixo da parte dereita"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:277
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:278
 msgid "Delete change"
 msgstr "Eliminar o cambio"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:280
 msgid "Merge All from Left"
 msgstr "Combinar todos os cambios desde a esquerda"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:281
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:283
 msgid "Merge All from Right"
 msgstr "Combinar todos os cambios desde a dereita"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:284
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Combinar todos os cambios non conflitivos desde a dereita"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:286
 msgid "Merge All"
 msgstr "Combinar todos"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:287
 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:287
+#: ../meld/filediff.py:291
 msgid "Cycle Through Documents"
 msgstr "Cambiar ciclicamente entre documentos"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:292
 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:294
+#: ../meld/filediff.py:298
 msgid "Lock Scrolling"
 msgstr "Bloquear desprazamento"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:420
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:420
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:419
+#: ../meld/filediff.py:422
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Li %i, Col %i"
 
-#: ../meld/filediff.py:754
+#: ../meld/filediff.py:757
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -948,42 +1032,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:1084
+#: ../meld/filediff.py:1083
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Estabelecer número de paneis"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1089
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo os ficheiros"
 
-#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1112 ../meld/filediff.py:1122 ../meld/filediff.py:1135
+#: ../meld/filediff.py:1141
 msgid "Could not read file"
 msgstr "Non foi posíbel ler o ficheiro"
 
-#: ../meld/filediff.py:1115
+#: ../meld/filediff.py:1113
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo os ficheiros"
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s semella ser un ficheiro binario."
 
-#: ../meld/filediff.py:1138
+#: ../meld/filediff.py:1136
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non está na codificación: %s"
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1170
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando as diferenzas"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1370
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -991,19 +1075,19 @@ msgstr ""
 "Se están usando filtros de texto, e poden estar agochando diferenzas entre "
 "ficheiros. Quere comparar os ficheiros non filtrados?"
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1376
 msgid "Files are identical"
 msgstr "Os ficheiros son idénticos"
 
-#: ../meld/filediff.py:1375
+#: ../meld/filediff.py:1384
 msgid "Show without filters"
 msgstr "Mostrar sen filtros"
 
-#: ../meld/filediff.py:1397
+#: ../meld/filediff.py:1406
 msgid "Change highlighting incomplete"
 msgstr "Cambiar realzado incompleto"
 
-#: ../meld/filediff.py:1398
+#: ../meld/filediff.py:1407
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1012,15 +1096,15 @@ msgstr ""
 "Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser "
 "lento."
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1415
 msgid "Keep highlighting"
 msgstr "Manter realzado"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1417
 msgid "_Keep highlighting"
 msgstr "_Manter realzado"
 
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1549
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1029,7 +1113,7 @@ msgstr ""
 "\"%s\" existe!\n"
 "Sobrescribir?"
 
-#: ../meld/filediff.py:1554
+#: ../meld/filediff.py:1562
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1040,19 +1124,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1565
+#: ../meld/filediff.py:1573
 msgid "Save Left Pane As"
 msgstr "Gardar panel da esquerda como"
 
-#: ../meld/filediff.py:1567
+#: ../meld/filediff.py:1575
 msgid "Save Middle Pane As"
 msgstr "Gardar panel intermedio como"
 
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1577
 msgid "Save Right Pane As"
 msgstr "Gardar panel da dereita como"
 
-#: ../meld/filediff.py:1590
+#: ../meld/filediff.py:1598
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1063,7 +1147,7 @@ msgstr ""
 "\n"
 "Que formato quere usar?"
 
-#: ../meld/filediff.py:1606
+#: ../meld/filediff.py:1614
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1072,11 +1156,11 @@ msgstr ""
 "«%s» contén caracteres non codificábeis con «%s»\n"
 "Quere gardar como UTF-8?"
 
-#: ../meld/filediff.py:1974
+#: ../meld/filediff.py:1982
 msgid "Live comparison updating disabled"
 msgstr "Actualización de comparación en vivo desactivada"
 
-#: ../meld/filediff.py:1975
+#: ../meld/filediff.py:1983
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1440,7 +1524,7 @@ 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:172
+#: ../meld/misc.py:189
 msgid "[None]"
 msgstr "[Ningún]"
 
@@ -1520,172 +1604,76 @@ msgstr "Comentario de script\t0\t#.*"
 msgid "Version control:"
 msgstr "Control de versións:"
 
-#: ../meld/vcview.py:161
-msgid "Compare selected files"
-msgstr "Comparar ficheiros seleccionados"
-
-#: ../meld/vcview.py:163
-msgid "Co_mmit..."
-msgstr "Re_mitir…"
-
-#: ../meld/vcview.py:164
-msgid "Commit changes to version control"
-msgstr "Remitir cambios ao control de versións"
-
-#: ../meld/vcview.py:166
-msgid "_Update"
-msgstr "Act_ualizar"
-
-#: ../meld/vcview.py:167
-msgid "Update working copy from version control"
-msgstr "Actualizar a copia local desde o sistema de control de versións"
-
-#: ../meld/vcview.py:169
-msgid "_Push"
-msgstr "_Enviar"
-
-#: ../meld/vcview.py:170
-msgid "Push local changes to remote"
-msgstr "Enviar cambios locais ao remoto"
-
-#: ../meld/vcview.py:173
-msgid "Add to version control"
-msgstr "Engadir ao control de versións"
-
-#: ../meld/vcview.py:176
-msgid "Remove from version control"
-msgstr "Eliminar do control de versións"
-
-#: ../meld/vcview.py:178
-msgid "Mar_k as Resolved"
-msgstr "Marc_ar como solucionado"
-
-#: ../meld/vcview.py:179
-msgid "Mark as resolved in version control"
-msgstr "Marcar como solucionado no control de versións"
-
-#: ../meld/vcview.py:181
-msgid "Re_vert"
-msgstr "Re_verter"
-
-#: ../meld/vcview.py:182
-msgid "Revert working copy to original state"
-msgstr "Reverter a copia local ao seu estado orixinal"
-
-#: ../meld/vcview.py:185
-msgid "Delete from working copy"
-msgstr "Eliminar desde a copia local"
-
-#: ../meld/vcview.py:190
-msgid "_Flatten"
-msgstr "Apl_anar"
-
-#: ../meld/vcview.py:191
-msgid "Flatten directories"
-msgstr "Rasar cartafoles"
-
-#: ../meld/vcview.py:193
-msgid "_Modified"
-msgstr "_Modificado"
-
-#: ../meld/vcview.py:194
-msgid "Show modified files"
-msgstr "Mostrar ficheiros modificados"
-
-#: ../meld/vcview.py:196
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../meld/vcview.py:197
-msgid "Show normal files"
-msgstr "Mostrar ficheiros normais"
-
-#: ../meld/vcview.py:199
-msgid "Un_versioned"
-msgstr "Sen _versión"
-
-#: ../meld/vcview.py:200
-msgid "Show unversioned files"
-msgstr "Mostrar ficheiros sen versión"
-
-#: ../meld/vcview.py:202
-msgid "Ignored"
-msgstr "Ignorado"
-
-#: ../meld/vcview.py:203
-msgid "Show ignored files"
-msgstr "Mostrar ficheiros ignorados"
-
-#: ../meld/vcview.py:262 ../meld/vcview.py:432
+#: ../meld/vcview.py:205 ../meld/vcview.py:363
 msgid "Location"
 msgstr "Localización"
 
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:206
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:264
+#: ../meld/vcview.py:207
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../meld/vcview.py:265
+#: ../meld/vcview.py:208
 msgid "Options"
 msgstr "Opcións"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:342
+#: ../meld/vcview.py:273
 #, 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:346
+#: ../meld/vcview.py:277
 msgid "Invalid repository"
 msgstr "O repositorio non é válido"
 
-#: ../meld/vcview.py:355
+#: ../meld/vcview.py:286
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:357 ../meld/vcview.py:365
+#: ../meld/vcview.py:288 ../meld/vcview.py:296
 msgid "None"
 msgstr "Ningún"
 
-#: ../meld/vcview.py:376
+#: ../meld/vcview.py:307
 msgid "No valid version control system found in this folder"
 msgstr "Non hai ningún sistema de control de versións válido neste cartafol"
 
-#: ../meld/vcview.py:378
+#: ../meld/vcview.py:309
 msgid "Only one version control system found in this folder"
 msgstr "Só se atopou un sistema de control de versións neste cartafol"
 
-#: ../meld/vcview.py:380
+#: ../meld/vcview.py:311
 msgid "Choose which version control system to use"
 msgstr "Seleccione que sistema de control de versións usar"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:432
+#: ../meld/vcview.py:363
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:446 ../meld/vcview.py:454
+#: ../meld/vcview.py:377 ../meld/vcview.py:385
 #, python-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../meld/vcview.py:487
+#: ../meld/vcview.py:418
 msgid "(Empty)"
 msgstr "(Baleiro)"
 
-#: ../meld/vcview.py:709
+#: ../meld/vcview.py:638
 msgid "Remove folder and all its files?"
 msgstr "Desexa eliminar o cartafol e todos os seus ficheiros?"
 
-#: ../meld/vcview.py:711
+#: ../meld/vcview.py:640
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -1694,14 +1682,14 @@ msgstr ""
 "ficheiros dentro de calqueda dos cartafoles seleccionados, do control de "
 "versións."
 
-#: ../meld/ui/findbar.py:150
+#: ../meld/vcview.py:674
 #, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Erro na expresión regular\n"
-"«%s»"
+msgid "Error removing %s"
+msgstr "Produciuse un erro ao retirar %s"
+
+#: ../meld/ui/findbar.py:143
+msgid "Regular expression error"
+msgstr "Erro na expresión regular"
 
 #: ../meld/ui/historyentry.py:381
 msgid "_Browse..."
@@ -1760,45 +1748,53 @@ msgstr ""
 "Ignorado:Non Versionado:::Erro::Novas adicións:Modificado:Conflito:Eliminado:"
 "Que falta:Non presente"
 
-#: ../meld/vc/cvs.py:231
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"Produciuse un erro ao converter a unha expresión regular\n"
-"O patrón era «%s»\n"
-"O erro foi «%s»"
-
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:120
+#: ../meld/vc/git.py:126
 #, python-format
 msgid "%s in %s"
 msgstr "%s en %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:121 ../meld/vc/git.py:128
+#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d remisión sen enviar"
 msgstr[1] "%d remisións sen enviar"
 
-#: ../meld/vc/git.py:123
+#: ../meld/vc/git.py:129
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d rama"
 msgstr[1] "%d ramas"
 
-#: ../meld/vc/git.py:333
+#: ../meld/vc/git.py:341
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo cambiado desde %s a %s"
 
+#~ msgid "Compare selected"
+#~ msgstr "Comparar o seleccionado"
+
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "«%s» é un cartafol.\n"
+#~ "Retirar recursivamente?"
+
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Produciuse un erro ao converter a unha expresión regular\n"
+#~ "O patrón era «%s»\n"
+#~ "O erro foi «%s»"
+
 #~ msgid "[%s] Fetching differences"
 #~ msgstr "[%s] Obtendo as diferenzas"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]