[meld] Updated Basque language

[Iñaki Larrañaga Murgoitio <dooteo src gnome org>]

commit 43bc28bc800a545ca35eaaf46a07077aabeed576
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Mon May 19 23:26:26 2014 +0200

    Updated Basque language

 po/eu.po | 2353 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1547 insertions(+), 806 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 426a5c2..d30e0d4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -15,31 +15,35 @@
 # 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"
-"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"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-18 15:06+0200\n"
+"PO-Revision-Date: 2014-05-19 23:22+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:134
 msgid "Cannot import: "
 msgstr "Ezin da inportatu: "
 
-#: ../bin/meld:124
+#: ../bin/meld:137
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld-ek %s edo berriagoa behar du."
 
+#: ../bin/meld:141
+msgid "Meld does not support Python 3."
+msgstr "Meld-ek ez du Python 3 onartzen."
+
 #: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
@@ -56,10 +60,531 @@ msgstr "Meld diferentzia-ikustailea"
 msgid "Compare and merge your files"
 msgstr "Konparatu eta konbinatu fitxategiak"
 
+#: ../data/meld.appdata.xml.in.h:1
+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."
+
+#: ../data/meld.appdata.xml.in.h:2
+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/mime/meld.xml.in.h:1
-#, fuzzy
 msgid "Meld comparison description"
-msgstr "Karpeten konparazioa"
+msgstr "Meld-en konparazioaren azalpena"
+
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "Leihoaren tamaina lehenetsia"
+
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Show toolbar"
+msgstr "Erakutsi tresna-barra"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "If true, the window toolbar is visible."
+msgstr "TRUE (egia) bada, leihoaren tresna-barra ikusgai egongo da."
+
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "Show statusbar"
+msgstr "Erakutsi egoera-barra"
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "If true, the window statusbar is visible."
+msgstr "TRUE (egia) bada, leihoaren egoera-barra ikusgai egongo da."
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "Automatically detected text encodings"
+msgstr "Atzeman automatikoki testu-kodeketak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "Width of an indentation step"
+msgstr "Koskatzearen urratsaren zabalera"
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
+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:10
+msgid "Whether to indent using spaces or tabs"
+msgstr "Zuriuneak edo tabulazioak erabiliko diren koskatzean"
+
+#: ../data/org.gnome.meld.gschema.xml.h:11
+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:12
+msgid "Show line numbers"
+msgstr "Erakutsi lerro-zenbakiak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:13
+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:14
+msgid "Highlight syntax"
+msgstr "Nabarmendu sintaxia"
+
+#: ../data/org.gnome.meld.gschema.xml.h:15
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:16
+msgid "Displayed whitespace"
+msgstr "Bistaratutako zuriuneak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:17
+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)."
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Wrap mode"
+msgstr "Itzulbiratze modua"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
+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:20
+msgid "Highlight current line"
+msgstr "Nabarmendu uneko lerroa"
+
+#: ../data/org.gnome.meld.gschema.xml.h:21
+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:22
+msgid "Use the system default monospace font"
+msgstr "Erabili sistemaren zabalera finkoko letra-tipo lehenetsia"
+
+#: ../data/org.gnome.meld.gschema.xml.h:23
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:24
+msgid "Custom font"
+msgstr "Letra-tipo pertsonalizatua"
+
+#: ../data/org.gnome.meld.gschema.xml.h:25
+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:26
+msgid "Ignore blank lines when comparing files"
+msgstr "Ez ikusi egin lerro hutsei fitxategiak konparatzean"
+
+#: ../data/org.gnome.meld.gschema.xml.h:27
+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:28
+msgid "Use the system default editor"
+msgstr "Erabili sistemaren editore lehenetsia"
+
+#: ../data/org.gnome.meld.gschema.xml.h:29
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid "The custom editor launch command"
+msgstr "Editore pertsonalizatua abiarazteko komandoa"
+
+#: ../data/org.gnome.meld.gschema.xml.h:31
+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:32
+msgid "Columns to display"
+msgstr "Zutabeak bistaratzeko"
+
+#: ../data/org.gnome.meld.gschema.xml.h:33
+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:34 ../data/ui/preferences.ui.h:30
+msgid "Ignore symbolic links"
+msgstr "Ez ikusi egin esteka sinbolikoei"
+
+#: ../data/org.gnome.meld.gschema.xml.h:35
+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:36
+msgid "Use shallow comparison"
+msgstr "Erabili azaleko konparazioa"
+
+#: ../data/org.gnome.meld.gschema.xml.h:37
+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:38
+msgid "File timestamp resolution"
+msgstr "Fitxategiaren data-zigiluaren bereizmena"
+
+#: ../data/org.gnome.meld.gschema.xml.h:39
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid "File status filters"
+msgstr "Fitxategiaren egoeraren iragazkiak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:41
+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:42
+msgid "Show the version control console output"
+msgstr "Erakutsi bertsio-kontrolaren kontsolaren irteera"
+
+#: ../data/org.gnome.meld.gschema.xml.h:43
+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:44
+msgid "Version control pane position"
+msgstr "Bertsio-kontrolaren panelaren posizioa"
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+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:46
+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:47
+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:48
+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:49
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid "Show margin in commit message editor"
+msgstr "Erakutsi marjinak egikaritze-mezuen editorean"
+
+#: ../data/org.gnome.meld.gschema.xml.h:51
+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:52
+msgid "Margin column in commit message editor"
+msgstr "Marjinaren zutabea egikaritze-mezuaren editorean"
+
+#: ../data/org.gnome.meld.gschema.xml.h:53
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:54
+msgid "Automatically hard-wrap commit messages"
+msgstr "Itzulbiratze gogor automatikoa egikaritze-mezuetan"
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
+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."
+
+#: ../data/org.gnome.meld.gschema.xml.h:56
+msgid "Version control status filters"
+msgstr "Bertsio-kontrolaren egoeraren iragazkiak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:57
+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:58
+msgid "Filename-based filters"
+msgstr "Fitxategi-izenean oinarritutako iragazkiak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:59
+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:60
+msgid "Text-based filters"
+msgstr "Testuan oinarritutako iragazkiak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:61
+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."
+
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "Meld-i buruz"
+
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+msgstr ""
+"Copyright-a © 2002-2009 Stephen Kennedy\n"
+"Copyright-a © 2009-2013 Kai Willadsen"
+
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "Webgunea"
+
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+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/application.ui.h:6
+msgid "_Preferences"
+msgstr "_Hobespenak"
+
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "_Laguntza"
+
+#: ../data/ui/application.ui.h:8
+msgid "_About"
+msgstr "Honi _buruz"
+
+#: ../data/ui/application.ui.h:9
+msgid "_Quit"
+msgstr "I_rten"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Konparatu"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Konparatu hautatutako fitxategiak"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy _Left"
+msgstr "Kopiatu e_zkerrean"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Ezkerrean kopiatzen du"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy _Right"
+msgstr "Kopiatu e_skuinean"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Eskuinean kopiatzen du"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Ezabatu hautapena"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+msgid "Hide"
+msgstr "Ezkutatu"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Hautapena ezkutatzen du"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei"
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Berdintzat jotzen ditu fitxategi-izenak, berdinak badira maiuskulak/"
+"minuskulak izan ezik"
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Berdinak"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Berdinak erakusten ditu"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Berriak"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Berriak erakusten ditu"
+
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+msgid "Modified"
+msgstr "Aldatuak"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Aldatuak erakusten ditu"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Iragazkiak"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Iragazki aktiboak ezartzen ditu"
 
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
@@ -70,14 +595,15 @@ 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 ../data/ui/vcview.ui.h:9
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:168
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:735
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -98,8 +624,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:363
+#: ../meld/vcview.py:203
 msgid "Name"
 msgstr "Izena"
 
@@ -109,11 +635,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 +650,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"
@@ -144,7 +670,27 @@ 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:7
+msgid "File 3"
+msgstr "3. fitxategia"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "File 2"
+msgstr "2. fitxategia"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "File 1"
+msgstr "1. fitxategia"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Revert unsaved changes to documents?"
+msgstr "Leheneratu gorde gabeko aldaketak dokumentuetan?"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "Dokumentu hauetan egindako aldaketak betirako galduko dira:\n"
+
+#: ../data/ui/findbar.ui.h:1
 msgid "_Replace"
 msgstr "_Ordeztu"
 
@@ -166,10 +712,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,173 +723,194 @@ 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"
-
-#: ../data/ui/meldapp.ui.h:2
-msgid ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2012 Kai Willadsen"
-msgstr ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2012 Kai Willadsen"
-
-#: ../data/ui/meldapp.ui.h:4
-msgid ""
-"Meld is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 2 of the License, or (at your option) any later "
-"version.\n"
-"\n"
-"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details. \n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Meld software librea da; banatu eta/edo alda dezakezu, GNUren Lizentzia "
-"Publiko Orokorraren arauak betez (Free Software foundation-ek argitaratutako "
-"lizentziaren 2. bertsioa edo berriagoa).\n"
-"\n"
-"Meld erabilgarria izango delakoan banatzen dugu, baina INOLAKO BERMERIK "
-"GABE; MERKATURATZEKO edo ERABILERA JAKIN BATERAKO egokitasunaren bermerik "
-"ere gabe banatzen da.  Informazio gehiago behar izanez gero, ikusi GNUren "
-"Lizentzia Publiko Orokorra. \n"
-"\n"
-"GNUren Lizentzia Publiko orokorraren kopia bat jaso beharko zenuke programa "
-"honekin batera.  Bestela, ikusi <http://www.gnu.org/licenses/>."
-
-#: ../data/ui/meldapp.ui.h:9
-msgid "translator-credits"
-msgstr "Elhuyar Fundazioa <itzulpenak elhuyar com>"
+msgstr "Itzulbiratuta"
 
 #: ../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:119
+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 "Remote, merge, local"
+msgstr "Urrunekoa, batu, lokala"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "Lokala, batu, urrunekoa"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
+#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Meld-en hobespenak"
 
-#: ../data/ui/preferences.ui.h:2
+#: ../data/ui/preferences.ui.h:10
 msgid "Font"
 msgstr "Letra-tipoa"
 
-#: ../data/ui/preferences.ui.h:3
+#: ../data/ui/preferences.ui.h:11
 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:12
 msgid "_Editor font:"
 msgstr "_Editorearen letra-tipoa:"
 
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:13
 msgid "Display"
-msgstr "Bistaratzea"
+msgstr "Bistaratu"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:14
 msgid "_Tab width:"
-msgstr "_Tabuladorearen zabalera:"
+msgstr "_Tabulazioaren zabalera:"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:15
 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:16
 msgid "Enable text _wrapping"
-msgstr "Gaitu testua _egokitzea"
+msgstr "Gaitu testua _itzulbiratzea"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:17
 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:18
+msgid "Highlight _current line"
+msgstr "Nabarmendu _uneko lerroa"
+
+#: ../data/ui/preferences.ui.h:19
 msgid "Show _line numbers"
 msgstr "Erakutsi _lerro-zenbakiak"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:20
 msgid "Show w_hitespace"
-msgstr "Erakutsi z_uriuneak"
+msgstr "Erakutsi _zuriuneak"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:21
 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:22
+msgid "External Editor"
+msgstr "Kanpoko editorea"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:23
 msgid "Use _default system editor"
 msgstr "Erabili sistema-editore _lehenetsia"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:24
 msgid "Edito_r command:"
-msgstr "Edito_re-komandoa:"
+msgstr "Edito_rearen komandoa:"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:25
 msgid "Editor"
 msgstr "Editorea"
 
-#: ../data/ui/preferences.ui.h:17
-msgid "Shallow comparison"
+#: ../data/ui/preferences.ui.h:26
+msgid "Shallow Comparison"
 msgstr "Azaleko konparazioa"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:27
 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:28
 msgid "_Timestamp resolution:"
 msgstr "_Data-zigiluaren bereizmena:"
 
-#: ../data/ui/preferences.ui.h:20
-msgid "Symbolic links"
+#: ../data/ui/preferences.ui.h:29
+msgid "Symbolic Links"
 msgstr "Esteka sinbolikoak"
 
-#: ../data/ui/preferences.ui.h:21
-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:31
+msgid "Visible Columns"
+msgstr "Zutabe ikusgaiak"
 
-#: ../data/ui/preferences.ui.h:23
-msgid "Folder comparisons"
+#: ../data/ui/preferences.ui.h:32
+msgid "Folder Comparisons"
 msgstr "Karpeten konparazioa"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:33
+msgid "Version Comparisons"
+msgstr "Bertsioen konparazioa"
+
+#: ../data/ui/preferences.ui.h:34
+msgid "_Order when comparing file revisions:"
+msgstr "_Ordenatu fitxategien gainbegiraketa konparatzean"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Order when _merging files:"
+msgstr "Ordenatu fitxategiak _batzean:"
+
+#: ../data/ui/preferences.ui.h:36
+msgid "Commit Messages"
+msgstr "Egikaritze-mezuak"
+
+#: ../data/ui/preferences.ui.h:37
+msgid "Show _right margin at:"
+msgstr "Erakutsi e_skuineko marjina hemen:"
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Automatically _break lines at right margin on commit"
+msgstr "_Hautsi lerroak automatikoki eskuineko marjinan egikaritzean"
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Version Control"
+msgstr "Bertsio-kontrola"
+
+#: ../data/ui/preferences.ui.h:40
 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 +920,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:41 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Fitxategi-iragazkiak"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:42
 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 +933,21 @@ 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:43
 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:44
 msgid "Text Filters"
 msgstr "Testu-iragazkiak"
 
-#: ../data/ui/preferences.ui.h:29
-msgid "Loading"
-msgstr "Kargatzea"
-
-#: ../data/ui/preferences.ui.h:30
-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
-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:583
 msgid "New comparison"
 msgstr "Beste konparazio bat"
 
@@ -439,7 +993,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,156 +1001,197 @@ msgstr "_Garbitu konparazioa"
 
 #: ../data/ui/tab-placeholder.ui.h:14
 msgid "C_ompare"
-msgstr "K_onparatu"
-
-#: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
-msgstr "Bertsio-kontrolaren egunkaria"
-
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
-msgstr "Balidatu fitxategiak"
+msgstr "_Konparatu"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "Aurreko egunkariak"
+msgid "Co_mmit..."
+msgstr "_Egikaritu..."
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Log Message"
-msgstr "Egunkariaren mezua"
+msgid "Commit changes to version control"
+msgstr "Egikaritu aldaketak bertsio-kontrolera"
 
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
-msgid "_Compare"
-msgstr "_Konparatu"
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "_Eguneratu"
 
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
-msgid "Compare selected"
-msgstr "Hautapena konparatzen du"
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr "Eguneratu laneko kopia bertsio-kontroletik"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy _Left"
-msgstr "Kopiatu e_zkerrean"
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr "_Bidali"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy to left"
-msgstr "Ezkerrean kopiatzen du"
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr "Bidali lokaleko aldaketak urrunekora"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy _Right"
-msgstr "Kopiatu e_skuinean"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Gehitu bertsio-kontrolari"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy to right"
-msgstr "Eskuinean kopiatzen du"
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "Kendu bertsio-kontroletik"
 
-#: ../meld/dirdiff.py:272
-msgid "Delete selected"
-msgstr "Ezabatu hautapena"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "_Markatu ebatzi gisa"
 
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1286
-msgid "Hide"
-msgstr "Ezkutatu"
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "Markatu ebatzita bezala bertsio-kontrolean"
 
-#: ../meld/dirdiff.py:273
-msgid "Hide selected"
-msgstr "Hautapena ezkutatzen du"
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "_Leheneratu"
 
-#: ../meld/dirdiff.py:277
-msgid "Ignore filename case"
-msgstr "Ez ikusi egin fitxategi-izeneko maiuskula/minuskulei"
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "Leheneratu laneko kopia jatorrizko egoerara"
 
-#: ../meld/dirdiff.py:277
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Berdintzat jotzen ditu fitxategi-izenak, berdinak badira maiuskulak/"
-"minuskulak izan ezik"
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Ezabatu laneko kopiatik"
 
-#: ../meld/dirdiff.py:278
-msgid "Same"
-msgstr "Berdinak"
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "Kontsola"
 
-#: ../meld/dirdiff.py:278
-msgid "Show identical"
-msgstr "Berdinak erakusten ditu"
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr "Erakutsi edo ezkutatu bertsio-kontrolaren kontsolaren irteerako panela"
 
-#: ../meld/dirdiff.py:279
-msgid "New"
-msgstr "Berriak"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr "_Berdindu"
 
-#: ../meld/dirdiff.py:279
-msgid "Show new"
-msgstr "Berriak erakusten ditu"
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr "Direktorioak berdintzen ditu"
 
-#: ../meld/dirdiff.py:280
-msgid "Modified"
-msgstr "Aldatuak"
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "_Aldatuta"
 
-#: ../meld/dirdiff.py:280 ../meld/vcview.py:176
-msgid "Show modified"
-msgstr "Aldatuak erakusten ditu"
+#: ../data/ui/vcview.ui.h:23
+msgid "Show modified files"
+msgstr "Erakutsi aldatutako fitxategiak"
 
-#: ../meld/dirdiff.py:282
-msgid "Filters"
-msgstr "Iragazkiak"
+#: ../data/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr "_Normala"
 
-#: ../meld/dirdiff.py:282
-msgid "Set active filters"
-msgstr "Iragazki aktiboak ezartzen ditu"
+#: ../data/ui/vcview.ui.h:25
+msgid "Show normal files"
+msgstr "Erakutsi fitxategi normalak"
+
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr "Bertsiorik _gabe"
+
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr "Bertsiorik ez duten fitxategiak bistaratzen ditu"
+
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
+msgid "Ignored"
+msgstr "Ez ikusi eginda"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "Erakutsi ez ikusi egin zaien fitxategiak"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "Egikaritu"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "Egikaritu fitxategiak"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "Egunkariaren mezua"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr "Aurreko egunkaria:"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "_Egikaritu"
+
+#: ../data/ui/vcview.ui.h:35
+msgid "Console output"
+msgstr "Kontsolaren irteera"
+
+#: ../data/ui/vcview.ui.h:36
+msgid "Push local commits to remote?"
+msgstr "Bidali egikaritze lokalak urrunekora?"
+
+#: ../data/ui/vcview.ui.h:37
+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:38
+msgid "_Push commits"
+msgstr "_Bidali egikariketak"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:359
+#: ../meld/dirdiff.py:381
 msgid "Size"
 msgstr "Tamaina"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:366
+#: ../meld/dirdiff.py:389
 msgid "Modification time"
-msgstr "Aldaketa-ordua"
+msgstr "Aldatze-ordua"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:397
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: ../meld/dirdiff.py:506
+#: ../meld/dirdiff.py:543
 #, 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:672 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s eskaneatzen"
 
-#: ../meld/dirdiff.py:750
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Eginda"
 
-#: ../meld/dirdiff.py:756
+#: ../meld/dirdiff.py:830
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
 
-#: ../meld/dirdiff.py:757
+#: ../meld/dirdiff.py:831
 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:833
 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:835
 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:837
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -605,276 +1200,230 @@ msgstr ""
 "maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta "
 "honetako fitxategi hauek ezkutatu dira:"
 
-#: ../meld/dirdiff.py:774
+#: ../meld/dirdiff.py:848
 #, 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:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
+#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
 msgid "Hi_de"
-msgstr "Ezk_utatu"
+msgstr "_Ezkutatu"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:904
 #, python-format
 msgid ""
 "'%s' exists.\n"
 "Overwrite?"
 msgstr ""
-"'%s' dagoeneko badago.\n"
+"'%s' badago lehendik ere.\n"
 "Gainidatzi?"
 
-#: ../meld/dirdiff.py:838
-#, python-format
-msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
-msgstr ""
-"Errorea gertatu da '%s' '%s'(e)ra kopiatzean\n"
-"\n"
-"%s."
+#: ../meld/dirdiff.py:912
+msgid "Error copying file"
+msgstr "Errorea fitxategia kopiatzean"
 
-#: ../meld/dirdiff.py:856 ../meld/vcview.py:650
+#: ../meld/dirdiff.py:913
 #, python-format
 msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
-msgstr ""
-"'%s' direktorio bat da.\n"
-"Kendu errekurtsiboki?"
-
-#: ../meld/dirdiff.py:863 ../meld/vcview.py:655
-#, python-format
-msgid ""
-"Error removing %s\n"
+"Couldn't copy %s\n"
+"to %s.\n"
 "\n"
-"%s."
+"%s"
 msgstr ""
-"Errorea gertatu da %s kentzean\n"
+"Ezin izan da '%s' kopiatu\n"
+"'%s' gisa.\n"
 "\n"
-"%s."
-
-#: ../meld/dirdiff.py:994
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i segundo"
-msgstr[1] "%i segundo"
-
-#: ../meld/dirdiff.py:995
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minutu"
-msgstr[1] "%i minutu"
-
-#: ../meld/dirdiff.py:996
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i ordu"
-msgstr[1] "%i ordu"
+"%s"
 
-#: ../meld/dirdiff.py:997
+#: ../meld/dirdiff.py:936
 #, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i egun"
-msgstr[1] "%i egun"
+msgid "Error deleting %s"
+msgstr "Errorea '%s' ezabatzean"
 
-#: ../meld/dirdiff.py:998
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i aste"
-msgstr[1] "%i aste"
+#: ../meld/filediff.py:243
+msgid "Format as Patch..."
+msgstr "Eman formatua adabaki gisa..."
 
-#: ../meld/dirdiff.py:999
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i hilabete"
-msgstr[1] "%i hilabete"
+#: ../meld/filediff.py:244
+msgid "Create a patch using differences between files"
+msgstr "Adabaki bat sortzen du fitxategien arteko diferentziekin"
 
-#: ../meld/dirdiff.py:1000
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i urte"
-msgstr[1] "%i urte"
+#: ../meld/filediff.py:246
+msgid "Save A_ll"
+msgstr "Gorde _denak"
 
-#: ../meld/filediff.py:220
-msgid "Format as patch..."
-msgstr "Adabaki gisa formateatu..."
+#: ../meld/filediff.py:247
+msgid "Save all files in the current comparison"
+msgstr "Gorde fitxategi guztiak uneko konparazioan"
 
-#: ../meld/filediff.py:220
-msgid "Create a patch using differences between files"
-msgstr "Adabaki bat sortzen du fitxategien arteko diferentziekin"
+#: ../meld/filediff.py:250
+msgid "Revert files to their saved versions"
+msgstr "Leheneratu fitxategiak haien gordetako bertsioetara"
 
-#: ../meld/filediff.py:221
-msgid "Add synchronization point"
-msgstr ""
+#: ../meld/filediff.py:252
+msgid "Add Synchronization Point"
+msgstr "Gehitu sinkronizazio-puntua"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:253
 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:256
+msgid "Clear Synchronization Points"
+msgstr "Garbitu sinkronizazio-puntuak"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:257
 msgid "Clear manual change sychronization points"
-msgstr ""
+msgstr "Garbitu eskuzko aldaketen sinkronizazio-puntuak"
 
-#: ../meld/filediff.py:228
-msgid "Previous conflict"
+#: ../meld/filediff.py:259
+msgid "Previous Conflict"
 msgstr "Aurreko gatazka"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:260
 msgid "Go to the previous conflict"
 msgstr "Aurreko gatazkara joaten da"
 
-#: ../meld/filediff.py:229
-msgid "Next conflict"
+#: ../meld/filediff.py:262
+msgid "Next Conflict"
 msgstr "Hurrengo gatazka"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:263
 msgid "Go to the next conflict"
 msgstr "Hurrengo gatazkara joaten da"
 
-#: ../meld/filediff.py:230
-msgid "Push to left"
+#: ../meld/filediff.py:265
+msgid "Push to Left"
 msgstr "Bidali ezkerrera"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:266
 msgid "Push current change to the left"
 msgstr "Uneko aldaketa ezkerrera bidaltzen du"
 
-#: ../meld/filediff.py:231
-msgid "Push to right"
+#: ../meld/filediff.py:269
+msgid "Push to Right"
 msgstr "Bidali eskuinera"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:270
 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:274
+msgid "Pull from Left"
 msgstr "Ekarri ezkerretik"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:275
 msgid "Pull change from the left"
 msgstr "Ezkerreko aldaketa ekartzen du"
 
-#: ../meld/filediff.py:234
-msgid "Pull from right"
+#: ../meld/filediff.py:278
+msgid "Pull from Right"
 msgstr "Ekarri eskuinetik"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:279
 msgid "Pull change from the right"
 msgstr "Eskuineko aldaketa ekartzen du"
 
-#: ../meld/filediff.py:235
-msgid "Copy above left"
+#: ../meld/filediff.py:281
+msgid "Copy Above Left"
 msgstr "Kopiatu ezkerrekoaren gainean"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:282
 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:284
+msgid "Copy Below Left"
 msgstr "Kopiatu ezkerrekoaren azpian"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:285
 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:287
+msgid "Copy Above Right"
 msgstr "Kopiatu eskuinekoaren gainean"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:288
 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:290
+msgid "Copy Below Right"
 msgstr "Kopiatu eskuinekoaren azpian"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:291
 msgid "Copy change below the right chunk"
 msgstr "Aldaketa eskuinekoaren azpian kopiatzen du"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:293
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:294
 msgid "Delete change"
 msgstr "Ezabatu aldaketa"
 
-#: ../meld/filediff.py:240
-msgid "Merge all changes from left"
-msgstr "Ezkerreko aldaketa guztiak konbinatu"
+#: ../meld/filediff.py:296
+msgid "Merge All from Left"
+msgstr "Batu guztiak ezkerretik"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:297
 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:299
+msgid "Merge All from Right"
+msgstr "Batu guztiak eskuinetik"
 
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:300
 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:302
+msgid "Merge All"
+msgstr "Batu guztiak"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:303
 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:307
+msgid "Cycle Through Documents"
+msgstr "Begiztatu dokumentuen artean"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:308
 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:314
+msgid "Lock Scrolling"
 msgstr "Blokeatu korritzea"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:315
 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:472
 msgid "INS"
-msgstr "TXERT"
+msgstr "TXER"
 
-#: ../meld/filediff.py:370
+#: ../meld/filediff.py:472
 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:474
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i. err., %i. zut."
 
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:821
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -884,42 +1433,72 @@ msgstr ""
 "izango da. Informazio gehiago behar izanez gero, ikusi erabiltzailearen "
 "eskuliburua."
 
-#: ../meld/filediff.py:1017
+#: ../meld/filediff.py:890
+msgid "Mark conflict as resolved?"
+msgstr "Markatu gatazka ebatzita bezala?"
+
+#: ../meld/filediff.py:892
+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:894
+msgid "Cancel"
+msgstr "Utzi"
+
+#: ../meld/filediff.py:895
+msgid "Mark _Resolved"
+msgstr "Markatu _ebatzita"
+
+#: ../meld/filediff.py:1111
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ezarri panel kopurua"
 
-#: ../meld/filediff.py:1023
+#: ../meld/filediff.py:1117
 #, 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:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
+#: ../meld/filediff.py:1169
 msgid "Could not read file"
 msgstr "Ezin izan da fitxategia irakurri"
 
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1141
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Fitxategiak irakurtzen"
 
-#: ../meld/filediff.py:1058
+#: ../meld/filediff.py:1151
 #, 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:1164
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ez dago kodeketetan: %s"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1202
 #, python-format
 msgid "[%s] Computing differences"
-msgstr "[%s] Diferentziak analizatzen"
+msgstr "[%s] Diferentziak kalkulatzen"
 
-#: ../meld/filediff.py:1277
+#: ../meld/filediff.py:1269
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "'%s' fitxategia diskoan aldatu da"
+
+#: ../meld/filediff.py:1270
+msgid "Do you want to reload the file?"
+msgstr "Fitxategia berriro kargatzea nahi duzu?"
+
+#: ../meld/filediff.py:1273
+msgid "_Reload"
+msgstr "_Birkargatu"
+
+#: ../meld/filediff.py:1439
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -928,40 +1507,85 @@ msgstr ""
 "horiek fitxategien arteko diferentziak ezkutatzea. Iragazi gabeko "
 "fitxategiak konparatu nahi dituzu?"
 
-#: ../meld/filediff.py:1283
+#: ../meld/filediff.py:1445
 msgid "Files are identical"
-msgstr "Fitxategiak berdin-berdinak dira"
+msgstr "Fitxategiak berdinak dira"
 
-#: ../meld/filediff.py:1293
+#: ../meld/filediff.py:1453
 msgid "Show without filters"
 msgstr "Erakutsi iragazkirik gabe"
 
-#: ../meld/filediff.py:1424
+#: ../meld/filediff.py:1475
+msgid "Change highlighting incomplete"
+msgstr "Aldaketen nabarmentzea osatu gabe"
+
+#: ../meld/filediff.py:1476
+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:1484
+msgid "Keep highlighting"
+msgstr "Mantendu nabarmentzea"
+
+#: ../meld/filediff.py:1486
+msgid "_Keep highlighting"
+msgstr "_Mantendu nabarmentzea"
+
+#: ../meld/filediff.py:1617
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
 "Overwrite?"
 msgstr ""
-"\"%s\" badago!\n"
+"'%s' badago!\n"
 "Gainidatzi?"
 
-#: ../meld/filediff.py:1437
+#: ../meld/filediff.py:1630
 #, 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
+#: ../meld/filediff.py:1641
+msgid "Save Left Pane As"
+msgstr "Gorde ezkerreko panela honela"
+
+#: ../meld/filediff.py:1643
+msgid "Save Middle Pane As"
+msgstr "Gorde erdiko panela honela"
+
+#: ../meld/filediff.py:1645
+msgid "Save Right Pane As"
+msgstr "Gorde eskuineko panela honela"
+
+#: ../meld/filediff.py:1658
 #, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Aukeratu izen bat %i. bufferrerako."
+msgid "File %s has changed on disk since it was opened"
+msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)"
+
+#: ../meld/filediff.py:1660
+msgid "If you save it, any external changes will be lost."
+msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da."
+
+#: ../meld/filediff.py:1663
+msgid "Save Anyway"
+msgstr "Gorde dena den"
 
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1664
+msgid "Don't Save"
+msgstr "Ez gorde"
+
+#: ../meld/filediff.py:1688
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -972,695 +1596,812 @@ msgstr ""
 "\n"
 "Zer formatu erabili nahi duzu?"
 
-#: ../meld/filediff.py:1482
+#: ../meld/filediff.py:1704
 #, 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:1548
-msgid "Save changes to documents before reloading?"
-msgstr "Gorde dokumentuetako aldaketak berriro kargatu aurretik?"
+#: ../meld/filediff.py:2065
+msgid "Live comparison updating disabled"
+msgstr "Konparazioaren zuzeneko eguneraketa desgaituta"
 
-#: ../meld/filemerge.py:53
+#: ../meld/filediff.py:2066
+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:48
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fitxategiak konbinatzen"
 
-#: ../meld/meldapp.py:95
+#: ../meld/gutterrendererchunk.py:90
+msgid "Copy _up"
+msgstr "Kopiatu _goian"
+
+#: ../meld/gutterrendererchunk.py:91
+msgid "Copy _down"
+msgstr "Kopiatu _behean"
+
+#: ../meld/meldapp.py:160
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff: emandako argumentu kopurua okerra da"
 
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:165
 msgid "Start with an empty window"
 msgstr "Hasi leiho huts batekin"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
+#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
 msgid "file"
 msgstr "fitxategia"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
-msgid "dir"
-msgstr "direktorioa"
+#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+msgid "folder"
+msgstr "karpeta"
 
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:167
 msgid "Start a version control comparison"
 msgstr "Hasi bertsio-kontrolaren konparazioa"
 
-#: ../meld/meldapp.py:103
+#: ../meld/meldapp.py:169
 msgid "Start a 2- or 3-way file comparison"
-msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazio bat"
-
-#: ../meld/meldapp.py:105
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "Hasi bi edo hiru direktorioko konparazio bat"
+msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazioa"
 
-#: ../meld/meldapp.py:107
-msgid "Start a comparison between file and dir/file"
-msgstr "Hasi fitxategi eta direktorio/fitxategi baten arteko konparazioa"
+#: ../meld/meldapp.py:171
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Hasi bi edo hiru sarrerako karpeten konparazioa"
 
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:209
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld fitxategiak eta direktorioak konparatzeko tresna bat da."
 
-#: ../meld/meldapp.py:117
+#: ../meld/meldapp.py:213
 msgid "Set label to use instead of file name"
 msgstr "Ezarri etiketa bat fitxategi-izenaren ordez erabiltzeko"
 
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:216
 msgid "Open a new tab in an already running instance"
 msgstr "Ireki beste fitxa bat dagoeneko martxan dagoen instantzia batean"
 
-#: ../meld/meldapp.py:122
+#: ../meld/meldapp.py:219
 msgid "Automatically compare all differing files on startup"
 msgstr "Automatikoki konparatu fitxategi desberdin guztiak abioan"
 
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:222
 msgid "Ignored for compatibility"
 msgstr "Ez ikusi egin zaio, bateragarritasuna dela eta"
 
-#: ../meld/meldapp.py:127
+#: ../meld/meldapp.py:226
 msgid "Set the target file for saving a merge result"
 msgstr "Ezarri helburuko fitxategia emaitza konbinatua gordetzeko"
 
-#: ../meld/meldapp.py:129
+#: ../meld/meldapp.py:229
 msgid "Automatically merge files"
 msgstr "Automatikoki konbinatu fitxategiak"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:233
 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
+#: ../meld/meldapp.py:237
 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
+#: ../meld/meldapp.py:249
 #, 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
+#: ../meld/meldapp.py:252
 msgid "can't auto-merge less than 3 files"
 msgstr "ezin dira automatikoki konbinatu 3 fitxategi baino gutxiago"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:254
 msgid "can't auto-merge directories"
 msgstr "ezin dira automatikoki konbinatu direktorioak"
 
-#: ../meld/meldapp.py:149
-msgid "D-Bus error; comparisons will open in a new window."
-msgstr "D-Bus errorea; konparazioak beste leiho batean irekiko dira."
-
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:264
 msgid "Error reading saved comparison file"
 msgstr "Errorea gertatu da gordetako konparazio-fitxategia irakurtzean"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:89
+#: ../meld/meldbuffer.py:131
 msgid "<unnamed>"
 msgstr "<izenik gabea>"
 
-#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
+#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
 msgid "untitled"
 msgstr "izengabea"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:48
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../meld/meldwindow.py:63
-msgid "_New comparison"
-msgstr "_Konparazio berria"
+#: ../meld/meldwindow.py:49
+msgid "_New Comparison..."
+msgstr "Konparazio _berria..."
 
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:50
 msgid "Start a new comparison"
 msgstr "Konparazio berri bat hasten du"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:53
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:55
+msgid "Save As..."
+msgstr "Gorde honela..."
+
+#: ../meld/meldwindow.py:56
+msgid "Save the current file with a different name"
+msgstr "Gorde uneko fitxategia beste izen batekin"
+
+#: ../meld/meldwindow.py:59
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
-#: ../meld/meldwindow.py:67
-msgid "Quit the program"
-msgstr "Irten programatik"
-
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:62
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:64
 msgid "Undo the last action"
 msgstr "Desegin azken ekintza"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:67
 msgid "Redo the last undone action"
 msgstr "Berregin desegindako azken ekintza"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:69
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:71
 msgid "Copy the selection"
 msgstr "Kopiatu hautapena"
 
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:73
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbelean"
 
 #: ../meld/meldwindow.py:75
+msgid "Find..."
+msgstr "Bilatu..."
+
+#: ../meld/meldwindow.py:75
 msgid "Search for text"
-msgstr "Testua bilatu"
+msgstr "Bilatu testua"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:77
 msgid "Find Ne_xt"
 msgstr "Bilatu _hurrengoa"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:78
 msgid "Search forwards for the same text"
 msgstr "Testu bera bilatzen du berriro, aurrerantz"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:80
 msgid "Find _Previous"
 msgstr "Bilatu _aurrekoa"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:81
 msgid "Search backwards for the same text"
 msgstr "Testu bera bilatzen du berriro, atzerantz"
 
-#: ../meld/meldwindow.py:78
-msgid "Find and replace text"
-msgstr "Testua bilatu eta ordeztu"
-
-#: ../meld/meldwindow.py:79
-msgid "Prefere_nces"
-msgstr "Hobes_penak"
+#: ../meld/meldwindow.py:84
+msgid "_Replace..."
+msgstr "_Ordeztu..."
 
-#: ../meld/meldwindow.py:79
-msgid "Configure the application"
-msgstr "Aplikazioa konfiguratzen du"
+#: ../meld/meldwindow.py:85
+msgid "Find and replace text"
+msgstr "Bilatu eta ordeztu testua"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:88
 msgid "_Changes"
 msgstr "_Aldaketak"
 
-#: ../meld/meldwindow.py:82
-msgid "Next change"
+#: ../meld/meldwindow.py:89
+msgid "Next Change"
 msgstr "Hurrengo aldaketa"
 
-#: ../meld/meldwindow.py:82
+#: ../meld/meldwindow.py:90
 msgid "Go to the next change"
 msgstr "Hurrengo aldaketara joaten da"
 
-#: ../meld/meldwindow.py:83
-msgid "Previous change"
+#: ../meld/meldwindow.py:92
+msgid "Previous Change"
 msgstr "Aurreko aldaketa"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:93
 msgid "Go to the previous change"
 msgstr "Aurreko aldaketara joaten da"
 
-#: ../meld/meldwindow.py:84
-msgid "Open externally"
+#: ../meld/meldwindow.py:95
+msgid "Open Externally"
 msgstr "Ireki kanpotik"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:96
 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:100
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../meld/meldwindow.py:87
-msgid "File status"
+#: ../meld/meldwindow.py:101
+msgid "File Status"
 msgstr "Fitxategiaren egoera"
 
-#: ../meld/meldwindow.py:88
-msgid "Version status"
+#: ../meld/meldwindow.py:102
+msgid "Version Status"
 msgstr "Bertsioaren egoera"
 
-#: ../meld/meldwindow.py:89
-msgid "File filters"
-msgstr "Fitxategi-iragazkiak"
-
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:105
 msgid "Stop the current action"
 msgstr "Gelditu uneko ekintza"
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:108
 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:111
 msgid "_Tabs"
 msgstr "_Fitxak"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:112
 msgid "_Previous Tab"
 msgstr "_Aurreko fitxa"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:113
 msgid "Activate previous tab"
 msgstr "Aurreko fitxa aktibatzen du"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:115
 msgid "_Next Tab"
 msgstr "_Hurrengo fitxa"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:116
 msgid "Activate next tab"
 msgstr "Hurrengo fitxa aktibatzen du"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:119
 msgid "Move Tab _Left"
 msgstr "Eraman fitxa e_zkerrera"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:120
 msgid "Move current tab to left"
 msgstr "Uneko fitxa ezkerrera eramaten du"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:123
 msgid "Move Tab _Right"
 msgstr "Eraman fitxa e_skuinera"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:124
 msgid "Move current tab to right"
 msgstr "Uneko fitxa eskuinera eramaten du"
 
-#: ../meld/meldwindow.py:100
-msgid "_Help"
-msgstr "_Laguntza"
-
-#: ../meld/meldwindow.py:101
-msgid "_Contents"
-msgstr "_Edukia"
-
-#: ../meld/meldwindow.py:101
-msgid "Open the Meld manual"
-msgstr "Meld-en eskuliburua irekitzen du"
-
-#: ../meld/meldwindow.py:102
-msgid "Report _Bug"
-msgstr "Akatsaren _berri eman"
-
-#: ../meld/meldwindow.py:102
-msgid "Report a bug in Meld"
-msgstr "Meld-eko akats baten txostena bidaltzen du"
-
-#: ../meld/meldwindow.py:103
-msgid "About this program"
-msgstr "Programa honi buruz"
-
-#: ../meld/meldwindow.py:106
-msgid "Full Screen"
+#: ../meld/meldwindow.py:128
+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:129
+msgid "View the comparison in fullscreen"
+msgstr "Ikusi konparazioa pantaila osoan"
 
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:131
 msgid "_Toolbar"
 msgstr "_Tresna-barra"
 
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:132
 msgid "Show or hide the toolbar"
-msgstr "Tresna-barra bistaratzen/ezkutatzen du"
-
-#: ../meld/meldwindow.py:108
-msgid "_Statusbar"
-msgstr "_Egoera-barra"
+msgstr "Erakutsi edo ezkutatu tresna-barra"
 
-#: ../meld/meldwindow.py:108
-msgid "Show or hide the statusbar"
-msgstr "Egoera-barra bistaratzen/ezkutatzen du"
-
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:141
 msgid "Open Recent"
 msgstr "Ireki azkenak"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:142
 msgid "Open recent files"
 msgstr "Azken erabilitako fitxategiak irekitzen ditu"
 
-#: ../meld/meldwindow.py:533
+#: ../meld/meldwindow.py:506
 msgid "Switch to this tab"
 msgstr "Joan fitxa honetara"
 
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian.\n"
+#: ../meld/meldwindow.py:629
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:213
 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:33
 msgid "label"
 msgstr "etiketa"
 
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:33
 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"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:306
-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
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-msgstr ""
-"Sistema eragilearen metadatu espezifikoak\t0\t.DS_Store ._* .Spotlight-V100 ."
-"Trashes Thumbs.db Desktop.ini\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:310
-#, 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
-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
-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
-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
-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
-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
-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
-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
-msgid "Script comment\t0\t#.*"
-msgstr "Script iruzkina\t0\t#.*"
-
-#: ../meld/vcview.py:165
-msgid "Co_mmit"
-msgstr "Ba_lidatu"
+#: ../meld/recent.py:105
+msgid "Version control:"
+msgstr "Bertsio-kontrola:"
 
-#: ../meld/vcview.py:165
-msgid "Commit"
-msgstr "Balidatu egiten du"
+#: ../meld/ui/findbar.py:141
+msgid "Regular expression error"
+msgstr "Adierazpen erregularraren errorea"
 
-#: ../meld/vcview.py:166
-msgid "_Update"
-msgstr "_Eguneratu"
+#: ../meld/ui/notebooklabel.py:65
+msgid "Close tab"
+msgstr "Itxi fitxa"
 
-#: ../meld/vcview.py:166
-msgid "Update"
-msgstr "Eguneratu egiten du"
+#: ../meld/ui/vcdialogs.py:61
+msgid "No files will be committed"
+msgstr "Ez da fitxategirik egikarituko"
 
-#: ../meld/vcview.py:167
-msgid "Add to VC"
-msgstr "Gehitu bertsio-kontrolari"
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:126
+#, python-format
+msgid "%s in %s"
+msgstr "%s (%s)"
 
-#: ../meld/vcview.py:168
-msgid "Remove from VC"
-msgstr "Kendu bertsio-kontroletik"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "Bidali gabeko egikaritze %d"
+msgstr[1] "Bidali gabeko %d egikaritze"
 
-#: ../meld/vcview.py:169
-msgid "_Resolved"
-msgstr "_Ebatzita"
+#: ../meld/vc/git.py:129
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "adar %d"
+msgstr[1] "%d adar"
 
-#: ../meld/vcview.py:169
-msgid "Mark as resolved for VC"
-msgstr "Bertsio-kontrolerako ebatzia dagoela markatzen du"
+#: ../meld/vc/git.py:348
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "'%s' modua hona aldatuta: %s"
 
-#: ../meld/vcview.py:170
-msgid "Revert to original"
-msgstr "Leheneratu jatorrizkora"
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr "Batuta"
 
-#: ../meld/vcview.py:171
-msgid "Delete locally"
-msgstr "Ezabatu lokalean"
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr "Oinarria"
 
-#: ../meld/vcview.py:175
-msgid "_Flatten"
-msgstr "_Berdindu"
+#: ../meld/vc/_vc.py:47
+msgid "Local"
+msgstr "Lokala"
 
-#: ../meld/vcview.py:175
-msgid "Flatten directories"
-msgstr "Direktorioak berdintzen ditu"
+#: ../meld/vc/_vc.py:47
+msgid "Remote"
+msgstr "Urrunekoa"
 
-#: ../meld/vcview.py:176
-msgid "_Modified"
-msgstr "_Aldatuta"
+#: ../meld/vc/_vc.py:65
+msgid "Unversioned"
+msgstr "Bertsiorik gabekoa"
 
-#: ../meld/vcview.py:177
-msgid "_Normal"
-msgstr "_Normala"
+#: ../meld/vc/_vc.py:68
+msgid "Error"
+msgstr "Errorea"
 
-#: ../meld/vcview.py:177
-msgid "Show normal"
-msgstr "Bistaratze normala"
+#: ../meld/vc/_vc.py:70
+msgid "Newly added"
+msgstr "Berriki gehituta"
 
-#: ../meld/vcview.py:178
-msgid "Non _VC"
-msgstr "Bertsio-_kontrolik gabeak"
+#: ../meld/vc/_vc.py:72
+msgid "Conflict"
+msgstr "Gatazka"
 
-#: ../meld/vcview.py:178
-msgid "Show unversioned files"
-msgstr "Bertsiorik ez duten fitxategiak bistaratzen ditu"
+#: ../meld/vc/_vc.py:73
+msgid "Removed"
+msgstr "Kenduta"
 
-#: ../meld/vcview.py:179
-msgid "Ignored"
-msgstr "Ez ikusi eginda"
+#: ../meld/vc/_vc.py:74
+msgid "Missing"
+msgstr "Falta da"
 
-#: ../meld/vcview.py:179
-msgid "Show ignored files"
-msgstr "Ez ikusi egin zaien fitxategiak bistaratzen ditu"
+#: ../meld/vc/_vc.py:75
+msgid "Not present"
+msgstr "Ez dago"
 
-#: ../meld/vcview.py:230 ../meld/vcview.py:378
+#: ../meld/vcview.py:233 ../meld/vcview.py:413
 msgid "Location"
 msgstr "Kokapena"
 
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:234
 msgid "Status"
 msgstr "Egoera"
 
-#: ../meld/vcview.py:232
-msgid "Rev"
+#: ../meld/vcview.py:235
+msgid "Revision"
 msgstr "Berrikuspena"
 
-#: ../meld/vcview.py:233
-msgid "Tag"
-msgstr "Etiketa"
-
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:236
 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:324
 #, 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:328
+msgid "Invalid repository"
+msgstr "Baliogabeko biltegia"
 
-#: ../meld/vcview.py:331
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
+msgid "None"
+msgstr "Bat ere ez"
+
+#: ../meld/vcview.py:358
+msgid "No valid version control system found in this folder"
+msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan"
+
+#: ../meld/vcview.py:360
+msgid "Only one version control system found in this folder"
+msgstr "Bertsio-kontrol bakar bat aurkituta karpeta honetan"
+
+#: ../meld/vcview.py:362
+msgid "Choose which version control system to use"
+msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den"
+
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:378
+#: ../meld/vcview.py:413
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:421
+#: ../meld/vcview.py:427 ../meld/vcview.py:435
+#, python-format
+msgid "Scanning %s"
+msgstr "%s eskaneatzen"
+
+#: ../meld/vcview.py:470
 msgid "(Empty)"
 msgstr "(hutsik)"
 
-#: ../meld/vcview.py:453
+#: ../meld/vcview.py:510
 #, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Diferentziak bilatzen"
+msgid "%s — local"
+msgstr "%s — lokala"
 
-#: ../meld/vcview.py:466
+#: ../meld/vcview.py:511
 #, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Adabakia aplikatzen"
+msgid "%s — remote"
+msgstr "%s — urrunekoa"
 
-#: ../meld/vcview.py:669
-msgid "Patch tool not found"
-msgstr "Ez da aurkitu adabaki-tresna"
-
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:519
 #, 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."
+msgid "%s (local, merge, remote)"
+msgstr "%s (lokala, batu, urrunekoa)"
 
-#: ../meld/vcview.py:710
-msgid "Error fetching original comparison file"
-msgstr "Errorea gertatu da jatorrizko konparazio-fitxategia eskuratzean"
+#: ../meld/vcview.py:524
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (urrunekoa, batu, lokala)"
 
-#: ../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."
-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:535
+#, python-format
+msgid "%s — repository"
+msgstr "%s — biltegia"
 
-#: ../meld/vcview.py:719
-msgid "Report a bug"
-msgstr "Akats baten berri eman"
+#: ../meld/vcview.py:541
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (lanekoa, biltegia)"
 
-#: ../meld/ui/findbar.py:150
+#: ../meld/vcview.py:545
 #, python-format
+msgid "%s (repository, working)"
+msgstr "%s (biltegia, lanekoa)"
+
+#: ../meld/vcview.py:729
+msgid "Remove folder and all its files?"
+msgstr "Kendu karpeta eta bere fitxategi guztiak?"
+
+#: ../meld/vcview.py:731
 msgid ""
-"Regular expression error\n"
-"'%s'"
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
 msgstr ""
-"Adierazpen erregularraren errorea\n"
-"'%s'"
+"Honek hautatutako fitxategi eta karpeta guztiak, baita "
+"hautatutako karpeten barruan dauden fitxategi guztiak ere, "
+"bertsio-kontroletik kenduko ditu."
 
-#: ../meld/ui/historyentry.py:296
-msgid "_Browse..."
-msgstr "_Arakatu..."
+#: ../meld/vcview.py:765
+#, python-format
+msgid "Error removing %s"
+msgstr "Errorea %s kentzean"
+
+#~ msgid ""
+#~ "Meld is free software: you can redistribute it and/or modify it under the "
+#~ "terms of the GNU General Public License as published by the Free Software "
+#~ "Foundation, either version 2 of the License, or (at your option) any "
+#~ "later version.\n"
+#~ "\n"
+#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details. \n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Meld software librea da; banatu eta/edo alda dezakezu, GNUren Lizentzia "
+#~ "Publiko Orokorraren arauak betez (Free Software foundation-ek "
+#~ "argitaratutako lizentziaren 2. bertsioa edo berriagoa).\n"
+#~ "\n"
+#~ "Meld erabilgarria izango delakoan banatzen dugu, baina INOLAKO BERMERIK "
+#~ "GABE; MERKATURATZEKO edo ERABILERA JAKIN BATERAKO egokitasunaren bermerik "
+#~ "ere gabe banatzen da.  Informazio gehiago behar izanez gero, ikusi GNUren "
+#~ "Lizentzia Publiko Orokorra. \n"
+#~ "\n"
+#~ "GNUren Lizentzia Publiko orokorraren kopia bat jaso beharko zenuke "
+#~ "programa honekin batera.  Bestela, ikusi <http://www.gnu.org/licenses/>."
+
+#~ msgid "Create Patch"
+#~ msgstr "Sortu adabakia"
+
+#~ msgid "Create a patch"
+#~ msgstr "Sortu adabaki bat"
+
+#~ msgid "Loading"
+#~ msgstr "Kargatzea"
+
+#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#~ msgstr ""
+#~ "Kargatzean, egin proba kodek hauekin, ordena horretan. (e.g. utf8, "
+#~ "iso8859)"
+
+#~ msgid "Encoding"
+#~ msgstr "Kodeketa"
+
+#~ msgid "VC Log"
+#~ msgstr "Bertsio-kontrolaren egunkaria"
+
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "'%s' direktorio bat da.\n"
+#~ "Kendu errekurtsiboki?"
+
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i segundo"
+#~ msgstr[1] "%i segundo"
+
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i minutu"
+#~ msgstr[1] "%i minutu"
+
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i ordu"
+#~ msgstr[1] "%i ordu"
+
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i egun"
+#~ msgstr[1] "%i egun"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i aste"
+#~ msgstr[1] "%i aste"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i hilabete"
+#~ msgstr[1] "%i hilabete"
 
-#: ../meld/ui/historyentry.py:304
-msgid "Path"
-msgstr "Bide-izena"
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i urte"
+#~ msgstr[1] "%i urte"
 
-#: ../meld/ui/historyentry.py:305
-msgid "Path to file"
-msgstr "Fitxategiaren bide-izena"
+#~ msgid "Merge all non-conflicting"
+#~ msgstr "Gatazkatsuak ez direnak konbinatu"
 
-#: ../meld/ui/historyentry.py:306
-msgid "Pop up a file selector to choose a file"
-msgstr "Fitxategi-hautatzaile bat zabaldu, fitxategi bat aukeratzeko"
+#~ msgid "Choose a name for buffer %i."
+#~ msgstr "Aukeratu izen bat %i. bufferrerako."
 
-#: ../meld/ui/historyentry.py:444
-msgid "Select directory"
-msgstr "Direktorioa hautatu"
+#~ msgid "Save changes to documents before reloading?"
+#~ msgstr "Gorde dokumentuetako aldaketak berriro kargatu aurretik?"
 
-#: ../meld/ui/historyentry.py:448
-msgid "Select file"
-msgstr "Fitxategia hautatu"
+#~ msgid "dir"
+#~ msgstr "direktorioa"
 
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Itxi fitxa"
+#~ msgid "Start a 2- or 3-way directory comparison"
+#~ msgstr "Hasi bi edo hiru direktorioko konparazio bat"
 
-#: ../meld/vc/_vc.py:45
-msgid "Merged"
-msgstr ""
+#~ msgid "Start a comparison between file and dir/file"
+#~ msgstr "Hasi fitxategi eta direktorio/fitxategi baten arteko konparazioa"
 
-#: ../meld/vc/_vc.py:45
-msgid "Base"
-msgstr ""
+#~ msgid "D-Bus error; comparisons will open in a new window."
+#~ msgstr "D-Bus errorea; konparazioak beste leiho batean irekiko dira."
 
-#: ../meld/vc/_vc.py:45
-#, fuzzy
-msgid "Local"
-msgstr "Kokapena"
+#~ msgid "Quit the program"
+#~ msgstr "Irten programatik"
 
-#: ../meld/vc/_vc.py:45
-#, fuzzy
-msgid "Remote"
-msgstr "_Kendu"
+#~ msgid "Configure the application"
+#~ msgstr "Aplikazioa konfiguratzen du"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:51
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
-"Not present"
-msgstr ""
-"Ez ikusi egina:Bertsiorik gabea:::Errorea::Gehitu berria:Aldatua:Gatazka:"
-"Kendua:Falta da:Ez dago"
+#~ msgid "Reload the comparison"
+#~ msgstr "Konparazioa birkargatzen du"
 
-#: ../meld/vc/cvs.py:181
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"Errorea gertatu da adierazpen erregular bihurtzean\n"
-"Eredua: '%s'\n"
-"Errorea: '%s'"
+#~ msgid "_Contents"
+#~ msgstr "_Edukia"
 
-#: ../meld/vc/git.py:218
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr "Modua aldatu da %s modutik %s modura"
+#~ msgid "Open the Meld manual"
+#~ msgstr "Meld-en eskuliburua irekitzen du"
+
+#~ msgid "Report _Bug"
+#~ msgstr "Akatsaren _berri eman"
+
+#~ msgid "Report a bug in Meld"
+#~ msgstr "Meld-eko akats baten txostena bidaltzen du"
+
+#~ msgid "About this program"
+#~ msgstr "Programa honi buruz"
+
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Egoera-barra bistaratzen/ezkutatzen du"
+
+#~ msgid "Only available if you have gnome-python-desktop installed"
+#~ msgstr "Erabilgarri dago soilik gnome-python-mahaigaina instalatua badago"
+
+#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgstr "Babeskopiak\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#~ msgid ""
+#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+#~ "Desktop.ini\n"
+#~ msgstr ""
+#~ "Sistema eragilearen metadatu espezifikoak\t0\t.DS_Store ._* .Spotlight-"
+#~ "V100 .Trashes Thumbs.db Desktop.ini\n"
+
+#~ 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"
+
+#~ 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}"
+
+#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgstr "CVS gako-hitzak\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#~ msgid "C++ comment\t0\t//.*\n"
+#~ msgstr "C++ iruzkina\t0\t//.*\n"
+
+#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
+#~ msgstr "C iruzkina\t0\t/\\*.*?\\*/\n"
+
+#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Zuriune guztiak\t0\t[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Hasierako zuriunea\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Script comment\t0\t#.*"
+#~ msgstr "Script iruzkina\t0\t#.*"
+
+#~ 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"
+
+#~ msgid "_Browse..."
+#~ msgstr "_Arakatu..."
+
+#~ msgid "Path"
+#~ msgstr "Bide-izena"
+
+#~ msgid "Path to file"
+#~ msgstr "Fitxategiaren bide-izena"
+
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Fitxategi-hautatzaile bat zabaldu, fitxategi bat aukeratzeko"
+
+#~ msgid "Select directory"
+#~ msgstr "Direktorioa hautatu"
+
+#~ msgid "Select file"
+#~ msgstr "Fitxategia hautatu"
+
+#~ msgid ""
+#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:"
+#~ "Missing:Not present"
+#~ msgstr ""
+#~ "Ez ikusi egina:Bertsiorik gabea:::Errorea::Gehitu berria:Aldatua:Gatazka:"
+#~ "Kendua:Falta da:Ez dago"
+
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Errorea gertatu da adierazpen erregular bihurtzean\n"
+#~ "Eredua: '%s'\n"
+#~ "Errorea: '%s'"