Thu, 01 Aug 2013 18:41:16 +0200
Continued extending the Mercurial side-by-side diff support.
--- a/APIs/Python3/eric5.api Wed Jul 31 20:07:41 2013 +0200 +++ b/APIs/Python3/eric5.api Thu Aug 01 18:41:16 2013 +0200 @@ -4800,7 +4800,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRevert?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRollback?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSbsDiff?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSbsDiff?4(name, extended=False, revisions=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgServe?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowBranch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowConfig?4(name)
--- a/Documentation/Help/source.qhp Wed Jul 31 20:07:41 2013 +0200 +++ b/Documentation/Help/source.qhp Thu Aug 01 18:41:16 2013 +0200 @@ -5402,6 +5402,7 @@ <keyword name="Hg" id="Hg" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> <keyword name="Hg.__getExtensionsInfo" id="Hg.__getExtensionsInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getExtensionsInfo" /> + <keyword name="Hg.__hgGetFileForRevision" id="Hg.__hgGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgGetFileForRevision" /> <keyword name="Hg.__hgURL" id="Hg.__hgURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgURL" /> <keyword name="Hg.__iniFileChanged" id="Hg.__iniFileChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__iniFileChanged" /> <keyword name="Hg.__monitorRepoIniFile" id="Hg.__monitorRepoIniFile" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__monitorRepoIniFile" /> @@ -5900,6 +5901,7 @@ <keyword name="HgProjectBrowserHelper.__HgResolve" id="HgProjectBrowserHelper.__HgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolve" /> <keyword name="HgProjectBrowserHelper.__HgRevert" id="HgProjectBrowserHelper.__HgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgRevert" /> <keyword name="HgProjectBrowserHelper.__HgSbsDiff" id="HgProjectBrowserHelper.__HgSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsDiff" /> + <keyword name="HgProjectBrowserHelper.__HgSbsExtendedDiff" id="HgProjectBrowserHelper.__HgSbsExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsExtendedDiff" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> <keyword name="HgProjectBrowserHelper._addVCSMenuBack" id="HgProjectBrowserHelper._addVCSMenuBack" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuBack" /> <keyword name="HgProjectBrowserHelper._addVCSMenuDir" id="HgProjectBrowserHelper._addVCSMenuDir" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuDir" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Wed Jul 31 20:07:41 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Thu Aug 01 18:41:16 2013 +0200 @@ -87,6 +87,9 @@ <td><a href="#HgProjectBrowserHelper.__HgSbsDiff">__HgSbsDiff</a></td> <td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> </tr><tr> +<td><a href="#HgProjectBrowserHelper.__HgSbsExtendedDiff">__HgSbsExtendedDiff</a></td> +<td>Private slot called by the context menu to show the difference of a file to the repository side-by-side allowing the selection of revisions to compare.</td> +</tr><tr> <td><a href="#HgProjectBrowserHelper._addVCSMenu">_addVCSMenu</a></td> <td>Protected method used to add the VCS menu to all project browsers.</td> </tr><tr> @@ -195,6 +198,12 @@ <p> Private slot called by the context menu to show the difference of a file to the repository side-by-side. +</p><a NAME="HgProjectBrowserHelper.__HgSbsExtendedDiff" ID="HgProjectBrowserHelper.__HgSbsExtendedDiff"></a> +<h4>HgProjectBrowserHelper.__HgSbsExtendedDiff</h4> +<b>__HgSbsExtendedDiff</b>(<i></i>) +<p> + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. </p><a NAME="HgProjectBrowserHelper._addVCSMenu" ID="HgProjectBrowserHelper._addVCSMenu"></a> <h4>HgProjectBrowserHelper._addVCSMenu</h4> <b>_addVCSMenu</b>(<i>mainMenu</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Jul 31 20:07:41 2013 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Thu Aug 01 18:41:16 2013 +0200 @@ -73,6 +73,9 @@ <td><a href="#Hg.__getExtensionsInfo">__getExtensionsInfo</a></td> <td>Private method to get the active extensions from Mercurial.</td> </tr><tr> +<td><a href="#Hg.__hgGetFileForRevision">__hgGetFileForRevision</a></td> +<td>Private method to get a file for a specific revision from the repository.</td> +</tr><tr> <td><a href="#Hg.__hgURL">__hgURL</a></td> <td>Private method to format a url for Mercurial.</td> </tr><tr> @@ -360,7 +363,25 @@ <b>__getExtensionsInfo</b>(<i></i>) <p> Private method to get the active extensions from Mercurial. -</p><a NAME="Hg.__hgURL" ID="Hg.__hgURL"></a> +</p><a NAME="Hg.__hgGetFileForRevision" ID="Hg.__hgGetFileForRevision"></a> +<h4>Hg.__hgGetFileForRevision</h4> +<b>__hgGetFileForRevision</b>(<i>name, rev=""</i>) +<p> + Private method to get a file for a specific revision from the repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file name to get from the repository (string) +</dd><dt><i>rev=</i></dt> +<dd> +revision to retrieve (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +contents of the file (string) and an error message (string) +</dd> +</dl><a NAME="Hg.__hgURL" ID="Hg.__hgURL"></a> <h4>Hg.__hgURL</h4> <b>__hgURL</b>(<i>url</i>) <p> @@ -923,7 +944,7 @@ </dd> </dl><a NAME="Hg.hgSbsDiff" ID="Hg.hgSbsDiff"></a> <h4>Hg.hgSbsDiff</h4> -<b>hgSbsDiff</b>(<i>name</i>) +<b>hgSbsDiff</b>(<i>name, extended=False, revisions=None</i>) <p> Public method used to view the difference of a file to the Mercurial repository side-by-side. @@ -931,6 +952,12 @@ <dt><i>name</i></dt> <dd> file name to be diffed (string) +</dd><dt><i>extended=</i></dt> +<dd> +flag indicating the extended variant (boolean) +</dd><dt><i>revisions=</i></dt> +<dd> +tuple of two revisions (tuple of strings) </dd> </dl><a NAME="Hg.hgServe" ID="Hg.hgServe"></a> <h4>Hg.hgServe</h4>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Wed Jul 31 20:07:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Aug 01 18:41:16 2013 +0200 @@ -953,6 +953,7 @@ @param rev1 first revision number (integer) @param rev2 second revision number (integer) """ + # TODO: add SBS option (file mode only) if self.diff is None: from .HgDiffDialog import HgDiffDialog self.diff = HgDiffDialog(self.vcs)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Wed Jul 31 20:07:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Thu Aug 01 18:41:16 2013 +0200 @@ -443,6 +443,7 @@ return self.contents.scrollToAnchor(ver) + # TODO: add SBS option (file mode only) if self.diff is None: from .HgDiffDialog import HgDiffDialog self.diff = HgDiffDialog(self.vcs)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Wed Jul 31 20:07:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Thu Aug 01 18:41:16 2013 +0200 @@ -690,6 +690,7 @@ """ available/selected.""")) return + # add SBS option (file mode only) if self.diff is None: from .HgDiffDialog import HgDiffDialog self.diff = HgDiffDialog(self.vcs)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Wed Jul 31 20:07:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Thu Aug 01 18:41:16 2013 +0200 @@ -229,6 +229,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) + # TODO: create an icon for SBS mode act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) self.vcsMenuActions.append(act) @@ -236,6 +237,11 @@ self.trUtf8('Show difference (extended)'), self.__HgExtendedDiff) self.vcsMenuActions.append(act) + # TODO: create an icon for SBS mode + act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), + self.trUtf8('Show difference side-by-side (extended)'), + self.__HgSbsExtendedDiff) + self.vcsMenuActions.append(act) self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), self.__HgAnnotate) self.vcsMenuActions.append(self.annotateAct) @@ -579,6 +585,15 @@ fn = itm.fileName() self.vcs.hgSbsDiff(fn) + def __HgSbsExtendedDiff(self): + """ + Private slot called by the context menu to show the difference of a file to + the repository side-by-side allowing the selection of revisions to compare. + """ + itm = self.browser.currentItem() + fn = itm.fileName() + self.vcs.hgSbsDiff(fn, extended=True) + def __HgAnnotate(self): """ Private slot called by the context menu to show the annotations of a file.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Jul 31 20:07:41 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Aug 01 18:41:16 2013 +0200 @@ -93,6 +93,7 @@ self.log = None self.logBrowser = None self.diff = None + self.sbsDiff = None self.status = None self.summary = None self.tagbranchList = None @@ -158,6 +159,8 @@ self.logBrowser.close() if self.diff is not None: self.diff.close() + if self.sbsDiff is not None: + self.sbsDiff.close() if self.status is not None: self.status.close() if self.summary is not None: @@ -1628,22 +1631,25 @@ self.diff.show() self.diff.start(name, revisions) - def hgSbsDiff(self, name): + def __hgGetFileForRevision(self, name, rev=""): """ - Public method used to view the difference of a file to the Mercurial repository - side-by-side. + Private method to get a file for a specific revision from the repository. - @param name file name to be diffed (string) + @param name file name to get from the repository (string) + @keyparam rev revision to retrieve (string) + @return contents of the file (string) and an error message (string) """ - if isinstance(name, list): - raise ValueError("Wrong parameter type") - args = [] args.append("cat") + if rev: + args.append("--rev") + args.append(rev) args.append(name) - output1 = "" if self.__client is None: + output = "" + error = "" + # find the root of the repo repodir = self.splitPath(name)[0] while not os.path.isdir(os.path.join(repodir, self.adminDir)): @@ -1657,28 +1663,95 @@ procStarted = process.waitForStarted(5000) if procStarted: finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output1 = str(process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), 'replace') + if finished: + if process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') + else: + error = str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') + else: + error = self.trUtf8("The hg process did not finish within 30s.") + else: + error = self.trUtf8('The process {0} could not be started. ' + 'Ensure, that it is in the search path.').format('hg') else: - output1, error = self.__client.runcommand(args) + output, error = self.__client.runcommand(args) + + return output, error + + def hgSbsDiff(self, name, extended=False, revisions=None): + """ + Public method used to view the difference of a file to the Mercurial repository + side-by-side. - try: - f1 = open(name, "r", encoding="utf-8") - output2 = f1.read() - f1.close() - except IOError: + @param name file name to be diffed (string) + @keyparam extended flag indicating the extended variant (boolean) + @keyparam revisions tuple of two revisions (tuple of strings) + """ + if isinstance(name, list): + raise ValueError("Wrong parameter type") + + if extended: + # find the root of the repo + repodir = self.splitPath(name)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + if self.isExtensionActive("bookmarks"): + bookmarksList = \ + self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + else: + bookmarksList = None + + from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog + dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), + self.hgGetBranchesList(repodir), + bookmarksList) + if dlg.exec_() == QDialog.Accepted: + rev1, rev2 = dlg.getRevisions() + elif revisions: + rev1, rev2 = revisions[0], revisions[1] + else: + rev1, rev2 = "", "" + + output1, error = self.__hgGetFileForRevision(name, rev=rev1) + if error: E5MessageBox.critical(self, self.trUtf8("Mercurial Side-by-Side Difference"), - self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") - .format(name)) + error) return + name1 = "{0} (rev. {1})".format(name, rev1 and rev1 or ".") + + if rev2: + output2, error = self.__hgGetFileForRevision(name, rev=rev2) + if error: + E5MessageBox.critical(self, + self.trUtf8("Mercurial Side-by-Side Difference"), + error) + return + name2 = "{0} (rev. {1})".format(name, rev2) + else: + try: + f1 = open(name, "r", encoding="utf-8") + output2 = f1.read() + f1.close() + name2 = name + except IOError: + E5MessageBox.critical(self, + self.trUtf8("Mercurial Side-by-Side Difference"), + self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""") + .format(name)) + return if output1 and output2: - from UI.CompareDialog import CompareDialog - self.sbsDiff = CompareDialog() + if self.sbsDiff is None: + from UI.CompareDialog import CompareDialog + self.sbsDiff = CompareDialog() self.sbsDiff.show() - self.sbsDiff.compare(output1, output2, "{0}@.".format(name), name) + self.sbsDiff.compare(output1, output2, name1, name2) def hgLogBrowser(self, path): """
--- a/i18n/eric5_cs.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_cs.ts Thu Aug 01 18:41:16 2013 +0200 @@ -18605,42 +18605,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -18650,47 +18650,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -18705,112 +18705,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -18820,155 +18820,160 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20886,12 +20891,12 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Autor</translation> </message> @@ -21157,12 +21162,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -21718,22 +21723,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> @@ -21748,7 +21753,7 @@ <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> @@ -21758,32 +21763,32 @@ <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> @@ -21793,60 +21798,65 @@ <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -62745,23 +62755,23 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -62779,23 +62789,23 @@ <translation type="obsolete"><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -62803,12 +62813,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_de.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_de.ts Thu Aug 01 18:41:16 2013 +0200 @@ -17956,350 +17956,355 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <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/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <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> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20198,12 +20203,12 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Autor</translation> </message> @@ -20464,12 +20469,12 @@ <translation>Drücken, um die ausgewählten Änderungssätze in den aktuellen Zweig zu kopeieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -21035,115 +21040,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Show difference</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Show difference (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> + <source>Show annotated file</source> + <translation>Zeige kommentierte Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <source>Select all versioned directory entries</source> + <translation>Alle versionierten Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> + <source>Conflict resolved</source> + <translation>Konflikt gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> - <source>Show status</source> - <translation>Status anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> - <source>Show annotated file</source> - <translation>Zeige kommentierte Datei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local directory entries</source> - <translation>Alle lokalen Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned directory entries</source> - <translation>Alle versionierten Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Remove from repository only</source> - <translation>Nur vom Repository löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> - <source>Do you really want to remove these translation files from the repository?</source> - <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> - <source>Conflict resolved</source> - <translation>Konflikt gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> <source>Move</source> <translation>Verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -59863,24 +59873,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -59889,24 +59899,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -59917,12 +59927,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_en.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_en.ts Thu Aug 01 18:41:16 2013 +0200 @@ -17857,350 +17857,355 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20085,12 +20090,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -20341,12 +20346,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20895,115 +20900,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Show difference (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> - <source>Show annotated file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> - <source>Do you really want to remove these translation files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -59320,46 +59330,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -59367,12 +59377,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_es.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_es.ts Thu Aug 01 18:41:16 2013 +0200 @@ -17957,350 +17957,355 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20199,12 +20204,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Autor</translation> </message> @@ -20466,12 +20471,12 @@ <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -21038,115 +21043,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorio locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <source>Select all versioned directory entries</source> + <translation>Seleccionar todas las entradas de directorio versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> - <source>Select all versioned file entries</source> - <translation>Seleccionar todas las entradas de archivo versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local directory entries</source> - <translation>Seleccionar todas las entradas de directorio locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned directory entries</source> - <translation>Seleccionar todas las entradas de directorio versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> - <source>Show annotated file</source> - <translation>Mostrar archivo anotado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Eliminar solamente del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos de traducción del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation>Conflicto resuelto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation>Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -59817,17 +59827,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -59838,31 +59848,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -59888,12 +59898,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_fr.ts Thu Aug 01 18:41:16 2013 +0200 @@ -19642,87 +19642,87 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -19732,265 +19732,270 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21890,12 +21895,12 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> @@ -22176,12 +22181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22741,22 +22746,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> @@ -22771,7 +22776,7 @@ <translation type="obsolete">Déplacer dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> @@ -22781,32 +22786,32 @@ <translation type="obsolete">Afficher un log limité</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation type="unfinished">Afficher les différences (étendu)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> @@ -22816,60 +22821,65 @@ <translation type="obsolete">Résoudre les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -66492,24 +66502,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -66535,23 +66545,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -66562,12 +66572,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_it.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_it.ts Thu Aug 01 18:41:16 2013 +0200 @@ -18500,42 +18500,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -18545,47 +18545,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -18600,265 +18600,270 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20776,12 +20781,12 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Autore</translation> </message> @@ -21042,12 +21047,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -21617,22 +21622,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> @@ -21647,7 +21652,7 @@ <translation type="obsolete">Muovi nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Mostra log</translation> </message> @@ -21657,32 +21662,32 @@ <translation type="obsolete">Mostra log ridotto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation>Mostra differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation>Mostra differenza (esteso)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation>Mostra file appuntati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> @@ -21692,60 +21697,65 @@ <translation type="obsolete">Risolvi conflitti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation>Seleziona tutt i file locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Vuoi veramente rimuovere questi file di traduzione dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation type="unfinished">Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -62893,24 +62903,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -62936,24 +62946,24 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -62963,12 +62973,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_ru.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_ru.ts Thu Aug 01 18:41:16 2013 +0200 @@ -18624,42 +18624,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -18669,32 +18669,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -18709,280 +18709,285 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20895,12 +20900,12 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Автор</translation> </message> @@ -21167,12 +21172,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -21741,22 +21746,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -21771,7 +21776,7 @@ <translation type="obsolete">Переместить в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Показать журнал</translation> </message> @@ -21781,17 +21786,17 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> @@ -21801,75 +21806,80 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation>Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation>Сдвинуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -63056,17 +63066,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -63077,30 +63087,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -63127,12 +63137,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_tr.ts Thu Aug 01 18:41:16 2013 +0200 @@ -18591,87 +18591,87 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -18686,265 +18686,270 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20859,12 +20864,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation>Yazar</translation> </message> @@ -21130,12 +21135,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -21685,27 +21690,27 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> @@ -21720,7 +21725,7 @@ <translation type="obsolete">Kaynak havuzuna taşı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> @@ -21730,32 +21735,32 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation>Farkları göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> @@ -21765,55 +21770,60 @@ <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Gerçekten bu çeviri dosyalarını kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -62178,24 +62188,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -62221,23 +62231,23 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -62248,12 +62258,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Aug 01 18:41:16 2013 +0200 @@ -19576,87 +19576,87 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -19666,265 +19666,270 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21824,12 +21829,12 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> @@ -22110,12 +22115,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22675,22 +22680,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库(和磁盘)中移除</translation> </message> @@ -22705,7 +22710,7 @@ <translation type="obsolete">在储存库中移动</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation type="unfinished">显示日志</translation> </message> @@ -22715,32 +22720,32 @@ <translation type="obsolete">显示受限日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> <source>Show log browser</source> <translation type="unfinished">显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> <source>Show status</source> <translation type="unfinished">显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Show difference</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Show difference (extended)</source> <translation type="unfinished">显示差异(扩展)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> <source>Show annotated file</source> <translation type="unfinished">显示有注释的文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> @@ -22750,60 +22755,65 @@ <translation type="obsolete">解析冲突</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> <source>Select all local file entries</source> <translation type="unfinished">选择所有本地文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all versioned file entries</source> <translation type="unfinished">选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -66395,46 +66405,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -66442,12 +66452,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>