[meld] Update Basque translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Basque translation
- Date: Mon, 5 Apr 2021 16:55:36 +0000 (UTC)
commit 088dbdb798b18b1f2138fa911f50202678a1b1da
Author: Asier Sarasua Garmendia <asiersarasua ni eus>
Date: Mon Apr 5 16:55:34 2021 +0000
Update Basque translation
po/eu.po | 1284 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 647 insertions(+), 637 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index eb1eb1cc..7841cfe5 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -16,64 +16,40 @@
# Larraitz Uriarte Erkoreka <larraitz uriarte gmail com>, 2013.
# Josune Zuzuarregui Lizarazu <josunezl gmail com>, 2013.
# Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2014.
-# Asier Sarasua Garmendia <asier sarasua gmail com>, 2019.
+# Asier Sarasua Garmendia <asiersarasua ni eus>, 2019, 2021.
#
msgid ""
msgstr "Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-08-14 20:54+0000\n"
-"PO-Revision-Date: 2019-09-23 10:00+0100\n"
-"Last-Translator: Asier Sarasua Garmendia <asier sarasua gmail com>\n"
+"POT-Creation-Date: 2021-02-13 05:47+0000\n"
+"PO-Revision-Date: 2021-04-05 10:00+0100\n"
+"Last-Translator: Asier Sarasua Garmendia <asiersarasua ni eus>\n"
"Language-Team: Basque <librezale librezale eus>\n"
"Language: eu\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: Lokalize 1.4\n"
-#: ../bin/meld:194
-msgid "Cannot import: "
-msgstr "Ezin da inportatu: "
-
-#: ../bin/meld:197
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld-ek %s edo berriagoa behar du."
-
-#: ../bin/meld:276
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr "Ezin izan da kargatu Meld-ena espezifikoa den CSSa (%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
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Diferentzia-ikustailea"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld diferentzia-ikustailea"
-
-#: ../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 "Konparatu eta konbinatu fitxategiak"
#. 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 "diff;merge;"
-#: ../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 "
@@ -81,41 +57,41 @@ msgid ""
"many version control systems including Git, Mercurial, Bazaar and Subversion."
msgstr "Meld aplikazioak garatzaileentzako 'diff' eta 'merge' tresna bisuala da. Meld-ek fitxategiak,
direktorioak eta bertsio-kontrola daramaten proiektuak konparatzen lagunduko dizu. Bai fitxategi bai
direktorioen bi eta hiru elementuen arteko konparazioa eskaintzen ditu. Bertsio-kontrola daramaten hainbat
sistema onartzen ditu, Git, Mercurial, Bazaar eta Subversion barne."
-#: ../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."
msgstr "Meld-ek zure kodearen aldaketak gainbegiratzen, adabakiak ulertzen lagunduko dizu. Kode handiak
batzean gerta daitezkeen gatazkak sortzen dituzte buruhausteak leunduz."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "GNOME proiektua"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Meld-en konparazioaren azalpena"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Leihoaren zabalera lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Leihoaren altuera lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Maximizatutako leihoaren egoera lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Pantaila osoko leihoaren egoera lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Automatikoki detektatutako testu-kodeketa gehigarriak"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:59
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 "
@@ -123,183 +99,180 @@ msgid ""
"may also be tried, depending on the user’s locale."
msgstr "Meld-ek testu-kodeketa horiek erabiliko ditu kargatutako testuak deskodetzeko, beste edozein
kodeketa probatu baino lehen. Zerrenda honetako kodeketez gain, UTF-8 eta uneko hizkuntza lehenetsiaren
kodeketa ere erabiliko dira beti; beste kodeketa batzuk ere probatuak izan daitezke, erabiltzailearen
hizkuntzaren arabera."
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
msgstr "Koskatzearen urratsaren zabalera"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:67
msgid "The number of spaces to use for a single indent step"
msgstr "Koskatze bakar batean erabiliko den zuriuneen kopurua"
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:71
msgid "Whether to indent using spaces or tabs"
msgstr "Zuriuneak edo tabulazioak erabiliko diren koskatzean"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:72
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr "TRUE (egia) bada, koskatze berri bakoitzean zuriuneak erabiliko dira tabulazioen ordez."
-#: ../data/org.gnome.meld.gschema.xml.h:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Erakutsi lerro-zenbakiak"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:77
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "TRUE (egia) bada, lerroen zenbakiak erakutsiko dira fitxategien konparazioan."
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Nabarmendu sintaxia"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:82
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
msgstr "Konparazioetan sintaxia nabarmenduko den edo ez. Meld-ek berezko kolorea duenez, modu lehenetsian
aukera hau desgaituta dago."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:86
msgid "Color scheme to use for syntax highlighting"
msgstr "Sintaxia nabarmentzeko erabilitako kolore-eskema"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:87
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr "GtkSourceView funtzioak erabilitakoa sintaxia nabarmentzeko koloreak zehazteko"
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: data/org.gnome.meld.gschema.xml:91
msgid "Draw whitespace"
msgstr "Marraztu zuriunea"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:92
msgid ""
"If true, whitespace characters will be drawn in comparisons even if they are "
"not in a changed area."
-msgstr ""
+msgstr "Egia bada, konparazioetan zuriuneak marraztuko dira, baita aldatu gabeko area batean daudenean ere."
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Itzulbiratze-modua"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:102
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 "
"('word')."
msgstr "Fitxategien konparazioko lerroak itzulbiratu egingo dira ezarpen honen arabera: 'none' (bat ere ez),
'char' (edozer karaktere) edo 'word' (hitzen amaieran soilik)."
-#: ../data/org.gnome.meld.gschema.xml.h:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Nabarmendu uneko lerroa"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr "TRUE (egia) bada, kurtsorea kokatuta dagoen lerroa nabarmenduko da fitxategien konparazioan."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
msgstr "Erabili sistemaren zabalera finkoko letra-tipo lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:115
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr "Faltsua bada, letra-tipo pertsonalizatua erabiliko da sistemaren zabalera finkoko letra-tipoaren
ordez."
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Letra-tipo pertsonalizatua"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:120
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
msgstr "Letra-tipo pertsonalizatua, kate bat bezala gordeta eta Pango letra-tipoaren azalpen gisa
analizatuta."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:126
msgid "Show overview source map"
-msgstr ""
+msgstr "Erakutsi ikuspegi orokorraren iturburuaren mapa"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:127
msgid ""
"If true, file comparisons will have paired source maps for compared files."
-msgstr ""
+msgstr "Egia bada, fitxategi-konparazioek parekatutako iturburu-mapak izango dituzte konparatutako
fitxategietarako."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: data/org.gnome.meld.gschema.xml:132
msgid "Style of overview map"
-msgstr ""
+msgstr "Ikuspegi orokorraren maparen estiloa"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:133
msgid "Style options for how the overview map is displayed."
-msgstr ""
+msgstr "Ikuspegi orokorraren mapa bistaratzeko estilo-aukerak."
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr "Ez ikusi egin lerro hutsei fitxategiak konparatzean"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:140
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr "TRUE (egia) bada, lerro hutsak kendu egingo dira fitxategien arteko aldaketak nabarmentzean."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
msgstr "Erabili sistemaren editore lehenetsia"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:148
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
msgstr "Faltsua bada, fitxategiak kanpoko editore pertsonalizatuarekin irekiko dira sistemaren editorea
erabili ordez."
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: data/org.gnome.meld.gschema.xml:152
msgid "The custom editor launch command"
msgstr "Editore pertsonalizatua abiarazteko komandoa"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:153
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
msgstr "Editore pertsonalizatua abiaraztean erabiliko den komandoa. Txantiloi gutxi batzuk soilik daude
onartuta: oraingoz '{file}' eta '{line}' tokenak bakarrik onartzen dira."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Zutabeak bistaratzeko"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr "Zutabeen izenen zerrenda karpetak konparatzean eta hauek bistaratu behar diren edo ez."
-#: ../data/org.gnome.meld.gschema.xml.h:39
-#: ../meld/resources/ui/preferences.ui.h:28
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Ez ikusi egin esteka sinbolikoei"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:165
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
msgstr "TRUE (egia) bada, karpetak konparatzean ez jarraitu esteka sinbolikorik karpeten zuhaitza
arakatzean."
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Erabili azaleko konparazioa"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:170
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 "
"different otherwise."
msgstr "TRUE (egia) bada, karpeten konparazioak fitxategietan oinarritutako tamaina eta aldatze-datan
bakarrik konparatuko dira, fitxategiak berdinak direla onartuko du haien tamaina eta aldatze-data bat
datozenean, bestela desberdintzat joko ditu."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: data/org.gnome.meld.gschema.xml:174
msgid "File timestamp resolution"
msgstr "Fitxategiaren data-zigiluaren bereizmena"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:175
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 "
@@ -307,1065 +280,1061 @@ msgid ""
"resolution."
msgstr "Konparazioa aldatze-datan oinarritzean, aldatze-data desberdinak dituztela onartzeko bi fitxategien
arteko gutxieneko desberdintasuna nanosegundotan neurtzen da hau. Erabilgarria da denbora-zigiluaren
bereizmen desberdinak dituzten fitxategi-sistemetako fitxategiak konparatzeko."
-#: ../data/org.gnome.meld.gschema.xml.h:45
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr "Aplikatu testu-iragazkiak karpeten konparazioan zehar"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:180
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
"differences."
msgstr "Egia bada, fitxategi-edukiak konparatzen dituzten karpeten konparazioek testu-iragazki aktiboak eta
lerro zurien moztea aplikatuko dituzte, eta lerro berrien diferentziak ezikusiko dituzte."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Fitxategiaren egoeraren iragazkiak"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:185
msgid "List of statuses used to filter visible files in folder comparison."
msgstr "Karpeten konparazioan fitxategi ikusgaiak iragazteko erabiliko den egoeren zerrenda."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: data/org.gnome.meld.gschema.xml:191
msgid "Show the version control console output"
msgstr "Erakutsi bertsio-kontrolaren kontsolaren irteera"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:192
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
msgstr "TRUE (egia) bada, kontsolaren irteerako atala erakutsiko da bertsio-kontrolaren ikuspegian,
bertsio-kontrolaren eragiketetan exekutatutako komandoak erakutsiz."
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: data/org.gnome.meld.gschema.xml:196
msgid "Version control pane position"
msgstr "Bertsio-kontrolaren panelaren posizioa"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:197
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
msgstr "Bertsio-kontrolaren zuhaitz nagusiaren altuera da, kontsolaren panela erakusten denean."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:201
msgid "Present version comparisons as left-local/right-remote"
msgstr "Aurkeztu bertsioen konparazioa ezkerra-lokala/eskuina-urrunekoa gisa"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:202
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, "
"a left-is-theirs, right-is-mine scheme is used."
msgstr "TRUE (egia) bada, bertsio-kontrolen konparazioak ezkerra-lokala, eskuina-urrunekoa eskema erabiliko
du fitxategiak paneletan zer ordenarekin aurkeztuko diren zehazteko. Bestela, ezkerra-haiena, eskuina-nirea
eskema erabiliko da."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: data/org.gnome.meld.gschema.xml:206
msgid "Order for files in three-way version control merge comparisons"
msgstr "Fitxategien ordena hiruko bertsio-kontrolaren baturen konparazioan"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: data/org.gnome.meld.gschema.xml:207
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
"control view, so is used solely for merges/conflict resolution within Meld."
msgstr "Fitxategiak ordenatzeko aukerak: 'remote/merged/local' eta 'local/merged/remote' dira. Hobespen
honek soilik bertsio-kontrolaren ikuspegitik abiarazitako hiruko konparazioari eragiten dio, bakarrik
batzean/gatazken ebazpenean erabiltzen da Meld-en."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:211
msgid "Show margin in commit message editor"
msgstr "Erakutsi marjinak egikaritze-mezuen editorean"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:212
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
msgstr "TRUE (egia) bada, gida bat bistaratuko da bertsio-kontrolaren egikaritze-mezuaren editorean marjina
zer zutabean dagoen erakusteko."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: data/org.gnome.meld.gschema.xml:216
msgid "Margin column in commit message editor"
msgstr "Marjinaren zutabea egikaritze-mezuaren editorean"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
msgstr "Bertsio-kontrolaren egikaritze-mezuaren editorean marjina zein zutabetan erakutsiko den."
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "Itzulbiratze gogor automatikoa egikaritze-mezuetan"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:222
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
msgstr "TRUE (egia) bada, bertsio-kontrolaren egikaritze-mezuen editoreak itzulbiratze gogorra (adib.
lerro-jauzia txertatzea) landuko du egikaritzearen marjinan egikaritu aurretik."
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Bertsio-kontrolaren egoeraren iragazkiak"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:227
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr "Bertsio-kontrolen konparazioan fitxategi ikusgaiak iragazteko erabiliko den egoeren zerrenda."
-#: ../data/org.gnome.meld.gschema.xml.h:65
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Fitxategi-izenean oinarritutako iragazkiak"
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: data/org.gnome.meld.gschema.xml:242
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
msgstr "Aurredefinitutako fitxategi-izenetan oinarritutako iragazkien zerrenda. Aktibo dauden iragazkiek bat
datozen fitxategiak kenduko dituzte karpeten konparaziotik."
-#: ../data/org.gnome.meld.gschema.xml.h:67
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Testuan oinarritutako iragazkiak"
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: data/org.gnome.meld.gschema.xml:257
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, "
"but won’t contribute to the comparison itself."
msgstr "Aurredefinitutako testuetan oinarritutako iragazkien zerrenda. Aktibo dauden iragazkiek bat datozen
testuak kenduko dituzte fitxategien konparaziotik. Hala ere, testua bistaratzen jarraituko da, baina ez dio
konparazioari berari lagunduko."
-#: ../data/styles/meld-base.xml.h:1
+#: data/styles/meld-base.style-scheme.xml.in:1
msgid "Classic (Meld)"
msgstr "Klasikoa (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 "Oinarrizko kolore-eskema Meld-en nabarmentzerako"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Meld eskema iluna"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Kolore-eskema iluna Meld-en nabarmentzerako"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Orokorra"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Beste konparazio bat"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Itxi konparazioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Irten Meld-etik"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Gelditu uneko ekintza"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Freskatu konparazioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Pantaila osoa"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:63
msgctxt "shortcut window"
msgid "Panes"
msgstr "Panelak"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:68
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Aurreko konparazio-panela"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:75
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Hurrengo konparazio-panela"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:84
msgctxt "shortcut window"
msgid "Changes"
msgstr "Aldaketak"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:89
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Joan aurreko aldaketara"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:96
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Joan hurrengo aldaketara"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
+#: meld/resources/gtk/help-overlay.ui:105
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Fitxak"
-#: ../meld/resources/gtk/help-overlay.ui.h:15
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Joan aurreko fitxara"
-#: ../meld/resources/gtk/help-overlay.ui.h:16
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Joan hurrengo fitxara"
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Aldatu fitxara"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Eraman fitxa ezkerrera"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Eraman fitxa eskuinera"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:147
msgctxt "shortcut window"
msgid "Editing"
msgstr "Edizioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Undo"
msgstr "Desegin"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Redo"
msgstr "Berregin"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Cut"
msgstr "Ebaki"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiatu"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Paste"
msgstr "Itsatsi"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Find"
msgstr "Bilatu"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Bilatu hurrengoa"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Bilatu aurrekoa"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Replace"
msgstr "Ordeztu"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:217
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Fitxategi-konparazioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Gorde uneko fitxategia"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Gorde uneko fitxategia bide berrian"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Gorde fitxategi guztiak konparazioan"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Aurreko gatazka"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Hurrengo gatazka"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Bidali aldaketa ezkerrera"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Bidali aldaketa eskuinera"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Ekarri aldaketa ezkerretik"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Ekarri aldaketa eskuinetik"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiatu aldaketa ezkerraren gainean"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiatu aldaketa ezkerraren azpian"
-#: ../meld/resources/gtk/help-overlay.ui.h:42
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiatu aldaketa eskuinaren gainean"
-#: ../meld/resources/gtk/help-overlay.ui.h:43
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiatu aldaketa eskuinaren azpian"
-#: ../meld/resources/gtk/help-overlay.ui.h:44
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Ezabatu aldaketa"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:322
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Karpeta-konparazioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:327
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Ezkerrean kopiatzen du"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Eskuinean kopiatzen du"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:350
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Bertsio-kontrolaren konparazioa"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Egikaritu bertsio-kontrolera"
-#: ../meld/resources/gtk/help-overlay.ui.h:50
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Erakutsi/ezkutatu kontsolaren irteera"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
msgid "Refresh"
msgstr "Freskatu"
-#: ../meld/resources/gtk/menus.ui.h:2
+#: meld/resources/gtk/menus.ui:12
msgid "Stop"
msgstr "Gelditu"
-#: ../meld/resources/gtk/menus.ui.h:3
+#: meld/resources/gtk/menus.ui:17
msgid "Fullscreen"
msgstr "Pantaila osoa"
-#: ../meld/resources/gtk/menus.ui.h:4
+#: meld/resources/gtk/menus.ui:26
msgid "Save As…"
msgstr "Gorde honela…"
-#: ../meld/resources/gtk/menus.ui.h:5
+#: meld/resources/gtk/menus.ui:30
msgid "Save A_ll"
msgstr "Gorde _denak"
-#: ../meld/resources/gtk/menus.ui.h:6
+#: meld/resources/gtk/menus.ui:34
msgid "Revert files…"
-msgstr ""
+msgstr "Alderantzikatu fitxategiak…"
-#: ../meld/resources/gtk/menus.ui.h:7
+#: meld/resources/gtk/menus.ui:38
msgid "Open Externally"
msgstr "Ireki kanpotik"
-#: ../meld/resources/gtk/menus.ui.h:8
+#: meld/resources/gtk/menus.ui:45
msgid "_Find…"
msgstr "_Bilatu…"
-#: ../meld/resources/gtk/menus.ui.h:9
+#: meld/resources/gtk/menus.ui:49
msgid "_Replace…"
msgstr "_Ordeztu…"
-#: ../meld/resources/gtk/menus.ui.h:10
+#: meld/resources/gtk/menus.ui:55
msgid "View"
msgstr "Ikusi"
-#: ../meld/resources/gtk/menus.ui.h:11
+#: meld/resources/gtk/menus.ui:59
msgid "Overview Map"
-msgstr ""
+msgstr "Ikuspegi orokorraren mapa"
-#: ../meld/resources/gtk/menus.ui.h:12
+#: meld/resources/gtk/menus.ui:63
msgid "Version control console"
-msgstr ""
+msgstr "Bertsio-kontrolaren kontsola"
-#: ../meld/resources/gtk/menus.ui.h:13
+#: meld/resources/gtk/menus.ui:67
msgid "Lock scrolling"
-msgstr ""
+msgstr "Blokeatu korritzea"
-#: ../meld/resources/gtk/menus.ui.h:14
+#: meld/resources/gtk/menus.ui:73
msgid "Comparison"
-msgstr ""
+msgstr "Konparazioa"
-#: ../meld/resources/gtk/menus.ui.h:15
+#: meld/resources/gtk/menus.ui:77
msgid "Merge All from Left"
msgstr "Batu guztiak ezkerretik"
-#: ../meld/resources/gtk/menus.ui.h:16
+#: meld/resources/gtk/menus.ui:81
msgid "Merge All from Right"
msgstr "Batu guztiak eskuinetik"
-#: ../meld/resources/gtk/menus.ui.h:17
+#: meld/resources/gtk/menus.ui:85
msgid "Merge All"
msgstr "Batu guztiak"
-#: ../meld/resources/gtk/menus.ui.h:18
-#: ../meld/resources/ui/filediff-menus.ui.h:10
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
msgid "Add Synchronization Point"
msgstr "Gehitu sinkronizazio-puntua"
-#: ../meld/resources/gtk/menus.ui.h:19
-#: ../meld/resources/ui/filediff-menus.ui.h:11
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
msgid "Clear Synchronization Points"
msgstr "Garbitu sinkronizazio-puntuak"
-#: ../meld/resources/gtk/menus.ui.h:20
+#: meld/resources/gtk/menus.ui:103
msgid "Format as Patch…"
msgstr "Formateatu adabaki gisa…"
-#: ../meld/resources/gtk/menus.ui.h:21
+#: meld/resources/gtk/menus.ui:112
msgid "_Preferences"
msgstr "_Hobespenak"
-#: ../meld/resources/gtk/menus.ui.h:22
+#: meld/resources/gtk/menus.ui:116
msgid "Keyboard Shortcuts"
msgstr "Laster-teklak"
-#: ../meld/resources/gtk/menus.ui.h:23
+#: meld/resources/gtk/menus.ui:120
msgid "_Help"
msgstr "_Laguntza"
-#: ../meld/resources/gtk/menus.ui.h:24
+#: meld/resources/gtk/menus.ui:125
msgid "_About Meld"
-msgstr ""
+msgstr "Meld aplikazioari _buruz"
-#: ../meld/resources/gtk/menus.ui.h:25
+#: meld/resources/gtk/menus.ui:138
msgid "File status"
-msgstr ""
+msgstr "Fitxategiaren egoera"
-#: ../meld/resources/gtk/menus.ui.h:26
+#: meld/resources/gtk/menus.ui:140
msgid "Same"
msgstr "Berdinak"
-#: ../meld/resources/gtk/menus.ui.h:27
+#: meld/resources/gtk/menus.ui:144
msgid "New"
msgstr "Berria"
-#: ../meld/resources/gtk/menus.ui.h:28 ../meld/vc/_vc.py:77
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
msgid "Modified"
msgstr "Aldatze-data"
-#: ../meld/resources/gtk/menus.ui.h:29
+#: meld/resources/gtk/menus.ui:158
msgid "Ignore filename case"
-msgstr ""
+msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei"
-#: ../meld/resources/gtk/menus.ui.h:30
+#: meld/resources/gtk/menus.ui:171
msgid "Normal"
msgstr "Arrunta"
-#: ../meld/resources/gtk/menus.ui.h:31 ../meld/vc/_vc.py:71
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
msgid "Unversioned"
msgstr "Bertsiorik gabekoa"
-#: ../meld/resources/gtk/menus.ui.h:32 ../meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
msgid "Ignored"
msgstr "Ez ikusi eginda"
-#: ../meld/resources/gtk/menus.ui.h:33
+#: meld/resources/gtk/menus.ui:186
msgid "Flatten folders"
-msgstr ""
+msgstr "Berdindu karpetak"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Meld-i buruz"
-
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
msgstr "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "Webgunea"
+"Copyright © 2009-2019 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr "Asier Sarasua Garmendia <asier sarasua gmail com>"
-#: ../meld/resources/ui/appwindow.ui.h:2
+#: meld/resources/ui/appwindow.ui:29
msgid "Start a new comparison"
msgstr "Konparazio berri bat hasten du"
-#: ../meld/resources/ui/appwindow.ui.h:3
+#: meld/resources/ui/appwindow.ui:45
msgid "Open a recent comparison"
-msgstr ""
+msgstr "Ireki azken aldiko konparazio bat"
-#: ../meld/resources/ui/appwindow.ui.h:4
+#: meld/resources/ui/appwindow.ui:73
msgid "Go to the previous change"
msgstr "Aurreko aldaketara joaten da"
-#: ../meld/resources/ui/appwindow.ui.h:5
+#: meld/resources/ui/appwindow.ui:93
msgid "Go to the next change"
msgstr "Hurrengo aldaketara joaten da"
-#: ../meld/resources/ui/appwindow.ui.h:6
+#: meld/resources/ui/appwindow.ui:123
msgid "Go to the previous conflict"
msgstr "Aurreko gatazkara joaten da"
-#: ../meld/resources/ui/appwindow.ui.h:7
+#: meld/resources/ui/appwindow.ui:143
msgid "Go to the next conflict"
msgstr "Hurrengo gatazkara joaten da"
-#: ../meld/resources/ui/appwindow.ui.h:8
+#: meld/resources/ui/appwindow.ui:192
msgid "Version Filters"
-msgstr ""
+msgstr "Bertsio-iragazkiak"
-#: ../meld/resources/ui/appwindow.ui.h:9
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
msgid "File Filters"
msgstr "Fitxategi-iragazkiak"
-#: ../meld/resources/ui/appwindow.ui.h:10
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
msgid "Text Filters"
msgstr "Testu-iragazkiak"
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Aktibo"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
msgid "Column Name"
msgstr "Zutabe-izena"
-#: ../meld/resources/ui/column-list.ui.h:3
-#: ../meld/resources/ui/filter-list.ui.h:7
-#: ../meld/resources/ui/vcview-menus.ui.h:5 ../meld/vcview.py:742
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
msgid "_Remove"
msgstr "_Kendu"
-#: ../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 "Elementua igotzen du"
-#: ../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 "_Igo"
-#: ../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 "Elementua jaisten du"
-#: ../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 "_Jaitsi"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Egikaritu"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Egikaritu fitxategiak"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Egunkariaren mezua"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Aurreko egunkaria:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
msgid "Co_mmit"
msgstr "_Egikaritu"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:1
+#: meld/resources/ui/dirdiff-actions.ui:20
msgid "Copy to left"
msgstr "Ezkerrean kopiatzen du"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:2
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Eskuinean kopiatzen du"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:3
+#: meld/resources/ui/dirdiff-actions.ui:66
msgid "Delete selected"
msgstr "Ezabatu hautapena"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:1
+#: meld/resources/ui/dirdiff-menus.ui:7
msgid "_Compare selected files"
-msgstr ""
+msgstr "_Konparatu hautatutako fitxategiak"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:2
+#: meld/resources/ui/dirdiff-menus.ui:14
msgid "Copy to _left"
-msgstr ""
+msgstr "Kopiatu e_zkerrean"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:3
+#: meld/resources/ui/dirdiff-menus.ui:18
msgid "Copy to _right"
-msgstr ""
+msgstr "Kopiatu e_skuinean"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:4
+#: meld/resources/ui/dirdiff-menus.ui:22
msgid "_Delete selected"
-msgstr ""
+msgstr "E_zabatu hautatutakoa"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:5
+#: meld/resources/ui/dirdiff-menus.ui:29
msgid "Collapse Recursively"
msgstr "Tolestu errekurtsiboki"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:6
+#: meld/resources/ui/dirdiff-menus.ui:33
msgid "Expand Recursively"
msgstr "Zabaldu errekurtsiboki"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:7
+#: meld/resources/ui/dirdiff-menus.ui:40
msgid "_Open Externally"
-msgstr ""
+msgstr "_Ireki kanpotik"
+
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "_Copy File Paths"
+msgstr "Kopiatu fitxategi-_adabakiak"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
msgstr "Bilaketa-testuaren kodeketa…"
-#: ../meld/resources/ui/filediff-actions.ui.h:1
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Uneko aldaketa ezkerrera bidaltzen du"
-#: ../meld/resources/ui/filediff-actions.ui.h:2
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Uneko aldaketa eskuinera bidaltzen du"
-#: ../meld/resources/ui/filediff-actions.ui.h:3
+#: meld/resources/ui/filediff-actions.ui:65
msgid "Copy chunks"
-msgstr ""
+msgstr "Kopiatu puskak"
-#: ../meld/resources/ui/filediff-actions.ui.h:4
+#: meld/resources/ui/filediff-actions.ui:87
msgid "Delete change"
msgstr "Ezabatu aldaketa"
-#: ../meld/resources/ui/filediff-menus.ui.h:1
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
-msgstr "Aldaketa ezkerreko zatiaren gainean kopiatzen du"
+msgstr "Aldaketa ezkerreko puskaren gainean kopiatzen du"
-#: ../meld/resources/ui/filediff-menus.ui.h:2
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
-msgstr "Aldaketa ezkerreko zatiaren azpian kopiatzen du"
+msgstr "Aldaketa ezkerreko puskaren azpian kopiatzen du"
-#: ../meld/resources/ui/filediff-menus.ui.h:3
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
-msgstr "Aldaketa eskuineko zatiaren gainean kopiatzen du"
+msgstr "Aldaketa eskuineko puskaren gainean kopiatzen du"
-#: ../meld/resources/ui/filediff-menus.ui.h:4
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
-msgstr "Aldaketa eskuinekoaren azpian kopiatzen du"
+msgstr "Aldaketa eskuineko puskaren azpian kopiatzen du"
-#: ../meld/resources/ui/filediff-menus.ui.h:5
+#: meld/resources/ui/filediff-menus.ui:28
msgid "_Undo"
msgstr "_Desegin"
-#: ../meld/resources/ui/filediff-menus.ui.h:6
+#: meld/resources/ui/filediff-menus.ui:32
msgid "_Redo"
msgstr "_Berregin"
-#: ../meld/resources/ui/filediff-menus.ui.h:7
+#: meld/resources/ui/filediff-menus.ui:39
msgid "Cu_t"
msgstr "_Ebaki"
-#: ../meld/resources/ui/filediff-menus.ui.h:8
+#: meld/resources/ui/filediff-menus.ui:43
msgid "_Copy"
msgstr "_Kopiatu"
-#: ../meld/resources/ui/filediff-menus.ui.h:9
+#: meld/resources/ui/filediff-menus.ui:47
msgid "_Paste"
msgstr "_Itsatsi"
-#: ../meld/resources/ui/filediff.ui.h:1
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
+#: meld/resources/ui/filediff.ui:171
msgid ""
"This file can not be written to. You may click here to unlock this file and "
"make changes anyway, but these changes must be saved to a new file."
msgstr "Fitxategi honetan ezin da idatzi. Hala ere, hemen klik egin eta fitxategia desblokea dezakezu,
aldaketak egiteko. Aldaketa horiek, ordea, beste fitxategi batean gorde behar dira."
-#: ../meld/resources/ui/filediff.ui.h:2
+#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
+#: meld/resources/ui/filediff.ui:185
+msgid "Open file in this pane"
+msgstr "Ireki fitxategia panel honetan"
+
+#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
+#: meld/resources/ui/filediff.ui:194
+msgid "Save file in this pane"
+msgstr "Gorde panel honetako fitxategia"
+
+#: meld/resources/ui/filediff.ui:73
msgid "File 3"
msgstr "3. fitxategia"
-#: ../meld/resources/ui/filediff.ui.h:3
+#: meld/resources/ui/filediff.ui:142
msgid "File 2"
msgstr "2. fitxategia"
-#: ../meld/resources/ui/filediff.ui.h:4
+#: meld/resources/ui/filediff.ui:207
msgid "File 1"
msgstr "1. fitxategia"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:17
-#: ../meld/dirdiff.py:511
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:517
msgid "Name"
msgstr "Izena"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Eredua"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Gehitu iragazkia"
-#: ../meld/resources/ui/filter-list.ui.h:5
-#: ../meld/resources/ui/vcview-menus.ui.h:4
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
msgid "_Add"
msgstr "_Gehitu"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
msgid "Remove selected filter"
msgstr "Kendu hautatutako iragazkia"
-#: ../meld/resources/ui/findbar.ui.h:1
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Maiuskula/minuskula"
-#: ../meld/resources/ui/findbar.ui.h:2
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "Hitz _osoa"
-#: ../meld/resources/ui/findbar.ui.h:3
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "Adierazpen _erregularra"
-#: ../meld/resources/ui/findbar.ui.h:4
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Itzulbiratuta"
-#: ../meld/resources/ui/findbar.ui.h:5
+#: meld/resources/ui/findbar.ui:193
msgid "Replace _All"
msgstr "Ordeztu _denak"
-#: ../meld/resources/ui/findbar.ui.h:6 ../meld/dirdiff.py:1044
-#: ../meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
msgid "_Replace"
msgstr "_Ordeztu"
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:226
msgid "Switch between Find and Find-and-Replace"
-msgstr ""
+msgstr "Txandakatu bilatzeko modua eta bilatu eta ordezteko modua"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Bilaketaren nabarmentze modua…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:344
-#: ../meld/newdifftab.py:53
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
+#: meld/newdifftab.py:49
msgid "New comparison"
msgstr "Beste konparazio bat"
-#: ../meld/resources/ui/new-diff-tab.ui.h:2
+#: meld/resources/ui/new-diff-tab.ui:72
msgid "File"
msgstr "Fitxategia"
-#: ../meld/resources/ui/new-diff-tab.ui.h:3
+#: meld/resources/ui/new-diff-tab.ui:121
msgid "Folder"
msgstr "Karpeta"
-#: ../meld/resources/ui/new-diff-tab.ui.h:4
+#: meld/resources/ui/new-diff-tab.ui:170
msgid "Version control"
-msgstr ""
+msgstr "Bertsio-kontrola"
-#: ../meld/resources/ui/new-diff-tab.ui.h:5
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
msgid "_3-way comparison"
msgstr "_3 sarrerako konparazioa"
-#: ../meld/resources/ui/new-diff-tab.ui.h:6
+#: meld/resources/ui/new-diff-tab.ui:254
msgid "Select First File"
msgstr "Hautatu lehen fitxategia"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:267
msgid "Select Second File"
msgstr "Hautatu bigarren fitxategia"
-#: ../meld/resources/ui/new-diff-tab.ui.h:8
+#: meld/resources/ui/new-diff-tab.ui:281
msgid "Select Third File"
msgstr "Hautatu hirugarren fitxategia"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:316
msgid "Select First Folder"
msgstr "Hautatu lehen karpeta"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:329
msgid "Select Second Folder"
msgstr "Hautatu bigarren karpeta"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:343
msgid "Select Third Folder"
msgstr "Hautatu hirugarren karpeta"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:393
msgid "Select A Version-Controlled Folder"
msgstr "Hautatu bertsio-kontrola duen karpeta bat"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:442
msgid "_Blank comparison"
msgstr "_Garbitu konparazioa"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:459
msgid "C_ompare"
msgstr "_Konparatu"
-#: ../meld/resources/ui/notebook-label.ui.h:1
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Itxi fitxa"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Formateatu adabaki gisa"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Kopiatu arbelean"
-#: ../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 "Gorde adabakia"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Erabili hauen arteko diferentziak:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Ezkerreko eta erdiko panelak"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Erdiko eta eskuineko panelak"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "_Alderantzikatu adabakiaren norabidea"
-#: ../meld/resources/ui/preferences.ui.h:1
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Hobespenak"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Letra-tipoa"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "_Erabili sistemaren zabalera finkoko letra-tipoa"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "_Editorearen letra-tipoa:"
#. 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:292
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
msgid "Display"
msgstr "Pantaila"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "_Zabalera:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "_Txertatu zuriuneak tabulazioen ordez"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Gaitu t_estua egokitzea"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Ez _zatitu hitzak bi lerrotan"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Nabarmendu _uneko lerroa"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Erakutsi _lerro-zenbakiak"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Erakutsi _zuriuneak"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Nabarmendu _sintaxia"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Sintaxia nabarmentzeko kolore-eskema:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
msgid "Code Overview"
msgstr "Kodearen ikuspegi orokorra"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:506
msgid "Show overview map"
msgstr "Erakutsi ikuspegi orokorra"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:529
msgid "Overview map style:"
-msgstr ""
+msgstr "Ikuspegi orokorraren maparen estiloa:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Kanpoko editorea"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
msgstr "Erabili sistema-editore _lehenetsia"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "Edito_rearen komandoa:"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Editorea"
-#: ../meld/resources/ui/preferences.ui.h:22
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Azaleko konparazioa"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:768
msgid "C_ompare files based only on size and timestamp"
msgstr "_Konparatu fitxategiak tamainan eta data-zigiluan soilik oinarrituta"
-#: ../meld/resources/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "_Data-zigiluaren bereizmena:"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:855
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr "Oharra: testu-iragazkiak gaitzen badira, fitxategi handien konparazioak motelagoak izango dira"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Esteka sinbolikoak"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Zutabe ikusgaiak"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Karpeten konparazioa"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Bertsioen konparazioa"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1104
msgid "_Order when comparing file revisions:"
msgstr "_Ordenatu fitxategien gainbegiraketa konparatzean"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1151
msgid "Order when _merging files:"
msgstr "Ordenatu fitxategiak _batzean:"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Egikaritze-mezuak"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Erakutsi e_skuineko marjina hemen:"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1301
msgid "Automatically _break lines at right margin on commit"
msgstr "_Hautsi lerroak automatikoki eskuineko marjinan egikaritzean"
-#: ../meld/resources/ui/preferences.ui.h:37
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Bertsio-kontrola"
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Fitxategi-izenen iragazkiak"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
"separated by spaces."
msgstr "Direktorioak konparatzean, izenaren arabera iragaz ditzakezu fitxategiak eta direktorioak. Zuriunez
bereizia dagoen shell motako komodinen zerrenda bat da eredu bakoitza."
-#: ../meld/resources/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1478
msgid "Change trimming"
msgstr "Aldatu moztea"
-#: ../meld/resources/ui/preferences.ui.h:42
+#: meld/resources/ui/preferences.ui:1514
msgid "Trim blank line differences from the start and end of changes"
msgstr "Moztu lerro hutsen diferentziak aldaketen hasieran eta amaieran"
-#: ../meld/resources/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Testu-iragazkiak"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1374,318 +1343,322 @@ msgid ""
"details."
msgstr "Fitxategiak konparatzean, aldaketa mota batzuei ez ikusi egin diezaiekezu. Eredu bakoitza python-eko
adierazpen erregular bat da, eta bat datorren testua kate huts batekin ordezten du konparazioa egin aurretik.
Adierazpenak taldeak badauzka, taldeak soilik ordezkatzen dira. Informazio gehiago behar izanez gero, ikusi
erabiltzailearen eskuliburua."
-#: ../meld/resources/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Ezkerra urrunekoa da, eskuina lokalekoa"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Ezkerra lokalekoa da, eskuina urrunekoa"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1705
msgid "Simple change map"
-msgstr ""
+msgstr "Aldaketa sinpleen mapa"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1709
msgid "Compact source map"
-msgstr ""
+msgstr "Iturburu trinkoaren mapa"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1713
msgid "Full source map"
-msgstr ""
+msgstr "Iturburu osoaren mapa"
-#: ../meld/resources/ui/preferences.ui.h:51
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Urrunekoa, batu, lokala"
-#: ../meld/resources/ui/preferences.ui.h:52
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Lokala, batu, urrunekoa"
-#: ../meld/resources/ui/preferences.ui.h:53
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:54
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:55
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:56
+#: meld/resources/ui/preferences.ui:1765
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 "Bidali egikaritze lokalak urrunekora?"
-#: ../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 "Bidali beharreko egikaritzeak bertsio-kontrol sistemaren arabera zehaztuta dago."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
msgstr "_Bidali egikariketak"
-#: ../meld/resources/ui/recent-selector.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
msgid "Search recent comparisons…"
-msgstr ""
+msgstr "Bilatu azken aldiko konparazioetan…"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
+#: meld/resources/ui/revert-dialog.ui:9
msgid "Discard unsaved changes to documents?"
msgstr "Baztertu gorde gabeko dokumentu-aldaketak?"
-#: ../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 "Honako dokumentuei egindako aldaketak betiko galduko dira:"
-#: ../meld/resources/ui/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Baztertu"
-#: ../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 "Dokumentuetan egindako aldaketak gorde itxi aurretik?"
-#: ../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 "Gordetzen ez baduzu, aldaketak betiko galduko dira."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Itxi gorde _gabe"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1043
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:116
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
+#: meld/iohelpers.py:55 meld/iohelpers.py:112
msgid "_Cancel"
msgstr "_Utzi"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+#: meld/resources/ui/save-confirm-dialog.ui:52
msgid "_Save"
msgstr "_Gorde"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
+#: meld/resources/ui/statusbar-menu.ui:9
msgid "Show whitespace"
-msgstr ""
+msgstr "Erakutsi zuriunea"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
+#: meld/resources/ui/statusbar-menu.ui:17
msgid "Text wrapping"
msgstr "Testua egokitzea"
-#: ../meld/resources/ui/vcview-menus.ui.h:1
+#: meld/resources/ui/vcview-menus.ui:7
msgid "_Compare"
msgstr "_Konparatu"
-#: ../meld/resources/ui/vcview-menus.ui.h:2
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "Eg_ikaritu…"
-#: ../meld/resources/ui/vcview-menus.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:15
msgid "_Update"
msgstr "_Eguneratu"
-#: ../meld/resources/ui/vcview-menus.ui.h:6
+#: meld/resources/ui/vcview-menus.ui:30
msgid "Re_vert"
msgstr "_Leheneratu"
-#: ../meld/resources/ui/vcview-menus.ui.h:7 ../meld/resources/ui/vcview.ui.h:15
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
msgid "Delete"
msgstr "Ezabatu"
-#: ../meld/resources/ui/vcview-menus.ui.h:8
+#: meld/resources/ui/vcview-menus.ui:41
msgid "Mar_k as Resolved"
msgstr "_Markatu ebatzi gisa"
-#: ../meld/resources/ui/vcview.ui.h:1
+#: meld/resources/ui/vcview.ui:73
msgid "Commit…"
-msgstr ""
+msgstr "Egikaritu…"
-#: ../meld/resources/ui/vcview.ui.h:2
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Egikaritu aldaketak bertsio-kontrolera"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview.ui:86
msgid "Update"
msgstr "Eguneratu"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview.ui:87
msgid "Update working copy from version control"
msgstr "Eguneratu laneko kopia bertsio-kontroletik"
-#: ../meld/resources/ui/vcview.ui.h:5
+#: meld/resources/ui/vcview.ui:99
msgid "Push"
msgstr "Bultzatu"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
msgstr "Bidali lokaleko aldaketak urrunekora"
-#: ../meld/resources/ui/vcview.ui.h:7
+#: meld/resources/ui/vcview.ui:112
msgid "Add"
msgstr "Gehitu"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Gehitu bertsio-kontrolari"
-#: ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/vcview.ui:125
msgid "Remove"
msgstr "Kendu"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Kendu bertsio-kontroletik"
-#: ../meld/resources/ui/vcview.ui.h:11
+#: meld/resources/ui/vcview.ui:138
msgid "Mark as Resolved"
-msgstr ""
+msgstr "Markatu ebatzita bezala"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Markatu ebatzita bezala bertsio-kontrolean"
-#: ../meld/resources/ui/vcview.ui.h:13
+#: meld/resources/ui/vcview.ui:151
msgid "Revert"
msgstr "Alderantzikatu"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Leheneratu laneko kopia jatorrizko egoerara"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Ezabatu laneko kopiatik"
-#: ../meld/resources/ui/vcview.ui.h:18 ../meld/vcview.py:417
+#: meld/resources/ui/vcview.ui:220
msgid "Location"
msgstr "Kokalekua"
-#: ../meld/resources/ui/vcview.ui.h:19
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Egoera"
-#: ../meld/resources/ui/vcview.ui.h:20
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Gehigarria"
-#: ../meld/resources/ui/vcview.ui.h:21
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Kontsolaren irteera"
-#: ../meld/actiongutter.py:250
+#: meld/actiongutter.py:247
msgid "Copy _up"
msgstr "Kopiatu _goian"
-#: ../meld/actiongutter.py:251
+#: meld/actiongutter.py:248
msgid "Copy _down"
msgstr "Kopiatu _behean"
-#: ../meld/const.py:25
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:26
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:27
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:532 ../meld/preferences.py:138
+#: meld/dirdiff.py:538 meld/preferences.py:132
msgid "Size"
msgstr "Tamaina"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:540 ../meld/preferences.py:139
+#: meld/dirdiff.py:546 meld/preferences.py:133
msgid "Modification time"
msgstr "Aldatze-ordua"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:548 ../meld/preferences.py:140
+#: meld/dirdiff.py:554 meld/preferences.py:134
msgid "Permissions"
msgstr "Baimenak"
-#: ../meld/dirdiff.py:771 ../meld/dirdiff.py:794
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] %s eskaneatzen"
+#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr "[{label}] Eskaneatzen {folder}"
-#: ../meld/dirdiff.py:930
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Eginda"
+#: meld/dirdiff.py:942
+#, python-brace-format
+msgid "[{label}] Done"
+msgstr "[{label}] Egina"
+
+#: meld/dirdiff.py:951
+msgid "Folder {} is being compared to itself"
+msgstr "{} karpeta bere buruarekin konparatzen"
-#: ../meld/dirdiff.py:937
+#: meld/dirdiff.py:957
msgid "Folders have no differences"
msgstr "Karpetek ez dute diferentziarik"
-#: ../meld/dirdiff.py:939
+#: meld/dirdiff.py:959
msgid "Contents of scanned files in folders are identical."
msgstr "Karpetetan eskaneatutako fitxategien edukiak berdinak dira."
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:961
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
msgstr "Karpetetan eskaneatutako fitxategiek berdinak dirudite, baina edukiak ez dira eskaneatu."
-#: ../meld/dirdiff.py:944
+#: meld/dirdiff.py:964
msgid "File filters are in use, so not all files have been scanned."
msgstr "Fitxategi-iragazkiak indarrean daudenez, ez dira fitxategi guztiak eskaneatu."
-#: ../meld/dirdiff.py:946
+#: meld/dirdiff.py:966
msgid "Text filters are in use and may be masking content differences."
msgstr "Testu-fitxategiak indarrean daudenez, beharbada edukien diferentziak ezkutuan geratu dira."
-#: ../meld/dirdiff.py:962 ../meld/filediff.py:1755
+#: meld/dirdiff.py:982 meld/filediff.py:1874
msgid "Hide"
msgstr "Ezkutatu"
-#: ../meld/dirdiff.py:964 ../meld/filediff.py:1757 ../meld/filediff.py:1787
-#: ../meld/filediff.py:1789 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
+#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "_Ezkutatu"
-#: ../meld/dirdiff.py:973
+#: meld/dirdiff.py:993
msgid "Multiple errors occurred while scanning this folder"
msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
-#: ../meld/dirdiff.py:974
+#: meld/dirdiff.py:994
msgid "Files with invalid encodings found"
msgstr "Kodeketa baliogabea duten fitxategiak aurkitu dira"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:976
+#: meld/dirdiff.py:996
msgid "Some files were in an incorrect encoding. The names are something like:"
msgstr "Fitxategi batzuen kodeketa okerra da. Hauek dira fitxategi-izenak:"
-#: ../meld/dirdiff.py:978
+#: meld/dirdiff.py:998
msgid "Files hidden by case insensitive comparison"
msgstr "Fitxategiren bat ezkutatu da, konparazioan maiuskulak/minuskulak ez bereizteagatik"
#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:980
+#: meld/dirdiff.py:1000
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
msgstr "Maiuskulak/minuskulak bereizten ez dituen konparazio bat egiten ari zara, maiuskulak/minuskulak
bereizten dituen fitxategi-sistema batean. Karpeta honetako fitxategi hauek ezkutatu dira:"
-#: ../meld/dirdiff.py:991
-#, python-format
-msgid "“%s” hidden by “%s”"
-msgstr "“%s” honek ezkutatua: “%s”"
+#: meld/dirdiff.py:1011
+#, python-brace-format
+msgid "“{first_file}” hidden by “{second_file}”"
+msgstr "“{first_file}” ezkutatu du “{second_file}” fitxategiak"
-#: ../meld/dirdiff.py:1047
+#: meld/dirdiff.py:1070
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ordeztu “%s” karpeta?"
-#: ../meld/dirdiff.py:1049
+#: meld/dirdiff.py:1072
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1693,108 +1666,117 @@ msgid ""
msgstr "Badago izen bereko beste karpeta bat “%s”(e)n.\n"
"Lehendik dagoen karpeta ordezten baduzu, bertako fitxategi guztiak galdu egingo dira."
-#: ../meld/dirdiff.py:1062
+#: meld/dirdiff.py:1085
msgid "Error copying file"
msgstr "Errorea fitxategia kopiatzean"
-#: ../meld/dirdiff.py:1063
-#, python-format
+#: meld/dirdiff.py:1086
+#, python-brace-format
msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
"\n"
-"%s"
-msgstr "Ezin izan da %s kopiatu\n"
-"%s kokalekura.\n"
+"{error}"
+msgstr "Ezin da {source} kopiatu\n"
+"{dest} helburuan.\n"
"\n"
-"%s"
+"{error}"
-#: ../meld/dirdiff.py:1088 ../meld/vcview.py:765
+#: meld/dirdiff.py:1111 meld/vcview.py:759
msgid "Error deleting {}"
msgstr "Errorea {} ezabatzean"
-#: ../meld/dirdiff.py:1567
+#: meld/dirdiff.py:1604
msgid "No folder"
msgstr "Karpetarik ez"
-#: ../meld/filediff.py:1065
+#: meld/filediff.py:1144
msgid "Comparison results will be inaccurate"
msgstr "Konparazioaren emaitzak ez dira zehatzak izango"
-#: ../meld/filediff.py:1067
+#: meld/filediff.py:1146
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
msgstr "Iragazki batek fitxategiko lerro kopurua aldatu du, eta hori ez dago onartuta. Konparazioa ez da
zehatza izango."
-#: ../meld/filediff.py:1139
+#: meld/filediff.py:1218
msgid "Mark conflict as resolved?"
msgstr "Markatu gatazka ebatzita bezala?"
-#: ../meld/filediff.py:1141
+#: meld/filediff.py:1220
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr "Gatazka ongi ebatzi bada, ebatzita bezala marka dezakezu orain."
-#: ../meld/filediff.py:1143
+#: meld/filediff.py:1222
msgid "Cancel"
msgstr "Utzi"
-#: ../meld/filediff.py:1144
+#: meld/filediff.py:1223
msgid "Mark _Resolved"
msgstr "Markatu _ebatzita"
-#: ../meld/filediff.py:1463
+#: meld/filediff.py:1556
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Arazo bat egon da '%s' fitxategia irekitzean."
-#: ../meld/filediff.py:1471
+#: meld/filediff.py:1564
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Badirudi %s fitxategia bitarra dela."
-#: ../meld/filediff.py:1473
+#: meld/filediff.py:1566
msgid "Do you want to open the file using the default application?"
msgstr "Fitxategia ireki nahi duzu aplikazio lehenetsia erabilita?"
-#: ../meld/filediff.py:1475
+#: meld/filediff.py:1568
msgid "Open"
msgstr "Ireki"
-#: ../meld/filediff.py:1491
+#: meld/filediff.py:1582
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Fitxategiak konbinatzen"
+
+#: meld/filediff.py:1596
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Diferentziak kalkulatzen"
-#: ../meld/filediff.py:1550
+#: meld/filediff.py:1657
#, python-format
msgid "File %s has changed on disk"
msgstr "'%s' fitxategia diskoan aldatu da"
-#: ../meld/filediff.py:1551
+#: meld/filediff.py:1658
msgid "Do you want to reload the file?"
msgstr "Nahi duzu fitxategia berriro kargatzea?"
-#: ../meld/filediff.py:1553
+#: meld/filediff.py:1660
msgid "_Reload"
msgstr "Bir_kargatu"
-#: ../meld/filediff.py:1720
+#: meld/filediff.py:1830
+msgid "File {} is being compared to itself"
+msgstr "{} fitxategia bere buruarekin konparatzen"
+
+#: meld/filediff.py:1839
msgid "Files are identical"
msgstr "Fitxategiak berdinak dira"
-#: ../meld/filediff.py:1733
+#: meld/filediff.py:1852
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
msgstr "Testu-iragazkiak erabiltzen ari dira fitxategiak, eta baliteke iragazki horiek fitxategien arteko
diferentziak ezkutatzea. Iragazi gabeko fitxategiak konparatu nahi dituzu?"
-#: ../meld/filediff.py:1738
+#: meld/filediff.py:1857
msgid "Files differ in line endings only"
msgstr "Fitxategien diferentziak lerro-amaieretan soilik daude"
-#: ../meld/filediff.py:1740
+#: meld/filediff.py:1859
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1802,74 +1784,74 @@ msgid ""
msgstr "Fitxategiak berdinak dira, lerro-amaieretan salbu:\n"
"%s"
-#: ../meld/filediff.py:1760
+#: meld/filediff.py:1879
msgid "Show without filters"
msgstr "Erakutsi iragazkirik gabe"
-#: ../meld/filediff.py:1782
+#: meld/filediff.py:1901
msgid "Change highlighting incomplete"
msgstr "Aldaketen nabarmentzea osatu gabe"
-#: ../meld/filediff.py:1783
+#: meld/filediff.py:1902
msgid ""
"Some changes were not highlighted because they were too large. You can force "
"Meld to take longer to highlight larger changes, though this may be slow."
msgstr "Aldaketa batzuk ez dira nabarmendu handiegiak direlako. Derrigor diezaiokezu Meld-i aldaketa handiak
nabarmentzeko, nahiz eta halakoetan motelagoa izan."
-#: ../meld/filediff.py:1791
+#: meld/filediff.py:1910
msgid "Keep highlighting"
msgstr "Mantendu nabarmentzea"
-#: ../meld/filediff.py:1793
+#: meld/filediff.py:1912
msgid "_Keep highlighting"
msgstr "_Mantendu nabarmentzea"
-#: ../meld/filediff.py:1806
+#: meld/filediff.py:1925
msgid "Saving failed"
msgstr "Gordetzeak huts egin du"
-#: ../meld/filediff.py:1807
+#: meld/filediff.py:1926
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
-msgstr ""
+msgstr "Kopiatu edozein aldaketa kritiko beste programa edo fitxategi batean, datuak galtzea eragozteko."
-#: ../meld/filediff.py:1816
+#: meld/filediff.py:1935
msgid "Save Left Pane As"
msgstr "Gorde ezkerreko panela honela"
-#: ../meld/filediff.py:1818
+#: meld/filediff.py:1937
msgid "Save Middle Pane As"
msgstr "Gorde erdiko panela honela"
-#: ../meld/filediff.py:1820
+#: meld/filediff.py:1939
msgid "Save Right Pane As"
msgstr "Gorde eskuineko panela honela"
-#: ../meld/filediff.py:1831
+#: meld/filediff.py:1950
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)"
-#: ../meld/filediff.py:1833
+#: meld/filediff.py:1952
msgid "If you save it, any external changes will be lost."
msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da."
-#: ../meld/filediff.py:1836
+#: meld/filediff.py:1955
msgid "Save Anyway"
msgstr "Gorde dena den"
-#: ../meld/filediff.py:1837
+#: meld/filediff.py:1956
msgid "Don’t Save"
msgstr "Ez gorde"
-#: ../meld/filediff.py:1879
+#: meld/filediff.py:1998
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
msgstr "“{}” fitxategiak dituen zenbait karaktere ezin dira kodetu “{}” kodeketa erabilita."
-#: ../meld/filediff.py:1883 ../meld/patchdialog.py:144
+#: meld/filediff.py:2002 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1877,57 +1859,52 @@ msgid ""
msgstr "Ezin izan da fitxategia gorde honakoagatik:\n"
"%s"
-#: ../meld/filediff.py:1887 ../meld/patchdialog.py:143
+#: meld/filediff.py:2006 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Ezin izan da %s fitxategia gorde."
-#: ../meld/filediff.py:1948
+#: meld/filediff.py:2067
msgid "Open File"
msgstr "Ireki fitxategia"
-#: ../meld/filediff.py:2292
+#: meld/filediff.py:2420
msgid "Live comparison updating disabled"
msgstr "Konparazioaren zuzeneko eguneraketa desgaituta"
-#: ../meld/filediff.py:2293
+#: meld/filediff.py:2421
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
"resume when synchronization points are cleared."
msgstr "Konparazioen zuzeneko eguneraketa desgaitu egiten da sinkronizazio-puntuak aktibo daudenean. Hala
ere, konparazioak eskuz freskatu ditzakezu, eta zuzeneko eguneraketak jarraitu egingo dute
sinkronizazio-puntuak garbitzen direnean."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Fitxategiak konbinatzen"
-
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:40
msgid "Deleting remote folders is not supported"
msgstr "Urruneko karpetak ezabatzea ez dago onartuta"
-#: ../meld/iohelpers.py:45
+#: meld/iohelpers.py:42
msgid "Not a file or directory"
msgstr "Ez da fitxategi bat edo direktorio bat"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:46
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr "“{}” ezin da zakarrontzira bota. Berehala ezabatu nahi duzu?"
-#: ../meld/iohelpers.py:54
+#: meld/iohelpers.py:51
msgid "This remote location does not support sending items to the trash."
msgstr "Urruneko kokaleku horrek ez du elementuak zakarrontzira botatzea onartzen."
-#: ../meld/iohelpers.py:59
+#: meld/iohelpers.py:56
msgid "_Delete Permanently"
msgstr "_Ezabatu behin betiko"
-#: ../meld/iohelpers.py:110
+#: meld/iohelpers.py:106
#, python-format
msgid "Replace file “%s”?"
msgstr "Ordeztu “%s” fitxategia?"
-#: ../meld/iohelpers.py:112
+#: meld/iohelpers.py:108
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -1935,124 +1912,124 @@ msgid ""
msgstr "“%s” kokalekuan badago izen hori duen fitxategia lehendik.\n"
"Hori ordezten baduzu, bere eduki guztia galduko da."
-#: ../meld/meldapp.py:171
+#: meld/meldapp.py:183
msgid "wrong number of arguments supplied to --diff"
msgstr "--diff: emandako argumentu kopurua okerra da"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:188
msgid "Start with an empty window"
msgstr "Hasi leiho huts batekin"
-#: ../meld/meldapp.py:177 ../meld/meldapp.py:179
+#: meld/meldapp.py:189 meld/meldapp.py:191
msgid "file"
msgstr "fitxategia"
-#: ../meld/meldapp.py:177 ../meld/meldapp.py:181
+#: meld/meldapp.py:189 meld/meldapp.py:193
msgid "folder"
msgstr "karpeta"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:190
msgid "Start a version control comparison"
msgstr "Hasi bertsio-kontrolaren konparazioa"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:192
msgid "Start a 2- or 3-way file comparison"
msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazioa"
-#: ../meld/meldapp.py:182
+#: meld/meldapp.py:194
msgid "Start a 2- or 3-way folder comparison"
msgstr "Hasi bi edo hiru sarrerako karpeten konparazioa"
-#: ../meld/meldapp.py:225
+#: meld/meldapp.py:237
#, python-format
msgid "Error: %s\n"
msgstr "Errorea: %s\n"
-#: ../meld/meldapp.py:232
+#: meld/meldapp.py:244
msgid "Meld is a file and directory comparison tool."
msgstr "Meld fitxategiak eta direktorioak konparatzeko tresna bat da."
-#: ../meld/meldapp.py:236
+#: meld/meldapp.py:248
msgid "Set label to use instead of file name"
msgstr "Ezarri etiketa bat fitxategi-izenaren ordez erabiltzeko"
-#: ../meld/meldapp.py:239
+#: meld/meldapp.py:251
msgid "Open a new tab in an already running instance"
msgstr "Ireki beste fitxa bat dagoeneko martxan dagoen instantzia batean"
-#: ../meld/meldapp.py:242
+#: meld/meldapp.py:254
msgid "Automatically compare all differing files on startup"
msgstr "Automatikoki konparatu fitxategi desberdin guztiak abioan"
-#: ../meld/meldapp.py:245
+#: meld/meldapp.py:257
msgid "Ignored for compatibility"
msgstr "Ez ikusi egin zaio, bateragarritasuna dela eta"
-#: ../meld/meldapp.py:249
+#: meld/meldapp.py:261
msgid "Set the target file for saving a merge result"
msgstr "Ezarri helburuko fitxategia emaitza konbinatua gordetzeko"
-#: ../meld/meldapp.py:252
+#: meld/meldapp.py:264
msgid "Automatically merge files"
msgstr "Automatikoki konbinatu fitxategiak"
-#: ../meld/meldapp.py:256
+#: meld/meldapp.py:268
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Kargatu gordetako konparazioa Meld-en konparazio-fitxategi batetik"
-#: ../meld/meldapp.py:260
+#: meld/meldapp.py:272
msgid "Create a diff tab for the supplied files or folders"
msgstr "Sortu diferentzia-fitxa emandako fitxategi edo karpetentzako"
-#: ../meld/meldapp.py:280
+#: meld/meldapp.py:292
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "argumentu gehiegi (0-3 ordez, %d jasota)"
-#: ../meld/meldapp.py:283
+#: meld/meldapp.py:295
msgid "can’t auto-merge less than 3 files"
msgstr "ezin dira automatikoki konbinatu 3 fitxategi baino gehiago"
-#: ../meld/meldapp.py:285
+#: meld/meldapp.py:297
msgid "can’t auto-merge directories"
msgstr "ezin dira automatikoki konbinatu direktorioak"
-#: ../meld/meldapp.py:300
+#: meld/meldapp.py:312
msgid "Error reading saved comparison file"
msgstr "Errorea gertatu da gordetako konparazio-fitxategia irakurtzean"
-#: ../meld/meldapp.py:317
+#: meld/meldapp.py:329
#, python-format
msgid "invalid path or URI “%s”"
msgstr "baliogabeko bide-izena edo URIa: “%s”"
-#: ../meld/meldapp.py:323
+#: meld/meldapp.py:336
msgid "remote folder “{}” not supported"
msgstr "“{}” urruneko karpeta ez dago onartuta"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:117
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<izenik gabea>"
-#: ../meld/melddoc.py:63
+#: meld/melddoc.py:61
msgid "untitled"
msgstr "izengabea"
-#: ../meld/meldwindow.py:150
+#: meld/meldwindow.py:155
msgid "Filename"
msgstr "Fitxategia"
-#: ../meld/meldwindow.py:379
+#: meld/meldwindow.py:384
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "Hiru fitxategi behar dira automatikoki konbinatzeko, honenbeste daude: %r"
-#: ../meld/meldwindow.py:400
+#: meld/meldwindow.py:406
msgid "Cannot compare a mixture of files and directories"
msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian"
-#: ../meld/misc.py:152
+#: meld/misc.py:150
msgid ""
"{}\n"
"\n"
@@ -2063,247 +2040,280 @@ msgstr "{}\n"
"Meld-ek errore kritikoa aurkitu du honakoa exekutatzean:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:203
+#: meld/misc.py:201
msgid "[None]"
msgstr "[Bat ere ez]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "etiketa"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "eredua"
-#: ../meld/recent.py:106
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Bertsio-kontrola:"
-#: ../meld/style.py:95
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr "Ez dira aurkitu kolore-eskemaren xehetasunak %s-%s(e)rako; gaizki instalatu da"
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
+msgstr "Ez dira aurkitu kolore-eskemaren xehetasunak {}-rako; gaizki instalatu da"
-#: ../meld/ui/bufferselectors.py:114
+#: meld/ui/bufferselectors.py:110
+#, python-brace-format
msgid "{name} ({charset})"
-msgstr "{izena} ({karaktere multzoa})"
+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 "Testu arrunta"
-#: ../meld/ui/filechooser.py:70
-msgid "Autodetect Encoding"
-msgstr "Detektako kodeketa automatikoki"
-
-#: ../meld/ui/filechooser.py:73
-msgid "Current Locale ({})"
-msgstr "Uneko hizkuntza ({})"
-
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:127
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "%i. err., %i. zut."
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr "{line}. lerroa, {column}. zutabea"
-#: ../meld/ui/statusbar.py:187
+#: meld/ui/statusbar.py:185
msgid "Line you want to move the cursor to"
msgstr "Lerroa kurtsorea kokatzeko"
-#: ../meld/ui/vcdialogs.py:55
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Ez da fitxategirik egikarituko"
-#. 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 %s gailuan"
+#. 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 "{unpushed_commits} in {unpushed_branches}"
+msgstr "{unpushed_commits} hemen: {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:103
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
msgstr[0] "Bidali gabeko egikaritze %d"
msgstr[1] "Bidali gabeko %d egikaritze"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:97
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "adar %d"
msgstr[1] "%d adar"
-#: ../meld/vc/git.py:334
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "'%s' modua hona aldatuta: %s"
+#: meld/vc/git.py:344
+#, python-brace-format
+msgid "Mode changed from {old_mode} to {new_mode}"
+msgstr "Modua aldatu da {old_mode} modutik {new_mode} modura"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:352
msgid "Partially staged"
msgstr "Partzialki gordailuan gordea"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:352
msgid "Staged"
msgstr "Gordailuan gordea"
#. 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 "Bat ere ez"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
#, python-format
msgid "Rev %s"
msgstr "%s erreb."
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Batua"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Oinarria"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Lokala"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Urrunekoa"
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Errorea"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Berriki gehitua"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Izena aldatua"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "Gatazka"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Kendua"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Falta da"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Ez dago"
#. Translators: This error message is shown when no
#. repository of this type is found.
-#: ../meld/vcview.py:339
+#: meld/vcview.py:333
#, python-format
msgid "%(name)s (not found)"
-msgstr ""
+msgstr "%(name)s (ez da aurkitu)"
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:343
+#: meld/vcview.py:337
#, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr "%(name)s (%(cmd)s ez daude instalatuta)"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:347
+#: meld/vcview.py:341
#, python-format
msgid "%(name)s (invalid repository)"
-msgstr ""
+msgstr "%(name)s (biltegi baliogabea)"
-#: ../meld/vcview.py:361
+#: meld/vcview.py:355
msgid "No valid version control system found in this folder"
msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan"
-#: ../meld/vcview.py:363
+#: meld/vcview.py:357
msgid "Choose which version control system to use"
msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den"
#. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:417
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#: meld/vcview.py:411
+#, python-brace-format
+msgid "Location: {path}"
+msgstr "Kokalekua: {path}"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:424
+#: meld/vcview.py:418
msgid "Scanning repository"
msgstr "Biltegia eskaneatzen"
-#: ../meld/vcview.py:453
+#: meld/vcview.py:447
#, python-format
msgid "Scanning %s"
msgstr "%s eskaneatzen"
-#: ../meld/vcview.py:492
+#: meld/vcview.py:486
msgid "(Empty)"
msgstr "(Hutsa)"
-#: ../meld/vcview.py:539
+#: meld/vcview.py:533
#, python-format
msgid "%s — local"
msgstr "%s — lokala"
-#: ../meld/vcview.py:540
+#: meld/vcview.py:534
#, python-format
msgid "%s — remote"
msgstr "%s — urrunekoa"
-#: ../meld/vcview.py:548
+#: meld/vcview.py:542
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (lokala, batu, urrunekoa)"
-#: ../meld/vcview.py:553
+#: meld/vcview.py:547
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (urrunekoa, batu, lokala)"
-#: ../meld/vcview.py:564
+#: meld/vcview.py:558
#, python-format
msgid "%s — repository"
msgstr "%s — biltegia"
-#: ../meld/vcview.py:570
+#: meld/vcview.py:564
#, python-format
msgid "%s (working, repository)"
msgstr "%s (lanekoa, biltegia)"
-#: ../meld/vcview.py:574
+#: meld/vcview.py:568
#, python-format
msgid "%s (repository, working)"
msgstr "%s (biltegia, lanekoa)"
-#: ../meld/vcview.py:736
+#: meld/vcview.py:730
msgid "Remove folder and all its files?"
msgstr "Kendu karpeta eta bere fitxategi guztiak?"
-#: ../meld/vcview.py:738
+#: meld/vcview.py:732
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
msgstr "Honek hautatutako fitxategi eta karpeta guztiak, baita hautatutako karpeten barruan dauden fitxategi
guztiak ere, bertsio-kontroletik kenduko ditu."
-#: ../meld/vcview.py:851
+#: meld/vcview.py:845
msgid "Clear"
msgstr "Garbitu"
+#~ msgid "Cannot import: "
+#~ msgstr "Ezin da inportatu: "
+
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Meld-ek %s edo berriagoa behar du."
+
+#~ msgid ""
+#~ "Couldn’t load Meld-specific CSS (%s)\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da kargatu Meld-ena espezifikoa den CSSa (%s)\n"
+#~ "%s"
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld diferentzia-ikustailea"
+
+#~ msgid "About Meld"
+#~ msgstr "Meld-i buruz"
+
+#~ msgid "Website"
+#~ msgstr "Webgunea"
+
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] %s eskaneatzen"
+
+#~ msgid "Autodetect Encoding"
+#~ msgstr "Detektako kodeketa automatikoki"
+
+#~ msgid "Current Locale ({})"
+#~ msgstr "Uneko hizkuntza ({})"
+
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "%i. err., %i. zut."
+
+#~ msgid "%s in %s"
+#~ msgstr "%s %s gailuan"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
#~ msgid "Meld does not support Python 3."
#~ msgstr "Meld-ek ez du Python 3 onartzen."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
