[meld/meld-1-8] Updated Basque language
- From: Iñaki Larrañaga Murgoitio <dooteo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/meld-1-8] Updated Basque language
- Date: Mon, 19 May 2014 21:32:15 +0000 (UTC)
commit 92b72ec759040b0406396722d346a68de958b7e8
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date: Mon May 19 23:30:45 2014 +0200
Updated Basque language
po/eu.po | 1658 ++++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1188 insertions(+), 470 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 426a5c2..d632331 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -15,27 +15,27 @@
# Kristina Salas Sierra <kristina_salas_sierra hotmail com>, 2013.
# Larraitz Uriarte Erkoreka <larraitz uriarte gmail com>, 2013.
# Josune Zuzuarregui Lizarazu <josunezl gmail com>, 2013.
-# Elhuyar Fundazioa <itzulpenak elhuyar com>, 2013.
-#
+# Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: meld master\n"
+"Project-Id-Version: meld meld-1-8\n"
"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2013-04-17 11:17+0200\n"
-"PO-Revision-Date: 2013-02-17 19:27+0000\n"
-"Last-Translator: Elhuyar Fundazioa <itzulpenak elhuyar com>\n"
-"Language-Team: Basque <itzulpena euskalgnu org>\n"
+"POT-Creation-Date: 2014-05-19 23:28+0200\n"
+"PO-Revision-Date: 2014-05-19 23:30+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
+"Language-Team: Basque <librezale librezale org>\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:121
+#: ../bin/meld:126
msgid "Cannot import: "
msgstr "Ezin da inportatu: "
-#: ../bin/meld:124
+#: ../bin/meld:129
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld-ek %s edo berriagoa behar du."
@@ -57,9 +57,8 @@ msgid "Compare and merge your files"
msgstr "Konparatu eta konbinatu fitxategiak"
#: ../data/mime/meld.xml.in.h:1
-#, fuzzy
msgid "Meld comparison description"
-msgstr "Karpeten konparazioa"
+msgstr "Meld-en konparazioaren azalpena"
#: ../data/ui/EditableList.ui.h:1
msgid "Editable List"
@@ -70,14 +69,14 @@ msgid "Active"
msgstr "Aktibo"
#: ../data/ui/EditableList.ui.h:3
-msgid "Column name"
+msgid "Column Name"
msgstr "Zutabe-izena"
-#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:167
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:172
msgid "_Add"
msgstr "_Gehitu"
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:168
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:175 ../meld/vcview.py:715
msgid "_Remove"
msgstr "_Kendu"
@@ -98,8 +97,8 @@ msgid "Move _Down"
msgstr "_Jaitsi"
#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:342
-#: ../meld/vcview.py:204
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:343
+#: ../meld/vcview.py:231
msgid "Name"
msgstr "Izena"
@@ -109,11 +108,11 @@ msgstr "Eredua"
#: ../data/ui/EditableList.ui.h:12
msgid "Add new filter"
-msgstr "Iragazki bat gehitu"
+msgstr "Gehitu iragazkia"
#: ../data/ui/EditableList.ui.h:13
msgid "Remove selected filter"
-msgstr "Hautatutako iragazkia kendu"
+msgstr "Kendu hautatutako iragazkia"
#: ../data/ui/filediff.ui.h:1
msgid "Save changes to documents before closing?"
@@ -124,8 +123,8 @@ msgid "If you don't save, changes will be permanently lost."
msgstr "Aldaketak gordetzen ez badituzu, betiko galduko dira."
#: ../data/ui/filediff.ui.h:3
-msgid "Close _without saving"
-msgstr "Itxi gorde g_abe"
+msgid "Close _without Saving"
+msgstr "Itxi gorde _gabe"
#: ../data/ui/filediff.ui.h:4
msgid "_Cancel"
@@ -136,6 +135,14 @@ msgid "_Save"
msgstr "_Gorde"
#: ../data/ui/filediff.ui.h:6
+msgid "Revert unsaved changes to documents?"
+msgstr "Leheneratu gorde gabeko aldaketak dokumentuetan?"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "Dokumentu hauetan egindako aldaketak betirako galduko dira:\n"
+
+#: ../data/ui/filediff.ui.h:9
msgid ""
"This file can not be written to. You may click here to unlock this file and "
"make changes anyway, but these changes must be saved to a new file."
@@ -144,7 +151,11 @@ msgstr ""
"desblokea dezakezu, aldaketak egiteko. Aldaketa horiek, ordea, beste "
"fitxategi batean gorde behar dira."
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
+#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:295
+msgid "Lock scrolling of all panes"
+msgstr "Panel guztien korritzea blokeatzen du"
+
+#: ../data/ui/findbar.ui.h:1
msgid "_Replace"
msgstr "_Ordeztu"
@@ -166,10 +177,10 @@ msgstr "Bilatu:"
#: ../data/ui/findbar.ui.h:6
msgid "Replace _with:"
-msgstr "Ordeztu ho_nekin:"
+msgstr "Ordeztu _honekin:"
#: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
+msgid "_Match case"
msgstr "_Bereizi maiuskulak/minuskulak"
#: ../data/ui/findbar.ui.h:8
@@ -177,20 +188,20 @@ msgid "Who_le word"
msgstr "Hitz _osoa"
#: ../data/ui/findbar.ui.h:9
-msgid "Regular E_xpression"
-msgstr "_Adierazpen erregularra"
+msgid "Regular e_xpression"
+msgstr "Adierazpen _erregularra"
#: ../data/ui/findbar.ui.h:10
msgid "Wrapped"
-msgstr "Ertzean egokitua"
+msgstr "Itzulbiratuta"
#: ../data/ui/meldapp.ui.h:2
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2012 Kai Willadsen"
+"Copyright © 2009-2013 Kai Willadsen"
msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2012 Kai Willadsen"
+"Copyright-a © 2002-2009 Stephen Kennedy\n"
+"Copyright-a © 2009-2013 Kai Willadsen"
#: ../data/ui/meldapp.ui.h:4
msgid ""
@@ -221,129 +232,179 @@ msgstr ""
#: ../data/ui/meldapp.ui.h:9
msgid "translator-credits"
-msgstr "Elhuyar Fundazioa <itzulpenak elhuyar com>"
+msgstr ""
+"Maddi Agiriano Etxabe <maddi agiriano gmail com>\n"
+"Leire Agirre Aramendi <leireagara yahoo es>\n"
+"Juan Mari Apaolaza Estensoro <juanmari apaolaza ehu es>\n"
+"Nestor Atxikallende Bilbao <nestor atxikallende bizkaia net>\n"
+"Amaia Bergara Aretxabaleta <a bergara a gmail com>\n"
+"Garikoitz Etxebarria Zamalloa <garikoitz etxebarria uribekosta org>\n"
+"Ziortza Garmendia Bengoetxea <ziortzagarmen hotmail com>\n"
+"Susana Ibarrondo Rodriguez <suibarrondo gmail com>\n"
+"Ramon Iriarte Otamendi <ririarte62 yahoo es>\n"
+"Izaskun Larrañaga Sanchez <larranaga izaskun gmail com>\n"
+"Kristina Salas Sierra <kristina_salas_sierra hotmail com>\n"
+"Larraitz Uriarte Erkoreka <larraitz uriarte gmail com>\n"
+"Josune Zuzuarregui Lizarazu <josunezl gmail com>\n"
+"Iñaki Larrañaga Murgoitio <dooteo zundan com>"
#: ../data/ui/patch-dialog.ui.h:1
-msgid "Create Patch"
-msgstr "Sortu adabakia"
+msgid "Format as Patch"
+msgstr "Formateatu adabaki gisa"
#: ../data/ui/patch-dialog.ui.h:2
-msgid "Create a patch"
-msgstr "Sortu adabaki bat"
-
-#: ../data/ui/patch-dialog.ui.h:3
msgid "Use differences between:"
msgstr "Erabili hauen arteko diferentziak:"
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:3
msgid "Left and middle panes"
-msgstr "ezkerreko eta erdiko panelak"
+msgstr "Ezkerreko eta erdiko panelak"
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:4
msgid "Middle and right panes"
-msgstr "erdiko eta eskuineko panelak"
+msgstr "Erdiko eta eskuineko panelak"
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../data/ui/patch-dialog.ui.h:5
msgid "_Reverse patch direction"
msgstr "_Alderantzikatu adabakiaren norabidea"
-#: ../data/ui/patch-dialog.ui.h:7
+#: ../data/ui/patch-dialog.ui.h:6
msgid "Copy to Clipboard"
msgstr "Kopiatu arbelean"
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:124
+msgid "Save Patch"
+msgstr "Gorde adabakia"
+
#: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
+msgstr "Ezkerra urrunekoa da, eskuina lokalekoa"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
+msgstr "Ezkerra lokalekoa da, eskuina urrunekoa"
+
+#: ../data/ui/preferences.ui.h:3
msgid "Meld Preferences"
msgstr "Meld-en hobespenak"
-#: ../data/ui/preferences.ui.h:2
+#: ../data/ui/preferences.ui.h:4
msgid "Font"
msgstr "Letra-tipoa"
-#: ../data/ui/preferences.ui.h:3
+#: ../data/ui/preferences.ui.h:5
msgid "_Use the system fixed width font"
-msgstr "E_rabili sistemaren zabalera finkoko letra-tipoa"
+msgstr "_Erabili sistemaren zabalera finkoko letra-tipoa"
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:6
msgid "_Editor font:"
msgstr "_Editorearen letra-tipoa:"
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:7
msgid "Display"
-msgstr "Bistaratzea"
+msgstr "Bistaratu"
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:8
msgid "_Tab width:"
-msgstr "_Tabuladorearen zabalera:"
+msgstr "_Tabulazioaren zabalera:"
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:9
msgid "_Insert spaces instead of tabs"
-msgstr "_Txertatu zuriuneak tabuladoreen ordez"
+msgstr "_Txertatu zuriuneak tabulazioen ordez"
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:10
msgid "Enable text _wrapping"
-msgstr "Gaitu testua _egokitzea"
+msgstr "Gaitu testua _itzulbiratzea"
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:11
msgid "Do not _split words over two lines"
msgstr "Ez _zatitu hitzak bi lerrotan"
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:12
+msgid "Highlight _current line"
+msgstr "Nabarmendu _uneko lerroa"
+
+#: ../data/ui/preferences.ui.h:13
msgid "Show _line numbers"
msgstr "Erakutsi _lerro-zenbakiak"
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:14
msgid "Show w_hitespace"
-msgstr "Erakutsi z_uriuneak"
+msgstr "Erakutsi _zuriuneak"
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:15
msgid "Use s_yntax highlighting"
msgstr "Nabarmendu _sintaxia"
-#: ../data/ui/preferences.ui.h:13
-msgid "External editor"
-msgstr "Kanpo-editorea"
+#: ../data/ui/preferences.ui.h:16
+msgid "External Editor"
+msgstr "Kanpoko editorea"
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:17
msgid "Use _default system editor"
msgstr "Erabili sistema-editore _lehenetsia"
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:18
msgid "Edito_r command:"
-msgstr "Edito_re-komandoa:"
+msgstr "Edito_rearen komandoa:"
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:19
msgid "Editor"
msgstr "Editorea"
-#: ../data/ui/preferences.ui.h:17
-msgid "Shallow comparison"
+#: ../data/ui/preferences.ui.h:20
+msgid "Shallow Comparison"
msgstr "Azaleko konparazioa"
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:21
msgid "C_ompare files based only on size and timestamp"
msgstr "_Konparatu fitxategiak tamainan eta data-zigiluan soilik oinarrituta"
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "_Timestamp resolution:"
msgstr "_Data-zigiluaren bereizmena:"
-#: ../data/ui/preferences.ui.h:20
-msgid "Symbolic links"
+#: ../data/ui/preferences.ui.h:23
+msgid "Symbolic Links"
msgstr "Esteka sinbolikoak"
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid "Ignore symbolic links"
msgstr "Ez ikusi egin esteka sinbolikoei"
-#: ../data/ui/preferences.ui.h:22
-msgid "Visible columns"
-msgstr "Ikusgai dauden zutabeak"
+#: ../data/ui/preferences.ui.h:25
+msgid "Visible Columns"
+msgstr "Zutabe ikusgaiak"
-#: ../data/ui/preferences.ui.h:23
-msgid "Folder comparisons"
+#: ../data/ui/preferences.ui.h:26
+msgid "Folder Comparisons"
msgstr "Karpeten konparazioa"
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
+msgid "Version Comparisons"
+msgstr "Bertsioen konparazioa"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "_When comparing file revisions:"
+msgstr "_Fitxategien gainbegiraketak konparatzean:"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "Commit Messages"
+msgstr "Egikaritze-mezuak"
+
+#: ../data/ui/preferences.ui.h:30
+msgid "Show _right margin at:"
+msgstr "Erakutsi e_skuineko marjina hemen:"
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Automatically _break lines at right margin on commit"
+msgstr "_Hautsi lerroak automatikoki eskuineko marjinan egikaritzean"
+
+#: ../data/ui/preferences.ui.h:32
+msgid "Version Control"
+msgstr "Bertsio-kontrola"
+
+#: ../data/ui/preferences.ui.h:33
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -353,11 +414,11 @@ msgstr ""
"direktorioak. Zuriunez bereizia dagoen shell motako komodinen zerrenda bat "
"da eredu bakoitza."
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:122
msgid "File Filters"
msgstr "Fitxategi-iragazkiak"
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:35
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -366,34 +427,34 @@ msgid ""
"details."
msgstr ""
"Fitxategiak konparatzean, aldaketa mota batzuei ez ikusi egin diezaiekezu. "
-"Eredu bakoitza pythoneko adierazpen erregular bat da, eta bat datorren "
+"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."
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:36
msgid "Ignore changes which insert or delete blank lines"
msgstr ""
"Ez ikusi egin lerro zurriak txertatzen edo ezabatzen dituzten aldaketei"
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:37
msgid "Text Filters"
msgstr "Testu-iragazkiak"
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:38
msgid "Loading"
msgstr "Kargatzea"
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:39
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr ""
"Kargatzean, egin proba kodek hauekin, ordena horretan. (e.g. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:40
msgid "Encoding"
msgstr "Kodeketa"
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:612
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:681
msgid "New comparison"
msgstr "Beste konparazio bat"
@@ -439,7 +500,7 @@ msgstr "Hautatu hirugarren karpeta"
#: ../data/ui/tab-placeholder.ui.h:12
msgid "Select A Version-Controlled Folder"
-msgstr "Hautatu bertsioa kontrolatua duen karpeta bat"
+msgstr "Hautatu bertsio-kontrola duen karpeta bat"
#: ../data/ui/tab-placeholder.ui.h:13
msgid "_Blank comparison"
@@ -447,31 +508,49 @@ msgstr "_Garbitu konparazioa"
#: ../data/ui/tab-placeholder.ui.h:14
msgid "C_ompare"
-msgstr "K_onparatu"
+msgstr "_Konparatu"
#: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
-msgstr "Bertsio-kontrolaren egunkaria"
+msgid "Commit"
+msgstr "Egikaritu"
#: ../data/ui/vcview.ui.h:2
msgid "Commit Files"
-msgstr "Balidatu fitxategiak"
+msgstr "Egikaritu fitxategiak"
#: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "Aurreko egunkariak"
-
-#: ../data/ui/vcview.ui.h:4
msgid "Log Message"
msgstr "Egunkariaren mezua"
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
+#: ../data/ui/vcview.ui.h:4
+msgid "Previous logs:"
+msgstr "Aurreko egunkaria:"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "Co_mmit"
+msgstr "_Egikaritu"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Push local commits to remote?"
+msgstr "Bidali egikaritze lokalak urrunekora?"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Bidali beharreko egikaritzeak bertsio-kontrol sistemaren arabera zehaztuta "
+"dago."
+
+#: ../data/ui/vcview.ui.h:8
+msgid "_Push commits"
+msgstr "_Bidali egikariketak"
+
+#: ../meld/dirdiff.py:269 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_Konparatu"
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
+#: ../meld/dirdiff.py:269
msgid "Compare selected"
-msgstr "Hautapena konparatzen du"
+msgstr "Konparatu hautatutakoa"
#: ../meld/dirdiff.py:270
msgid "Copy _Left"
@@ -493,7 +572,7 @@ msgstr "Eskuinean kopiatzen du"
msgid "Delete selected"
msgstr "Ezabatu hautapena"
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1286
+#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403
msgid "Hide"
msgstr "Ezkutatu"
@@ -502,7 +581,7 @@ msgid "Hide selected"
msgstr "Hautapena ezkutatzen du"
#: ../meld/dirdiff.py:277
-msgid "Ignore filename case"
+msgid "Ignore Filename Case"
msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei"
#: ../meld/dirdiff.py:277
@@ -533,7 +612,7 @@ msgstr "Berriak erakusten ditu"
msgid "Modified"
msgstr "Aldatuak"
-#: ../meld/dirdiff.py:280 ../meld/vcview.py:176
+#: ../meld/dirdiff.py:280
msgid "Show modified"
msgstr "Aldatuak erakusten ditu"
@@ -546,57 +625,56 @@ msgid "Set active filters"
msgstr "Iragazki aktiboak ezartzen ditu"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:359
+#: ../meld/dirdiff.py:361
msgid "Size"
msgstr "Tamaina"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:366
+#: ../meld/dirdiff.py:369
msgid "Modification time"
-msgstr "Aldaketa-ordua"
+msgstr "Aldatze-ordua"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:377
msgid "Permissions"
msgstr "Baimenak"
-#: ../meld/dirdiff.py:506
+#: ../meld/dirdiff.py:511
#, python-format
msgid "Hide %s"
msgstr "Ezkutatu %s"
-#: ../meld/dirdiff.py:631 ../meld/dirdiff.py:650 ../meld/vcview.py:382
-#: ../meld/vcview.py:406
+#: ../meld/dirdiff.py:637 ../meld/dirdiff.py:656
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] %s eskaneatzen"
-#: ../meld/dirdiff.py:750
+#: ../meld/dirdiff.py:756
#, python-format
msgid "[%s] Done"
msgstr "[%s] Eginda"
-#: ../meld/dirdiff.py:756
+#: ../meld/dirdiff.py:762
msgid "Multiple errors occurred while scanning this folder"
msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
-#: ../meld/dirdiff.py:757
+#: ../meld/dirdiff.py:763
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:759
+#: ../meld/dirdiff.py:765
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:761
+#: ../meld/dirdiff.py:767
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:763
+#: ../meld/dirdiff.py:769
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -605,37 +683,37 @@ msgstr ""
"maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta "
"honetako fitxategi hauek ezkutatu dira:"
-#: ../meld/dirdiff.py:774
+#: ../meld/dirdiff.py:780
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "'%s', honek ezkutatua: '%s'"
-#: ../meld/dirdiff.py:799 ../meld/filediff.py:1029 ../meld/filediff.py:1290
-#: ../meld/vcview.py:676 ../meld/vcview.py:718
+#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372
+#: ../meld/filediff.py:1405
msgid "Hi_de"
-msgstr "Ezk_utatu"
+msgstr "_Ezkutatu"
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:837
#, python-format
msgid ""
"'%s' exists.\n"
"Overwrite?"
msgstr ""
-"'%s' dagoeneko badago.\n"
+"'%s' badago lehendik ere.\n"
"Gainidatzi?"
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:844
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
"\n"
"%s."
msgstr ""
-"Errorea gertatu da '%s' '%s'(e)ra kopiatzean\n"
+"Errorea '%s' hemen kopiatzean: %s\n"
"\n"
"%s."
-#: ../meld/dirdiff.py:856 ../meld/vcview.py:650
+#: ../meld/dirdiff.py:862 ../meld/vcview.py:745
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -644,237 +722,245 @@ msgstr ""
"'%s' direktorio bat da.\n"
"Kendu errekurtsiboki?"
-#: ../meld/dirdiff.py:863 ../meld/vcview.py:655
+#: ../meld/dirdiff.py:869 ../meld/vcview.py:750
#, python-format
msgid ""
"Error removing %s\n"
"\n"
"%s."
msgstr ""
-"Errorea gertatu da %s kentzean\n"
+"Errorea '%s' kentzean\n"
"\n"
"%s."
-#: ../meld/dirdiff.py:994
+#: ../meld/dirdiff.py:1000
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i segundo"
msgstr[1] "%i segundo"
-#: ../meld/dirdiff.py:995
+#: ../meld/dirdiff.py:1001
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i minutu"
msgstr[1] "%i minutu"
-#: ../meld/dirdiff.py:996
+#: ../meld/dirdiff.py:1002
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i ordu"
msgstr[1] "%i ordu"
-#: ../meld/dirdiff.py:997
+#: ../meld/dirdiff.py:1003
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] "%i egun"
msgstr[1] "%i egun"
-#: ../meld/dirdiff.py:998
+#: ../meld/dirdiff.py:1004
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] "%i aste"
msgstr[1] "%i aste"
-#: ../meld/dirdiff.py:999
+#: ../meld/dirdiff.py:1005
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] "%i hilabete"
msgstr[1] "%i hilabete"
-#: ../meld/dirdiff.py:1000
+#: ../meld/dirdiff.py:1006
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] "%i urte"
msgstr[1] "%i urte"
-#: ../meld/filediff.py:220
-msgid "Format as patch..."
-msgstr "Adabaki gisa formateatu..."
+#: ../meld/filediff.py:223
+msgid "Format as Patch..."
+msgstr "Eman formatua adabaki gisa..."
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:224
msgid "Create a patch using differences between files"
msgstr "Adabaki bat sortzen du fitxategien arteko diferentziekin"
-#: ../meld/filediff.py:221
-msgid "Add synchronization point"
-msgstr ""
+#: ../meld/filediff.py:226
+msgid "Save A_ll"
+msgstr "Gorde _denak"
+
+#: ../meld/filediff.py:227
+msgid "Save all files in the current comparison"
+msgstr "Gorde fitxategi guztiak uneko konparazioan"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:230
+msgid "Revert files to their saved versions"
+msgstr "Leheneratu fitxategiak haien gordetako bertsioetara"
+
+#: ../meld/filediff.py:232
+msgid "Add Synchronization Point"
+msgstr "Gehitu sinkronizazio-puntua"
+
+#: ../meld/filediff.py:233
msgid "Add a manual point for synchronization of changes between files"
-msgstr ""
+msgstr "Gehitu eskuzko puntu bat fitxategien arteko aldaketak sinkronizatzeko"
-#: ../meld/filediff.py:225
-msgid "Clear synchronization points"
-msgstr ""
+#: ../meld/filediff.py:236
+msgid "Clear Synchronization Points"
+msgstr "Garbitu sinkronizazio-puntuak"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:237
msgid "Clear manual change sychronization points"
-msgstr ""
+msgstr "Garbitu eskuzko aldaketen sinkronizazio-puntuak"
-#: ../meld/filediff.py:228
-msgid "Previous conflict"
+#: ../meld/filediff.py:239
+msgid "Previous Conflict"
msgstr "Aurreko gatazka"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:240
msgid "Go to the previous conflict"
msgstr "Aurreko gatazkara joaten da"
-#: ../meld/filediff.py:229
-msgid "Next conflict"
+#: ../meld/filediff.py:242
+msgid "Next Conflict"
msgstr "Hurrengo gatazka"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Go to the next conflict"
msgstr "Hurrengo gatazkara joaten da"
-#: ../meld/filediff.py:230
-msgid "Push to left"
+#: ../meld/filediff.py:245
+msgid "Push to Left"
msgstr "Bidali ezkerrera"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:246
msgid "Push current change to the left"
msgstr "Uneko aldaketa ezkerrera bidaltzen du"
-#: ../meld/filediff.py:231
-msgid "Push to right"
+#: ../meld/filediff.py:249
+msgid "Push to Right"
msgstr "Bidali eskuinera"
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:250
msgid "Push current change to the right"
msgstr "Uneko aldaketa eskuinera bidaltzen du"
-#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:233
-msgid "Pull from left"
+#: ../meld/filediff.py:254
+msgid "Pull from Left"
msgstr "Ekarri ezkerretik"
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:255
msgid "Pull change from the left"
msgstr "Ezkerreko aldaketa ekartzen du"
-#: ../meld/filediff.py:234
-msgid "Pull from right"
+#: ../meld/filediff.py:258
+msgid "Pull from Right"
msgstr "Ekarri eskuinetik"
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:259
msgid "Pull change from the right"
msgstr "Eskuineko aldaketa ekartzen du"
-#: ../meld/filediff.py:235
-msgid "Copy above left"
+#: ../meld/filediff.py:261
+msgid "Copy Above Left"
msgstr "Kopiatu ezkerrekoaren gainean"
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:262
msgid "Copy change above the left chunk"
msgstr "Aldaketa ezkerreko zatiaren gainean kopiatzen du"
-#: ../meld/filediff.py:236
-msgid "Copy below left"
+#: ../meld/filediff.py:264
+msgid "Copy Below Left"
msgstr "Kopiatu ezkerrekoaren azpian"
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:265
msgid "Copy change below the left chunk"
msgstr "Aldaketa ezkerreko zatiaren azpian kopiatzen du"
-#: ../meld/filediff.py:237
-msgid "Copy above right"
+#: ../meld/filediff.py:267
+msgid "Copy Above Right"
msgstr "Kopiatu eskuinekoaren gainean"
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:268
msgid "Copy change above the right chunk"
msgstr "Aldaketa eskuineko zatiaren gainean kopiatzen du"
-#: ../meld/filediff.py:238
-msgid "Copy below right"
+#: ../meld/filediff.py:270
+msgid "Copy Below Right"
msgstr "Kopiatu eskuinekoaren azpian"
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:271
msgid "Copy change below the right chunk"
msgstr "Aldaketa eskuinekoaren azpian kopiatzen du"
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:273
msgid "Delete"
msgstr "Ezabatu"
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:274
msgid "Delete change"
msgstr "Ezabatu aldaketa"
-#: ../meld/filediff.py:240
-msgid "Merge all changes from left"
-msgstr "Ezkerreko aldaketa guztiak konbinatu"
+#: ../meld/filediff.py:276
+msgid "Merge All from Left"
+msgstr "Batu guztiak ezkerretik"
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:277
msgid "Merge all non-conflicting changes from the left"
msgstr "Ezkerreko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
-#: ../meld/filediff.py:241
-msgid "Merge all changes from right"
-msgstr "Eskuineko aldaketa guztiak konbinatu"
+#: ../meld/filediff.py:279
+msgid "Merge All from Right"
+msgstr "Batu guztiak eskuinetik"
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:280
msgid "Merge all non-conflicting changes from the right"
msgstr "Eskuineko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
-#: ../meld/filediff.py:242
-msgid "Merge all non-conflicting"
-msgstr "Gatazkatsuak ez direnak konbinatu"
+#: ../meld/filediff.py:282
+msgid "Merge All"
+msgstr "Batu guztiak"
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:283
msgid "Merge all non-conflicting changes from left and right panes"
msgstr ""
"Ezkerreko eta eskuineko paneletako aldaketa ez-gatazkatsu guztiak "
"konbinatzen ditu"
-#: ../meld/filediff.py:243
-msgid "Cycle through documents"
-msgstr "Joan hurrengo dokumentura"
+#: ../meld/filediff.py:287
+msgid "Cycle Through Documents"
+msgstr "Begiztatu dokumentuen artean"
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:288
msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Teklatuaren fokua konparaketa honetako hurrengo dokumentuan jartzen du"
+msgstr ""
+"Teklatuaren fokua konparaketa honetako hurrengo dokumentura eramaten du"
-#: ../meld/filediff.py:247
-msgid "Lock scrolling"
+#: ../meld/filediff.py:294
+msgid "Lock Scrolling"
msgstr "Blokeatu korritzea"
-#: ../meld/filediff.py:248
-msgid "Lock scrolling of all panes"
-msgstr "Panel guztien korritzea blokeatzen du"
-
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:370
+#: ../meld/filediff.py:417
msgid "INS"
-msgstr "TXERT"
+msgstr "TXER"
-#: ../meld/filediff.py:370
+#: ../meld/filediff.py:417
msgid "OVR"
-msgstr "GAINID"
+msgstr "GAIN"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:372
+#: ../meld/filediff.py:419
#, python-format
msgid "Ln %i, Col %i"
msgstr "%i. err., %i. zut."
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:754
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -884,42 +970,42 @@ msgstr ""
"izango da. Informazio gehiago behar izanez gero, ikusi erabiltzailearen "
"eskuliburua."
-#: ../meld/filediff.py:1017
+#: ../meld/filediff.py:1084
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Ezarri panel kopurua"
-#: ../meld/filediff.py:1023
+#: ../meld/filediff.py:1090
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Fitxategiak irekitzen"
-#: ../meld/filediff.py:1047 ../meld/filediff.py:1057 ../meld/filediff.py:1070
-#: ../meld/filediff.py:1076
+#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137
+#: ../meld/filediff.py:1143
msgid "Could not read file"
msgstr "Ezin izan da fitxategia irakurri"
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1115
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Fitxategiak irakurtzen"
-#: ../meld/filediff.py:1058
+#: ../meld/filediff.py:1125
#, python-format
msgid "%s appears to be a binary file."
-msgstr "Badirudi %s fitxategi bitar bat dela."
+msgstr "Badirudi '%s' fitxategia bitarra dela."
-#: ../meld/filediff.py:1071
+#: ../meld/filediff.py:1138
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s ez dago kodeketetan: %s"
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1172
#, python-format
msgid "[%s] Computing differences"
-msgstr "[%s] Diferentziak analizatzen"
+msgstr "[%s] Diferentziak kalkulatzen"
-#: ../meld/filediff.py:1277
+#: ../meld/filediff.py:1359
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -928,40 +1014,67 @@ msgstr ""
"horiek fitxategien arteko diferentziak ezkutatzea. Iragazi gabeko "
"fitxategiak konparatu nahi dituzu?"
-#: ../meld/filediff.py:1283
+#: ../meld/filediff.py:1365
msgid "Files are identical"
-msgstr "Fitxategiak berdin-berdinak dira"
+msgstr "Fitxategiak berdinak dira"
-#: ../meld/filediff.py:1293
+#: ../meld/filediff.py:1375
msgid "Show without filters"
msgstr "Erakutsi iragazkirik gabe"
-#: ../meld/filediff.py:1424
+#: ../meld/filediff.py:1397
+msgid "Change highlighting incomplete"
+msgstr "Aldaketen nabarmentzea osatu gabe"
+
+#: ../meld/filediff.py:1398
+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:1407
+msgid "Keep highlighting"
+msgstr "Mantendu nabarmentzea"
+
+#: ../meld/filediff.py:1409
+msgid "_Keep highlighting"
+msgstr "_Mantendu nabarmentzea"
+
+#: ../meld/filediff.py:1541
#, python-format
msgid ""
"\"%s\" exists!\n"
"Overwrite?"
msgstr ""
-"\"%s\" badago!\n"
+"'%s' badago!\n"
"Gainidatzi?"
-#: ../meld/filediff.py:1437
+#: ../meld/filediff.py:1554
#, python-format
msgid ""
"Error writing to %s\n"
"\n"
"%s."
msgstr ""
-"Errorea gertatu da %s(e)(a)n idaztean\n"
+"Errorea gertatu da '%s'(e)n idaztean\n"
"\n"
"%s."
-#: ../meld/filediff.py:1446
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Aukeratu izen bat %i. bufferrerako."
+#: ../meld/filediff.py:1565
+msgid "Save Left Pane As"
+msgstr "Gorde ezkerreko panela honela"
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1567
+msgid "Save Middle Pane As"
+msgstr "Gorde erdiko panela honela"
+
+#: ../meld/filediff.py:1569
+msgid "Save Right Pane As"
+msgstr "Gorde eskuineko panela honela"
+
+#: ../meld/filediff.py:1590
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -972,20 +1085,31 @@ msgstr ""
"\n"
"Zer formatu erabili nahi duzu?"
-#: ../meld/filediff.py:1482
+#: ../meld/filediff.py:1606
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
"Would you like to save as UTF-8?"
msgstr ""
-"'%s' fitxategiko karaktere batzuk ezin dira '%s' (r)ekin kodetu\n"
-"Gorde nahi duzu UTF-8 gisa?"
+"'%s' fitxategiko karaktere batzuk ezin dira '%s'(r)ekin kodetu.\n"
+"UTF-8 gisa gorde nahi duzu ?"
+
+#: ../meld/filediff.py:1974
+msgid "Live comparison updating disabled"
+msgstr "Konparazioaren zuzeneko eguneraketa desgaituta"
-#: ../meld/filediff.py:1548
-msgid "Save changes to documents before reloading?"
-msgstr "Gorde dokumentuetako aldaketak berriro kargatu aurretik?"
+#: ../meld/filediff.py:1975
+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:53
+#: ../meld/filemerge.py:51
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Fitxategiak konbinatzen"
@@ -1012,7 +1136,7 @@ msgstr "Hasi bertsio-kontrolaren konparazioa"
#: ../meld/meldapp.py:103
msgid "Start a 2- or 3-way file comparison"
-msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazio bat"
+msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazioa"
#: ../meld/meldapp.py:105
msgid "Start a 2- or 3-way directory comparison"
@@ -1052,16 +1176,16 @@ msgstr "Automatikoki konbinatu fitxategiak"
#: ../meld/meldapp.py:132
msgid "Load a saved comparison from a Meld comparison file"
-msgstr "Gordetako konparazio bat kargatu, Meld-en konparazio-fitxategi batetik"
+msgstr "Kargatu gordetako konparazioa Meld-en konparazio-fitxategi batetik"
#: ../meld/meldapp.py:135
msgid "Create a diff tab for the supplied files or folders"
-msgstr "Diferentzia-fitxa bat sortu, emandako fitxategi edo karpetetarako"
+msgstr "Sortu diferentzia-fitxa emandako fitxategi edo karpetentzako"
#: ../meld/meldapp.py:138
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
-msgstr "argumentu gehiegi (0-3 beharrean, %d)"
+msgstr "argumentu gehiegi (0-3 ordez, %d jasota)"
#: ../meld/meldapp.py:141
msgid "can't auto-merge less than 3 files"
@@ -1084,281 +1208,281 @@ msgstr "Errorea gertatu da gordetako konparazio-fitxategia irakurtzean"
msgid "<unnamed>"
msgstr "<izenik gabea>"
-#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
msgid "untitled"
msgstr "izengabea"
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:61
msgid "_File"
msgstr "_Fitxategia"
-#: ../meld/meldwindow.py:63
-msgid "_New comparison"
-msgstr "_Konparazio berria"
+#: ../meld/meldwindow.py:62
+msgid "_New Comparison..."
+msgstr "Konparazio _berria..."
#: ../meld/meldwindow.py:63
msgid "Start a new comparison"
msgstr "Konparazio berri bat hasten du"
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:66
msgid "Save the current file"
msgstr "Gorde uneko fitxategia"
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:68
+msgid "Save As..."
+msgstr "Gorde honela..."
+
+#: ../meld/meldwindow.py:69
+msgid "Save the current file with a different name"
+msgstr "Gorde uneko fitxategia beste izen batekin"
+
+#: ../meld/meldwindow.py:72
msgid "Close the current file"
msgstr "Itxi uneko fitxategia"
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:75
msgid "Quit the program"
msgstr "Irten programatik"
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:78
msgid "_Edit"
msgstr "_Editatu"
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:80
msgid "Undo the last action"
msgstr "Desegin azken ekintza"
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:83
msgid "Redo the last undone action"
msgstr "Berregin desegindako azken ekintza"
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:85
msgid "Cut the selection"
msgstr "Ebaki hautapena"
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:87
msgid "Copy the selection"
msgstr "Kopiatu hautapena"
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:89
msgid "Paste the clipboard"
msgstr "Itsatsi arbelean"
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:91
+msgid "Find..."
+msgstr "Bilatu..."
+
+#: ../meld/meldwindow.py:91
msgid "Search for text"
-msgstr "Testua bilatu"
+msgstr "Bilatu testua"
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:93
msgid "Find Ne_xt"
msgstr "Bilatu _hurrengoa"
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:94
msgid "Search forwards for the same text"
msgstr "Testu bera bilatzen du berriro, aurrerantz"
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:96
msgid "Find _Previous"
msgstr "Bilatu _aurrekoa"
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:97
msgid "Search backwards for the same text"
msgstr "Testu bera bilatzen du berriro, atzerantz"
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:100
+msgid "_Replace..."
+msgstr "_Ordeztu..."
+
+#: ../meld/meldwindow.py:101
msgid "Find and replace text"
-msgstr "Testua bilatu eta ordeztu"
+msgstr "Bilatu eta ordeztu testua"
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:103
msgid "Prefere_nces"
-msgstr "Hobes_penak"
+msgstr "_Hobespenak"
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:104
msgid "Configure the application"
msgstr "Aplikazioa konfiguratzen du"
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:107
msgid "_Changes"
msgstr "_Aldaketak"
-#: ../meld/meldwindow.py:82
-msgid "Next change"
+#: ../meld/meldwindow.py:108
+msgid "Next Change"
msgstr "Hurrengo aldaketa"
-#: ../meld/meldwindow.py:82
+#: ../meld/meldwindow.py:109
msgid "Go to the next change"
msgstr "Hurrengo aldaketara joaten da"
-#: ../meld/meldwindow.py:83
-msgid "Previous change"
+#: ../meld/meldwindow.py:111
+msgid "Previous Change"
msgstr "Aurreko aldaketa"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:112
msgid "Go to the previous change"
msgstr "Aurreko aldaketara joaten da"
-#: ../meld/meldwindow.py:84
-msgid "Open externally"
+#: ../meld/meldwindow.py:114
+msgid "Open Externally"
msgstr "Ireki kanpotik"
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:115
msgid "Open selected file or directory in the default external application"
msgstr ""
-"Hautatutako fitxategia edo direktorioa irekitzen du kanpo-aplikazio "
+"Hautatutako fitxategia edo direktorioa irekitzen du kanpoko aplikazio "
"lehenetsian"
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:119
msgid "_View"
msgstr "_Ikusi"
-#: ../meld/meldwindow.py:87
-msgid "File status"
+#: ../meld/meldwindow.py:120
+msgid "File Status"
msgstr "Fitxategiaren egoera"
-#: ../meld/meldwindow.py:88
-msgid "Version status"
+#: ../meld/meldwindow.py:121
+msgid "Version Status"
msgstr "Bertsioaren egoera"
-#: ../meld/meldwindow.py:89
-msgid "File filters"
-msgstr "Fitxategi-iragazkiak"
-
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:124
msgid "Stop the current action"
msgstr "Gelditu uneko ekintza"
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:127
msgid "Refresh the view"
msgstr "Freskatu ikuspegia"
-#: ../meld/meldwindow.py:92
-msgid "Reload"
-msgstr "Birkargatu"
-
-#: ../meld/meldwindow.py:92
-msgid "Reload the comparison"
-msgstr "Konparazioa birkargatzen du"
-
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:130
msgid "_Tabs"
msgstr "_Fitxak"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:131
msgid "_Previous Tab"
msgstr "_Aurreko fitxa"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:132
msgid "Activate previous tab"
msgstr "Aurreko fitxa aktibatzen du"
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:134
msgid "_Next Tab"
msgstr "_Hurrengo fitxa"
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:135
msgid "Activate next tab"
msgstr "Hurrengo fitxa aktibatzen du"
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:138
msgid "Move Tab _Left"
msgstr "Eraman fitxa e_zkerrera"
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:139
msgid "Move current tab to left"
msgstr "Uneko fitxa ezkerrera eramaten du"
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:142
msgid "Move Tab _Right"
msgstr "Eraman fitxa e_skuinera"
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:143
msgid "Move current tab to right"
msgstr "Uneko fitxa eskuinera eramaten du"
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:146
msgid "_Help"
msgstr "_Laguntza"
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:147
msgid "_Contents"
msgstr "_Edukia"
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:148
msgid "Open the Meld manual"
msgstr "Meld-en eskuliburua irekitzen du"
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:149
msgid "Report _Bug"
msgstr "Akatsaren _berri eman"
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:150
msgid "Report a bug in Meld"
msgstr "Meld-eko akats baten txostena bidaltzen du"
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:153
msgid "About this program"
msgstr "Programa honi buruz"
-#: ../meld/meldwindow.py:106
-msgid "Full Screen"
+#: ../meld/meldwindow.py:157
+msgid "Fullscreen"
msgstr "Pantaila osoa"
-#: ../meld/meldwindow.py:106
-msgid "View the comparison in full screen"
-msgstr "Konparazioa pantaila osoan bistaratzen du"
+#: ../meld/meldwindow.py:158
+msgid "View the comparison in fullscreen"
+msgstr "Ikusi konparazioa pantaila osoan"
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:160
msgid "_Toolbar"
msgstr "_Tresna-barra"
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:161
msgid "Show or hide the toolbar"
-msgstr "Tresna-barra bistaratzen/ezkutatzen du"
+msgstr "Erakutsi edo ezkutatu tresna-barra"
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:163
msgid "_Statusbar"
msgstr "_Egoera-barra"
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:164
msgid "Show or hide the statusbar"
msgstr "Egoera-barra bistaratzen/ezkutatzen du"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:173
msgid "Open Recent"
msgstr "Ireki azkenak"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:174
msgid "Open recent files"
msgstr "Azken erabilitako fitxategiak irekitzen ditu"
-#: ../meld/meldwindow.py:533
+#: ../meld/meldwindow.py:601
msgid "Switch to this tab"
msgstr "Joan fitxa honetara"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:734
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian.\n"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:172
msgid "[None]"
msgstr "[Bat ere ez]"
-#: ../meld/patchdialog.py:124
-msgid "Save Patch As..."
-msgstr "Gorde adabakia honela..."
-
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:49
msgid "label"
msgstr "etiketa"
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:49
msgid "pattern"
msgstr "eredua"
-#: ../meld/preferences.py:160
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr "Erabilgarri dago soilik gnome-python-mahaigaina instalatua badago"
+#: ../meld/preferences.py:168 ../meld/preferences.py:240
+msgid "Only available if you have PyGtkSourceView 2 installed"
+msgstr "Erabilgarri dago soilik PyGtkSourceView 2 instalatua badago"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:306
+#: ../meld/preferences.py:356
msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
msgstr "Babeskopiak\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:308
+#: ../meld/preferences.py:358
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1367,223 +1491,227 @@ msgstr ""
"Trashes Thumbs.db Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:310
+#: ../meld/preferences.py:360
#, python-format
msgid "Version Control\t1\t%s\n"
msgstr "Bertsio-kontrola\t1\t%s\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:312
+#: ../meld/preferences.py:362
msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
msgstr "Bitarrak\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:314
+#: ../meld/preferences.py:364
msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
msgstr "Multimedia\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:316
+#: ../meld/preferences.py:366
msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
msgstr "CVS gako-hitzak\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:318
+#: ../meld/preferences.py:368
msgid "C++ comment\t0\t//.*\n"
msgstr "C++ iruzkina\t0\t//.*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:320
+#: ../meld/preferences.py:370
msgid "C comment\t0\t/\\*.*?\\*/\n"
msgstr "C iruzkina\t0\t/\\*.*?\\*/\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:322
+#: ../meld/preferences.py:372
msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
msgstr "Zuriune guztiak\t0\t[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:324
+#: ../meld/preferences.py:374
msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
msgstr "Hasierako zuriunea\t0\t^[ \\t\\r\\f\\v]*\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:326
+#: ../meld/preferences.py:376
msgid "Script comment\t0\t#.*"
msgstr "Script iruzkina\t0\t#.*"
-#: ../meld/vcview.py:165
-msgid "Co_mmit"
-msgstr "Ba_lidatu"
+#: ../meld/recent.py:107
+msgid "Version control:"
+msgstr "Bertsio-kontrola:"
-#: ../meld/vcview.py:165
-msgid "Commit"
-msgstr "Balidatu egiten du"
+#: ../meld/vcview.py:161
+msgid "Compare selected files"
+msgstr "Konparatu hautatutako fitxategiak"
+
+#: ../meld/vcview.py:163
+msgid "Co_mmit..."
+msgstr "_Egikaritu..."
+
+#: ../meld/vcview.py:164
+msgid "Commit changes to version control"
+msgstr "Egikaritu aldaketak bertsio-kontrolera"
#: ../meld/vcview.py:166
msgid "_Update"
msgstr "_Eguneratu"
-#: ../meld/vcview.py:166
-msgid "Update"
-msgstr "Eguneratu egiten du"
-
#: ../meld/vcview.py:167
-msgid "Add to VC"
+msgid "Update working copy from version control"
+msgstr "Eguneratu laneko kopia bertsio-kontroletik"
+
+#: ../meld/vcview.py:169
+msgid "_Push"
+msgstr "_Bidali"
+
+#: ../meld/vcview.py:170
+msgid "Push local changes to remote"
+msgstr "Bidali lokaleko aldaketak urrunekora"
+
+#: ../meld/vcview.py:173
+msgid "Add to version control"
msgstr "Gehitu bertsio-kontrolari"
-#: ../meld/vcview.py:168
-msgid "Remove from VC"
+#: ../meld/vcview.py:176
+msgid "Remove from version control"
msgstr "Kendu bertsio-kontroletik"
-#: ../meld/vcview.py:169
-msgid "_Resolved"
-msgstr "_Ebatzita"
+#: ../meld/vcview.py:178
+msgid "Mar_k as Resolved"
+msgstr "_Markatu ebatzi gisa"
-#: ../meld/vcview.py:169
-msgid "Mark as resolved for VC"
-msgstr "Bertsio-kontrolerako ebatzia dagoela markatzen du"
+#: ../meld/vcview.py:179
+msgid "Mark as resolved in version control"
+msgstr "Markatu ebatzita bezala bertsio-kontrolean"
-#: ../meld/vcview.py:170
-msgid "Revert to original"
-msgstr "Leheneratu jatorrizkora"
+#: ../meld/vcview.py:181
+msgid "Re_vert"
+msgstr "_Leheneratu"
+
+#: ../meld/vcview.py:182
+msgid "Revert working copy to original state"
+msgstr "Leheneratu laneko kopia jatorrizko egoerara"
-#: ../meld/vcview.py:171
-msgid "Delete locally"
-msgstr "Ezabatu lokalean"
+#: ../meld/vcview.py:185
+msgid "Delete from working copy"
+msgstr "Ezabatu laneko kopiatik"
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:190
msgid "_Flatten"
msgstr "_Berdindu"
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:191
msgid "Flatten directories"
msgstr "Direktorioak berdintzen ditu"
-#: ../meld/vcview.py:176
+#: ../meld/vcview.py:193
msgid "_Modified"
msgstr "_Aldatuta"
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:194
+msgid "Show modified files"
+msgstr "Erakutsi aldatutako fitxategiak"
+
+#: ../meld/vcview.py:196
msgid "_Normal"
msgstr "_Normala"
-#: ../meld/vcview.py:177
-msgid "Show normal"
-msgstr "Bistaratze normala"
+#: ../meld/vcview.py:197
+msgid "Show normal files"
+msgstr "Erakutsi fitxategi normalak"
-#: ../meld/vcview.py:178
-msgid "Non _VC"
-msgstr "Bertsio-_kontrolik gabeak"
+#: ../meld/vcview.py:199
+msgid "Un_versioned"
+msgstr "Bertsiorik _gabe"
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:200
msgid "Show unversioned files"
msgstr "Bertsiorik ez duten fitxategiak bistaratzen ditu"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:202
msgid "Ignored"
msgstr "Ez ikusi eginda"
-#: ../meld/vcview.py:179
+#: ../meld/vcview.py:203
msgid "Show ignored files"
-msgstr "Ez ikusi egin zaien fitxategiak bistaratzen ditu"
+msgstr "Erakutsi ez ikusi egin zaien fitxategiak"
-#: ../meld/vcview.py:230 ../meld/vcview.py:378
+#: ../meld/vcview.py:262 ../meld/vcview.py:432
msgid "Location"
msgstr "Kokapena"
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:263
msgid "Status"
msgstr "Egoera"
-#: ../meld/vcview.py:232
-msgid "Rev"
+#: ../meld/vcview.py:264
+msgid "Revision"
msgstr "Berrikuspena"
-#: ../meld/vcview.py:233
-msgid "Tag"
-msgstr "Etiketa"
-
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:265
msgid "Options"
msgstr "Aukerak"
-#: ../meld/vcview.py:296
-msgid "Choose one Version Control"
-msgstr "Bertsio-kontrol bat aukeratu"
-
-#: ../meld/vcview.py:297
-msgid "Only one Version Control in this directory"
-msgstr "Bertsio-kontrol bakar bat direktorio honetan"
-
#. TRANSLATORS: this is an error message when a version control
#. application isn't installed or can't be found
-#: ../meld/vcview.py:318
+#: ../meld/vcview.py:342
#, python-format
-msgid "%s Not Installed"
-msgstr "%s ez dago instalatua"
+msgid "%s not installed"
+msgstr "'%s' ez dago instalatua"
#. TRANSLATORS: this is an error message when a version
#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:322
-msgid "Invalid Repository"
-msgstr "Biltegia baliogabea da"
+#: ../meld/vcview.py:346
+msgid "Invalid repository"
+msgstr "Baliogabeko biltegia"
-#: ../meld/vcview.py:331
+#: ../meld/vcview.py:355
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:357 ../meld/vcview.py:365
+msgid "None"
+msgstr "Bat ere ez"
+
+#: ../meld/vcview.py:376
+msgid "No valid version control system found in this folder"
+msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan"
+
#: ../meld/vcview.py:378
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "Only one version control system found in this folder"
+msgstr "Bertsio-kontrol bakar bat aurkituta karpeta honetan"
-#: ../meld/vcview.py:421
-msgid "(Empty)"
-msgstr "(hutsik)"
+#: ../meld/vcview.py:380
+msgid "Choose which version control system to use"
+msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den"
-#: ../meld/vcview.py:453
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:432
#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Diferentziak bilatzen"
+msgid "%s: %s"
+msgstr "%s: %s"
-#: ../meld/vcview.py:466
+#: ../meld/vcview.py:446 ../meld/vcview.py:454
#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Adabakia aplikatzen"
-
-#: ../meld/vcview.py:669
-msgid "Patch tool not found"
-msgstr "Ez da aurkitu adabaki-tresna"
+msgid "Scanning %s"
+msgstr "%s eskaneatzen"
-#: ../meld/vcview.py:670
-#, python-format
-msgid ""
-"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
-"%s repositories. Please install <i>patch</i> and try again."
-msgstr ""
-"<i>Adabaki</i>-tresna instalatua egotea behar du Meld-ek %s biltegietan "
-"konparazioak egiteko. Instalatu <i>adabakia</i> eta egin proba berriz."
+#: ../meld/vcview.py:487
+msgid "(Empty)"
+msgstr "(hutsik)"
-#: ../meld/vcview.py:710
-msgid "Error fetching original comparison file"
-msgstr "Errorea gertatu da jatorrizko konparazio-fitxategia eskuratzean"
+#: ../meld/vcview.py:709
+msgid "Remove folder and all its files?"
+msgstr "Kendu karpeta eta bere fitxategi guztiak?"
#: ../meld/vcview.py:711
msgid ""
-"Meld couldn't obtain the original version of your comparison file. If you "
-"are using the most recent version of Meld, please report a bug, including as "
-"many details as possible."
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
msgstr ""
-"Meld-ek ezin izan du eskuratu konparazio-fitxategiaren jatorrizko bertsioa. "
-"Meld-en bertsio berriena erabiltzen ari bazara, eman arazoaren berri, eta "
-"adierazi ahalik eta xehetasun gehien."
-
-#: ../meld/vcview.py:719
-msgid "Report a bug"
-msgstr "Akats baten berri eman"
+"Honek hautatutako fitxategi eta karpeta guztiak, baita hautatutako karpeten "
+"barruan dauden fitxategi guztiak ere, bertsio-kontroletik kenduko ditu."
#: ../meld/ui/findbar.py:150
#, python-format
@@ -1594,27 +1722,27 @@ msgstr ""
"Adierazpen erregularraren errorea\n"
"'%s'"
-#: ../meld/ui/historyentry.py:296
+#: ../meld/ui/historyentry.py:381
msgid "_Browse..."
msgstr "_Arakatu..."
-#: ../meld/ui/historyentry.py:304
+#: ../meld/ui/historyentry.py:389
msgid "Path"
msgstr "Bide-izena"
-#: ../meld/ui/historyentry.py:305
+#: ../meld/ui/historyentry.py:390
msgid "Path to file"
msgstr "Fitxategiaren bide-izena"
-#: ../meld/ui/historyentry.py:306
+#: ../meld/ui/historyentry.py:391
msgid "Pop up a file selector to choose a file"
msgstr "Fitxategi-hautatzaile bat zabaldu, fitxategi bat aukeratzeko"
-#: ../meld/ui/historyentry.py:444
+#: ../meld/ui/historyentry.py:529
msgid "Select directory"
msgstr "Direktorioa hautatu"
-#: ../meld/ui/historyentry.py:448
+#: ../meld/ui/historyentry.py:533
msgid "Select file"
msgstr "Fitxategia hautatu"
@@ -1622,26 +1750,28 @@ msgstr "Fitxategia hautatu"
msgid "Close tab"
msgstr "Itxi fitxa"
-#: ../meld/vc/_vc.py:45
+#: ../meld/ui/vcdialogs.py:57
+msgid "No files will be committed"
+msgstr "Ez da fitxategirik egikarituko"
+
+#: ../meld/vc/_vc.py:47
msgid "Merged"
-msgstr ""
+msgstr "Batuta"
-#: ../meld/vc/_vc.py:45
+#: ../meld/vc/_vc.py:47
msgid "Base"
-msgstr ""
+msgstr "Oinarria"
-#: ../meld/vc/_vc.py:45
-#, fuzzy
+#: ../meld/vc/_vc.py:47
msgid "Local"
-msgstr "Kokapena"
+msgstr "Lokala"
-#: ../meld/vc/_vc.py:45
-#, fuzzy
+#: ../meld/vc/_vc.py:47
msgid "Remote"
-msgstr "_Kendu"
+msgstr "Urrunekoa"
#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:51
+#: ../meld/vc/_vc.py:62
msgid ""
"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
"Not present"
@@ -1649,7 +1779,7 @@ msgstr ""
"Ez ikusi egina:Bertsiorik gabea:::Errorea::Gehitu berria:Aldatua:Gatazka:"
"Kendua:Falta da:Ez dago"
-#: ../meld/vc/cvs.py:181
+#: ../meld/vc/cvs.py:231
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1660,7 +1790,595 @@ msgstr ""
"Eredua: '%s'\n"
"Errorea: '%s'"
-#: ../meld/vc/git.py:218
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:120
+#, python-format
+msgid "%s in %s"
+msgstr "%s (%s)"
+
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:121 ../meld/vc/git.py:128
+#, 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:123
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "adar %d"
+msgstr[1] "%d adar"
+
+#: ../meld/vc/git.py:333
#, python-format
msgid "Mode changed from %s to %s"
-msgstr "Modua aldatu da %s modutik %s modura"
+msgstr "'%s' modua hona aldatuta: %s"
+
+#~ msgid "Meld does not support Python 3."
+#~ msgstr "Meld-ek ez du Python 3 onartzen."
+
+#~ msgid ""
+#~ "Meld is a visual diff and merge tool targeted at developers. Meld helps "
+#~ "you compare files, directories, and version controlled projects. It "
+#~ "provides two- and three-way comparison of both files and directories, and "
+#~ "supports 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."
+
+#~ 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."
+
+#~ msgid "Default window size"
+#~ msgstr "Leihoaren tamaina lehenetsia"
+
+#~ msgid "Show toolbar"
+#~ msgstr "Erakutsi tresna-barra"
+
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "TRUE (egia) bada, leihoaren tresna-barra ikusgai egongo da."
+
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "TRUE (egia) bada, leihoaren egoera-barra ikusgai egongo da."
+
+#~ msgid "Automatically detected text encodings"
+#~ msgstr "Atzeman automatikoki testu-kodeketak"
+
+#~ msgid ""
+#~ "These text encodings will be automatically used (in order) to try to "
+#~ "decode loaded text files."
+#~ msgstr ""
+#~ "Testu-kodeketa hauek automatikoki erabiliko dira kargatutako testu-"
+#~ "fitxategiak deskodetzen saiatzeko."
+
+#~ msgid "Width of an indentation step"
+#~ msgstr "Koskatzearen urratsaren zabalera"
+
+#~ msgid "The number of spaces to use for a single indent step"
+#~ msgstr "Koskatze bakar batean erabiliko den zuriuneen kopurua"
+
+#~ msgid "Whether to indent using spaces or tabs"
+#~ msgstr "Zuriuneak edo tabulazioak erabiliko diren koskatzean"
+
+#~ msgid "If true, any new indentation will use spaces instead of tabs."
+#~ msgstr ""
+#~ "TRUE (egia) bada, koskatze berri bakoitzean zuriuneak erabiliko dira "
+#~ "tabulazioen ordez."
+
+#~ msgid "Show line numbers"
+#~ msgstr "Erakutsi lerro-zenbakiak"
+
+#~ msgid ""
+#~ "If true, line numbers will be shown in the gutter of file comparisons."
+#~ msgstr ""
+#~ "TRUE (egia) bada, lerroen zenbakiak erakutsiko dira fitxategien "
+#~ "konparazioan."
+
+#~ msgid "Highlight syntax"
+#~ msgstr "Nabarmendu sintaxia"
+
+#~ 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-en kolore propioa "
+#~ "dela eta, lehenetsi gisa hau desgaituta dago."
+
+#~ msgid "Displayed whitespace"
+#~ msgstr "Bistaratutako zuriuneak"
+
+#~ msgid ""
+#~ "Selector for individual whitespace character types to be shown. Possible "
+#~ "values are 'space', 'tab', 'newline' and 'nbsp'."
+#~ msgstr ""
+#~ "Zuriunea karaktere mota bakoitzaren hautatzailea erakusteko. Balio "
+#~ "erabilgarriak: 'space' (zuriunea), 'tab' (tabulazioa), 'newline' (lerro "
+#~ "berria) and 'nbsp' (zuriune zatikaitza)."
+
+#~ msgid "Wrap mode"
+#~ msgstr "Itzulbiratze modua"
+
+#~ 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)."
+
+#~ msgid "Highlight current line"
+#~ msgstr "Nabarmendu uneko lerroa"
+
+#~ 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."
+
+#~ msgid "Use the system default monospace font"
+#~ msgstr "Erabili sistemaren zabalera finkoko letra-tipo lehenetsia"
+
+#~ msgid ""
+#~ "If false, the defined custom font will be used instead of the system "
+#~ "monospace font."
+#~ msgstr ""
+#~ "FALSE (faltsua) bada, letra-tipo pertsonalizatua erabiliko da sistemaren "
+#~ "zabalera finkoko letra-tipoaren ordez."
+
+#~ msgid "Custom font"
+#~ msgstr "Letra-tipo pertsonalizatua"
+
+#~ 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."
+
+#~ msgid "Ignore blank lines when comparing files"
+#~ msgstr "Ez ikusi egin lerro hutsei fitxategiak konparatzean"
+
+#~ 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."
+
+#~ msgid "Use the system default editor"
+#~ msgstr "Erabili sistemaren editore lehenetsia"
+
+#~ msgid ""
+#~ "If false, the defined custom editor will be used instead of the system "
+#~ "editor when opening files externally."
+#~ msgstr ""
+#~ "FALSE (faltsua) bada, fitxategiak kanpoko editore pertsonalizatuarekin "
+#~ "irekiko dira sistemaren editorea erabili ordez."
+
+#~ msgid "The custom editor launch command"
+#~ msgstr "Editore pertsonalizatua abiarazteko komandoa"
+
+#~ 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."
+
+#~ msgid "Columns to display"
+#~ msgstr "Zutabeak bistaratzeko"
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Use shallow comparison"
+#~ msgstr "Erabili azaleko konparazioa"
+
+#~ 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."
+
+#~ msgid "File timestamp resolution"
+#~ msgstr "Fitxategiaren data-zigiluaren bereizmena"
+
+#~ 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 is useful when comparing files between filesystems with "
+#~ "different timestamp 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."
+
+#~ msgid "File status filters"
+#~ msgstr "Fitxategiaren egoeraren iragazkiak"
+
+#~ msgid "List of statuses used to filter visible files in folder comparison."
+#~ msgstr ""
+#~ "Karpeten konparazioan fitxategi ikusgaiak iragazteko erabiliko den "
+#~ "egoeren zerrenda."
+
+#~ msgid "Show the version control console output"
+#~ msgstr "Erakutsi bertsio-kontrolaren kontsolaren irteera"
+
+#~ 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."
+
+#~ msgid "Version control pane position"
+#~ msgstr "Bertsio-kontrolaren panelaren posizioa"
+
+#~ 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."
+
+#~ msgid "Present version comparisons as left-local/right-remote"
+#~ msgstr ""
+#~ "Aurkeztu bertsioen konparazioa ezkerra-lokala/eskuina-urrunekoa gisa"
+
+#~ 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."
+
+#~ msgid "Order for files in three-way version control merge comparisons"
+#~ msgstr "Fitxategien ordena hiruko bertsio-kontrolaren baturen konparazioan"
+
+#~ msgid ""
+#~ "Choices for file order are remote/merge/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/merge/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."
+
+#~ msgid "Show margin in commit message editor"
+#~ msgstr "Erakutsi marjinak egikaritze-mezuen editorean"
+
+#~ 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."
+
+#~ msgid "Margin column in commit message editor"
+#~ msgstr "Marjinaren zutabea egikaritze-mezuaren editorean"
+
+#~ msgid ""
+#~ "The column of the margin is at in the version control commit message "
+#~ "editor."
+#~ msgstr ""
+#~ "Bertsio-kontrolaren egikaritze-mezuaren editorean marjina zer zutabean "
+#~ "dagoen."
+
+#~ msgid "Automatically hard-wrap commit messages"
+#~ msgstr "Itzulbiratze gogor automatikoa egikaritze-mezuetan"
+
+#~ msgid ""
+#~ "If true, the version control commit message editor will hard-wrap (i.e., "
+#~ "insert line breaks) at the defined commit margin before commit."
+#~ msgstr ""
+#~ "TRUE (egia) bada, bertsio-kontrolaren egikaritze-mezuen editoreak "
+#~ "itzulbiratze gogorra (adib. lerro-jauzia txertatzea) landuko du "
+#~ "definitutako egikaritzearen marjinan egikaritu aurretik."
+
+#~ msgid "Version control status filters"
+#~ msgstr "Bertsio-kontrolaren egoeraren iragazkiak"
+
+#~ msgid ""
+#~ "List of statuses used to filter visible files in version control "
+#~ "comparison."
+#~ msgstr ""
+#~ "Bertsio-kontrolen konparazioan fitxategi ikusgaiak iragazteko erabiliko "
+#~ "den egoeren zerrenda."
+
+#~ msgid "Filename-based filters"
+#~ msgstr "Fitxategi-izenean oinarritutako iragazkiak"
+
+#~ 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."
+
+#~ msgid "Text-based filters"
+#~ msgstr "Testuan oinarritutako iragazkiak"
+
+#~ 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 "
+#~ "konparazio berari lagunduko."
+
+#~ msgid "About Meld"
+#~ msgstr "Meld-i buruz"
+
+#~ msgid "Website"
+#~ msgstr "Webgunea"
+
+#~ msgid "_About"
+#~ msgstr "Honi _buruz"
+
+#~ msgid "_Quit"
+#~ msgstr "I_rten"
+
+#~ msgid "File 3"
+#~ msgstr "3. fitxategia"
+
+#~ msgid "File 2"
+#~ msgstr "2. fitxategia"
+
+#~ msgid "File 1"
+#~ msgstr "1. fitxategia"
+
+#~ msgid "Remote, merge, local"
+#~ msgstr "Urrunekoa, batu, lokala"
+
+#~ msgid "Local, merge, remote"
+#~ msgstr "Lokala, batu, urrunekoa"
+
+#~ msgid "1ns (ext4)"
+#~ msgstr "1ns (ext4)"
+
+#~ msgid "100ns (NTFS)"
+#~ msgstr "100ns (NTFS)"
+
+#~ msgid "1s (ext2/ext3)"
+#~ msgstr "1s (ext2/ext3)"
+
+#~ msgid "2s (VFAT)"
+#~ msgstr "2s (VFAT)"
+
+#~ msgid "Order when _merging files:"
+#~ msgstr "Ordenatu fitxategiak _batzean:"
+
+#~ msgid "Console"
+#~ msgstr "Kontsola"
+
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr ""
+#~ "Erakutsi edo ezkutatu bertsio-kontrolaren kontsolaren irteerako panela"
+
+#~ msgid "Console output"
+#~ msgstr "Kontsolaren irteera"
+
+#~ msgid "Error copying file"
+#~ msgstr "Errorea fitxategia kopiatzean"
+
+#~ msgid ""
+#~ "Couldn't copy %s\n"
+#~ "to %s.\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin izan da '%s' kopiatu\n"
+#~ "'%s' gisa.\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Error deleting %s"
+#~ msgstr "Errorea '%s' ezabatzean"
+
+#~ msgid "Mark conflict as resolved?"
+#~ msgstr "Markatu gatazka ebatzita bezala?"
+
+#~ msgid ""
+#~ "If the conflict was resolved successfully, you may mark it as resolved "
+#~ "now."
+#~ msgstr "Gatazka ongi ebatzi bada, ebatzita bezala marka dezakezu orain."
+
+#~ msgid "Cancel"
+#~ msgstr "Utzi"
+
+#~ msgid "Mark _Resolved"
+#~ msgstr "Markatu _ebatzita"
+
+#~ msgid "File %s has changed on disk"
+#~ msgstr "'%s' fitxategia diskoan aldatu da"
+
+#~ msgid "Do you want to reload the file?"
+#~ msgstr "Fitxategia berriro kargatzea nahi duzu?"
+
+#~ msgid "_Reload"
+#~ msgstr "_Birkargatu"
+
+#~ msgid "File %s has changed on disk since it was opened"
+#~ msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)"
+
+#~ msgid "If you save it, any external changes will be lost."
+#~ msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da."
+
+#~ msgid "Save Anyway"
+#~ msgstr "Gorde dena den"
+
+#~ msgid "Don't Save"
+#~ msgstr "Ez gorde"
+
+#~ msgid "Copy _up"
+#~ msgstr "Kopiatu _goian"
+
+#~ msgid "Copy _down"
+#~ msgstr "Kopiatu _behean"
+
+#~ msgid "folder"
+#~ msgstr "karpeta"
+
+#~ msgid "Start a 2- or 3-way folder comparison"
+#~ msgstr "Hasi bi edo hiru sarrerako karpeten konparazioa"
+
+#~ msgid "Unversioned"
+#~ msgstr "Bertsiorik gabekoa"
+
+#~ msgid "Error"
+#~ msgstr "Errorea"
+
+#~ msgid "Newly added"
+#~ msgstr "Berriki gehituta"
+
+#~ msgid "Conflict"
+#~ msgstr "Gatazka"
+
+#~ msgid "Removed"
+#~ msgstr "Kenduta"
+
+#~ msgid "Missing"
+#~ msgstr "Falta da"
+
+#~ msgid "Not present"
+#~ msgstr "Ez dago"
+
+#~ msgid "%s — local"
+#~ msgstr "%s — lokala"
+
+#~ msgid "%s — remote"
+#~ msgstr "%s — urrunekoa"
+
+#~ msgid "%s (local, merge, remote)"
+#~ msgstr "%s (lokala, batu, urrunekoa)"
+
+#~ msgid "%s (remote, merge, local)"
+#~ msgstr "%s (urrunekoa, batu, lokala)"
+
+#~ msgid "%s — repository"
+#~ msgstr "%s — biltegia"
+
+#~ msgid "%s (working, repository)"
+#~ msgstr "%s (lanekoa, biltegia)"
+
+#~ msgid "%s (repository, working)"
+#~ msgstr "%s (biltegia, lanekoa)"
+
+#~ msgid "Create Patch"
+#~ msgstr "Sortu adabakia"
+
+#~ msgid "Create a patch"
+#~ msgstr "Sortu adabaki bat"
+
+#~ msgid "VC Log"
+#~ msgstr "Bertsio-kontrolaren egunkaria"
+
+#~ msgid "Merge all non-conflicting"
+#~ msgstr "Gatazkatsuak ez direnak konbinatu"
+
+#~ msgid "Choose a name for buffer %i."
+#~ msgstr "Aukeratu izen bat %i. bufferrerako."
+
+#~ msgid "Save changes to documents before reloading?"
+#~ msgstr "Gorde dokumentuetako aldaketak berriro kargatu aurretik?"
+
+#~ msgid "Reload the comparison"
+#~ msgstr "Konparazioa birkargatzen du"
+
+#~ msgid "Update"
+#~ msgstr "Eguneratu egiten du"
+
+#~ msgid "Add to VC"
+#~ msgstr "Gehitu bertsio-kontrolari"
+
+#~ msgid "Remove from VC"
+#~ msgstr "Kendu bertsio-kontroletik"
+
+#~ msgid "Delete locally"
+#~ msgstr "Ezabatu lokalean"
+
+#~ msgid "Show normal"
+#~ msgstr "Bistaratze normala"
+
+#~ msgid "Non _VC"
+#~ msgstr "Bertsio-_kontrolik gabeak"
+
+#~ msgid "Rev"
+#~ msgstr "Berrikuspena"
+
+#~ msgid "Tag"
+#~ msgstr "Etiketa"
+
+#~ msgid "[%s] Fetching differences"
+#~ msgstr "[%s] Diferentziak bilatzen"
+
+#~ msgid "[%s] Applying patch"
+#~ msgstr "[%s] Adabakia aplikatzen"
+
+#~ msgid "Patch tool not found"
+#~ msgstr "Ez da aurkitu adabaki-tresna"
+
+#~ msgid ""
+#~ "Meld needs the <i>patch</i> tool to be installed to perform comparisons "
+#~ "in %s repositories. Please install <i>patch</i> and try again."
+#~ msgstr ""
+#~ "<i>Adabaki</i>-tresna instalatua egotea behar du Meld-ek %s biltegietan "
+#~ "konparazioak egiteko. Instalatu <i>adabakia</i> eta egin proba berriz."
+
+#~ msgid "Error fetching original comparison file"
+#~ msgstr "Errorea gertatu da jatorrizko konparazio-fitxategia eskuratzean"
+
+#~ msgid ""
+#~ "Meld couldn't obtain the original version of your comparison file. If you "
+#~ "are using the most recent version of Meld, please report a bug, including "
+#~ "as many details as possible."
+#~ msgstr ""
+#~ "Meld-ek ezin izan du eskuratu konparazio-fitxategiaren jatorrizko "
+#~ "bertsioa. Meld-en bertsio berriena erabiltzen ari bazara, eman arazoaren "
+#~ "berri, eta adierazi ahalik eta xehetasun gehien."
+
+#~ msgid "Report a bug"
+#~ msgstr "Akats baten berri eman"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]