[meld/meld-3-22] Update Galician translation
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-3-22] Update Galician translation
- Date: Fri, 9 Sep 2022 23:48:47 +0000 (UTC)
commit d4b8a1712530e739b7fd6abe866e31dced180595
Author: Fran Dieguez <frandieguez gnome org>
Date: Tue Sep 6 09:13:33 2022 +0000
Update Galician translation
po/gl.po | 2443 ++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 1357 insertions(+), 1086 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index d99329de..4d954472 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,66 +8,47 @@
# Fran Diéguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
# Leandro Regueiro <leandro regueiro gmail com>, 2012.
# Marcos Lans <marcoslansgarza gmail com>, 2018.
-# Fran Dieguez <frandieguez gnome org>, 2012-2019.
+# Fran Dieguez <frandieguez gnome org>, 2012-2022.
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: unnamed project\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-01-20 20:13+0000\n"
-"PO-Revision-Date: 2019-01-29 01:15+0100\n"
+"POT-Creation-Date: 2022-09-06 06:29+0000\n"
+"PO-Revision-Date: 2022-09-06 11:13+0200\n"
"Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
-"Language-Team: Galician <proxecto trasno gal>\n"
+"Language-Team: Galician <Proxecto Trasno <proxecto trasno gal>>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.30.0\n"
-
-#: ../bin/meld:190
-msgid "Cannot import: "
-msgstr "Non é posíbel importar: "
-
-#: ../bin/meld:193
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld require %s ou superior."
-
-#: ../bin/meld:262
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"Non foi posíbel cargar o CSS específico de Meld (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+"X-Generator: Gtranslator 40.0\n"
+"X-DL-Team: gl\n"
+"X-DL-Module: meld\n"
+"X-DL-Branch: main\n"
+"X-DL-Domain: po\n"
+"X-DL-State: Translating\n"
+
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Visualizador Diff"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Visualizador Diff Meld"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
msgid "Compare and merge your files"
msgstr "Compare e combine os seus ficheiros"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
msgid "diff;merge;"
msgstr "comparar;combinar;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -80,7 +61,7 @@ msgstr ""
"bandas tanto entre ficheiros como entre cartafoles e acepta moitos sistemas "
"de control de versións como Git, Bazaar e Subversion."
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
@@ -88,35 +69,48 @@ msgstr ""
"Meld axuda a revisar os cambios no código, a entender os parches e ademais "
"fai os enormes conflitos das fusións lixeiramente menos dorosos."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "O Proxecto GNOME"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Descrición da comparación do Meld"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Largura predeterminada da xanela"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Altura predeterminada da xanela"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Estado predeterminado coa xanela maximizada"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Estado de pantalla completa da xanela predeterminada"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
+msgid "Prefer application-wide dark theme"
+msgstr "Preferir o tema escuro a nivel aplicación"
+
+#: data/org.gnome.meld.gschema.xml:59
+msgid ""
+"If true, the GTK dark theme variant will be used, if available. Note that "
+"this is separate from the syntax highlighting scheme."
+msgstr ""
+"Se é verdadeiro, usarase a variante do tema escuro de GTK, se está "
+"dispoñíbel. Teña en conta que isto está separado do esquema de realzado de "
+"sintaxe."
+
+#: data/org.gnome.meld.gschema.xml:65
msgid "Additional automatically detected text encodings"
msgstr "Codificacións de texto adicionais detectadas automaticamente"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:66
msgid ""
"Meld will use these text encodings to try to decode loaded text files before "
"trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -129,36 +123,35 @@ msgstr ""
"predeterminada local actual. Poderán usarse outras codificacións dependendo "
"do idioma do usuario."
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: data/org.gnome.meld.gschema.xml:73
msgid "Width of an indentation step"
msgstr "Largura da sangría"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:74
msgid "The number of spaces to use for a single indent step"
msgstr "Número de espazos a usar nunha sangría"
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:78
msgid "Whether to indent using spaces or tabs"
msgstr "Indica se sangrar usando espazos ou tabulacións"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:79
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr "Se se marca, toda sangría nova usará espazos no canto de tabulacións."
-#: ../data/org.gnome.meld.gschema.xml.h:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:83 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Mostrar os números de liña"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:84
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "Se se marca, os números mostraranse na marxe dos ficheiros comparados."
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:88
msgid "Highlight syntax"
msgstr "Realzar a sintaxe"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:89
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -166,31 +159,32 @@ msgstr ""
"Indica se reslatar a sintaxe nas comparacións. Debido aos resaltes de cor do "
"propio Meld, isto está desactivado predeterminadamente."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:93
msgid "Color scheme to use for syntax highlighting"
msgstr "Esquema de cor a usar para resaltar a sintaxe"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:94
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr "Usado por GtkSourceView para determinar as cores de resalte da sintaxe"
-#: ../data/org.gnome.meld.gschema.xml.h:17
-msgid "Displayed whitespace"
-msgstr "Mostrar espazos en branco"
+#: data/org.gnome.meld.gschema.xml:98
+#| msgid "Show whitespace"
+msgid "Draw whitespace"
+msgstr "Debuxar espazos en branco"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:99
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-"Selector de tipos de caracteres de espazo en branco a mostrar. Os valores "
-"posíbeis son : «space», «tab», «newline» e «nbsp»."
+"Se é verdadeiro, os caracteres de espazos en branco debuxaranse nas "
+"comparacións incluso cando non cambiaran nun área."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:108
msgid "Wrap mode"
msgstr "Modo axuste de liña"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:109
msgid ""
"Lines in file comparisons will be wrapped according to this setting, either "
"not at all ('none'), at any character ('char') or only at the end of words "
@@ -200,12 +194,11 @@ msgstr ""
"axuste (Ningún), en calquera carácter (Carácter) ou só ao final da palabra "
"(Palabra)."
-#: ../data/org.gnome.meld.gschema.xml.h:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:116 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Realzar a liña actual"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:117
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
@@ -213,22 +206,22 @@ msgstr ""
"Se se marca, a liña que contén o cursor resaltarase nas comparacións de "
"ficheiros."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:121
msgid "Use the system default monospace font"
msgstr "Usar o tipo de letra de largo fixo do sistema"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:122
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
"Se non se marca, usarase o tipo de letra personalizado no canto do tipo "
"monoespazo do sistema."
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:126
msgid "Custom font"
msgstr "Personalizar tipo de letra"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:127
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -236,22 +229,41 @@ msgstr ""
"Tipo de letra personalizado a usar, gardado como unha cadea e analizado como "
"unha descrición de tipo de letra de Pango."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Show overview source map"
+msgstr "Mostrar mapa de vista xeral de código"
+
+#: data/org.gnome.meld.gschema.xml:134
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+"Se é verdadeiro, as comparacións de ficheiros terán ao carón mapas de código "
+"para os ficheiros comparados."
+
+#: data/org.gnome.meld.gschema.xml:139
+msgid "Style of overview map"
+msgstr "Estilo do mapa de vista xeral"
+
+#: data/org.gnome.meld.gschema.xml:140
+msgid "Style options for how the overview map is displayed."
+msgstr "Opcións de estilo sobre como se mostra o mapa de vista xeral."
+
+#: data/org.gnome.meld.gschema.xml:146
msgid "Ignore blank lines when comparing files"
msgstr "Ignorar as liñas en branco nas comparacións de ficheiros"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:147
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
"Se se marca, as liñas en branco eliminaranse ao resaltar os cambios entre "
"ficheiros."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:154
msgid "Use the system default editor"
msgstr "Usar o editor predeterminado do sistema"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:155
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -259,11 +271,11 @@ msgstr ""
"Se non se marca, usarase o editor personalizado no canto do editor do "
"sistema para abrir ficheiros externamente."
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:159
msgid "The custom editor launch command"
msgstr "Orde para iniciar o editor personalizado"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -271,11 +283,11 @@ msgstr ""
"Orde usada para executar o editor personalizado. Acéptanse algúns modelos "
"limitados; polo momento «{file}» e «{line}» son tokens recoñecidos."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:166
msgid "Columns to display"
msgstr "Columnas a mostrar"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:167
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
@@ -283,12 +295,11 @@ msgstr ""
"Lista de nomes de columna na comparación de cartafoles e se se deberían "
"mostrar."
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
msgid "Ignore symbolic links"
msgstr "Ignorar as ligazóns simbólicas"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:172
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
@@ -296,11 +307,11 @@ msgstr ""
"Se se marca, a comparación de cartafoles non seguirá as ligazóns simbólicas "
"ao percorrer a árbore de cartafoles."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:176
msgid "Use shallow comparison"
msgstr "Usar unha comparación superficial"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:177
msgid ""
"If true, folder comparisons compare files based solely on size and mtime, "
"considering files to be identical if their size and mtime match, and "
@@ -310,11 +321,11 @@ msgstr ""
"tamaño e o mtime, considerando que os ficheiros son idénticos se teñen igual "
"tamaño e mtime e diferentes no caso contrario."
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: data/org.gnome.meld.gschema.xml:181
msgid "File timestamp resolution"
msgstr "Resolución da marca de tempo do ficheiro"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:182
msgid ""
"When comparing based on mtime, this is the minimum difference in nanoseconds "
"between two files before they’re considered to have different mtimes. This "
@@ -326,12 +337,11 @@ msgstr ""
"mtimes. É útil cando se comparan ficheiros entre sistemas de ficheiros con "
"distintas resolucións nas marcas de tempo."
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
msgid "Apply text filters during folder comparisons"
msgstr "Aplicar filtros de texto nas comparacións de cartafoles"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:187
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -342,21 +352,21 @@ msgstr ""
"eliminar ás liñas en branco e ignorar as diferenzas na codificación das "
"novas liñas."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:191
msgid "File status filters"
msgstr "Filtros do estado do ficheiro"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:192
msgid "List of statuses used to filter visible files in folder comparison."
msgstr ""
"Lista de estados usados para filtrar os ficheiros visíbeis na comparación de "
"cartafoles."
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: data/org.gnome.meld.gschema.xml:198
msgid "Show the version control console output"
msgstr "Mostrar a saída por consola do control de versión"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:199
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -365,11 +375,11 @@ msgstr ""
"de versións, mostrando as ordes executadas para as operacións de control de "
"versión."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:203
msgid "Version control pane position"
msgstr "Posición do panel de control de versións"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:204
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -377,13 +387,13 @@ msgstr ""
"Altura da árbore principal de control de versións cando se mostra o panel da "
"consola."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:208
msgid "Present version comparisons as left-local/right-remote"
msgstr ""
"Mostrar as comparacións de versións como «esquerda é local» e «dereita é "
"remota»"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:209
msgid ""
"If true, version control comparisons will use a left-is-local, right-is-"
"remote scheme to determine what order to present files in panes. Otherwise, "
@@ -394,13 +404,13 @@ msgstr ""
"presentación dos ficheiros nos paneis. Noutro caso, usarase o esquema "
"«esquerda é seu», «dereita é meu»."
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:213
msgid "Order for files in three-way version control merge comparisons"
msgstr ""
"Orde dos ficheiros nas comparacións de combinacións de control de versións a "
"tres bandas"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:214
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -411,11 +421,11 @@ msgstr ""
"iniciadas desde a vista de control de versións, polo que se usa unicamente "
"para resolución de combinacións/conflitos en Meld."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:218
msgid "Show margin in commit message editor"
msgstr "Mostrar a marxe no editor de mensaxes para remitir"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:219
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -423,11 +433,11 @@ msgstr ""
"Se é certo, aparecerá unha guía para mostrar en que columna está a marxe no "
"editor de mensaxes do control de versións para remitir."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:223
msgid "Margin column in commit message editor"
msgstr "Columna da marxe no editor de mensaxes para remitir"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:224
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -435,11 +445,11 @@ msgstr ""
"Columna na que mostrar a marxe no editor de mensaxes do control de versións "
"para remitir."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:228
msgid "Automatically hard-wrap commit messages"
msgstr "Axuste duro automático das liñas nas mensaxes para remitir"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:229
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -448,22 +458,22 @@ msgstr ""
"axuste duro de liñas (inserirá quebras de liña) nas marxes dos elementos "
"antes da remisión."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:233
msgid "Version control status filters"
msgstr "Filtros do estado do control de versións"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:234
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
"Lista de estados usados para filtrar ficheiros visíbeis na comparación de "
"control de versións."
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:248
msgid "Filename-based filters"
msgstr "Filtros baseados nos nomes de fiicheiro"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:249
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -472,11 +482,11 @@ msgstr ""
"eliminarán, se están activos, os arquivos coincidentes nas comparacións de "
"cartafoles."
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: data/org.gnome.meld.gschema.xml:263
msgid "Text-based filters"
msgstr "Filtros de texto"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:264
msgid ""
"List of predefined text-based regex filters that, if active, will remove "
"text from being used in a file comparison. The text will still be displayed, "
@@ -486,644 +496,693 @@ msgstr ""
"se están activos, eliminarán partes de texto das comparacións de ficheiros. "
"O texto seguirá véndose pero non participará na comparación."
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Esquema base de Meld"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr "Clásico (Meld)"
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Esquema de cor base para o realzado de Meld"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Esquema escuro de Meld"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Esquema de cor escuro para o realzado de Meld"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Xeral"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Nova comparación"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Pechar unha comparación"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Saír do Meld"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Deter a acción actual"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Actualizar comparación"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
+#| msgid "Open Externally"
+msgctxt "shortcut window"
+msgid "Open externally"
+msgstr "Abrir externamente"
+
+#: meld/resources/gtk/help-overlay.ui:61
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Pantalla completa"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:68
+#| msgid "Middle and right panes"
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Trocar os paneis esquerdo e dereito"
+
+#: meld/resources/gtk/help-overlay.ui:77
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr "Paneis"
+
+#: meld/resources/gtk/help-overlay.ui:82
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Panel de comparación anterior"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Panel de comparación seguinte"
+
+#: meld/resources/gtk/help-overlay.ui:98
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Cambios"
+
+#: meld/resources/gtk/help-overlay.ui:103
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Ir ao cambio anterior"
+
+#: meld/resources/gtk/help-overlay.ui:110
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Ir ao seguinte cambio"
+
+#: meld/resources/gtk/help-overlay.ui:119
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Lapelas"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Ir á lapela anterior"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Ir á lapela seguinte"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Cambiar á lapela"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:145
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Mover lapela á esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Mover lapela á dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Cambios"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Ir ao cambio anterior"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Ir ao seguinte cambio"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:161
msgctxt "shortcut window"
msgid "Editing"
msgstr "Edición"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Undo"
msgstr "Desfacer"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Redo"
msgstr "Refacer"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Cut"
msgstr "Cortar"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Copy"
msgstr "Copiar"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Paste"
msgstr "Pegar"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find"
msgstr "Buscar"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Buscar seguinte"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:215
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Buscar anterior"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Replace"
msgstr "Substituir"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:231
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Comparación de ficheiros"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Gardar o ficheiro actual"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Gardar o ficheiro actual nunha ruta nova"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Gardar todos os ficheiros da comparación"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Conflito anterior"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Seguinte conflito"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Empurrar o cambio á esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Empurrar o cambio á dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Traer o cambio desde a esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Traer o cambio desde a dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Copiar o cambio por riba da parte esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Copiar o cambio por debaixo da parte esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:313
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Copiar o cambio por riba da parte dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:320
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Copiar o cambio por debaixo da parte dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Eliminar o cambio"
-#: ../meld/resources/gtk/help-overlay.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Panel de comparación anterior"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Panel de comparación seguinte"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:44
+#: meld/resources/gtk/help-overlay.ui:336
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Comparación de cartafoles"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Copiar á esquerda"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:348
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Copiar á dereita"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:364
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Comparación de control de versións"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:369
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Remitir ao control de versións"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: meld/resources/gtk/help-overlay.ui:376
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Mostrar/Ocultar saídas da consola"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
+msgid "Save As…"
+msgstr "Gardar como…"
+
+#: meld/resources/gtk/menus.ui:11
+msgid "Save A_ll"
+msgstr "G_ardar todo"
+
+#: meld/resources/gtk/menus.ui:15
+#| msgid "Select file"
+msgid "Revert files…"
+msgstr "Reverter ficheiros…"
+
+#: meld/resources/gtk/menus.ui:19
+msgid "Open Externally"
+msgstr "Abrir externamente"
+
+#: meld/resources/gtk/menus.ui:26
+#| msgctxt "shortcut window"
+#| msgid "Refresh comparison"
+msgid "Refresh Comparison"
+msgstr "Actualizar comparación"
+
+#: meld/resources/gtk/menus.ui:33
+#| msgid "Find…"
+msgid "_Find…"
+msgstr "_Buscar…"
+
+#: meld/resources/gtk/menus.ui:37
+msgid "_Replace…"
+msgstr "Substituí_r..."
+
+#: meld/resources/gtk/menus.ui:43
+#| msgid "_View"
+msgid "View"
+msgstr "Ver"
+
+#: meld/resources/gtk/menus.ui:47
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
+#: meld/resources/gtk/menus.ui:52
+msgid "Overview Map"
+msgstr "Mapa de vista xeral"
+
+#: meld/resources/gtk/menus.ui:56
+#| msgctxt "shortcut window"
+#| msgid "Version control comparison"
+msgid "Version control console"
+msgstr "Consola do control de versións"
+
+#: meld/resources/gtk/menus.ui:60
+#| msgid "Lock Scrolling"
+msgid "Lock scrolling"
+msgstr "Bloquear desprazamento"
+
+#: meld/resources/gtk/menus.ui:67
+#| msgid "Middle and right panes"
+msgid "Swap left and right panes"
+msgstr "Trocar os paneis esquerdo e dereito"
+
+#: meld/resources/gtk/menus.ui:73
+#| msgid "New comparison"
+msgid "Comparison"
+msgstr "Comparación"
+
+#: meld/resources/gtk/menus.ui:75
+msgid "Stop"
+msgstr "Deter"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Left"
+msgstr "Combinar todos os cambios desde a esquerda"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All from Right"
+msgstr "Combinar todos os cambios desde a dereita"
+
+#: meld/resources/gtk/menus.ui:89
+msgid "Merge All"
+msgstr "Combinar todos"
+
+#: meld/resources/gtk/menus.ui:96
+msgid "Format as Patch…"
+msgstr "Formatar como parche…"
+
+#: meld/resources/gtk/menus.ui:105
msgid "_Preferences"
msgstr "Prefere_ncias"
-#: ../meld/resources/gtk/menus.ui.h:2
+#: meld/resources/gtk/menus.ui:109
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
+
+#: meld/resources/gtk/menus.ui:113
msgid "_Help"
msgstr "A_xuda"
-#: ../meld/resources/gtk/menus.ui.h:3
-msgid "Keyboard Shortcuts"
-msgstr "Atallos de teclado"
+#: meld/resources/gtk/menus.ui:118
+#| msgid "About Meld"
+msgid "_About Meld"
+msgstr "_Sobre o Meld"
+
+#: meld/resources/gtk/menus.ui:131
+#| msgid "File Status"
+msgid "File status"
+msgstr "Estado do ficheiro"
+
+#: meld/resources/gtk/menus.ui:133
+msgid "Same"
+msgstr "Iguais"
+
+#: meld/resources/gtk/menus.ui:137
+msgid "New"
+msgstr "Novo"
+
+#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164
+#: meld/vc/_vc.py:77
+msgid "Modified"
+msgstr "Modificado"
-#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
-msgstr "_Sobre"
+#: meld/resources/gtk/menus.ui:151
+#| msgid "Ignore Filename Case"
+msgid "Ignore filename case"
+msgstr "Ignorar capitalización do nome do ficheiro"
-#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "_Saír"
+#: meld/resources/gtk/menus.ui:155
+msgid "Normalize Unicode paths"
+msgstr "Normalizar rutas Unicode"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Sobre o Meld"
+#: meld/resources/gtk/menus.ui:168
+#| msgid "_Normal"
+msgid "Normal"
+msgstr "Normal"
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71
+msgid "Unversioned"
+msgstr "Non versionados"
+
+#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70
+msgid "Ignored"
+msgstr "Ignorado"
+
+#: meld/resources/gtk/menus.ui:183
+#| msgid "Flatten directories"
+msgid "Flatten folders"
+msgstr "Aplanar cartafoles "
+
+#: meld/resources/ui/about-dialog.ui:8
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2017 Kai Willadsen"
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2022 Kai Willadsen"
msgstr ""
-"Dereitos de autor © 2002-2009 Stephen Kennedy\n"
-"Dereitos de autor © 2009-2017 Kai Willadsen"
-
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "Sitio web"
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2022 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr ""
+"Fran Diéguez <frandieguez gnome org>, 2011-2022\n"
"Leandro Regueiro <leandro regueiro gmail com>, 2012\n"
-"Fran Diéguez <frandieguez gnome org>, 2011\n"
"Proxecto Trasno - Tradución de software libre ao galego <proxecto@trasno."
"net>, 1999-2012"
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: meld/resources/ui/appwindow.ui:30
+msgid "Start a new comparison"
+msgstr "Comezar unha nova comparación"
+
+#: meld/resources/ui/appwindow.ui:46
+#| msgid "Open recent files"
+msgid "Open a recent comparison"
+msgstr "Abrir unha comparación recente"
+
+#: meld/resources/ui/appwindow.ui:74
+msgid "Go to the previous change"
+msgstr "Ir ao cambio anterior"
+
+#: meld/resources/ui/appwindow.ui:94
+msgid "Go to the next change"
+msgstr "Ir ao seguinte cambio"
+
+#: meld/resources/ui/appwindow.ui:124
+msgid "Go to the previous conflict"
+msgstr "Ir ao conflito anterior"
+
+#: meld/resources/ui/appwindow.ui:144
+msgid "Go to the next conflict"
+msgstr "Ir ao seguinte conflito"
+
+#: meld/resources/ui/appwindow.ui:193
+#| msgid "Version Status"
+msgid "Version Filters"
+msgstr "Filtros de versión"
+
+#: meld/resources/ui/appwindow.ui:208 meld/resources/ui/preferences.ui:1472
+msgid "File Filters"
+msgstr "Filtros de ficheiro"
+
+#: meld/resources/ui/appwindow.ui:223 meld/resources/ui/preferences.ui:1657
+msgid "Text Filters"
+msgstr "Filtros de texto"
+
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Activo"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
msgid "Column Name"
msgstr "Nome da columna"
-#: ../meld/resources/ui/column-list.ui.h:3
-#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
-#: ../meld/vcview.py:694
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
msgid "_Remove"
msgstr "_Retirar"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
msgid "Move item up"
msgstr "Mover o elemento cara arriba"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
msgid "Move _Up"
msgstr "S_ubir"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
msgid "Move item down"
msgstr "Mover o elemento cara abaixo"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
msgid "Move _Down"
msgstr "_Baixar"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Remitir"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Remitir os ficheiros"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Mensaxe de rexistro"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Rexistros anteriores:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
msgid "Co_mmit"
msgstr "Remitir"
-#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Comparar"
-
-#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Comparar ficheiros seleccionados"
-
-#: ../meld/resources/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Colapsar de forma recursiva"
-
-#: ../meld/resources/ui/dirdiff.ui.h:4
-#| msgid "Remove folder and all its files?"
-msgid "Collapse selected folder and all subfolders"
-msgstr "Colapsar os cartafoles seleccionados e todos os subcartafoles"
-
-#: ../meld/resources/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Expandir recursivamente"
-
-#: ../meld/resources/ui/dirdiff.ui.h:6
-#| msgid "Remove folder and all its files?"
-msgid "Expand selected folder and all subfolders"
-msgstr "Expandir o cartafol selecconado e todos os subcartafoles"
-
-#: ../meld/resources/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Copiar á es_querda"
-
-#: ../meld/resources/ui/dirdiff.ui.h:8
+#: meld/resources/ui/dirdiff-actions.ui:20
msgid "Copy to left"
msgstr "Copiar á esquerda"
-#: ../meld/resources/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Copiar á de_reita"
-
-#: ../meld/resources/ui/dirdiff.ui.h:10
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Copiar á dereita"
-#: ../meld/resources/ui/dirdiff.ui.h:11
+#: meld/resources/ui/dirdiff-actions.ui:66
msgid "Delete selected"
msgstr "Eliminar o seleccionado"
-#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959
-#: ../meld/filediff.py:1601
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../meld/resources/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Ocultar o seleccionado"
+#: meld/resources/ui/dirdiff-menus.ui:7
+#| msgid "Compare selected files"
+msgid "_Compare selected files"
+msgstr "_Comparar ficheiros seleccionados"
+
+#: meld/resources/ui/dirdiff-menus.ui:14
+#| msgid "Compare selected files"
+msgid "_Mark selected file"
+msgstr "_Marcar o ficheiro seleccionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+#| msgid "Compare selected files"
+msgid "Compare _with marked file"
+msgstr "Comparar con ficheiro _marcado"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
+#| msgid "Copy to left"
+msgid "Copy to _left"
+msgstr "Copiar á _esquerda"
+
+#: meld/resources/ui/dirdiff-menus.ui:29
+#| msgid "Copy to right"
+msgid "Copy to _right"
+msgstr "Copiar á _dereita"
+
+#: meld/resources/ui/dirdiff-menus.ui:33
+#| msgid "Delete selected"
+msgid "_Delete selected"
+msgstr "_Eliminar seleccionado"
+
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "Collapse Recursively"
+msgstr "Colapsar de forma recursiva"
-#: ../meld/resources/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Ignorar maiúsculas e minúsculas do nome do ficheiro"
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "Expand Recursively"
+msgstr "Expandir recursivamente"
-#: ../meld/resources/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Considerar casos diferentes os nomes de ficheiro que de outro modo serían "
-"idénticos"
+#: meld/resources/ui/dirdiff-menus.ui:51
+#| msgid "Open Externally"
+msgid "_Open Externally"
+msgstr "_Abrir externamente"
-#: ../meld/resources/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Iguais"
+#: meld/resources/ui/dirdiff-menus.ui:55
+msgid "_Copy File Paths"
+msgstr "_Copiar rutas de ficheiro"
-#: ../meld/resources/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Mostrar idénticos"
+#: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:76
+#: meld/resources/ui/dirdiff.ui:117
+msgid "Select folder to open in this pane"
+msgstr "Seleccionar o cartafol para abrir neste panel"
-#: ../meld/resources/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Novo"
+#: meld/resources/ui/dirdiff.ui:43
+#| msgid "folder"
+msgid "Folder 1"
+msgstr "Cartafol 1"
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Mostrar novo"
+#: meld/resources/ui/dirdiff.ui:84
+#| msgid "folder"
+msgid "Folder 2"
+msgstr "Cartafol 2"
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
-msgid "Modified"
-msgstr "Modificado"
+#: meld/resources/ui/dirdiff.ui:125
+#| msgid "folder"
+msgid "Folder 3"
+msgstr "Cartafol 3"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Mostrar modificados"
-
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtros"
-
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Estabelecer filtros activos"
-
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
msgstr "Buscar a codificación do texto..."
-#: ../meld/resources/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Formatar como parche…"
-
-#: ../meld/resources/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Crear un parche usando as diferenzas entre os ficheiros"
-
-#: ../meld/resources/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "G_ardar todo"
-
-#: ../meld/resources/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "Garda todos os ficheiros na comparación actual"
-
-#: ../meld/resources/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Reverte os ficheiros ás súas versións gardadas"
-
-#: ../meld/resources/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Engadir punto de sincronización"
-
-#: ../meld/resources/ui/filediff.ui.h:7
-msgid "Add a synchronization point for changes between files"
-msgstr "Engadir un punto de sincronización para os cambios entre ficheiros"
-
-#: ../meld/resources/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Limpar puntos de sincronización"
-
-#: ../meld/resources/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr "Limpar os puntos de sincronización para os cambios entre ficheiros"
-
-#: ../meld/resources/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Conflito anterior"
-
-#: ../meld/resources/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Ir ao conflito anterior"
-
-#: ../meld/resources/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Seguinte conflito"
-
-#: ../meld/resources/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Ir ao seguinte conflito"
-
-#: ../meld/resources/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Empurrar á esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:15
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Empurrar o cambio actual á esquerda"
-#: ../meld/resources/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Empurrar á dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:17
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Empurrar o cambio actual á dereita"
-#: ../meld/resources/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Traer desde á esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Traer o cambio desde á esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Traer desde á dereita"
+#: meld/resources/ui/filediff-actions.ui:65
+#| msgid "Copy _up"
+msgid "Copy chunks"
+msgstr "Copiar porcións"
-#: ../meld/resources/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Traer o cambio desde á dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Copiar por enriba da esquerda"
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Eliminar o cambio"
-#: ../meld/resources/ui/filediff.ui.h:23
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
msgstr "Copiar o cambio por enriba da parte esquerda"
-#: ../meld/resources/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Copiar por debaixo da esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:25
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
msgstr "Copiar o cambio por embaixo da parte esquerda"
-#: ../meld/resources/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Copiar por enriba da dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:27
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
msgstr "Copiar o cambio por enriba da parte dereita"
-#: ../meld/resources/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Copiar por debaixo da dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:29
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
msgstr "Copiar o cambio por embaixo da parte dereita"
-#: ../meld/resources/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../meld/resources/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Eliminar o cambio"
-
-#: ../meld/resources/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Combinar todos os cambios desde a esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:33
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
-
-#: ../meld/resources/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Combinar todos os cambios desde a dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:35
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Combinar todos os cambios non conflitivos desde a dereita"
-
-#: ../meld/resources/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Combinar todos"
-
-#: ../meld/resources/ui/filediff.ui.h:37
-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/resources/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Panel anterior"
-
-#: ../meld/resources/ui/filediff.ui.h:39
-msgid "Move keyboard focus to the previous document in this comparison"
-msgstr "Mover o foco do teclado ao documento anterior nesta comparación"
-
-#: ../meld/resources/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Panel seguinte"
-
-#: ../meld/resources/ui/filediff.ui.h:41
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Mover o foco do teclado ao seguinte documento desta comparación"
-
-#: ../meld/resources/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Bloquear desprazamento"
-
-#: ../meld/resources/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Bloquear o desprazamento de todos os paneis"
-
-#: ../meld/resources/ui/filediff.ui.h:44
+#: meld/resources/ui/filediff-menus.ui:28
+#| msgctxt "shortcut window"
+#| msgid "Undo"
+msgid "_Undo"
+msgstr "_Desfacer"
+
+#: meld/resources/ui/filediff-menus.ui:32
+#| msgctxt "shortcut window"
+#| msgid "Redo"
+msgid "_Redo"
+msgstr "_Refacer"
+
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: meld/resources/ui/filediff-menus.ui:43
+#| msgctxt "shortcut window"
+#| msgid "Copy"
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: meld/resources/ui/filediff-menus.ui:47
+#| msgctxt "shortcut window"
+#| msgid "Paste"
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: meld/resources/ui/filediff-menus.ui:54
+msgid "Open Containing Folder"
+msgstr "Abrir cartafol contedor"
+
+#: meld/resources/ui/filediff-menus.ui:58
+msgid "Copy Full Path"
+msgstr "Copiar ruta completa"
+
+#: meld/resources/ui/filediff.ui:31 meld/resources/ui/filediff.ui:100
+#: meld/resources/ui/filediff.ui:169
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."
@@ -1132,313 +1191,345 @@ msgstr ""
"este ficheiro e facer cambios de todas formas, aínda así os cambios debe "
"gardalos nun ficheiro novo."
-#: ../meld/resources/ui/filediff.ui.h:45
+#: meld/resources/ui/filediff.ui:45 meld/resources/ui/filediff.ui:114
+#: meld/resources/ui/filediff.ui:183
+#| msgctxt "shortcut window"
+#| msgid "Save all files in comparison"
+msgid "Save file in this pane"
+msgstr "Gardar o ficheiro neste panel"
+
+#: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:140
+#: meld/resources/ui/filediff.ui:209
+msgid "Open file in this pane"
+msgstr "Abrir o ficheiro neste panel"
+
+#: meld/resources/ui/filediff.ui:79
msgid "File 3"
msgstr "Ficheiro 3"
-#: ../meld/resources/ui/filediff.ui.h:46
+#: meld/resources/ui/filediff.ui:148
msgid "File 2"
msgstr "Ficheiro 2"
-#: ../meld/resources/ui/filediff.ui.h:47
+#: meld/resources/ui/filediff.ui:217 meld/resources/ui/vcview.ui:148
msgid "File 1"
msgstr "Ficheiro 1"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
-#: ../meld/dirdiff.py:455
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
+#: meld/dirdiff.py:603
msgid "Name"
msgstr "Nome"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Patrón"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Engadir novo filtro"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:18
msgid "_Add"
msgstr "Eng_adir"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
msgid "Remove selected filter"
msgstr "Retirar o filtro seleccionado"
-#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
-#: ../meld/iohelpers.py:113
-msgid "_Replace"
-msgstr "Substituí_r"
-
-#: ../meld/resources/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Substituír _todo"
-
-#: ../meld/resources/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: ../meld/resources/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "Segui_nte"
-
-#: ../meld/resources/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Buscar:"
-
-#: ../meld/resources/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Substituír _con:"
-
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Coincidir coa capitalización"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "Pa_labra completa"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "Expresión regular"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Axustado"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Substituír _todo"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
+msgid "_Replace"
+msgstr "Substituí_r"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Trocar entre «Buscar» e «Buscar e substituir»"
+
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Modo de realce de busca…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
-#: ../meld/newdifftab.py:53
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:342
+#: meld/newdifftab.py:49
msgid "New comparison"
msgstr "Nova comparación"
-#: ../meld/resources/ui/new-diff-tab.ui.h:2
-msgid "File comparison"
-msgstr "Comparación de ficheiros"
+#: meld/resources/ui/new-diff-tab.ui:72
+#| msgid "_File"
+msgid "File"
+msgstr "Ficheiro"
-#: ../meld/resources/ui/new-diff-tab.ui.h:3
-msgid "Directory comparison"
-msgstr "Comparación de directorios"
+#: meld/resources/ui/new-diff-tab.ui:121
+#| msgid "folder"
+msgid "Folder"
+msgstr "Cartafol"
-#: ../meld/resources/ui/new-diff-tab.ui.h:4
-msgid "Version control view"
-msgstr "Mostrar control de versións"
+#: meld/resources/ui/new-diff-tab.ui:170
+#| msgid "Version control:"
+msgid "Version control"
+msgstr "Control de versións"
-#: ../meld/resources/ui/new-diff-tab.ui.h:5
+#: meld/resources/ui/new-diff-tab.ui:236 meld/resources/ui/new-diff-tab.ui:357
msgid "_3-way comparison"
msgstr "Comparación a _3 bandas"
-#: ../meld/resources/ui/new-diff-tab.ui.h:6
-msgid "Select Third File"
-msgstr "Seleccionar terceiro ficheiro"
+#: meld/resources/ui/new-diff-tab.ui:256
+msgid "Select First File"
+msgstr "Seleccionar primeiro ficheiro"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:270
msgid "Select Second File"
msgstr "Seleccionar segundo ficheiro"
-#: ../meld/resources/ui/new-diff-tab.ui.h:8
-msgid "Select First File"
-msgstr "Seleccionar primeiro ficheiro"
+#: meld/resources/ui/new-diff-tab.ui:285
+msgid "Select Third File"
+msgstr "Seleccionar terceiro ficheiro"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:321
msgid "Select First Folder"
msgstr "Seleccionar primeiro cartafol"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:334
msgid "Select Second Folder"
msgstr "Seleccionar segundo cartafol"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:348
msgid "Select Third Folder"
msgstr "Seleccionar terceiro cartafol"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:399
msgid "Select A Version-Controlled Folder"
msgstr "Seleccionar un cartafol controlado por versións"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:448
msgid "_Blank comparison"
msgstr "Comparación _baleira"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:466
msgid "C_ompare"
msgstr "C_omparar"
-#: ../meld/resources/ui/notebook-label.ui.h:1
-#| msgid "Close tab"
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Pechar lapela"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Formatar como parche"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Copiar ao portapapeis"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Gardar parche"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Usar as diferencias entre:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Paneis esquerdo e do medio"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Paneis dereito e do medio"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "Dirección _inversa do parche"
-#: ../meld/resources/ui/preferences.ui.h:1
-#| msgid "_Preferences"
+#: meld/resources/ui/path-label.ui:23
+msgid "Path"
+msgstr "Ruta"
+
+#: meld/resources/ui/path-label.ui:62
+#| msgid "Copy to right"
+msgid "Copy Path"
+msgstr "Copiar ruta"
+
+#: meld/resources/ui/path-label.ui:78
+#| msgid "No folder"
+msgid "Open Folder"
+msgstr "Abrir cartafol"
+
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Preferencias"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Tipo de letra"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "Usar o tipo de letra de ancho fixo do sistema"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "Tipo de letra do _editor:"
#. TRANSLATORS: This is the status bar label for a group of settings,
#. such as text wrapping, show line numbers, whitespace, etc.
-#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:282
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
msgid "Display"
msgstr "Pantalla"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "Ancho do _tabulador:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "Insertar e_spazos no lugar de tabuladores"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Activar o a_xuste de texto"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Non _dividir as palabras en dúas liñas"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Realzar a liña a_ctual"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Mostrar os números de _liña"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Mostrar espazos en _branco"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
+#| msgid "Meld dark scheme"
+msgid "Prefer dark theme"
+msgstr "Preferir tema escuro"
+
+#: meld/resources/ui/preferences.ui:397
msgid "Use s_yntax highlighting"
msgstr "Usar realce de _sintaxe"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:420
msgid "Syntax highlighting color scheme:"
msgstr "Esquema de cor para o realzado da sintaxe:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:485
+msgid "Code Overview"
+msgstr "Vista xeral do código"
+
+#: meld/resources/ui/preferences.ui:522
+#| msgid "Show normal"
+msgid "Show overview map"
+msgstr "Mostrar o mapa de vista xeral"
+
+#: meld/resources/ui/preferences.ui:545
+msgid "Overview map style:"
+msgstr "Estilo do mapa de vista xeral:"
+
+#: meld/resources/ui/preferences.ui:612
msgid "External Editor"
msgstr "Editor externo"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:648
msgid "Use _default system editor"
msgstr "Usar o editor pre_definido do sistema"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:671
msgid "Edito_r command:"
msgstr "Orde do edito_r:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:727
msgid "Editor"
msgstr "Editor"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:748
msgid "Shallow Comparison"
msgstr "Comparación superficial"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:784
msgid "C_ompare files based only on size and timestamp"
msgstr "C_omparar ficheiros baseándose só no tamaño e marca de tempo"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:807
msgid "_Timestamp resolution:"
msgstr "Resolución da _marca de tempo:"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:871
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
"Aviso: a activación dos filtros de texto pode facer que a comparación de "
"grandes ficheiros sexa moito máis lenta"
-#: ../meld/resources/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:920
msgid "Symbolic Links"
msgstr "Ligazóns simbólicas"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:988
msgid "Visible Columns"
msgstr "Columnas visíbeis"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1055
msgid "Folder Comparisons"
msgstr "Comparación de cartafoles"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1077
msgid "Version Comparisons"
msgstr "Comparacións de versión"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1120
msgid "_Order when comparing file revisions:"
msgstr "_Orde ao comparar revisións de ficheiros:"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1167
msgid "Order when _merging files:"
msgstr "Orde na co_mbinación de ficheiros:"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1235
msgid "Commit Messages"
msgstr "Mensaxe de remisión"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1276
msgid "Show _right margin at:"
msgstr "Mostrar a marxe de_reita en:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1317
msgid "Automatically _break lines at right margin on commit"
msgstr "Cor_tar liñas automaticamente na marxe dereita ao remitir"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1367
msgid "Version Control"
msgstr "Control de versións"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1389
msgid "Filename filters"
msgstr "Filtros por nome de ficheiro"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1427
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1448,25 +1539,21 @@ msgstr ""
"e cartafoles polo nome. Cada patrón é unha lista de comodíns de shell "
"separados por espazos."
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "Filtros de ficheiro"
-
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1494
msgid "Change trimming"
msgstr "Cambiar recortado"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1530
msgid "Trim blank line differences from the start and end of changes"
msgstr ""
"Recortar as diferenzas das liñas en branco desde o inicio e remate dos "
"cambios"
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1574
msgid "Text filters"
msgstr "Filtros de texto"
-#: ../meld/resources/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1612
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1480,266 +1567,257 @@ msgstr ""
"Se a expresión contén grupos, só o grupos son substituídos. Ver o manual de "
"usuario para máis detalles."
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Filtros de texto"
-
-#: ../meld/resources/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1703
msgid "Left is remote, right is local"
msgstr "Á esquerda está o remoto, á dereita o local"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1707
msgid "Left is local, right is remote"
msgstr "Á esquerda está o local, á dereita o remoto"
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1721
+#| msgid "Delete change"
+msgid "Simple change map"
+msgstr "Mapa de cambios sinxelo"
+
+#: meld/resources/ui/preferences.ui:1725
+msgid "Compact source map"
+msgstr "Mapa de código compacto"
+
+#: meld/resources/ui/preferences.ui:1729
+msgid "Full source map"
+msgstr "Mapa de código completo"
+
+#: meld/resources/ui/preferences.ui:1743
msgid "Remote, merge, local"
msgstr "Remoto, combinar, local"
-#: ../meld/resources/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1747
msgid "Local, merge, remote"
msgstr "Local, combinar, remoto"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1769
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1773
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1777
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1781
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../meld/resources/ui/push-dialog.ui.h:1
+#: meld/resources/ui/push-dialog.ui:9
msgid "Push local commits to remote?"
msgstr "Remitir cambios locais ao remoto?"
-#: ../meld/resources/ui/push-dialog.ui.h:2
+#: meld/resources/ui/push-dialog.ui:10
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."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
msgstr "_Enviar remisións"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
+#| msgid "Search text encoding…"
+msgid "Search recent comparisons…"
+msgstr "Buscar comparacións recentes…"
+
+#: meld/resources/ui/revert-dialog.ui:9
msgid "Discard unsaved changes to documents?"
msgstr "Desexa desbotar os cambios non gardados nos documentos?"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
+#: meld/resources/ui/revert-dialog.ui:10
msgid "Changes made to the following documents will be permanently lost:"
msgstr ""
"Os cambios realizados nos seguintes documentos perderanse permanentemente:"
-#: ../meld/resources/ui/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Desbotar"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+#: meld/resources/ui/save-confirm-dialog.ui:9
msgid "Save changes to documents before closing?"
msgstr "Desexa gardar cambios nos documentos antes de gardar?"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+#: meld/resources/ui/save-confirm-dialog.ui:10
msgid "If you don’t save, changes will be permanently lost."
msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Pechar _sen gardar"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
msgid "_Cancel"
msgstr "_Cancelar"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+#: meld/resources/ui/save-confirm-dialog.ui:55
msgid "_Save"
msgstr "_Gardar"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
-#| msgid "Show w_hitespace"
+#: meld/resources/ui/statusbar-menu.ui:9
msgid "Show whitespace"
msgstr "Mostrar espazos en branco"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
-#| msgid "Enable text _wrapping"
+#: meld/resources/ui/statusbar-menu.ui:17
msgid "Text wrapping"
msgstr "Axuste de texto"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Comparar"
+
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "Re_mitir…"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview-menus.ui:26
+msgid "Re_vert"
+msgstr "Re_verter"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Delete"
+msgstr "Eliminar"
+
+#: meld/resources/ui/vcview-menus.ui:37
+#| msgid "Next Conflict"
+msgid "Resolve Conflict"
+msgstr "Resolver conflito"
+
+#: meld/resources/ui/vcview.ui:16
msgid "Commit changes to version control"
msgstr "Remitir cambios ao control de versións"
-#: ../meld/resources/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "Act_ualizar"
-
-#: ../meld/resources/ui/vcview.ui.h:6
-msgid "Update working copy from version control"
-msgstr "Actualizar a copia local desde o sistema de control de versións"
+#: meld/resources/ui/vcview.ui:21
+#| msgid "Co_mmit…"
+msgid "Commit…"
+msgstr "Remitir…"
-#: ../meld/resources/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Enviar"
+#: meld/resources/ui/vcview.ui:38
+#| msgid "Push current change to the left"
+msgid "Pull remote changes to the local repository"
+msgstr "Traer os cambios remotos ao repositorio local"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:51
msgid "Push local changes to remote"
msgstr "Enviar cambios locais ao remoto"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:74
msgid "Add to version control"
msgstr "Engadir ao control de versións"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:87
msgid "Remove from version control"
msgstr "Eliminar do control de versións"
-#: ../meld/resources/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Marc_ar como solucionado"
-
-#: ../meld/resources/ui/vcview.ui.h:14
-msgid "Mark as resolved in version control"
-msgstr "Marcar como solucionado no control de versións"
-
-#: ../meld/resources/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "Re_verter"
-
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:100
msgid "Revert working copy to original state"
msgstr "Reverter a copia local ao seu estado orixinal"
-#: ../meld/resources/ui/vcview.ui.h:17
-msgid "Delete from working copy"
-msgstr "Eliminar desde a copia local"
-
-#: ../meld/resources/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Consola"
-
-#: ../meld/resources/ui/vcview.ui.h:19
-msgid "Show or hide the version control console output pane"
-msgstr "Mostrar ou ocultar o panel de saída da consola do control de versións"
-
-#: ../meld/resources/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "Apl_anar"
-
-#: ../meld/resources/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Rasar cartafoles"
-
-#: ../meld/resources/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Modificado"
-
-#: ../meld/resources/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Mostrar ficheiros modificados"
-
-#: ../meld/resources/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../meld/resources/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Mostrar ficheiros normais"
-
-#: ../meld/resources/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "Sen _versión"
-
-#: ../meld/resources/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Mostrar ficheiros sen versión"
-
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
-msgid "Ignored"
-msgstr "Ignorado"
+#: meld/resources/ui/vcview.ui:113
+msgid "Mark as resolved in version control"
+msgstr "Marcar como solucionado no control de versións"
-#: ../meld/resources/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Mostrar ficheiros ignorados"
+#: meld/resources/ui/vcview.ui:140
+#| msgid "Only one version control system found in this folder"
+msgid "Open version controlled folder in this pane"
+msgstr "Abrir cartafol controlado en versións neste panel"
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: meld/resources/ui/vcview.ui:229
msgid "Location"
msgstr "Localización"
-#: ../meld/resources/ui/vcview.ui.h:32
+#: meld/resources/ui/vcview.ui:238
msgid "Status"
msgstr "Estado"
-#: ../meld/resources/ui/vcview.ui.h:33
+#: meld/resources/ui/vcview.ui:247
msgid "Extra"
msgstr "Adicional"
-#: ../meld/resources/ui/vcview.ui.h:34
+#: meld/resources/ui/vcview.ui:279
msgid "Console output"
msgstr "Saída da consola"
-#: ../meld/const.py:12
+#: meld/actiongutter.py:254
+msgid "Copy _up"
+msgstr "Copiar _arriba"
+
+#: meld/actiongutter.py:255
+msgid "Copy _down"
+msgstr "Copiar _abaixo"
+
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
+#: meld/dirdiff.py:624 meld/preferences.py:132
msgid "Size"
msgstr "Tamaño"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
+#: meld/dirdiff.py:632 meld/preferences.py:133
msgid "Modification time"
msgstr "Hora de modificación"
+#. Create ISO-format date-time CellRenderer
+#: meld/dirdiff.py:640 meld/preferences.py:134
+#| msgid "Modification time"
+msgid "Modification time (ISO)"
+msgstr "Hora de modificación (ISO)"
+
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
+#: meld/dirdiff.py:648 meld/preferences.py:135
msgid "Permissions"
msgstr "Permisos"
-#: ../meld/dirdiff.py:626
-#, python-format
-msgid "Hide %s"
-msgstr "Ocultar %s"
+#: meld/dirdiff.py:901
+#, python-brace-format
+msgid "{filename} (scanning…)"
+msgstr "{filename} (analizando…)"
-#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Analizando %s"
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Analizando {folder}"
-#: ../meld/dirdiff.py:926
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Feito"
+#: meld/dirdiff.py:1101
+#, python-brace-format
+#| msgid "[%s] Done"
+msgid "[{label}] Done"
+msgstr "[{label}] Feito"
+
+#: meld/dirdiff.py:1114
+msgid "Folder {} is being compared to itself"
+msgstr "O cartafol {} está comparándose consigo mesmo"
-#: ../meld/dirdiff.py:934
+#: meld/dirdiff.py:1120
msgid "Folders have no differences"
msgstr "Os cartafoles non teñen diferenzas"
-#: ../meld/dirdiff.py:936
+#: meld/dirdiff.py:1122
msgid "Contents of scanned files in folders are identical."
msgstr "Os contidos dos ficheiros analizados nos cartafoles son idénticos."
-#: ../meld/dirdiff.py:938
+#: meld/dirdiff.py:1124
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1747,43 +1825,47 @@ msgstr ""
"Os ficheiros analizados nos cartafoles parecen idénticos pero os contidos "
"non se comprobaron."
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:1127
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
"Os filtros de ficheiro están en uso, así que non se analizaron todos os "
"ficheiros."
-#: ../meld/dirdiff.py:943
+#: meld/dirdiff.py:1129
msgid "Text filters are in use and may be masking content differences."
msgstr ""
"Estanse usando filtros de texto e poden estar enmascarando diferenzas nos "
"contidos."
-#: ../meld/dirdiff.py:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633
-#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:1145 meld/filediff.py:1997
+msgid "Hide"
+msgstr "Ocultar"
+
+#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029
+#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "Ocu_ltar"
-#: ../meld/dirdiff.py:970
+#: meld/dirdiff.py:1156
msgid "Multiple errors occurred while scanning this folder"
msgstr "Producíronse varios erros ao analizar este cartafol"
-#: ../meld/dirdiff.py:971
+#: meld/dirdiff.py:1157
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:973
+#: meld/dirdiff.py:1159
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:975
+#: meld/dirdiff.py:1161
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:977
+#: meld/dirdiff.py:1163
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1792,17 +1874,18 @@ msgstr ""
"sistema de ficheiros que diferencia maiúsculas de minúsculas. Algúns "
"ficheiros non están visíbeis:"
-#: ../meld/dirdiff.py:988
-#, python-format
-msgid "“%s” hidden by “%s”"
-msgstr "«%s» oculto por «%s»"
+#: meld/dirdiff.py:1174
+#, python-brace-format
+#| msgid "“%s” hidden by “%s”"
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "“{first_file}” agochado por “{second_file}”"
-#: ../meld/dirdiff.py:1044
+#: meld/dirdiff.py:1236
#, python-format
msgid "Replace folder “%s”?"
msgstr "Desexa substituír o cartafol «%s»?"
-#: ../meld/dirdiff.py:1046
+#: meld/dirdiff.py:1238
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1811,37 +1894,47 @@ msgstr ""
"Xa existe outro cartafol co mesmo nome en «%s».\n"
"Se substitúe o cartafol existente, perderanse todos os ficheiros nel."
-#: ../meld/dirdiff.py:1059
+#: meld/dirdiff.py:1251
msgid "Error copying file"
msgstr "Produciuse un erro ao copiar o ficheiro"
-#: ../meld/dirdiff.py:1060
-#, python-format
+#: meld/dirdiff.py:1252
+#, python-brace-format
+#| msgid ""
+#| "Couldn’t copy %s\n"
+#| "to %s.\n"
+#| "\n"
+#| "%s"
msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
"\n"
-"%s"
+"{error}"
msgstr ""
-"Non foi posíbel copiar %s\n"
-"en %s.\n"
+"Non foi posíbel copiar {source}\n"
+"en {dest}.\n"
"\n"
-"%s"
+"{error}"
-#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
-#| msgid "Error deleting %s"
+#: meld/dirdiff.py:1277 meld/vcview.py:768
msgid "Error deleting {}"
msgstr "Produciuse un erro ao eliminar {}"
-#: ../meld/dirdiff.py:1597
+#: meld/dirdiff.py:1825
msgid "No folder"
msgstr "Non hai cartafol"
-#: ../meld/filediff.py:920
+#: meld/dirdiff.py:1838
+#| msgctxt "shortcut window"
+#| msgid "Folder comparison"
+msgid "Folder comparison:"
+msgstr "Comparación de cartafoles:"
+
+#: meld/filediff.py:1168
msgid "Comparison results will be inaccurate"
msgstr "Os resultados da comparación serán inexactos"
-#: ../meld/filediff.py:922
+#: meld/filediff.py:1170
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1849,64 +1942,101 @@ msgstr ""
"Un filtro cambiou o número de liñas do ficheiro, o cal non se acepta. A "
"comparación non será exacta."
-#: ../meld/filediff.py:994
+#: meld/filediff.py:1242
msgid "Mark conflict as resolved?"
msgstr "Marcar como solucionado?"
-#: ../meld/filediff.py:996
+#: meld/filediff.py:1244
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr "Se se solucionou o conflito, pode marcalo como resolto agora."
-#: ../meld/filediff.py:998
+#: meld/filediff.py:1247
msgid "Cancel"
msgstr "Cancelar"
-#: ../meld/filediff.py:999
+#: meld/filediff.py:1248
msgid "Mark _Resolved"
msgstr "Marca_r como solucionado"
-#: ../meld/filediff.py:1318
+#: meld/filediff.py:1439 meld/filediff.py:1455
+msgid "Add Synchronization Point"
+msgstr "Engadir punto de sincronización"
+
+#: meld/filediff.py:1443
+#| msgid "Add Synchronization Point"
+msgid "Remove Synchronization Point"
+msgstr "Eliminar punto de sincronización"
+
+#: meld/filediff.py:1447
+#| msgid "Add Synchronization Point"
+msgid "Move Synchronization Point"
+msgstr "Mover punto de sincronización"
+
+#: meld/filediff.py:1451
+#| msgid "Add Synchronization Point"
+msgid "Match Synchronization Point"
+msgstr "Coincidir co punto de sincronización"
+
+#: meld/filediff.py:1475
+msgid "Clear Synchronization Points"
+msgstr "Limpar puntos de sincronización"
+
+#: meld/filediff.py:1535
+#| msgid "File comparison"
+msgid "File comparison:"
+msgstr "Comparación de ficheiros:"
+
+#: meld/filediff.py:1671
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Produciuse un erro ao abrir o ficheiro «%s»."
-#: ../meld/filediff.py:1326
+#: meld/filediff.py:1680
#, python-format
msgid "File %s appears to be a binary file."
msgstr "O ficheiro %s semella ser un ficheiro binario."
-#: ../meld/filediff.py:1328
+#: meld/filediff.py:1682
msgid "Do you want to open the file using the default application?"
msgstr "Desexa abrir o ficheiro co aplicativo predeterminado?"
-#: ../meld/filediff.py:1330
+#: meld/filediff.py:1684
msgid "Open"
msgstr "Abrir"
-#: ../meld/filediff.py:1346
+#: meld/filediff.py:1706
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Combinando os ficheiros"
+
+#: meld/filediff.py:1720
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calculando as diferenzas"
-#: ../meld/filediff.py:1407
+#: meld/filediff.py:1780
#, python-format
msgid "File %s has changed on disk"
msgstr "O ficheiro %s cambiou no disco"
-#: ../meld/filediff.py:1408
+#: meld/filediff.py:1781
msgid "Do you want to reload the file?"
msgstr "Desexa recargar o ficheiro?"
-#: ../meld/filediff.py:1410
+#: meld/filediff.py:1783
msgid "_Reload"
msgstr "_Recargar"
-#: ../meld/filediff.py:1566
+#: meld/filediff.py:1953
+msgid "File {} is being compared to itself"
+msgstr "O ficheiro {} está comparándose consigo mesmo"
+
+#: meld/filediff.py:1962
msgid "Files are identical"
msgstr "Os ficheiros son idénticos"
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1975
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1914,11 +2044,11 @@ msgstr ""
"Se están usando filtros de texto, e poden estar agochando diferenzas entre "
"ficheiros. Quere comparar os ficheiros non filtrados?"
-#: ../meld/filediff.py:1584
+#: meld/filediff.py:1980
msgid "Files differ in line endings only"
msgstr "Os ficheiros só difiren nos finais de liña"
-#: ../meld/filediff.py:1586
+#: meld/filediff.py:1982
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1927,15 +2057,15 @@ msgstr ""
"Os ficheiros son idénticos excepto nos finais de liña:\n"
"%s"
-#: ../meld/filediff.py:1606
+#: meld/filediff.py:2002
msgid "Show without filters"
msgstr "Mostrar sen filtros"
-#: ../meld/filediff.py:1628
+#: meld/filediff.py:2024
msgid "Change highlighting incomplete"
msgstr "Cambiar realzado incompleto"
-#: ../meld/filediff.py:1629
+#: meld/filediff.py:2025
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."
@@ -1944,19 +2074,19 @@ msgstr ""
"Meld que vote máis tempo realzando cambios máis largos, porén isto pode ser "
"lento."
-#: ../meld/filediff.py:1637
+#: meld/filediff.py:2033
msgid "Keep highlighting"
msgstr "Manter realzado"
-#: ../meld/filediff.py:1639
+#: meld/filediff.py:2035
msgid "_Keep highlighting"
msgstr "_Manter realzado"
-#: ../meld/filediff.py:1652
+#: meld/filediff.py:2048
msgid "Saving failed"
msgstr "Fallou o gardado"
-#: ../meld/filediff.py:1653
+#: meld/filediff.py:2049
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1964,39 +2094,36 @@ msgstr ""
"Considere copiar calquera cambios críticos noutros programas ou ficheiros "
"para evitar a perda de datos."
-#: ../meld/filediff.py:1662
+#: meld/filediff.py:2058
msgid "Save Left Pane As"
msgstr "Gardar panel da esquerda como"
-#: ../meld/filediff.py:1664
+#: meld/filediff.py:2060
msgid "Save Middle Pane As"
msgstr "Gardar panel intermedio como"
-#: ../meld/filediff.py:1666
+#: meld/filediff.py:2062
msgid "Save Right Pane As"
msgstr "Gardar panel da dereita como"
-#: ../meld/filediff.py:1679
+#: meld/filediff.py:2073
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "O ficheiro «%s» cambiou no disco desde que se abriu"
-#: ../meld/filediff.py:1681
+#: meld/filediff.py:2075
msgid "If you save it, any external changes will be lost."
msgstr "Se o garda, perderase calquera cambio externo."
-#: ../meld/filediff.py:1684
+#: meld/filediff.py:2078
msgid "Save Anyway"
msgstr "Gardar de todos os xeitos"
-#: ../meld/filediff.py:1685
+#: meld/filediff.py:2079
msgid "Don’t Save"
msgstr "Non gardar"
-#: ../meld/filediff.py:1727
-#| msgid ""
-#| "File “%s” contains characters that can’t be encoded using encoding “%s”.\n"
-#| "Would you like to save as UTF-8?"
+#: meld/filediff.py:2121
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
@@ -2004,7 +2131,7 @@ msgstr ""
"O ficheiro «{}» contén caracteres non codificábeis usando a codificación "
"«{}» actual."
-#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144
+#: meld/filediff.py:2125 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -2013,16 +2140,16 @@ msgstr ""
"Non foi posíbel gardar debido a:\n"
"%s"
-#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
+#: meld/filediff.py:2129 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Non foi posíbel gardar o ficheiro %s."
-#: ../meld/filediff.py:2128
+#: meld/filediff.py:2539
msgid "Live comparison updating disabled"
msgstr "Actualización de comparación en vivo desactivada"
-#: ../meld/filediff.py:2129
+#: meld/filediff.py:2540
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2033,50 +2160,34 @@ msgstr ""
"as actualizacións en vivo volverán a activarse cando se limpen os puntos de "
"sincronización."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Combinando os ficheiros"
-
-#: ../meld/gutterrendererchunk.py:220
-msgid "Copy _up"
-msgstr "Copiar _arriba"
-
-#: ../meld/gutterrendererchunk.py:221
-msgid "Copy _down"
-msgstr "Copiar _abaixo"
-
-#: ../meld/iohelpers.py:43
-#| msgid "remote folder “{}” not supported"
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr "Non se admite eliminar os cartafoles remotos"
-#: ../meld/iohelpers.py:45
-#| msgid "Two way directory"
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Non é un ficheiro ou cartafol"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:47
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr ""
"«{}» non pode poñerse no lixo. Ten certeza que quere eliminalo "
"inmediatamente?"
-#: ../meld/iohelpers.py:54
+#: meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
msgstr "Esta localización remota non admite enviar elementos ao lixo."
-#: ../meld/iohelpers.py:59
-#| msgid "Delete change"
+#: meld/iohelpers.py:58
msgid "_Delete Permanently"
msgstr "Eliminar de forma _permanente"
-#: ../meld/iohelpers.py:106
+#: meld/iohelpers.py:110
#, python-format
msgid "Replace file “%s”?"
msgstr "Desexa substituír o ficheiro «%s»?"
-#: ../meld/iohelpers.py:108
+#: meld/iohelpers.py:112
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2085,281 +2196,128 @@ msgstr ""
"Xa existe un ficheiro con este nome en «%s».\n"
"Se substitúe o ficheiro existente, perderanse os seus contidos."
-#: ../meld/meldapp.py:169
+#: meld/meldapp.py:188
msgid "wrong number of arguments supplied to --diff"
msgstr "número incorrecto de argumentos proporcionado a --diff"
-#: ../meld/meldapp.py:174
+#: meld/meldapp.py:193
msgid "Start with an empty window"
msgstr "Comezar cunha xanela baleira"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: meld/meldapp.py:194 meld/meldapp.py:196
msgid "file"
msgstr "ficheiro"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: meld/meldapp.py:194 meld/meldapp.py:198
msgid "folder"
msgstr "cartafol"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:195
msgid "Start a version control comparison"
msgstr "Comezar unha comparación no control de versións"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:197
msgid "Start a 2- or 3-way file comparison"
msgstr "Comezar unha comparación de ficheiros a 2 ou 3 bandas"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:199
msgid "Start a 2- or 3-way folder comparison"
msgstr "Iniciar comparación de ficheiros a 2/3 bandas"
-#: ../meld/meldapp.py:223
+#: meld/meldapp.py:242
#, python-format
msgid "Error: %s\n"
msgstr "Erro: %s\n"
-#: ../meld/meldapp.py:230
+#: meld/meldapp.py:249
msgid "Meld is a file and directory comparison tool."
msgstr "Meld é un ferramenta de comparación de ficheiros e cartafoles."
-#: ../meld/meldapp.py:234
+#: meld/meldapp.py:253
msgid "Set label to use instead of file name"
msgstr "Estabelecer a etiqueta a usar en vez do nome do ficheiro"
-#: ../meld/meldapp.py:237
+#: meld/meldapp.py:256
msgid "Open a new tab in an already running instance"
msgstr "Abre unha nova lapela nunha instancia en execución"
-#: ../meld/meldapp.py:240
+#: meld/meldapp.py:259
msgid "Automatically compare all differing files on startup"
msgstr "Comparar automaticamente ao inicio todos os ficheiros distintos"
-#: ../meld/meldapp.py:243
+#: meld/meldapp.py:262
msgid "Ignored for compatibility"
msgstr "Ignorado para compatibilidade"
-#: ../meld/meldapp.py:247
+#: meld/meldapp.py:266
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:250
+#: meld/meldapp.py:269
msgid "Automatically merge files"
msgstr "Combinar ficheiros automaticamente"
-#: ../meld/meldapp.py:254
+#: meld/meldapp.py:273
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:258
+#: meld/meldapp.py:277
msgid "Create a diff tab for the supplied files or folders"
msgstr ""
"Crear unha lapela coas diferenzas para os directorios ou ficheiros fornecidos"
-#: ../meld/meldapp.py:278
+#: meld/meldapp.py:297
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "demasiados argumentos (buscábanse 0-3, obtivéronse %d)"
-#: ../meld/meldapp.py:281
+#: meld/meldapp.py:300
msgid "can’t auto-merge less than 3 files"
msgstr "non é posíbel combinar automaticamente menos de 3 ficheiros"
-#: ../meld/meldapp.py:283
+#: meld/meldapp.py:302
msgid "can’t auto-merge directories"
msgstr "non é posíbel combinar automaticamente cartafoles"
-#: ../meld/meldapp.py:297
+#: meld/meldapp.py:317
msgid "Error reading saved comparison file"
msgstr "Produciuse un erro ao ler o ficheiro de comparación gardado"
-#: ../meld/meldapp.py:314
+#: meld/meldapp.py:334
#, python-format
msgid "invalid path or URI “%s”"
msgstr "O URI ou a ruta son incorrectos «%s»"
-#: ../meld/meldapp.py:320
+#: meld/meldapp.py:341
msgid "remote folder “{}” not supported"
msgstr "cartafol remoto «{}» non compatíbel"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:123
+#: meld/meldbuffer.py:115
msgid "<unnamed>"
msgstr "<sen nome>"
-#: ../meld/melddoc.py:63
+#: meld/melddoc.py:124
msgid "untitled"
msgstr "sen título"
-#: ../meld/meldwindow.py:56
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ../meld/meldwindow.py:57
-msgid "_New Comparison…"
-msgstr "_Nova comparación…"
-
-#: ../meld/meldwindow.py:58
-msgid "Start a new comparison"
-msgstr "Comezar unha nova comparación"
-
-#: ../meld/meldwindow.py:61
-msgid "Save the current file"
-msgstr "Gardar o ficheiro actual"
-
-#: ../meld/meldwindow.py:63
-msgid "Save As…"
-msgstr "Gardar como…"
-
-#: ../meld/meldwindow.py:64
-msgid "Save the current file with a different name"
-msgstr "Gardar o ficheiro actual con un nome diferente"
-
-#: ../meld/meldwindow.py:67
-msgid "Close the current file"
-msgstr "Pechar o ficheiro actual"
-
-#: ../meld/meldwindow.py:70
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../meld/meldwindow.py:72
-msgid "Undo the last action"
-msgstr "Desfacer a última acción"
-
-#: ../meld/meldwindow.py:75
-msgid "Redo the last undone action"
-msgstr "Refacer a última acción desfeita"
-
-#: ../meld/meldwindow.py:77
-msgid "Cut the selection"
-msgstr "Cortar a selección"
-
-#: ../meld/meldwindow.py:79
-msgid "Copy the selection"
-msgstr "Copiar a selección"
-
-#: ../meld/meldwindow.py:81
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do portapapeis"
-
-#: ../meld/meldwindow.py:83
-msgid "Find…"
-msgstr "Buscar…"
-
-#: ../meld/meldwindow.py:83
-msgid "Search for text"
-msgstr "Buscar texto"
-
-#: ../meld/meldwindow.py:85
-msgid "Find Ne_xt"
-msgstr "Buscar a _seguinte"
-
-#: ../meld/meldwindow.py:86
-msgid "Search forwards for the same text"
-msgstr "Buscar cara a adiante o mesmo texto"
-
-#: ../meld/meldwindow.py:88
-msgid "Find _Previous"
-msgstr "_Anterior"
-
-#: ../meld/meldwindow.py:89
-msgid "Search backwards for the same text"
-msgstr "Buscar cara a adiante o mesmo texto"
-
-#: ../meld/meldwindow.py:92
-msgid "_Replace…"
-msgstr "Substituí_r..."
-
-#: ../meld/meldwindow.py:93
-msgid "Find and replace text"
-msgstr "Buscar e substituír texto"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to _Line"
-msgstr "Ir á _liña"
-
-#: ../meld/meldwindow.py:96
-msgid "Go to a specific line"
-msgstr "Ir a unha liña específica"
-
-#: ../meld/meldwindow.py:99
-msgid "_Changes"
-msgstr "_Cambios"
-
-#: ../meld/meldwindow.py:100
-msgid "Next Change"
-msgstr "Seguinte cambio"
-
-#: ../meld/meldwindow.py:101
-msgid "Go to the next change"
-msgstr "Ir ao seguinte cambio"
-
-#: ../meld/meldwindow.py:103
-msgid "Previous Change"
-msgstr "Anterior cambio"
-
-#: ../meld/meldwindow.py:104
-msgid "Go to the previous change"
-msgstr "Ir ao cambio anterior"
-
-#: ../meld/meldwindow.py:106
-msgid "Open Externally"
-msgstr "Abrir externamente"
-
-#: ../meld/meldwindow.py:107
-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:111
-msgid "_View"
-msgstr "_Ver"
-
-#: ../meld/meldwindow.py:112
-msgid "File Status"
-msgstr "Estado do ficheiro"
-
-#: ../meld/meldwindow.py:113
-msgid "Version Status"
-msgstr "Estado da versión"
-
-#: ../meld/meldwindow.py:116
-msgid "Stop the current action"
-msgstr "Deter a acción actual"
-
-#: ../meld/meldwindow.py:119
-msgid "Refresh the view"
-msgstr "Actualizar a vista"
-
-#: ../meld/meldwindow.py:123
-msgid "Fullscreen"
-msgstr "Pantalla completa"
-
-#: ../meld/meldwindow.py:124
-msgid "View the comparison in fullscreen"
-msgstr "Ver a comparación a pantalla completa"
-
-#: ../meld/meldwindow.py:133
-msgid "Open Recent"
-msgstr "Abrir recentes"
+#: meld/meldwindow.py:158
+#| msgid "Filename filters"
+msgid "Filename"
+msgstr "Nome de ficheiro"
-#: ../meld/meldwindow.py:134
-msgid "Open recent files"
-msgstr "Abrir ficheiros recentes"
-
-#: ../meld/meldwindow.py:567
+#: meld/meldwindow.py:381
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr ""
"Precísanse tres ficheiros para a combinación automática, conseguíronse: %r"
-#: ../meld/meldwindow.py:588
+#: meld/meldwindow.py:411
msgid "Cannot compare a mixture of files and directories"
msgstr "Non é posíbel comparar unha mestura de ficheiros e cartafoles"
-#: ../meld/misc.py:155
+#: meld/misc.py:154
msgid ""
"{}\n"
"\n"
@@ -2371,234 +2329,248 @@ msgstr ""
"Meld atopou un erro crítico ao executarse:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:237
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr ""
-"Non foi posíbel atopar os detalles do esquema de cores de %s-%s; esta é unha "
-"instalación incorrecta"
-
-#: ../meld/misc.py:311
+#: meld/misc.py:205
msgid "[None]"
msgstr "[Ningún]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "etiqueta"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "patrón"
-#: ../meld/recent.py:106
+#: meld/recent.py:111
msgid "Version control:"
msgstr "Control de versións:"
-#: ../meld/ui/bufferselectors.py:114
+#: meld/style.py:91
+#| msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
+msgstr ""
+"Non foi posíbel atopar os detalles do esquema de cores de {}; esta é unha "
+"instalación incorrecta"
+
+#: meld/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Texto plano"
+#: meld/ui/pathlabel.py:36
+#| msgid "Filename filters"
+msgid "Unnamed file"
+msgstr "Ficheiro sen nome"
+
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Li %i, Col %i"
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "Lñ {line}, Col {column}"
-#: ../meld/ui/statusbar.py:182
+#: meld/ui/statusbar.py:185
msgid "Line you want to move the cursor to"
msgstr "A liña á que quere mover o cursor"
-#: ../meld/ui/vcdialogs.py:55
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Non se remitirá ningún ficheiro"
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
-#, python-format
-msgid "%s in %s"
-msgstr "%s en %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, python-brace-format
+#| msgid "%d unpushed commits in %d branches"
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} en {unpushed_branches}"
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:94 meld/vc/git.py:104
#, 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:95
+#: meld/vc/git.py:97
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "%d rama"
msgstr[1] "%d ramas"
-#: ../meld/vc/git.py:334
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Modo cambiado desde %s a %s"
+#: meld/vc/git.py:345
+#, python-brace-format
+#| msgid "Mode changed from %s to %s"
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Modo cambiado de {old_mode} a {new_mode}"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:353
msgid "Partially staged"
msgstr "Parcialmente preparado"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:353
msgid "Staged"
msgstr "Preparado"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:38
msgid "None"
msgstr "Ningún"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
#, python-format
msgid "Rev %s"
msgstr "Rev %s"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:55
msgid "Merged"
msgstr "Combinado"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:55
msgid "Base"
msgstr "Base"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:55
msgid "Local"
msgstr "Local"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:55
msgid "Remote"
msgstr "Remoto"
-#: ../meld/vc/_vc.py:71
-msgid "Unversioned"
-msgstr "Non versionados"
-
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:74
msgid "Error"
msgstr "Erro"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:76
msgid "Newly added"
msgstr "Engadidos recentemente"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:78
msgid "Renamed"
msgstr "Renomeado"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:79
msgid "Conflict"
msgstr "Conflito"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:80
msgid "Removed"
msgstr "Retirado"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:81
msgid "Missing"
msgstr "Non atopado"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:82
msgid "Not present"
msgstr "Non presente"
+#: meld/vc/_vc.py:83
+#| msgid "Scanning %s"
+msgid "Scanning…"
+msgstr "Analizando…"
+
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:334
+#, python-format
+#| msgid "%(name)s (%(cmd)s not installed)"
+msgid "%(name)s (not found)"
+msgstr "%(name)s (non atopado)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
+#: meld/vcview.py:338
#, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr "%(name)s (%(cmd)s non instalado)"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:286
+#: meld/vcview.py:342
#, python-format
-msgid "%(name)s (Invalid repository)"
+#| msgid "%(name)s (Invalid repository)"
+msgid "%(name)s (invalid repository)"
msgstr "%(name)s (repositorio non válido)"
-#: ../meld/vcview.py:307
+#: meld/vcview.py:356
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:309
-msgid "Only one version control system found in this folder"
-msgstr "Só se atopou un sistema de control de versións neste cartafol"
-
-#: ../meld/vcview.py:311
+#: meld/vcview.py:358
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 being viewed
-#: ../meld/vcview.py:366
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
+#, python-brace-format
+#| msgid "New comparison"
+msgid "{vc} comparison:"
+msgstr "Comparación {vc}:"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:373
+#: meld/vcview.py:423
msgid "Scanning repository"
msgstr "Analizando o repositorio"
-#: ../meld/vcview.py:402
+#: meld/vcview.py:452
#, python-format
msgid "Scanning %s"
msgstr "Analizando %s"
-#: ../meld/vcview.py:441
+#: meld/vcview.py:491
msgid "(Empty)"
msgstr "(Baleiro)"
-#: ../meld/vcview.py:487
+#: meld/vcview.py:539
#, python-format
msgid "%s — local"
msgstr "%s — local"
-#: ../meld/vcview.py:488
+#: meld/vcview.py:540
#, python-format
msgid "%s — remote"
msgstr "%s — remoto"
-#: ../meld/vcview.py:496
+#: meld/vcview.py:548
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (local, combinar, remoto)"
-#: ../meld/vcview.py:501
+#: meld/vcview.py:553
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (remoto, combinar, local)"
-#: ../meld/vcview.py:512
+#: meld/vcview.py:564
#, python-format
msgid "%s — repository"
msgstr "%s — repositorio"
-#: ../meld/vcview.py:518
+#: meld/vcview.py:570
#, python-format
msgid "%s (working, repository)"
msgstr "%s (funcionando, repositorio)"
-#: ../meld/vcview.py:522
+#: meld/vcview.py:574
#, python-format
msgid "%s (repository, working)"
msgstr "%s (repositorio, funcionando)"
-#: ../meld/vcview.py:688
+#: meld/vcview.py:739
msgid "Remove folder and all its files?"
msgstr "Desexa eliminar o cartafol e todos os seus ficheiros?"
-#: ../meld/vcview.py:690
+#: meld/vcview.py:741
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2607,10 +2579,324 @@ msgstr ""
"ficheiros dentro de calqueda dos cartafoles seleccionados, do control de "
"versións."
-#: ../meld/vcview.py:804
+#: meld/vcview.py:854
msgid "Clear"
msgstr "Limpar"
+#~ msgid "Cannot import: "
+#~ msgstr "Non é posíbel importar: "
+
+#, c-format
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Meld require %s ou superior."
+
+#, c-format
+#~ msgid ""
+#~ "Couldn’t load Meld-specific CSS (%s)\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posíbel cargar o CSS específico de Meld (%s)\n"
+#~ "%s"
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Visualizador Diff Meld"
+
+#~ msgid "Displayed whitespace"
+#~ msgstr "Mostrar espazos en branco"
+
+#~ msgid ""
+#~ "Selector for individual whitespace character types to be shown. Possible "
+#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
+#~ msgstr ""
+#~ "Selector de tipos de caracteres de espazo en branco a mostrar. Os valores "
+#~ "posíbeis son : «space», «tab», «newline» e «nbsp»."
+
+#~ msgid "Meld base scheme"
+#~ msgstr "Esquema base de Meld"
+
+#~ msgid "_About"
+#~ msgstr "_Sobre"
+
+#~ msgid "_Quit"
+#~ msgstr "_Saír"
+
+#~ msgid "Website"
+#~ msgstr "Sitio web"
+
+#~| msgid "Remove folder and all its files?"
+#~ msgid "Collapse selected folder and all subfolders"
+#~ msgstr "Colapsar os cartafoles seleccionados e todos os subcartafoles"
+
+#~| msgid "Remove folder and all its files?"
+#~ msgid "Expand selected folder and all subfolders"
+#~ msgstr "Expandir o cartafol selecconado e todos os subcartafoles"
+
+#~ msgid "Copy to _Left"
+#~ msgstr "Copiar á es_querda"
+
+#~ msgid "Copy to _Right"
+#~ msgstr "Copiar á de_reita"
+
+#~ msgid "Hide selected"
+#~ msgstr "Ocultar o seleccionado"
+
+#~ msgid ""
+#~ "Consider differently-cased filenames that are otherwise-identical to be "
+#~ "the same"
+#~ msgstr ""
+#~ "Considerar casos diferentes os nomes de ficheiro que de outro modo serían "
+#~ "idénticos"
+
+#~ msgid "Show identical"
+#~ msgstr "Mostrar idénticos"
+
+#~ msgid "Show new"
+#~ msgstr "Mostrar novo"
+
+#~ msgid "Show modified"
+#~ msgstr "Mostrar modificados"
+
+#~ msgid "Filters"
+#~ msgstr "Filtros"
+
+#~ msgid "Set active filters"
+#~ msgstr "Estabelecer filtros activos"
+
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Crear un parche usando as diferenzas entre os ficheiros"
+
+#~ msgid "Save all files in the current comparison"
+#~ msgstr "Garda todos os ficheiros na comparación actual"
+
+#~ msgid "Revert files to their saved versions"
+#~ msgstr "Reverte os ficheiros ás súas versións gardadas"
+
+#~ msgid "Add a synchronization point for changes between files"
+#~ msgstr "Engadir un punto de sincronización para os cambios entre ficheiros"
+
+#~ msgid "Clear sychronization points for changes between files"
+#~ msgstr "Limpar os puntos de sincronización para os cambios entre ficheiros"
+
+#~ msgid "Previous Conflict"
+#~ msgstr "Conflito anterior"
+
+#~ msgid "Push to Left"
+#~ msgstr "Empurrar á esquerda"
+
+#~ msgid "Push to Right"
+#~ msgstr "Empurrar á dereita"
+
+#~ msgid "Pull from Left"
+#~ msgstr "Traer desde á esquerda"
+
+#~ msgid "Pull change from the left"
+#~ msgstr "Traer o cambio desde á esquerda"
+
+#~ msgid "Pull from Right"
+#~ msgstr "Traer desde á dereita"
+
+#~ msgid "Pull change from the right"
+#~ msgstr "Traer o cambio desde á dereita"
+
+#~ msgid "Copy Above Left"
+#~ msgstr "Copiar por enriba da esquerda"
+
+#~ msgid "Copy Below Left"
+#~ msgstr "Copiar por debaixo da esquerda"
+
+#~ msgid "Copy Above Right"
+#~ msgstr "Copiar por enriba da dereita"
+
+#~ msgid "Copy Below Right"
+#~ msgstr "Copiar por debaixo da dereita"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Combinar todos os cambios non conflitivos desde a esquerda"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Combinar todos os cambios non conflitivos desde a dereita"
+
+#~ 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"
+
+#~ msgid "Previous Pane"
+#~ msgstr "Panel anterior"
+
+#~ msgid "Move keyboard focus to the previous document in this comparison"
+#~ msgstr "Mover o foco do teclado ao documento anterior nesta comparación"
+
+#~ msgid "Next Pane"
+#~ msgstr "Panel seguinte"
+
+#~ msgid "Move keyboard focus to the next document in this comparison"
+#~ msgstr "Mover o foco do teclado ao seguinte documento desta comparación"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Bloquear o desprazamento de todos os paneis"
+
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
+
+#~ msgid "_Next"
+#~ msgstr "Segui_nte"
+
+#~ msgid "Find:"
+#~ msgstr "Buscar:"
+
+#~ msgid "Replace _with:"
+#~ msgstr "Substituír _con:"
+
+#~ msgid "Directory comparison"
+#~ msgstr "Comparación de directorios"
+
+#~ msgid "Version control view"
+#~ msgstr "Mostrar control de versións"
+
+#~ msgid "_Update"
+#~ msgstr "Act_ualizar"
+
+#~ msgid "Update working copy from version control"
+#~ msgstr "Actualizar a copia local desde o sistema de control de versións"
+
+#~ msgid "_Push"
+#~ msgstr "_Enviar"
+
+#~ msgid "Mar_k as Resolved"
+#~ msgstr "Marc_ar como solucionado"
+
+#~ msgid "Delete from working copy"
+#~ msgstr "Eliminar desde a copia local"
+
+#~ msgid "Console"
+#~ msgstr "Consola"
+
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr ""
+#~ "Mostrar ou ocultar o panel de saída da consola do control de versións"
+
+#~ msgid "_Flatten"
+#~ msgstr "Apl_anar"
+
+#~ msgid "_Modified"
+#~ msgstr "_Modificado"
+
+#~ msgid "Show modified files"
+#~ msgstr "Mostrar ficheiros modificados"
+
+#~ msgid "Show normal files"
+#~ msgstr "Mostrar ficheiros normais"
+
+#~ msgid "Un_versioned"
+#~ msgstr "Sen _versión"
+
+#~ msgid "Show unversioned files"
+#~ msgstr "Mostrar ficheiros sen versión"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Mostrar ficheiros ignorados"
+
+#, python-format
+#~ msgid "Hide %s"
+#~ msgstr "Ocultar %s"
+
+#, python-format
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] Analizando %s"
+
+#~ msgid "_New Comparison…"
+#~ msgstr "_Nova comparación…"
+
+#~ msgid "Save the current file"
+#~ msgstr "Gardar o ficheiro actual"
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Gardar o ficheiro actual con un nome diferente"
+
+#~ msgid "Close the current file"
+#~ msgstr "Pechar o ficheiro actual"
+
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a última acción"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Refacer a última acción desfeita"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Cortar a selección"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Copiar a selección"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Pegar o contido do portapapeis"
+
+#~ msgid "Search for text"
+#~ msgstr "Buscar texto"
+
+#~ msgid "Find Ne_xt"
+#~ msgstr "Buscar a _seguinte"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Buscar cara a adiante o mesmo texto"
+
+#~ msgid "Find _Previous"
+#~ msgstr "_Anterior"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Buscar cara a adiante o mesmo texto"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Buscar e substituír texto"
+
+#~ msgid "Go to _Line"
+#~ msgstr "Ir á _liña"
+
+#~ msgid "Go to a specific line"
+#~ msgstr "Ir a unha liña específica"
+
+#~ msgid "_Changes"
+#~ msgstr "_Cambios"
+
+#~ msgid "Next Change"
+#~ msgstr "Seguinte cambio"
+
+#~ msgid "Previous Change"
+#~ msgstr "Anterior cambio"
+
+#~ msgid "Open selected file or directory in the default external application"
+#~ msgstr ""
+#~ "Abrir o ficheiro ou cartafol seleccionado no aplicativo externo "
+#~ "predeterminado"
+
+#~ msgid "Stop the current action"
+#~ msgstr "Deter a acción actual"
+
+#~ msgid "Refresh the view"
+#~ msgstr "Actualizar a vista"
+
+#~ msgid "View the comparison in fullscreen"
+#~ msgstr "Ver a comparación a pantalla completa"
+
+#~ msgid "Open Recent"
+#~ msgstr "Abrir recentes"
+
+#, python-format
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "Li %i, Col %i"
+
+#, python-format
+#~ msgid "%s in %s"
+#~ msgstr "%s en %s"
+
+#, python-format
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
#~ msgid "Show toolbar"
#~ msgstr "Mostrar a barra de ferramentas"
@@ -2907,9 +3193,6 @@ msgstr "Limpar"
#~ msgid "_Browse..."
#~ msgstr "E_xaminar..."
-#~ msgid "Path"
-#~ msgstr "Ruta"
-
#~ msgid "Path to file"
#~ msgstr "Ruta ao ficheiro"
@@ -2919,9 +3202,6 @@ msgstr "Limpar"
#~ msgid "Select directory"
#~ msgstr "Seleccionar cartafol"
-#~ msgid "Select file"
-#~ msgstr "Seleccionar ficheiro"
-
#~ msgid ""
#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:"
#~ "Missing:Not present"
@@ -2977,9 +3257,6 @@ msgstr "Limpar"
#~ msgid "Report a bug"
#~ msgstr "Informar dun fallo"
-#~ msgid "%d unpushed commits in %d branches"
-#~ msgstr "%d remisións sen mandar en %d ramas"
-
#~ msgid "Choose Files"
#~ msgstr "Escoller ficheiros"
@@ -3040,9 +3317,6 @@ msgstr "Limpar"
#~ msgid "Delete locally"
#~ msgstr "Eliminar localmente"
-#~ msgid "Show normal"
-#~ msgstr "Mostrar normal"
-
#~ msgid "Non _VC"
#~ msgstr "Sen C_V"
@@ -3362,9 +3636,6 @@ msgstr "Limpar"
#~ msgid "Solid: Filled Quadilaterals"
#~ msgstr "Sólido: Cadrados recheos"
-#~ msgid "Stop"
-#~ msgstr "Deter"
-
#~ msgid ""
#~ "Syntax highlighting is only available if you have gnome-python-desktop "
#~ "installed."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
