[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: Sun, 11 Nov 2012 18:09:46 +0000 (UTC)
commit 03e768aa1cf2ae61bcdc052cf0171b5b2df13ced
Author: Fran DiÃguez <fran dieguez mabishu com>
Date: Sun Nov 11 19:09:16 2012 +0100
Updated Galician translations
po/gl.po | 623 +++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 330 insertions(+), 293 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 3c62e8a..13b7e5e 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-10-12 00:53+0200\n"
-"PO-Revision-Date: 2012-10-12 00:55+0200\n"
+"POT-Creation-Date: 2012-11-11 19:03+0100\n"
+"PO-Revision-Date: 2012-11-11 19:09+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:103
+#: ../bin/meld:104
msgid "Cannot import: "
msgstr "Non à posÃbel importar: "
-#: ../bin/meld:106
+#: ../bin/meld:107
#, 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:166
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:165
msgid "Name"
msgstr "Nome"
@@ -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:131
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:130
msgid "_Remove"
msgstr "_Retirar"
@@ -117,7 +117,7 @@ msgstr "_Rexeitar os cambios"
msgid "_Save Selected"
msgstr "Gardar os _seleccionados"
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:127
msgid "_Replace"
msgstr "SubstituÃ_r"
@@ -153,6 +153,10 @@ msgstr "Pa_labra completa"
msgid "Regular E_xpression"
msgstr "E_xpresiÃn regular"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "Axustado"
+
#: ../data/ui/meldapp.ui.h:2
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
@@ -399,47 +403,47 @@ msgstr "Rexistros anteriores"
msgid "Log Message"
msgstr "Mensaxe de rexistro"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:126
msgid "_Compare"
msgstr "_Comparar"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:126
msgid "Compare selected"
msgstr "Comparar o seleccionado"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:231
msgid "Copy _Left"
msgstr "Copiar à _esquerda"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:231
msgid "Copy to left"
msgstr "Copiar à esquerda"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:232
msgid "Copy _Right"
msgstr "Copiar à _dereita"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:232
msgid "Copy to right"
msgstr "Copiar à dereita"
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:233
msgid "Delete selected"
msgstr "Eliminar o seleccionado"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1106
+#: ../meld/dirdiff.py:234 ../meld/filediff.py:1217
msgid "Hide"
msgstr "Ocultar"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:234
msgid "Hide selected"
msgstr "Ocultar o seleccionado"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:238
msgid "Ignore filename case"
msgstr "Ignorar maiÃsculas e minÃsculas do nome do ficheiro"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:238
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -447,74 +451,74 @@ msgstr ""
"Considerar casos diferentes os nomes de ficheiro que de outro modo serÃan "
"idÃnticos"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:239
msgid "Same"
msgstr "Iguais"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:239
msgid "Show identical"
msgstr "Mostrar idÃnticos"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:240
msgid "New"
msgstr "Novo"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:240
msgid "Show new"
msgstr "Mostrar novo"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:241
msgid "Modified"
msgstr "Modificado"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:241 ../meld/vcview.py:138
msgid "Show modified"
msgstr "Mostrar modificados"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
msgid "Filters"
msgstr "Filtros"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
msgid "Set active filters"
msgstr "Estabelecer filtros activos"
-#: ../meld/dirdiff.py:398
+#: ../meld/dirdiff.py:407
#, python-format
msgid "Hide %s"
msgstr "Ocultar %s"
-#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:521 ../meld/vcview.py:329
-#: ../meld/vcview.py:353
+#: ../meld/dirdiff.py:511 ../meld/dirdiff.py:530 ../meld/vcview.py:327
+#: ../meld/vcview.py:351
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Analizando %s"
-#: ../meld/dirdiff.py:620
+#: ../meld/dirdiff.py:629
#, python-format
msgid "[%s] Done"
msgstr "[%s] Feito"
-#: ../meld/dirdiff.py:624
+#: ../meld/dirdiff.py:633
msgid "Multiple errors occurred while scanning this folder"
msgstr "ProducÃronse varios erros ao analizar este cartafol"
-#: ../meld/dirdiff.py:625
+#: ../meld/dirdiff.py:634
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:627
+#: ../meld/dirdiff.py:636
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:629
+#: ../meld/dirdiff.py:638
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:631
+#: ../meld/dirdiff.py:640
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -523,16 +527,17 @@ msgstr ""
"sistema de ficheiros que diferencia maiÃsculas de minÃsculas. AlgÃns "
"ficheiros non estÃn visÃbeis:"
-#: ../meld/dirdiff.py:642
+#: ../meld/dirdiff.py:651
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "Â%s agochado por Â%sÂ"
-#: ../meld/dirdiff.py:667 ../meld/filediff.py:943 ../meld/filediff.py:1110
+#: ../meld/dirdiff.py:676 ../meld/filediff.py:980 ../meld/filediff.py:1221
+#: ../meld/vcview.py:573 ../meld/vcview.py:615
msgid "Hi_de"
msgstr "Ocu_ltar"
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:726
#, python-format
msgid ""
"'%s' exists.\n"
@@ -541,7 +546,7 @@ msgstr ""
"Â%s existe.\n"
"Sobrescribir?"
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:733
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -552,7 +557,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:742 ../meld/vcview.py:542
+#: ../meld/dirdiff.py:751 ../meld/vcview.py:547
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -561,7 +566,7 @@ msgstr ""
"Â%s à un cartafol.\n"
"Retirar recursivamente?"
-#: ../meld/dirdiff.py:749 ../meld/vcview.py:547
+#: ../meld/dirdiff.py:758 ../meld/vcview.py:552
#, python-format
msgid ""
"Error removing %s\n"
@@ -572,210 +577,210 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:843
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i segundo"
msgstr[1] "%i segundos"
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:844
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i minuto"
msgstr[1] "%i minutos"
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:845
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i hora"
msgstr[1] "%i horas"
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:846
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] "%i dÃa"
msgstr[1] "%i dÃas"
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:847
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] "%i semana"
msgstr[1] "%i semanas"
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:848
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] "%i mes"
msgstr[1] "%i meses"
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:849
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] "%i ano"
msgstr[1] "%i anos"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:215
msgid "Format as patch..."
msgstr "Formatar o parche comoâ"
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:215
msgid "Create a patch using differences between files"
msgstr "Crear un parche usando as diferenzas entre os ficheiros"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:216
msgid "Previous conflict"
msgstr "Conflito anterior"
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:216
msgid "Go to the previous conflict"
msgstr "Ir ao conflito anterior"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:217
msgid "Next conflict"
msgstr "Seguinte conflito"
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:217
msgid "Go to the next conflict"
msgstr "Ir ao seguinte conflito"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:218
msgid "Push to left"
msgstr "Empurrar à esquerda"
-#: ../meld/filediff.py:190
+#: ../meld/filediff.py:218
msgid "Push current change to the left"
msgstr "Empurrar o cambio actual à esquerda"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:219
msgid "Push to right"
msgstr "Empurrar à dereita"
-#: ../meld/filediff.py:191
+#: ../meld/filediff.py:219
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:193
+#: ../meld/filediff.py:221
msgid "Pull from left"
msgstr "Traer desde à esquerda"
-#: ../meld/filediff.py:193
+#: ../meld/filediff.py:221
msgid "Pull change from the left"
msgstr "Traer o cambio desde à esquerda"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:222
msgid "Pull from right"
msgstr "Traer desde à dereita"
-#: ../meld/filediff.py:194
+#: ../meld/filediff.py:222
msgid "Pull change from the right"
msgstr "Traer o cambio desde à dereita"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:223
msgid "Copy above left"
msgstr "Copiar por enriba da esquerda"
-#: ../meld/filediff.py:195
+#: ../meld/filediff.py:223
msgid "Copy change above the left chunk"
msgstr "Copiar o cambio por enriba da parte esquerda"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:224
msgid "Copy below left"
msgstr "Copiar por debaixo da esquerda"
-#: ../meld/filediff.py:196
+#: ../meld/filediff.py:224
msgid "Copy change below the left chunk"
msgstr "Copiar o cambio por embaixo da parte esquerda"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:225
msgid "Copy above right"
msgstr "Copiar por enriba da dereita"
-#: ../meld/filediff.py:197
+#: ../meld/filediff.py:225
msgid "Copy change above the right chunk"
msgstr "Copiar o cambio por enriba da parte dereita"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:226
msgid "Copy below right"
msgstr "Copiar por debaixo da dereita"
-#: ../meld/filediff.py:198
+#: ../meld/filediff.py:226
msgid "Copy change below the right chunk"
msgstr "Copiar o cambio por embaixo da parte dereita"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:227
msgid "Delete"
msgstr "Eliminar"
-#: ../meld/filediff.py:199
+#: ../meld/filediff.py:227
msgid "Delete change"
msgstr "Eliminar o cambio"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:228
msgid "Merge all changes from left"
msgstr "Combinar todos os cambios desde a esquerda"
-#: ../meld/filediff.py:200
+#: ../meld/filediff.py:228
msgid "Merge all non-conflicting changes from the left"
msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:229
msgid "Merge all changes from right"
msgstr "Combinar todos os cambios desde a dereita"
-#: ../meld/filediff.py:201
+#: ../meld/filediff.py:229
msgid "Merge all non-conflicting changes from the right"
msgstr "Combinar todos os cambios non conflitivos desde a dereita"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:230
msgid "Merge all non-conflicting"
msgstr "Combinar todos os cambios non conflitivos"
-#: ../meld/filediff.py:202
+#: ../meld/filediff.py:230
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:203
+#: ../meld/filediff.py:231
msgid "Cycle through documents"
msgstr "Cambiar entre documentos"
-#: ../meld/filediff.py:203
+#: ../meld/filediff.py:231
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:207
+#: ../meld/filediff.py:235
msgid "Lock scrolling"
msgstr "Bloquear o desprazamento"
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:236
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:318
+#: ../meld/filediff.py:354
msgid "INS"
msgstr "INS"
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:354
msgid "OVR"
msgstr "SOB"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:320
+#: ../meld/filediff.py:356
#, python-format
msgid "Ln %i, Col %i"
msgstr "Li %i, Col %i"
-#: ../meld/filediff.py:644
+#: ../meld/filediff.py:683
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -784,42 +789,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:931
+#: ../meld/filediff.py:968
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Estabelecer nÃmero de paneis"
-#: ../meld/filediff.py:937
+#: ../meld/filediff.py:974
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Abrindo os ficheiros"
-#: ../meld/filediff.py:961 ../meld/filediff.py:971 ../meld/filediff.py:984
-#: ../meld/filediff.py:990
+#: ../meld/filediff.py:998 ../meld/filediff.py:1008 ../meld/filediff.py:1021
+#: ../meld/filediff.py:1027
msgid "Could not read file"
msgstr "Non foi posÃbel ler o ficheiro"
-#: ../meld/filediff.py:962
+#: ../meld/filediff.py:999
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Lendo os ficheiros"
-#: ../meld/filediff.py:972
+#: ../meld/filediff.py:1009
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s semella ser un ficheiro binario."
-#: ../meld/filediff.py:985
+#: ../meld/filediff.py:1022
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s non està na codificaciÃn: %s"
-#: ../meld/filediff.py:1016
+#: ../meld/filediff.py:1053
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calculando as diferenzas"
-#: ../meld/filediff.py:1097
+#: ../meld/filediff.py:1208
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -827,15 +832,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:1103
+#: ../meld/filediff.py:1214
msgid "Files are identical"
msgstr "Os ficheiros son idÃnticos"
-#: ../meld/filediff.py:1113
+#: ../meld/filediff.py:1224
msgid "Show without filters"
msgstr "Mostrar sen filtros"
-#: ../meld/filediff.py:1306
+#: ../meld/filediff.py:1348
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -844,7 +849,7 @@ msgstr ""
"\"%s\" existe!\n"
"Sobrescribir?"
-#: ../meld/filediff.py:1319
+#: ../meld/filediff.py:1361
#, python-format
msgid ""
"Error writing to %s\n"
@@ -855,12 +860,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1328
+#: ../meld/filediff.py:1370
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Escolla un nome para o bÃfer %i."
-#: ../meld/filediff.py:1343
+#: ../meld/filediff.py:1385
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -871,7 +876,7 @@ msgstr ""
"\n"
"Que formato quere usar?"
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1401
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -880,7 +885,7 @@ msgstr ""
"Â%s contÃn caracteres non codificÃbeis con Â%sÂ\n"
"Quere gardar como UTF-8?"
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1458
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -893,366 +898,366 @@ msgstr ""
"\n"
"Non à posÃbel desfacer esta operaciÃn."
-#: ../meld/filemerge.py:47
+#: ../meld/filemerge.py:48
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Combinando os ficheiros"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:153
msgid "wrong number of arguments supplied to --diff"
msgstr "nÃmero incorrecto de argumentos proporcionado a --diff"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:157
msgid "Start with an empty window"
msgstr "Comezar cunha xanela baleira"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:158 ../meld/meldapp.py:159 ../meld/meldapp.py:161
msgid "file"
msgstr "ficheiro"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:158 ../meld/meldapp.py:160 ../meld/meldapp.py:161
msgid "dir"
msgstr "cartafol"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:158
msgid "Start a version control comparison"
msgstr "Comezar unha comparaciÃn no control de versiÃns"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:159
msgid "Start a 2- or 3-way file comparison"
msgstr "Comezar unha comparaciÃn de ficheiros a 2 ou 3 bandas"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:160
msgid "Start a 2- or 3-way directory comparison"
msgstr "Comezar unha comparaciÃn de cartafol a 2 ou 3 bandas"
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:161
msgid "Start a comparison between file and dir/file"
msgstr "Comezar unha comparaciÃn entre ficheiro e dir/file"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:167
msgid "Meld is a file and directory comparison tool."
msgstr "Meld à un ferramenta de comparaciÃn de ficheiros e cartafoles."
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:170
msgid "Set label to use instead of file name"
msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:172
msgid "Open a new tab in an already running instance"
msgstr "Abre unha nova lapela nunha instancia en execuciÃn"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:174
msgid "Automatically compare all differing files on startup"
msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:176
msgid "Ignored for compatibility"
msgstr "Ignorado para compatibilidade"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:179
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:180
+#: ../meld/meldapp.py:181
msgid "Automatically merge files"
msgstr "Combinar ficheiros automaticamente"
-#: ../meld/meldapp.py:183
+#: ../meld/meldapp.py:184
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:186
+#: ../meld/meldapp.py:187
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "demasiados argumentos (buscÃbanse 0-3, obtivÃronse %d)"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:189
msgid "can't auto-merge less than 3 files"
msgstr "non à posÃbel autocombinar menos de 3 ficheiros"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:191
msgid "can't auto-merge directories"
msgstr "non à posÃbel autocombinar cartafoles"
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:197
msgid "D-Bus error; comparisons will open in a new window."
msgstr "Erro de D-Bus; as comparaciÃns abriranse nunha nova xanela."
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:83
+#: ../meld/meldbuffer.py:84
msgid "<unnamed>"
msgstr "<sen nome>"
-#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
msgid "untitled"
msgstr "sen tÃtulo"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:111
msgid "_File"
msgstr "_Ficheiro"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:112
msgid "_New..."
msgstr "_Novo..."
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:112
msgid "Start a new comparison"
msgstr "Comezar unha nova comparaciÃn"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:113
msgid "Save the current file"
msgstr "Gardar o ficheiro actual"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:115
msgid "Close the current file"
msgstr "Pechar o ficheiro actual"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:116
msgid "Quit the program"
msgstr "SaÃr do programa"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:118
msgid "_Edit"
msgstr "_Editar"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:119
msgid "Undo the last action"
msgstr "Desfacer a Ãltima acciÃn"
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:120
msgid "Redo the last undone action"
msgstr "Refacer a Ãltima acciÃn desfeita"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:121
msgid "Cut the selection"
msgstr "Cortar a selecciÃn"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:122
msgid "Copy the selection"
msgstr "Copiar a selecciÃn"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:123
msgid "Paste the clipboard"
msgstr "Pegar o contido do portapapeis"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:124
msgid "Search for text"
msgstr "Buscar texto"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:125
msgid "Find Ne_xt"
msgstr "Buscar a _seguinte"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:125
msgid "Search forwards for the same text"
msgstr "Buscar cara a adiante o mesmo texto"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:126
msgid "Find _Previous"
msgstr "_Anterior"
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:126
msgid "Search backwards for the same text"
msgstr "Buscar cara a adiante o mesmo texto"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:127
msgid "Find and replace text"
msgstr "Buscar e substituÃr texto"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:128
msgid "Prefere_nces"
msgstr "Prefere_ncias"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:128
msgid "Configure the application"
msgstr "Configurar o aplicativo"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:130
msgid "_Changes"
msgstr "_Cambios"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:131
msgid "Next change"
msgstr "Seguinte cambio"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:131
msgid "Go to the next change"
msgstr "Ir ao seguinte cambio"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:132
msgid "Previous change"
msgstr "Anterior cambio"
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:132
msgid "Go to the previous change"
msgstr "Ir ao cambio anterior"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:133
msgid "Open externally"
msgstr "Abrir externamente"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:133
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:156
+#: ../meld/meldwindow.py:135
msgid "_View"
msgstr "_Ver"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:136
msgid "File status"
msgstr "Estado do ficheiro"
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:137
msgid "Version status"
msgstr "Estado da versiÃn"
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:138
msgid "File filters"
msgstr "Filtros de ficheiro"
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:139
msgid "Stop the current action"
msgstr "Deter a acciÃn actual"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:140
msgid "Refresh the view"
msgstr "Actualizar a vista"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:141
msgid "Reload"
msgstr "Recargar"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:141
msgid "Reload the comparison"
msgstr "Recargar a comparaciÃn"
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:143
msgid "_Tabs"
msgstr "_Lapelas"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:144
msgid "_Previous Tab"
msgstr "_Anterior"
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:144
msgid "Activate previous tab"
msgstr "Ir à lapela anterior"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:145
msgid "_Next Tab"
msgstr "Segui_nte"
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:145
msgid "Activate next tab"
msgstr "Activar a seguinte lapela"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:146
msgid "Move Tab _Left"
msgstr "Copiar à esquerda"
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:146
msgid "Move current tab to left"
msgstr "Mover a lapela actual à esquerda"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:147
msgid "Move Tab _Right"
msgstr "Copiar à dereita"
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:147
msgid "Move current tab to right"
msgstr "Mover a lapela actual à dereita"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:149
msgid "_Help"
msgstr "A_xuda"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:150
msgid "_Contents"
msgstr "_Contidos"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:150
msgid "Open the Meld manual"
msgstr "Abrir o manual do Meld"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:151
msgid "Report _Bug"
msgstr "_Informar dun fallo"
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:151
msgid "Report a bug in Meld"
msgstr "Informe dun fallo en Meld"
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:152
msgid "About this program"
msgstr "Sobre este programa"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:155
msgid "Full Screen"
msgstr "Pantalla completa"
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:155
msgid "View the comparison in full screen"
msgstr "Ver a comparaciÃn a pantalla completa"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:156
msgid "_Toolbar"
msgstr "Barra de ferramen_tas"
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:156
msgid "Show or hide the toolbar"
msgstr "Mostrar ou ocultar a barra de ferramentas"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:157
msgid "_Statusbar"
msgstr "Barra de e_stado"
-#: ../meld/meldwindow.py:178
+#: ../meld/meldwindow.py:157
msgid "Show or hide the statusbar"
msgstr "Mostrar ou ocultar a barra de estado"
-#: ../meld/meldwindow.py:564
+#: ../meld/meldwindow.py:547
msgid "Switch to this tab"
msgstr "Cambiar a esta lapela"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:652
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:177
+#: ../meld/misc.py:178
msgid "[None]"
msgstr "[NingÃn]"
-#: ../meld/patchdialog.py:122
+#: ../meld/patchdialog.py:123
msgid "Save Patch As..."
msgstr "Gardar parche como..."
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "label"
msgstr "etiqueta"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "pattern"
msgstr "patrÃn"
-#: ../meld/preferences.py:111
+#: ../meld/preferences.py:112
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:228
+#: ../meld/preferences.py:229
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:230
+#: ../meld/preferences.py:231
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1261,48 +1266,48 @@ msgstr ""
"V100 .Trashes Thumbs.db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:232
+#: ../meld/preferences.py:233
#, 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:234
+#: ../meld/preferences.py:235
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
msgstr "Binarios\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
+#: ../meld/preferences.py:237
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:239
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:240
+#: ../meld/preferences.py:241
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:242
+#: ../meld/preferences.py:243
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:244
+#: ../meld/preferences.py:245
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:246
+#: ../meld/preferences.py:247
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:248
+#: ../meld/preferences.py:249
msgid "Script comment\t0\t#.*"
msgstr "Comentario de script\t0\t#.*"
@@ -1327,189 +1332,163 @@ msgid "Add to VC"
msgstr "Engadir a CV"
#: ../meld/vcview.py:130
-msgid "Add _Binary"
-msgstr "Engadir _binario"
-
-#: ../meld/vcview.py:130
-msgid "Add binary to VC"
-msgstr "Engadir binario a CV"
-
-#: ../meld/vcview.py:131
msgid "Remove from VC"
msgstr "Retirar de CV"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
msgid "_Resolved"
msgstr "Soluciona_do"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
msgid "Mark as resolved for VC"
msgstr "Marcar como solucionado para o CV"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
msgid "Revert to original"
msgstr "Reverter ao orixinal"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
msgid "Delete locally"
msgstr "Eliminar localmente"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:137
msgid "_Flatten"
msgstr "Apl_anar"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:137
msgid "Flatten directories"
msgstr "Rasar cartafoles"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
msgid "_Modified"
msgstr "_Modificado"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:139
msgid "_Normal"
msgstr "_Normal"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:139
msgid "Show normal"
msgstr "Mostrar normal"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
msgid "Non _VC"
msgstr "Sen C_V"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
msgid "Show unversioned files"
msgstr "Mostrar ficheiros sen versiÃn"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
msgid "Ignored"
msgstr "Ignorado"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
msgid "Show ignored files"
msgstr "Mostrar ficheiros ignorados"
-#: ../meld/vcview.py:192 ../meld/vcview.py:325
+#: ../meld/vcview.py:191 ../meld/vcview.py:323
msgid "Location"
msgstr "LocalizaciÃn"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:192
msgid "Status"
msgstr "Estado"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:193
msgid "Rev"
msgstr "Rev"
-#: ../meld/vcview.py:195
+#: ../meld/vcview.py:194
msgid "Tag"
msgstr "Etiqueta"
-#: ../meld/vcview.py:196
+#: ../meld/vcview.py:195
msgid "Options"
msgstr "OpciÃns"
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:253
msgid "Choose one Version Control"
msgstr "Escoller un control de versiÃns"
-#: ../meld/vcview.py:256
+#: ../meld/vcview.py:254
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:269
+#: ../meld/vcview.py:267
#, 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:273
+#: ../meld/vcview.py:271
msgid "Invalid Repository"
msgstr "O repositorio non à vÃlido"
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:280
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:325
+#: ../meld/vcview.py:323
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:369
+#: ../meld/vcview.py:367
msgid "(Empty)"
msgstr "(Baleiro)"
-#: ../meld/vcview.py:407
+#: ../meld/vcview.py:405
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Obtendo as diferenzas"
-#: ../meld/vcview.py:415
+#: ../meld/vcview.py:419
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Aplicando o parche"
-#: ../meld/vcview.py:517
+#: ../meld/vcview.py:523
msgid "Select some files first."
msgstr "Antes seleccione algÃns ficheiros."
-#: ../meld/vcview.py:590
+#: ../meld/vcview.py:566
+msgid "Patch tool not found"
+msgstr "Ferramenta de parches non atopada"
+
+#: ../meld/vcview.py:567
#, python-format
msgid ""
-"\n"
-" Invoking 'patch' failed.\n"
-" \n"
-" Maybe you don't have 'GNU patch' installed,\n"
-" or you use an untested version of %s.\n"
-" \n"
-" Please send email bug report to:\n"
-" meld-list gnome org\n"
-" \n"
-" Containing the following information:\n"
-" \n"
-" - meld version: '%s'\n"
-" - source control software type: '%s'\n"
-" - source control software version: 'X.Y.Z'\n"
-" - the output of '%s somefile.txt'\n"
-" - patch command: '%s'\n"
-" (no need to actually run it, just provide\n"
-" the command line) \n"
-" \n"
-" Replace 'X.Y.Z' by the actual version for the\n"
-" source control software you use.\n"
-" "
+"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
+"%s repositories. Please install <i>patch</i> and try again."
msgstr ""
-"\n"
-" Produciuse un erro ao invocar a 'patch'.\n"
-" \n"
-" Pode ser que non estea instalado 'GNU Patch'\n"
-" ou vostede usa unha versiÃn non probada de %s.\n"
-" \n"
-" EnvÃe un informe de fallo por correo electrÃnico a:\n"
-" meld-list gnome org\n"
-" \n"
-" Contendo a seguinte informaciÃn:\n"
-" \n"
-" - versiÃn de meld: Â%sÂ\n"
-" - tipo de software de control de cÃdigo: Â%sÂ\n"
-" - versiÃn do software de control de cÃdigo: 'X.Y.Z'\n"
-" - a saÃda de'%s algunficheiro.txt'\n"
-" - orde (patch): Â%sÂ\n"
-" (non necesita executala, xa lla fornece\n"
-" a liÃa de ordes) \n"
-" \n"
-" SubstitÃa 'X.Y.Z', pola versiÃn real para o\n"
-" software de control de cÃdigo que usa vostede.\n"
-" "
-
-#: ../meld/ui/findbar.py:140
+"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
+msgid "Error fetching original comparison file"
+msgstr "Produciuse un erro ao obter o ficheiro de comparaciÃn orixinal"
+
+#: ../meld/vcview.py:608
+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."
+
+#: ../meld/vcview.py:616
+msgid "Report a bug"
+msgstr "Informar dun fallo"
+
+#: ../meld/ui/findbar.py:143
#, python-format
msgid ""
"Regular expression error\n"
@@ -1518,31 +1497,31 @@ msgstr ""
"Erro na expresiÃn regular\n"
"Â%sÂ"
-#: ../meld/ui/historyentry.py:293
+#: ../meld/ui/historyentry.py:294
msgid "_Browse..."
msgstr "E_xaminar..."
-#: ../meld/ui/historyentry.py:301
+#: ../meld/ui/historyentry.py:302
msgid "Path"
msgstr "Ruta"
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:303
msgid "Path to file"
msgstr "Ruta ao ficheiro"
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:304
msgid "Pop up a file selector to choose a file"
msgstr "Mostrar un selector para escoller un ficheiro"
-#: ../meld/ui/historyentry.py:441
+#: ../meld/ui/historyentry.py:442
msgid "Select directory"
msgstr "Seleccionar cartafol"
-#: ../meld/ui/historyentry.py:445
+#: ../meld/ui/historyentry.py:446
msgid "Select file"
msgstr "Seleccionar ficheiro"
-#: ../meld/ui/notebooklabel.py:60
+#: ../meld/ui/notebooklabel.py:61
msgid "Close tab"
msgstr "Pechar a lapela"
@@ -1552,10 +1531,10 @@ msgid ""
"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
"Not present"
msgstr ""
-"Ignorado:Non Versionado:::Erro::Novas "
-"adiciÃns:Modificado:Conflito:Eliminado:Que falta:Non presente"
+"Ignorado:Non Versionado:::Erro::Novas adiciÃns:Modificado:Conflito:Eliminado:"
+"Que falta:Non presente"
-#: ../meld/vc/cvs.py:163
+#: ../meld/vc/cvs.py:161
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1566,6 +1545,64 @@ msgstr ""
"O patrÃn era Â%sÂ\n"
"O erro foi Â%sÂ"
+#: ../meld/vc/git.py:152
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "Modo cambiado desde %s a %s"
+
+#~ msgid "Add _Binary"
+#~ msgstr "Engadir _binario"
+
+#~ msgid "Add binary to VC"
+#~ msgstr "Engadir binario a CV"
+
+#~ msgid ""
+#~ "\n"
+#~ " Invoking 'patch' failed.\n"
+#~ " \n"
+#~ " Maybe you don't have 'GNU patch' installed,\n"
+#~ " or you use an untested version of %s.\n"
+#~ " \n"
+#~ " Please send email bug report to:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " Containing the following information:\n"
+#~ " \n"
+#~ " - meld version: '%s'\n"
+#~ " - source control software type: '%s'\n"
+#~ " - source control software version: 'X.Y.Z'\n"
+#~ " - the output of '%s somefile.txt'\n"
+#~ " - patch command: '%s'\n"
+#~ " (no need to actually run it, just provide\n"
+#~ " the command line) \n"
+#~ " \n"
+#~ " Replace 'X.Y.Z' by the actual version for the\n"
+#~ " source control software you use.\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " Produciuse un erro ao invocar a 'patch'.\n"
+#~ " \n"
+#~ " Pode ser que non estea instalado 'GNU Patch'\n"
+#~ " ou vostede usa unha versiÃn non probada de %s.\n"
+#~ " \n"
+#~ " EnvÃe un informe de fallo por correo electrÃnico a:\n"
+#~ " meld-list gnome org\n"
+#~ " \n"
+#~ " Contendo a seguinte informaciÃn:\n"
+#~ " \n"
+#~ " - versiÃn de meld: Â%sÂ\n"
+#~ " - tipo de software de control de cÃdigo: Â%sÂ\n"
+#~ " - versiÃn do software de control de cÃdigo: 'X.Y.Z'\n"
+#~ " - a saÃda de'%s algunficheiro.txt'\n"
+#~ " - orde (patch): Â%sÂ\n"
+#~ " (non necesita executala, xa lla fornece\n"
+#~ " a liÃa de ordes) \n"
+#~ " \n"
+#~ " SubstitÃa 'X.Y.Z', pola versiÃn real para o\n"
+#~ " software de control de cÃdigo que usa vostede.\n"
+#~ " "
+
#~ msgid "can't compare more than three directories"
#~ msgstr "non à posÃbel comparar mÃis de tres directorios"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
