Fri, 30 Apr 2010 16:23:24 +0000
Added code to preview a Mercurial bundle file.
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py | file | annotate | diff | comparison | revisions | |
i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_es.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_fr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_it.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_ru.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_tr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Apr 30 13:48:03 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Apr 30 16:23:24 2010 +0000 @@ -131,8 +131,8 @@ args.append('--style') args.append(os.path.join(os.path.dirname(__file__), "styles", "logDialog.style")) if self.mode == "incoming": - if self.bundle: - args.append(self.bundle) + if self.bundle: + args.append(self.bundle) else: project = e5App().getObject("Project") self.vcs.bundleFile = os.path.join( @@ -168,13 +168,17 @@ process = QProcess() args = [] args.append("parents") - if self.mode == "incoming": + if self.mode == "incoming": if self.bundle: args.append("--repository") - args.append(self.bundle) + args.append(self.bundle) elif self.vcs.bundleFile: args.append("--repository") args.append(self.vcs.bundleFile) + args.append("--template") + args.append("{rev}:{node|short}\n") + args.append("-r") + args.append(rev) if not self.projectMode: args.append(self.filename)
--- a/i18n/eric5_cs.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_cs.ts Fri Apr 30 16:23:24 2010 +0000 @@ -14299,22 +14299,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14329,20 +14319,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14815,37 +14820,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14883,17 +14888,17 @@ <translation type="unfinished">Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">Zpráva</translation> </message> @@ -15033,42 +15038,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">Přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished">Smazáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15166,100 +15171,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -16267,7 +16272,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16302,22 +16307,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16327,7 +16332,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -16347,80 +16352,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Přeskočit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_de.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_de.ts Fri Apr 30 16:23:24 2010 +0000 @@ -13356,22 +13356,12 @@ <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation>Mercurial Bundle Dateien (*.bundle)</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation><p>Die Mercurial Bundle Datei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation>Mercurial Bundle Dateien (*.bundle);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -13386,20 +13376,35 @@ <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation>Mercurial Bundle Dateien (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation>Mercurial Bundle Dateien (*.hg);;Alle Dateien (*)</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13878,37 +13883,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> @@ -13946,17 +13951,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -14071,42 +14076,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -14204,108 +14209,108 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Verarbeite ihre Anfrage, bitte warten...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation>Kein Log für '{0}' verfügbar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> <source>Branches: {0}<br /> </source> <translation>Zweige: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> <source>Tags: {0}<br /> </source> <translation>Marken: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>Parents: {0}<br /> </source> <translation>Vorgänger: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation>Hinzugefügt: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation>Modifiziert: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation>Gelöscht: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Hinzugefügt: {0} (kopiert von {1})</translation> @@ -15315,7 +15320,7 @@ <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -15350,22 +15355,22 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -15375,7 +15380,7 @@ <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit 'Änderungsgruppe erzeugen' erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> @@ -15395,80 +15400,100 @@ <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation>Als "schlecht" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation>Als "gut" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation>Änderungsgruppe ansehen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_es.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_es.ts Fri Apr 30 16:23:24 2010 +0000 @@ -13356,22 +13356,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -13386,20 +13376,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -13878,37 +13883,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> @@ -13946,17 +13951,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -14086,27 +14091,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -14121,17 +14126,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -14229,108 +14234,108 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Procesando la solicitud, por favor aguarde...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -15355,7 +15360,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15375,22 +15380,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -15400,7 +15405,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -15420,80 +15425,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Saltar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_fr.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_fr.ts Fri Apr 30 16:23:24 2010 +0000 @@ -14673,22 +14673,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14703,20 +14693,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15191,37 +15196,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">Aucune différence.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">Enregistrer Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -15259,17 +15264,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -15409,42 +15414,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15542,100 +15547,100 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -16649,7 +16654,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16684,22 +16689,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16709,7 +16714,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -16729,80 +16734,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_it.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_it.ts Fri Apr 30 16:23:24 2010 +0000 @@ -14338,22 +14338,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14368,20 +14358,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14856,37 +14861,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14924,17 +14929,17 @@ <translation type="unfinished">Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">Autore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">Messaggio</translation> </message> @@ -15074,42 +15079,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">Aggiunto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished">Cancellato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15207,100 +15212,100 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>Esecuzione in corso, attendere prego...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -16315,7 +16320,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16350,22 +16355,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16375,7 +16380,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -16395,80 +16400,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Salta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished">Resetta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_ru.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_ru.ts Fri Apr 30 16:23:24 2010 +0000 @@ -13920,22 +13920,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -13950,20 +13940,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14438,37 +14443,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">Различий нет.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">Сохранить изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Файлы изменений (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -14506,17 +14511,17 @@ <translation type="unfinished">Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">Сообщение</translation> </message> @@ -14646,27 +14651,27 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">Добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished">Удалено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -14681,17 +14686,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -14789,100 +14794,100 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -15903,7 +15908,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -15938,22 +15943,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -15963,7 +15968,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -15983,80 +15988,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Пропустить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_tr.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_tr.ts Fri Apr 30 16:23:24 2010 +0000 @@ -14605,22 +14605,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14635,20 +14625,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15122,37 +15127,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -15190,17 +15195,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">Yazar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">Mesaj</translation> </message> @@ -15315,42 +15320,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">Eklendi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished">Silindi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15448,100 +15453,100 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>İsteğiniz yerine getiriliyor, lütfen bekleyiniz...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -16544,7 +16549,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16579,22 +16584,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16604,7 +16609,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -16624,80 +16629,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">Atla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished">Başadön</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Apr 30 13:48:03 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Apr 30 16:23:24 2010 +0000 @@ -14645,22 +14645,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.bundle)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> - <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14675,20 +14665,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15163,37 +15168,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="155"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="173"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="260"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="264"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="281"/> <source><p>The patch file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="298"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -15231,17 +15236,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -15381,42 +15386,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="326"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15514,100 +15519,100 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="53"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>正在处理您的请求,请稍候……</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="222"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="244"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="252"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="255"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="261"/> - <source><i>Author: {0}</i><br /> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="263"/> + <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="265"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="286"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="198"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="200"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="282"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> @@ -16621,7 +16626,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16656,22 +16661,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16681,7 +16686,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> @@ -16701,80 +16706,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <source>Preview a changegroup file containing a collecting of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>