[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: Thu, 6 Jun 2013 14:39:12 +0000 (UTC)
commit f1e23d153d7e9dad2ce72fa9220b0b54271c88e6
Author: Fran Diéguez <fran dieguez mabishu com>
Date: Thu Jun 6 16:39:00 2013 +0200
Updated Galician translations
po/gl.po | 1160 ++++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 710 insertions(+), 450 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 1c194b6..c842448 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,13 +7,13 @@
# Antón Méixome <meixome mancomun org>, 2009.
# Fran Diéguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
# Leandro Regueiro <leandro regueiro gmail com>, 2012.
-# Fran Dieguez <frandieguez gnome org>, 2012.
+# Fran Dieguez <frandieguez gnome org>, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2012-12-27 00:55+0100\n"
-"PO-Revision-Date: 2012-12-27 00:57+0200\n"
+"POT-Creation-Date: 2013-06-06 16:25+0200\n"
+"PO-Revision-Date: 2013-06-06 16:38+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:113
+#: ../bin/meld:121
msgid "Cannot import: "
msgstr "Non é posíbel importar: "
-#: ../bin/meld:116
+#: ../bin/meld:124
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld require %s ou superior."
@@ -49,6 +49,10 @@ msgstr "Visualizador Diff Meld"
msgid "Compare and merge your files"
msgstr "Compare e combine os seus ficheiros"
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "Descrición da comparación do Meld"
+
#: ../data/ui/EditableList.ui.h:1
msgid "Editable List"
msgstr "Editar lista"
@@ -57,46 +61,52 @@ msgstr "Editar lista"
msgid "Active"
msgstr "Activo"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:200
-msgid "Name"
-msgstr "Nome"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Patrón"
-
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Engadir novo filtro"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "Nome da columna"
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:251
msgid "_Add"
msgstr "Eng_adir"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Retirar o filtro seleccionado"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:254
msgid "_Remove"
msgstr "_Retirar"
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "Mover o elemento cara arriba"
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "S_ubir"
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "Mover o elemento cara abaixo"
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
msgid "Move _Down"
msgstr "_Baixar"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:342
+#: ../meld/vcview.py:310
+msgid "Name"
+msgstr "Nome"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Patrón"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Engadir novo filtro"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Retirar o filtro seleccionado"
+
#: ../data/ui/filediff.ui.h:1
msgid "Save changes to documents before closing?"
msgstr "Desexa gardar cambios nos documentos antes de gardar?"
@@ -106,7 +116,7 @@ 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"
+msgid "Close _without Saving"
msgstr "Pechar _sen gardar"
#: ../data/ui/filediff.ui.h:4
@@ -118,6 +128,14 @@ msgid "_Save"
msgstr "_Gardar"
#: ../data/ui/filediff.ui.h:6
+msgid "Revert unsaved changes to documents?"
+msgstr "Desexa reverter os cambios non gardados nos documentos?"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "Os cambios realizados nos seguintes documentos perderanse permanentemente:\n"
+
+#: ../data/ui/filediff.ui.h:9
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."
@@ -126,7 +144,11 @@ msgstr ""
"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:132
+#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:293
+msgid "Lock scrolling of all panes"
+msgstr "Bloquear o desprazamento de todos os paneis"
+
+#: ../data/ui/findbar.ui.h:1
msgid "_Replace"
msgstr "Substituí_r"
@@ -151,16 +173,16 @@ msgid "Replace _with:"
msgstr "Substituír _con:"
#: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
-msgstr "Diferenciar _maiúsculas de minúsculas"
+msgid "_Match case"
+msgstr "_Coincidir coa capitalización"
#: ../data/ui/findbar.ui.h:8
msgid "Who_le word"
msgstr "Pa_labra completa"
#: ../data/ui/findbar.ui.h:9
-msgid "Regular E_xpression"
-msgstr "E_xpresión regular"
+msgid "Regular e_xpression"
+msgstr "Expresión regular"
#: ../data/ui/findbar.ui.h:10
msgid "Wrapped"
@@ -209,77 +231,34 @@ msgstr ""
"Proxecto Trasno - Tradución de software libre ao galego <proxecto trasno "
"net>, 1999-2012"
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Escoller ficheiros"
-
-#: ../data/ui/meldapp.ui.h:11
-msgid "_Three Way Compare"
-msgstr "Comparación a _tres bandas"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:13
-msgid "Mine"
-msgstr "Meu"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "Orixinal"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "Outro"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "Comparación de _ficheiros"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "Comparación _de cartafoles"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Seleccionar cartafol VC"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "Cartafol"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "Navegador do Control de _versións"
-
#: ../data/ui/patch-dialog.ui.h:1
-msgid "Create Patch"
-msgstr "Crear parche"
+msgid "Format as Patch"
+msgstr "Formatar como parche"
#: ../data/ui/patch-dialog.ui.h:2
-msgid "Create a patch"
-msgstr "Crear un parche"
-
-#: ../data/ui/patch-dialog.ui.h:3
msgid "Use differences between:"
msgstr "Usar as diferencias entre:"
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:3
msgid "Left and middle panes"
msgstr "Paneis esquerdo e do medio"
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:4
msgid "Middle and right panes"
msgstr "Paneis dereito e do medio"
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../data/ui/patch-dialog.ui.h:5
msgid "_Reverse patch direction"
msgstr "Dirección _inversa do parche"
-#: ../data/ui/patch-dialog.ui.h:7
+#: ../data/ui/patch-dialog.ui.h:6
msgid "Copy to Clipboard"
msgstr "Copiar ao portapapeis"
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:124
+msgid "Save Patch"
+msgstr "Gardar parche"
+
#: ../data/ui/preferences.ui.h:1
msgid "Meld Preferences"
msgstr "Preferencias de Meld"
@@ -329,7 +308,7 @@ msgid "Use s_yntax highlighting"
msgstr "Usar realce de _sintaxe"
#: ../data/ui/preferences.ui.h:13
-msgid "External editor"
+msgid "External Editor"
msgstr "Editor externo"
#: ../data/ui/preferences.ui.h:14
@@ -345,6 +324,34 @@ msgid "Editor"
msgstr "Editor"
#: ../data/ui/preferences.ui.h:17
+msgid "Shallow Comparison"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:18
+msgid "C_ompare files based only on size and timestamp"
+msgstr "C_omparar ficheiros baseándose só no tamaño e marca de tempo"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "_Timestamp resolution:"
+msgstr "Resolución da _marca de tempo:"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Symbolic Links"
+msgstr "Ligazóns simbólicas"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore symbolic links"
+msgstr "Ignorar as ligazóns simbólicas"
+
+#: ../data/ui/preferences.ui.h:22
+msgid "Visible Columns"
+msgstr "Columnas visíbeis"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "Folder Comparisons"
+msgstr "Comparación de cartafoles"
+
+#: ../data/ui/preferences.ui.h:24
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -354,15 +361,11 @@ msgstr ""
"e cartafoles polo nome. Cada patrón é unha lista de comodíns de shell "
"separados por espazos."
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Ignorar as ligazóns simbólicas"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:25 ../meld/meldwindow.py:122
msgid "File Filters"
msgstr "Filtros de ficheiro"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:26
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -376,83 +379,155 @@ msgstr ""
"Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de "
"usuario para máis detalles."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:27
msgid "Ignore changes which insert or delete blank lines"
msgstr "Ignorar os cambios que insiran ou eliminen liñas en branco"
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:28
msgid "Text Filters"
msgstr "Filtros de texto"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:29
msgid "Loading"
msgstr "Cargando"
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:30
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "Ao cargar, tentar en orde estas codificacións. (p.ex. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:31
msgid "Encoding"
msgstr "Codificación"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
+msgid "New comparison"
+msgstr "Nova comparación"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "Comparación de ficheiros"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "Comparación de directorios"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Mostrar control de versións"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "Comparación a _3 bandas"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Seleccionar terceiro ficheiro"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Seleccionar segundo ficheiro"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Seleccionar primeiro ficheiro"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Seleccionar primeiro cartafol"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "Seleccionar segundo cartafol"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "Seleccionar terceiro cartafol"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Seleccionar un cartafol controlado por versións"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "Comparación _baleira"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "C_omparar"
+
#: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
-msgstr "Rexistro CV"
+msgid "Commit"
+msgstr "Remitir"
#: ../data/ui/vcview.ui.h:2
msgid "Commit Files"
msgstr "Remitir os ficheiros"
#: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "Rexistros anteriores"
-
-#: ../data/ui/vcview.ui.h:4
msgid "Log Message"
msgstr "Mensaxe de rexistro"
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../data/ui/vcview.ui.h:4
+msgid "Previous logs:"
+msgstr "Rexistros anteriores:"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "Co_mmit"
+msgstr "Remitir"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Push local commits to remote?"
+msgstr "Remitir cambios locais ao remoto?"
+
+#: ../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."
+
+#: ../data/ui/vcview.ui.h:8
+msgid "_Push commits"
+msgstr "_Enviar remisións"
+
+#: ../meld/dirdiff.py:269 ../meld/vcview.py:239
msgid "_Compare"
msgstr "_Comparar"
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:269
msgid "Compare selected"
msgstr "Comparar o seleccionado"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:270
msgid "Copy _Left"
msgstr "Copiar á _esquerda"
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:270
msgid "Copy to left"
msgstr "Copiar á esquerda"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:271
msgid "Copy _Right"
msgstr "Copiar á _dereita"
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:271
msgid "Copy to right"
msgstr "Copiar á dereita"
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:272
msgid "Delete selected"
msgstr "Eliminar o seleccionado"
-#: ../meld/dirdiff.py:237 ../meld/filediff.py:1247
+#: ../meld/dirdiff.py:273 ../meld/filediff.py:1346 ../meld/filediff.py:1381
msgid "Hide"
msgstr "Ocultar"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:273
msgid "Hide selected"
msgstr "Ocultar o seleccionado"
-#: ../meld/dirdiff.py:241
-msgid "Ignore filename case"
+#: ../meld/dirdiff.py:277
+msgid "Ignore Filename Case"
msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro"
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:277
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -460,74 +535,89 @@ msgstr ""
"Considerar casos diferentes os nomes de ficheiro que de outro modo serían "
"idénticos"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:278
msgid "Same"
msgstr "Iguais"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:278
msgid "Show identical"
msgstr "Mostrar idénticos"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:279
msgid "New"
msgstr "Novo"
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:279
msgid "Show new"
msgstr "Mostrar novo"
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:280
msgid "Modified"
msgstr "Modificado"
-#: ../meld/dirdiff.py:244 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:280
msgid "Show modified"
msgstr "Mostrar modificados"
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:282
msgid "Filters"
msgstr "Filtros"
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:282
msgid "Set active filters"
msgstr "Estabelecer filtros activos"
-#: ../meld/dirdiff.py:407
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:360
+msgid "Size"
+msgstr "Tamaño"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:368
+msgid "Modification time"
+msgstr "Hora de modificación"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:376
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../meld/dirdiff.py:510
#, python-format
msgid "Hide %s"
msgstr "Ocultar %s"
-#: ../meld/dirdiff.py:521 ../meld/dirdiff.py:540 ../meld/vcview.py:370
-#: ../meld/vcview.py:394
+#: ../meld/dirdiff.py:636 ../meld/dirdiff.py:655 ../meld/vcview.py:516
+#: ../meld/vcview.py:540
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Analizando %s"
-#: ../meld/dirdiff.py:639
+#: ../meld/dirdiff.py:755
#, python-format
msgid "[%s] Done"
msgstr "[%s] Feito"
-#: ../meld/dirdiff.py:644
+#: ../meld/dirdiff.py:761
msgid "Multiple errors occurred while scanning this folder"
msgstr "Producíronse varios erros ao analizar este cartafol"
-#: ../meld/dirdiff.py:645
+#: ../meld/dirdiff.py:762
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:647
+#: ../meld/dirdiff.py:764
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:649
+#: ../meld/dirdiff.py:766
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:651
+#: ../meld/dirdiff.py:768
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -536,17 +626,17 @@ msgstr ""
"sistema de ficheiros que diferencia maiúsculas de minúsculas. Algúns "
"ficheiros non están visíbeis:"
-#: ../meld/dirdiff.py:662
+#: ../meld/dirdiff.py:779
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "«%s» agochado por «%s»"
-#: ../meld/dirdiff.py:687 ../meld/filediff.py:1010 ../meld/filediff.py:1251
-#: ../meld/vcview.py:620 ../meld/vcview.py:662
+#: ../meld/dirdiff.py:804 ../meld/filediff.py:1074 ../meld/filediff.py:1350
+#: ../meld/filediff.py:1383 ../meld/vcview.py:847 ../meld/vcview.py:890
msgid "Hi_de"
msgstr "Ocu_ltar"
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:836
#, python-format
msgid ""
"'%s' exists.\n"
@@ -555,7 +645,7 @@ msgstr ""
"«%s» existe.\n"
"Sobrescribir?"
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:843
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -566,7 +656,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:744 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:861 ../meld/vcview.py:821
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -575,7 +665,7 @@ msgstr ""
"«%s» é un cartafol.\n"
"Retirar recursivamente?"
-#: ../meld/dirdiff.py:751 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:868 ../meld/vcview.py:826
#, python-format
msgid ""
"Error removing %s\n"
@@ -586,210 +676,233 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:999
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i segundo"
msgstr[1] "%i segundos"
-#: ../meld/dirdiff.py:852
+#: ../meld/dirdiff.py:1000
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i minuto"
msgstr[1] "%i minutos"
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:1001
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i hora"
msgstr[1] "%i horas"
-#: ../meld/dirdiff.py:854
+#: ../meld/dirdiff.py:1002
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] "%i día"
msgstr[1] "%i días"
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:1003
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] "%i semana"
msgstr[1] "%i semanas"
-#: ../meld/dirdiff.py:856
+#: ../meld/dirdiff.py:1004
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] "%i mes"
msgstr[1] "%i meses"
-#: ../meld/dirdiff.py:857
+#: ../meld/dirdiff.py:1005
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] "%i ano"
msgstr[1] "%i anos"
-#: ../meld/filediff.py:228
-msgid "Format as patch..."
-msgstr "Formatar o parche como…"
+#: ../meld/filediff.py:221
+msgid "Format as Patch..."
+msgstr "Formatar como parche…"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:222
msgid "Create a patch using differences between files"
msgstr "Crear un parche usando as diferenzas entre os ficheiros"
-#: ../meld/filediff.py:229
-msgid "Previous conflict"
+#: ../meld/filediff.py:224
+msgid "Save A_ll"
+msgstr "G_ardar todo"
+
+#: ../meld/filediff.py:225
+msgid "Save all files in the current comparison"
+msgstr "Garda todos os ficheiros na comparación actual"
+
+#: ../meld/filediff.py:228
+msgid "Revert files to their saved versions"
+msgstr "Reverte os ficheiros ás súas versións gardadas"
+
+#: ../meld/filediff.py:230
+msgid "Add Synchronization Point"
+msgstr "Engadir punto de sincronización"
+
+#: ../meld/filediff.py:231
+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:234
+msgid "Clear Synchronization Points"
+msgstr "Limpar puntos de sincronización"
+
+#: ../meld/filediff.py:235
+msgid "Clear manual change sychronization points"
+msgstr ""
+
+#: ../meld/filediff.py:237
+msgid "Previous Conflict"
msgstr "Conflito anterior"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:238
msgid "Go to the previous conflict"
msgstr "Ir ao conflito anterior"
-#: ../meld/filediff.py:230
-msgid "Next conflict"
+#: ../meld/filediff.py:240
+msgid "Next Conflict"
msgstr "Seguinte conflito"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:241
msgid "Go to the next conflict"
msgstr "Ir ao seguinte conflito"
-#: ../meld/filediff.py:231
-msgid "Push to left"
+#: ../meld/filediff.py:243
+msgid "Push to Left"
msgstr "Empurrar á esquerda"
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:244
msgid "Push current change to the left"
msgstr "Empurrar o cambio actual á esquerda"
-#: ../meld/filediff.py:232
-msgid "Push to right"
+#: ../meld/filediff.py:247
+msgid "Push to Right"
msgstr "Empurrar á dereita"
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:248
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:234
-msgid "Pull from left"
+#: ../meld/filediff.py:252
+msgid "Pull from Left"
msgstr "Traer desde á esquerda"
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:253
msgid "Pull change from the left"
msgstr "Traer o cambio desde á esquerda"
-#: ../meld/filediff.py:235
-msgid "Pull from right"
+#: ../meld/filediff.py:256
+msgid "Pull from Right"
msgstr "Traer desde á dereita"
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:257
msgid "Pull change from the right"
msgstr "Traer o cambio desde á dereita"
-#: ../meld/filediff.py:236
-msgid "Copy above left"
+#: ../meld/filediff.py:259
+msgid "Copy Above Left"
msgstr "Copiar por enriba da esquerda"
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:260
msgid "Copy change above the left chunk"
msgstr "Copiar o cambio por enriba da parte esquerda"
-#: ../meld/filediff.py:237
-msgid "Copy below left"
+#: ../meld/filediff.py:262
+msgid "Copy Below Left"
msgstr "Copiar por debaixo da esquerda"
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:263
msgid "Copy change below the left chunk"
msgstr "Copiar o cambio por embaixo da parte esquerda"
-#: ../meld/filediff.py:238
-msgid "Copy above right"
+#: ../meld/filediff.py:265
+msgid "Copy Above Right"
msgstr "Copiar por enriba da dereita"
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:266
msgid "Copy change above the right chunk"
msgstr "Copiar o cambio por enriba da parte dereita"
-#: ../meld/filediff.py:239
-msgid "Copy below right"
+#: ../meld/filediff.py:268
+msgid "Copy Below Right"
msgstr "Copiar por debaixo da dereita"
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:269
msgid "Copy change below the right chunk"
msgstr "Copiar o cambio por embaixo da parte dereita"
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:271
msgid "Delete"
msgstr "Eliminar"
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:272
msgid "Delete change"
msgstr "Eliminar o cambio"
-#: ../meld/filediff.py:241
-msgid "Merge all changes from left"
+#: ../meld/filediff.py:274
+msgid "Merge All from Left"
msgstr "Combinar todos os cambios desde a esquerda"
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:275
msgid "Merge all non-conflicting changes from the left"
msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
-#: ../meld/filediff.py:242
-msgid "Merge all changes from right"
+#: ../meld/filediff.py:277
+msgid "Merge All from Right"
msgstr "Combinar todos os cambios desde a dereita"
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:278
msgid "Merge all non-conflicting changes from the right"
msgstr "Combinar todos os cambios non conflitivos desde a dereita"
-#: ../meld/filediff.py:243
-msgid "Merge all non-conflicting"
-msgstr "Combinar todos os cambios non conflitivos"
+#: ../meld/filediff.py:280
+msgid "Merge All"
+msgstr "Combinar todos"
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:281
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:244
-msgid "Cycle through documents"
-msgstr "Cambiar entre documentos"
+#: ../meld/filediff.py:285
+msgid "Cycle Through Documents"
+msgstr "Cambiar ciclicamente entre documentos"
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:286
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:248
-msgid "Lock scrolling"
-msgstr "Bloquear o desprazamento"
-
-#: ../meld/filediff.py:249
-msgid "Lock scrolling of all panes"
-msgstr "Bloquear o desprazamento de todos os paneis"
+#: ../meld/filediff.py:292
+msgid "Lock Scrolling"
+msgstr "Bloquear desprazamento"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:413
msgid "INS"
msgstr "INS"
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:413
msgid "OVR"
msgstr "SOB"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:367
+#: ../meld/filediff.py:415
#, python-format
msgid "Ln %i, Col %i"
msgstr "Li %i, Col %i"
-#: ../meld/filediff.py:703
+#: ../meld/filediff.py:748
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -798,42 +911,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:998
+#: ../meld/filediff.py:1062
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Estabelecer número de paneis"
-#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:1068
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Abrindo os ficheiros"
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
-#: ../meld/filediff.py:1057
+#: ../meld/filediff.py:1092 ../meld/filediff.py:1102 ../meld/filediff.py:1115
+#: ../meld/filediff.py:1121
msgid "Could not read file"
msgstr "Non foi posíbel ler o ficheiro"
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:1093
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Lendo os ficheiros"
-#: ../meld/filediff.py:1039
+#: ../meld/filediff.py:1103
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s semella ser un ficheiro binario."
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1116
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s non está na codificación: %s"
-#: ../meld/filediff.py:1083
+#: ../meld/filediff.py:1150
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calculando as diferenzas"
-#: ../meld/filediff.py:1238
+#: ../meld/filediff.py:1337
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -841,15 +954,36 @@ msgstr ""
"Se están usando filtros de texto, e poden estar agochando diferenzas entre "
"ficheiros. Quere comparar os ficheiros non filtrados?"
-#: ../meld/filediff.py:1244
+#: ../meld/filediff.py:1343
msgid "Files are identical"
msgstr "Os ficheiros son idénticos"
-#: ../meld/filediff.py:1254
+#: ../meld/filediff.py:1353
msgid "Show without filters"
msgstr "Mostrar sen filtros"
-#: ../meld/filediff.py:1378
+#: ../meld/filediff.py:1375
+msgid "Change highlighting incomplete"
+msgstr "Cambiar realzado incompleto"
+
+#: ../meld/filediff.py:1376
+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."
+msgstr ""
+"Algúns cambios non se realzan porque son demasiado longos. Pode forzar a "
+"Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser "
+"lento."
+
+#: ../meld/filediff.py:1385
+msgid "Keep highlighting"
+msgstr "Manter realzado"
+
+#: ../meld/filediff.py:1387
+msgid "_Keep highlighting"
+msgstr "_Manter realzado"
+
+#: ../meld/filediff.py:1513
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -858,7 +992,7 @@ msgstr ""
"\"%s\" existe!\n"
"Sobrescribir?"
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1526
#, python-format
msgid ""
"Error writing to %s\n"
@@ -869,12 +1003,19 @@ msgstr ""
"\n"
"%s."
-#: ../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:1537
+msgid "Save Left Pane As"
+msgstr "Gardar panel da esquerda como"
+
+#: ../meld/filediff.py:1539
+msgid "Save Middle Pane As"
+msgstr "Gardar panel intermedio como"
+
+#: ../meld/filediff.py:1541
+msgid "Save Right Pane As"
+msgstr "Gardar panel da dereita como"
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1562
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -885,7 +1026,7 @@ msgstr ""
"\n"
"Que formato quere usar?"
-#: ../meld/filediff.py:1432
+#: ../meld/filediff.py:1578
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -894,104 +1035,100 @@ msgstr ""
"«%s» contén caracteres non codificábeis con «%s»\n"
"Quere gardar como UTF-8?"
-#: ../meld/filediff.py:1497
-msgid "Save changes to documents before reloading?"
-msgstr "Desexa gardar cambios nos documentos antes de recargar?"
-
-#: ../meld/filemerge.py:53
+#: ../meld/filemerge.py:51
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Combinando os ficheiros"
-#: ../meld/meldapp.py:93
+#: ../meld/meldapp.py:95
msgid "wrong number of arguments supplied to --diff"
msgstr "número incorrecto de argumentos proporcionado a --diff"
-#: ../meld/meldapp.py:97
+#: ../meld/meldapp.py:99
msgid "Start with an empty window"
msgstr "Comezar cunha xanela baleira"
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:99 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
msgid "file"
msgstr "ficheiro"
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:100 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
msgid "dir"
msgstr "cartafol"
-#: ../meld/meldapp.py:98
+#: ../meld/meldapp.py:101
msgid "Start a version control comparison"
msgstr "Comezar unha comparación no control de versións"
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:103
msgid "Start a 2- or 3-way file comparison"
msgstr "Comezar unha comparación de ficheiros a 2 ou 3 bandas"
-#: ../meld/meldapp.py:100
+#: ../meld/meldapp.py:105
msgid "Start a 2- or 3-way directory comparison"
msgstr "Comezar unha comparación de cartafol a 2 ou 3 bandas"
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:107
msgid "Start a comparison between file and dir/file"
msgstr "Comezar unha comparación entre ficheiro e dir/file"
-#: ../meld/meldapp.py:107
+#: ../meld/meldapp.py:114
msgid "Meld is a file and directory comparison tool."
msgstr "Meld é un ferramenta de comparación de ficheiros e cartafoles."
-#: ../meld/meldapp.py:110
+#: ../meld/meldapp.py:117
msgid "Set label to use instead of file name"
msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
-#: ../meld/meldapp.py:112
+#: ../meld/meldapp.py:119
msgid "Open a new tab in an already running instance"
msgstr "Abre unha nova lapela nunha instancia en execución"
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:122
msgid "Automatically compare all differing files on startup"
msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
-#: ../meld/meldapp.py:116
+#: ../meld/meldapp.py:124
msgid "Ignored for compatibility"
msgstr "Ignorado para compatibilidade"
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:127
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:121
+#: ../meld/meldapp.py:129
msgid "Automatically merge files"
msgstr "Combinar ficheiros automaticamente"
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:132
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."
+#: ../meld/meldapp.py:135
+msgid "Create a diff tab for the supplied files or folders"
msgstr ""
-"Crea unha lapela coas diferenzas de ata 3 directorios ou ficheiros "
+"Crea unha lapela coas diferenzas para os directorios ou ficheiros "
"fornecidos."
-#: ../meld/meldapp.py:130
+#: ../meld/meldapp.py:138
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "demasiados argumentos (buscábanse 0-3, obtivéronse %d)"
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:141
msgid "can't auto-merge less than 3 files"
msgstr "non é posíbel autocombinar menos de 3 ficheiros"
-#: ../meld/meldapp.py:134
+#: ../meld/meldapp.py:143
msgid "can't auto-merge directories"
msgstr "non é posíbel autocombinar cartafoles"
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:149
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
+#: ../meld/meldapp.py:167
msgid "Error reading saved comparison file"
msgstr "Produciuse un erro ao ler o ficheiro de comparación gardado"
@@ -1004,217 +1141,221 @@ msgstr "<sen nome>"
msgid "untitled"
msgstr "sen título"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:61
msgid "_File"
msgstr "_Ficheiro"
-#: ../meld/meldwindow.py:117
-msgid "_New..."
-msgstr "_Novo..."
+#: ../meld/meldwindow.py:62
+msgid "_New Comparison..."
+msgstr "_Nova comparación…"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:63
msgid "Start a new comparison"
msgstr "Comezar unha nova comparación"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:66
msgid "Save the current file"
msgstr "Gardar o ficheiro actual"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:68
+msgid "Save As..."
+msgstr "Gardar como…"
+
+#: ../meld/meldwindow.py:69
+msgid "Save the current file with a different name"
+msgstr "Gardar o ficheiro actual con un nome diferente"
+
+#: ../meld/meldwindow.py:72
msgid "Close the current file"
msgstr "Pechar o ficheiro actual"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:75
msgid "Quit the program"
msgstr "Saír do programa"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:78
msgid "_Edit"
msgstr "_Editar"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:80
msgid "Undo the last action"
msgstr "Desfacer a última acción"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:83
msgid "Redo the last undone action"
msgstr "Refacer a última acción desfeita"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:85
msgid "Cut the selection"
msgstr "Cortar a selección"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:87
msgid "Copy the selection"
msgstr "Copiar a selección"
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:89
msgid "Paste the clipboard"
msgstr "Pegar o contido do portapapeis"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:91
+msgid "Find..."
+msgstr "Buscar…"
+
+#: ../meld/meldwindow.py:91
msgid "Search for text"
msgstr "Buscar texto"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:93
msgid "Find Ne_xt"
msgstr "Buscar a _seguinte"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:94
msgid "Search forwards for the same text"
msgstr "Buscar cara a adiante o mesmo texto"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:96
msgid "Find _Previous"
msgstr "_Anterior"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:97
msgid "Search backwards for the same text"
msgstr "Buscar cara a adiante o mesmo texto"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:100
+msgid "_Replace..."
+msgstr "Substituí_r…"
+
+#: ../meld/meldwindow.py:101
msgid "Find and replace text"
msgstr "Buscar e substituír texto"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:103
msgid "Prefere_nces"
msgstr "Prefere_ncias"
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:104
msgid "Configure the application"
msgstr "Configurar o aplicativo"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:107
msgid "_Changes"
msgstr "_Cambios"
-#: ../meld/meldwindow.py:136
-msgid "Next change"
+#: ../meld/meldwindow.py:108
+msgid "Next Change"
msgstr "Seguinte cambio"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:109
msgid "Go to the next change"
msgstr "Ir ao seguinte cambio"
-#: ../meld/meldwindow.py:137
-msgid "Previous change"
+#: ../meld/meldwindow.py:111
+msgid "Previous Change"
msgstr "Anterior cambio"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:112
msgid "Go to the previous change"
msgstr "Ir ao cambio anterior"
-#: ../meld/meldwindow.py:138
-msgid "Open externally"
+#: ../meld/meldwindow.py:114
+msgid "Open Externally"
msgstr "Abrir externamente"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:115
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:140
+#: ../meld/meldwindow.py:119
msgid "_View"
msgstr "_Ver"
-#: ../meld/meldwindow.py:141
-msgid "File status"
+#: ../meld/meldwindow.py:120
+msgid "File Status"
msgstr "Estado do ficheiro"
-#: ../meld/meldwindow.py:142
-msgid "Version status"
+#: ../meld/meldwindow.py:121
+msgid "Version Status"
msgstr "Estado da versión"
-#: ../meld/meldwindow.py:143
-msgid "File filters"
-msgstr "Filtros de ficheiro"
-
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:124
msgid "Stop the current action"
msgstr "Deter a acción actual"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:127
msgid "Refresh the view"
msgstr "Actualizar a vista"
-#: ../meld/meldwindow.py:146
-msgid "Reload"
-msgstr "Recargar"
-
-#: ../meld/meldwindow.py:146
-msgid "Reload the comparison"
-msgstr "Recargar a comparación"
-
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:130
msgid "_Tabs"
msgstr "_Lapelas"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:131
msgid "_Previous Tab"
msgstr "_Anterior"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:132
msgid "Activate previous tab"
msgstr "Ir á lapela anterior"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:134
msgid "_Next Tab"
msgstr "Segui_nte"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:135
msgid "Activate next tab"
msgstr "Activar a seguinte lapela"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:138
msgid "Move Tab _Left"
msgstr "Copiar á esquerda"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:139
msgid "Move current tab to left"
msgstr "Mover a lapela actual á esquerda"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:142
msgid "Move Tab _Right"
msgstr "Copiar á dereita"
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:143
msgid "Move current tab to right"
msgstr "Mover a lapela actual á dereita"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:146
msgid "_Help"
msgstr "A_xuda"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:147
msgid "_Contents"
msgstr "_Contidos"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:148
msgid "Open the Meld manual"
msgstr "Abrir o manual do Meld"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:149
msgid "Report _Bug"
msgstr "_Informar dun fallo"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:150
msgid "Report a bug in Meld"
msgstr "Informe dun fallo en Meld"
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:153
msgid "About this program"
msgstr "Sobre este programa"
-#: ../meld/meldwindow.py:160
-msgid "Full Screen"
+#: ../meld/meldwindow.py:157
+msgid "Fullscreen"
msgstr "Pantalla completa"
-#: ../meld/meldwindow.py:160
-msgid "View the comparison in full screen"
+#: ../meld/meldwindow.py:158
+msgid "View the comparison in fullscreen"
msgstr "Ver a comparación a pantalla completa"
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:160
msgid "_Toolbar"
msgstr "Barra de ferramen_tas"
@@ -1222,59 +1363,55 @@ msgstr "Barra de ferramen_tas"
msgid "Show or hide the toolbar"
msgstr "Mostrar ou ocultar a barra de ferramentas"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:163
msgid "_Statusbar"
msgstr "Barra de e_stado"
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:164
msgid "Show or hide the statusbar"
msgstr "Mostrar ou ocultar a barra de estado"
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:173
msgid "Open Recent"
msgstr "Abrir recentes"
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:174
msgid "Open recent files"
msgstr "Abrir ficheiros recentes"
-#: ../meld/meldwindow.py:569
+#: ../meld/meldwindow.py:588
msgid "Switch to this tab"
msgstr "Cambiar a esta lapela"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:674
+#: ../meld/meldwindow.py:721
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:180
+#: ../meld/misc.py:173
msgid "[None]"
msgstr "[Ningún]"
-#: ../meld/patchdialog.py:124
-msgid "Save Patch As..."
-msgstr "Gardar parche como..."
-
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:49
msgid "label"
msgstr "etiqueta"
-#: ../meld/preferences.py:38
+#: ../meld/preferences.py:49
msgid "pattern"
msgstr "patrón"
-#: ../meld/preferences.py:112
+#: ../meld/preferences.py:165
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:229
+#: ../meld/preferences.py:311
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:231
+#: ../meld/preferences.py:313
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1283,198 +1420,230 @@ 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:233
+#: ../meld/preferences.py:315
#, 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:235
+#: ../meld/preferences.py:317
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:237
+#: ../meld/preferences.py:319
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:239
+#: ../meld/preferences.py:321
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:241
+#: ../meld/preferences.py:323
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:243
+#: ../meld/preferences.py:325
msgid "C comment\t0\t/\\*.*?\\*/\n"
msgstr "Comentario C\t0\t/\\*.*?\\*/\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:245
+#: ../meld/preferences.py:327
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:247
+#: ../meld/preferences.py:329
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:249
+#: ../meld/preferences.py:331
msgid "Script comment\t0\t#.*"
msgstr "Comentario de script\t0\t#.*"
-#: ../meld/vcview.py:161
-msgid "Co_mmit"
-msgstr "Remitir"
+#: ../meld/recent.py:104
+msgid "Version control:"
+msgstr "Control de versións:"
-#: ../meld/vcview.py:161
-msgid "Commit"
-msgstr "Remitir"
+#: ../meld/vcview.py:96
+msgid "No files will be committed"
+msgstr "Non se remitirá ningún ficheiro"
+
+#: ../meld/vcview.py:240
+msgid "Compare selected files"
+msgstr "Comparar ficheiros seleccionados"
+
+#: ../meld/vcview.py:242
+msgid "Co_mmit..."
+msgstr "Re_mitir…"
+
+#: ../meld/vcview.py:243
+msgid "Commit changes to version control"
+msgstr "Remitir cambios ao control de versións"
-#: ../meld/vcview.py:162
+#: ../meld/vcview.py:245
msgid "_Update"
msgstr "Act_ualizar"
-#: ../meld/vcview.py:162
-msgid "Update"
-msgstr "Actualizar"
+#: ../meld/vcview.py:246
+msgid "Update working copy from version control"
+msgstr "Actualizar a copia local desde o sistema de control de versións"
-#: ../meld/vcview.py:163
-msgid "Add to VC"
-msgstr "Engadir a CV"
+#: ../meld/vcview.py:248
+msgid "_Push"
+msgstr "_Enviar"
-#: ../meld/vcview.py:164
-msgid "Remove from VC"
-msgstr "Retirar de CV"
+#: ../meld/vcview.py:249
+msgid "Push local changes to remote"
+msgstr "Enviar cambios locais ao remoto"
-#: ../meld/vcview.py:165
-msgid "_Resolved"
-msgstr "Soluciona_do"
+#: ../meld/vcview.py:252
+msgid "Add to version control"
+msgstr "Engadir ao control de versións"
-#: ../meld/vcview.py:165
-msgid "Mark as resolved for VC"
-msgstr "Marcar como solucionado para o CV"
+#: ../meld/vcview.py:255
+msgid "Remove from version control"
+msgstr "Eliminar do control de versións"
-#: ../meld/vcview.py:166
-msgid "Revert to original"
-msgstr "Reverter ao orixinal"
+#: ../meld/vcview.py:257
+msgid "Mar_k as Resolved"
+msgstr "Marc_ar como solucionado"
-#: ../meld/vcview.py:167
-msgid "Delete locally"
-msgstr "Eliminar localmente"
+#: ../meld/vcview.py:258
+msgid "Mark as resolved in version control"
+msgstr "Marcar como solucionado no control de versións"
-#: ../meld/vcview.py:171
+#: ../meld/vcview.py:260
+msgid "Re_vert"
+msgstr "Re_verter"
+
+#: ../meld/vcview.py:261
+msgid "Revert working copy to original state"
+msgstr "Reverter a copia local ao seu estado orixinal"
+
+#: ../meld/vcview.py:264
+msgid "Delete from working copy"
+msgstr "Eliminar desde a copia local"
+
+#: ../meld/vcview.py:269
msgid "_Flatten"
msgstr "Apl_anar"
-#: ../meld/vcview.py:171
+#: ../meld/vcview.py:270
msgid "Flatten directories"
msgstr "Rasar cartafoles"
-#: ../meld/vcview.py:172
+#: ../meld/vcview.py:272
msgid "_Modified"
msgstr "_Modificado"
-#: ../meld/vcview.py:173
+#: ../meld/vcview.py:273
+msgid "Show modified files"
+msgstr "Mostrar ficheiros modificados"
+
+#: ../meld/vcview.py:275
msgid "_Normal"
msgstr "_Normal"
-#: ../meld/vcview.py:173
-msgid "Show normal"
-msgstr "Mostrar normal"
+#: ../meld/vcview.py:276
+msgid "Show normal files"
+msgstr "Mostrar ficheiros normais"
-#: ../meld/vcview.py:174
-msgid "Non _VC"
-msgstr "Sen C_V"
+#: ../meld/vcview.py:278
+msgid "Un_versioned"
+msgstr "Sen _versión"
-#: ../meld/vcview.py:174
+#: ../meld/vcview.py:279
msgid "Show unversioned files"
msgstr "Mostrar ficheiros sen versión"
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:281
msgid "Ignored"
msgstr "Ignorado"
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:282
msgid "Show ignored files"
msgstr "Mostrar ficheiros ignorados"
-#: ../meld/vcview.py:226 ../meld/vcview.py:366
+#: ../meld/vcview.py:341 ../meld/vcview.py:512
msgid "Location"
msgstr "Localización"
-#: ../meld/vcview.py:227
+#: ../meld/vcview.py:342
msgid "Status"
msgstr "Estado"
-#: ../meld/vcview.py:228
-msgid "Rev"
-msgstr "Rev"
+#: ../meld/vcview.py:343
+msgid "Revision"
+msgstr "Revisión"
-#: ../meld/vcview.py:229
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:344
msgid "Options"
msgstr "Opcións"
-#: ../meld/vcview.py:292
-msgid "Choose one Version Control"
-msgstr "Escoller un control de versións"
-
-#: ../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:306
+#: ../meld/vcview.py:422
#, python-format
-msgid "%s Not Installed"
+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:310
-msgid "Invalid Repository"
+#: ../meld/vcview.py:426
+msgid "Invalid repository"
msgstr "O repositorio non é válido"
-#: ../meld/vcview.py:319
+#: ../meld/vcview.py:435
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
+#: ../meld/vcview.py:437 ../meld/vcview.py:445
+msgid "None"
+msgstr "Ningún"
+
+#: ../meld/vcview.py:456
+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:458
+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:460
+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:366
+#: ../meld/vcview.py:512
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:555
msgid "(Empty)"
msgstr "(Baleiro)"
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:587
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Obtendo as diferenzas"
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:595
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Aplicando o parche"
-#: ../meld/vcview.py:613
+#: ../meld/vcview.py:840
msgid "Patch tool not found"
msgstr "Ferramenta de parches non atopada"
-#: ../meld/vcview.py:614
+#: ../meld/vcview.py:841
#, python-format
msgid ""
"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1483,11 +1652,11 @@ 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:654
+#: ../meld/vcview.py:882
msgid "Error fetching original comparison file"
msgstr "Produciuse un erro ao obter o ficheiro de comparación orixinal"
-#: ../meld/vcview.py:655
+#: ../meld/vcview.py:883
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 "
@@ -1496,11 +1665,11 @@ 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:663
+#: ../meld/vcview.py:891
msgid "Report a bug"
msgstr "Informar dun fallo"
-#: ../meld/ui/findbar.py:145
+#: ../meld/ui/findbar.py:150
#, python-format
msgid ""
"Regular expression error\n"
@@ -1509,36 +1678,52 @@ msgstr ""
"Erro na expresión regular\n"
"«%s»"
-#: ../meld/ui/historyentry.py:296
+#: ../meld/ui/historyentry.py:374
msgid "_Browse..."
msgstr "E_xaminar..."
-#: ../meld/ui/historyentry.py:304
+#: ../meld/ui/historyentry.py:382
msgid "Path"
msgstr "Ruta"
-#: ../meld/ui/historyentry.py:305
+#: ../meld/ui/historyentry.py:383
msgid "Path to file"
msgstr "Ruta ao ficheiro"
-#: ../meld/ui/historyentry.py:306
+#: ../meld/ui/historyentry.py:384
msgid "Pop up a file selector to choose a file"
msgstr "Mostrar un selector para escoller un ficheiro"
-#: ../meld/ui/historyentry.py:444
+#: ../meld/ui/historyentry.py:522
msgid "Select directory"
msgstr "Seleccionar cartafol"
-#: ../meld/ui/historyentry.py:448
+#: ../meld/ui/historyentry.py:526
msgid "Select file"
msgstr "Seleccionar ficheiro"
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:63
msgid "Close tab"
msgstr "Pechar a lapela"
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr "Combinado"
+
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr "Base"
+
+#: ../meld/vc/_vc.py:47
+msgid "Local"
+msgstr "Local"
+
+#: ../meld/vc/_vc.py:47
+msgid "Remote"
+msgstr "Remoto"
+
#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:40
+#: ../meld/vc/_vc.py:62
msgid ""
"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
"Not present"
@@ -1546,7 +1731,7 @@ msgstr ""
"Ignorado:Non Versionado:::Erro::Novas adicións:Modificado:Conflito:Eliminado:"
"Que falta:Non presente"
-#: ../meld/vc/cvs.py:165
+#: ../meld/vc/cvs.py:182
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1557,13 +1742,100 @@ msgstr ""
"O patrón era «%s»\n"
"O erro foi «%s»"
-#: ../meld/vc/git.py:181
+#: ../meld/vc/git.py:121
+#, python-format
+msgid "%d unpushed commits in %d branches"
+msgstr "%d remisións sen mandar en %d ramas"
+
+#: ../meld/vc/git.py:124
+#, 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:325
#, 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 "Choose Files"
+#~ msgstr "Escoller ficheiros"
+
+#~ msgid "_Three Way Compare"
+#~ msgstr "Comparación a _tres bandas"
+
+#~ msgid "Mine"
+#~ msgstr "Meu"
+
+#~ msgid "Original"
+#~ msgstr "Orixinal"
+
+#~ msgid "Other"
+#~ msgstr "Outro"
+
+#~ msgid "Select VC Directory"
+#~ msgstr "Seleccionar cartafol VC"
+
+#~ msgid "Directory"
+#~ msgstr "Cartafol"
+
+#~ msgid "Create Patch"
+#~ msgstr "Crear parche"
+
+#~ msgid "Create a patch"
+#~ msgstr "Crear un parche"
+
+#~ msgid "VC Log"
+#~ msgstr "Rexistro CV"
+
+#~ msgid "Merge all non-conflicting"
+#~ msgstr "Combinar todos os cambios non conflitivos"
+
+#~ msgid "Choose a name for buffer %i."
+#~ msgstr "Escolla un nome para o búfer %i."
+
+#~ msgid "Save changes to documents before reloading?"
+#~ msgstr "Desexa gardar cambios nos documentos antes de recargar?"
+
+#~ msgid "_New..."
+#~ msgstr "_Novo..."
+
+#~ msgid "File filters"
+#~ msgstr "Filtros de ficheiro"
+
+#~ msgid "Reload"
+#~ msgstr "Recargar"
+
+#~ msgid "Reload the comparison"
+#~ msgstr "Recargar a comparación"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Add to VC"
+#~ msgstr "Engadir a CV"
+
+#~ msgid "Remove from VC"
+#~ msgstr "Retirar de CV"
+
+#~ msgid "_Resolved"
+#~ msgstr "Soluciona_do"
+
+#~ msgid "Delete locally"
+#~ msgstr "Eliminar localmente"
+
+#~ msgid "Show normal"
+#~ msgstr "Mostrar normal"
+
+#~ msgid "Non _VC"
+#~ msgstr "Sen C_V"
+
+#~ msgid "Rev"
+#~ msgstr "Rev"
+
+#~ msgid "Tag"
+#~ msgstr "Etiqueta"
#~ msgid ""
#~ "Some files have been modified.\n"
@@ -1684,9 +1956,6 @@ msgstr "Modo cambiado desde %s a %s"
#~ msgid "Two way file"
#~ msgstr "Ficheiro a dúas bandas"
-#~ msgid "Version control view"
-#~ msgstr "Mostrar control de versións"
-
#~ msgid "<b>Display</b>"
#~ msgstr "<b>Mostrar</b>"
@@ -1733,9 +2002,6 @@ msgstr "Modo cambiado desde %s a %s"
#~ msgid "_Character"
#~ msgstr "_Carácter"
-#~ msgid "_None"
-#~ msgstr "_Ningún"
-
#~ msgid "_Word"
#~ msgstr "_Palabra"
@@ -1807,9 +2073,6 @@ msgstr "Modo cambiado desde %s a %s"
#~ "Elixa como se debuxa a barra central do visor de diferenzas. Debería "
#~ "escoller un modo máis sinxelo se o desprazamento vai lento."
-#~ msgid "Compare"
-#~ msgstr "Comparar"
-
#~ msgid "Copy All To _Left"
#~ msgstr "Copiar todo á es_querda"
@@ -1890,9 +2153,6 @@ msgstr "Modo cambiado desde %s a %s"
#~ msgid "Save"
#~ msgstr "Gardar"
-#~ msgid "Save _As"
-#~ msgstr "G_ardar como"
-
#~ msgid "Save in UTF-8 encoding"
#~ msgstr "Gardar na codificación UTF-8"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
