Mercurial Repositories > eric / changeset
changeset
Enhanced the log browser functionality by pull and push actions.
Mon, 31 Aug 2015 18:32:20 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 31 Aug 2015 18:32:20 +0200
- changeset 4409
- ff1cb0107d40
- parent 4407
- 146030035bdc
- child 4410
- a3a2b652286d
Enhanced the log browser functionality by pull and push actions.
--- a/APIs/Python3/eric6.api Sun Aug 30 19:33:16 2015 +0200 +++ b/APIs/Python3/eric6.api Mon Aug 31 18:32:20 2015 +0200 @@ -5295,7 +5295,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(name, data=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False, rev=None) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRemoveSubrepositories?4()
--- a/Documentation/Help/source.qhp Sun Aug 30 19:33:16 2015 +0200 +++ b/Documentation/Help/source.qhp Mon Aug 31 18:32:20 2015 +0200 @@ -6327,6 +6327,7 @@ <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" /> <keyword name="HgLogBrowserDialog.__graftActTriggered" id="HgLogBrowserDialog.__graftActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__graftActTriggered" /> <keyword name="HgLogBrowserDialog.__identifyProject" id="HgLogBrowserDialog.__identifyProject" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__identifyProject" /> + <keyword name="HgLogBrowserDialog.__initActionsMenu" id="HgLogBrowserDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initActionsMenu" /> <keyword name="HgLogBrowserDialog.__initData" id="HgLogBrowserDialog.__initData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initData" /> <keyword name="HgLogBrowserDialog.__lfPullActTriggered" id="HgLogBrowserDialog.__lfPullActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__lfPullActTriggered" /> <keyword name="HgLogBrowserDialog.__modifyForLargeFiles" id="HgLogBrowserDialog.__modifyForLargeFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__modifyForLargeFiles" /> @@ -6334,6 +6335,9 @@ <keyword name="HgLogBrowserDialog.__prepareFieldSearch" id="HgLogBrowserDialog.__prepareFieldSearch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__prepareFieldSearch" /> <keyword name="HgLogBrowserDialog.__procFinished" id="HgLogBrowserDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__procFinished" /> <keyword name="HgLogBrowserDialog.__processBuffer" id="HgLogBrowserDialog.__processBuffer" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__processBuffer" /> + <keyword name="HgLogBrowserDialog.__pullActTriggered" id="HgLogBrowserDialog.__pullActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pullActTriggered" /> + <keyword name="HgLogBrowserDialog.__pushActTriggered" id="HgLogBrowserDialog.__pushActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pushActTriggered" /> + <keyword name="HgLogBrowserDialog.__pushAllActTriggered" id="HgLogBrowserDialog.__pushAllActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__pushAllActTriggered" /> <keyword name="HgLogBrowserDialog.__readStderr" id="HgLogBrowserDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStderr" /> <keyword name="HgLogBrowserDialog.__readStdout" id="HgLogBrowserDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStdout" /> <keyword name="HgLogBrowserDialog.__resetUI" id="HgLogBrowserDialog.__resetUI" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resetUI" />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Aug 30 19:33:16 2015 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Mon Aug 31 18:32:20 2015 +0200 @@ -108,6 +108,9 @@ <td><a href="#HgLogBrowserDialog.__identifyProject">__identifyProject</a></td> <td>Private method to determine the revision of the project directory.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__initActionsMenu">__initActionsMenu</a></td> +<td>Private method to initialize the actions menu.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__initData">__initData</a></td> <td>Private method to (re-)initialize some data.</td> </tr><tr> @@ -129,6 +132,15 @@ <td><a href="#HgLogBrowserDialog.__processBuffer">__processBuffer</a></td> <td>Private method to process the buffered output of the hg log command.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__pullActTriggered">__pullActTriggered</a></td> +<td>Private slot to pull changes from a remote repository.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__pushActTriggered">__pushActTriggered</a></td> +<td>Private slot to push changes to a remote repository up to a selected changeset.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__pushAllActTriggered">__pushAllActTriggered</a></td> +<td>Private slot to push all changes to a remote repository.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__readStderr">__readStderr</a></td> <td>Private slot to handle the readyReadStandardError signal.</td> </tr><tr> @@ -505,6 +517,11 @@ <b>__identifyProject</b>(<i></i>) <p> Private method to determine the revision of the project directory. +</p><a NAME="HgLogBrowserDialog.__initActionsMenu" ID="HgLogBrowserDialog.__initActionsMenu"></a> +<h4>HgLogBrowserDialog.__initActionsMenu</h4> +<b>__initActionsMenu</b>(<i></i>) +<p> + Private method to initialize the actions menu. </p><a NAME="HgLogBrowserDialog.__initData" ID="HgLogBrowserDialog.__initData"></a> <h4>HgLogBrowserDialog.__initData</h4> <b>__initData</b>(<i></i>) @@ -564,6 +581,22 @@ <b>__processBuffer</b>(<i></i>) <p> Private method to process the buffered output of the hg log command. +</p><a NAME="HgLogBrowserDialog.__pullActTriggered" ID="HgLogBrowserDialog.__pullActTriggered"></a> +<h4>HgLogBrowserDialog.__pullActTriggered</h4> +<b>__pullActTriggered</b>(<i></i>) +<p> + Private slot to pull changes from a remote repository. +</p><a NAME="HgLogBrowserDialog.__pushActTriggered" ID="HgLogBrowserDialog.__pushActTriggered"></a> +<h4>HgLogBrowserDialog.__pushActTriggered</h4> +<b>__pushActTriggered</b>(<i></i>) +<p> + Private slot to push changes to a remote repository up to a selected + changeset. +</p><a NAME="HgLogBrowserDialog.__pushAllActTriggered" ID="HgLogBrowserDialog.__pushAllActTriggered"></a> +<h4>HgLogBrowserDialog.__pushAllActTriggered</h4> +<b>__pushAllActTriggered</b>(<i></i>) +<p> + Private slot to push all changes to a remote repository. </p><a NAME="HgLogBrowserDialog.__readStderr" ID="HgLogBrowserDialog.__readStderr"></a> <h4>HgLogBrowserDialog.__readStderr</h4> <b>__readStderr</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Aug 30 19:33:16 2015 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Mon Aug 31 18:32:20 2015 +0200 @@ -1133,7 +1133,7 @@ </dd> </dl><a NAME="Hg.hgPush" ID="Hg.hgPush"></a> <h4>Hg.hgPush</h4> -<b>hgPush</b>(<i>name, force=False, newBranch=False</i>) +<b>hgPush</b>(<i>name, force=False, newBranch=False, rev=None</i>) <p> Public method used to push changes to a remote Mercurial repository. </p><dl> @@ -1146,6 +1146,9 @@ </dd><dt><i>newBranch=</i></dt> <dd> flag indicating to push a new branch (boolean) +</dd><dt><i>rev=</i></dt> +<dd> +revision to be pushed (including all ancestors) (string) </dd> </dl><a NAME="Hg.hgReMerge" ID="Hg.hgReMerge"></a> <h4>Hg.hgReMerge</h4>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Aug 30 19:33:16 2015 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Aug 31 18:32:20 2015 +0200 @@ -35,7 +35,6 @@ COLORS = [str(QColor(x).name()) for x in COLORNAMES] -# TODO: add push and pull actions class HgLogBrowserDialog(QWidget, Ui_HgLogBrowserDialog): """ Class implementing a dialog to browse the log history. @@ -158,6 +157,12 @@ 'M': self.tr('Modified'), } + self.phases = { + 'draft': self.tr("Draft"), + 'public': self.tr("Public"), + 'secret': self.tr("Secret"), + } + self.__dotRadius = 8 self.__rowHeight = 20 @@ -169,6 +174,12 @@ if self.vcs.version < (2, 1): self.logTree.setColumnHidden(self.PhaseColumn, True) + self.__initActionsMenu() + + def __initActionsMenu(self): + """ + Private method to initialize the actions menu. + """ self.__actionsMenu = QMenu() if self.vcs.version >= (2, 0): self.__graftAct = self.__actionsMenu.addAction( @@ -199,6 +210,12 @@ self.__switchAct.setToolTip(self.tr( "Switch the working directory to the selected revision")) + self.__actionsMenu.addSeparator() + + self.__pullAct = self.__actionsMenu.addAction( + self.tr("Pull Changes"), self.__pullActTriggered) + self.__pullAct.setToolTip(self.tr( + "Pull changes from a remote repository")) if self.vcs.version >= (2, 0): self.__lfPullAct = self.__actionsMenu.addAction( self.tr("Pull Large Files"), self.__lfPullActTriggered) @@ -207,6 +224,18 @@ else: self.__lfPullAct = None + self.__actionsMenu.addSeparator() + + self.__pushAct = self.__actionsMenu.addAction( + self.tr("Push Selected Changes"), self.__pushActTriggered) + self.__pushAct.setToolTip(self.tr( + "Push changes of the selected changeset and its ancestors" + " to a remote repository")) + self.__pushAllAct = self.__actionsMenu.addAction( + self.tr("Push All Changes"), self.__pushAllActTriggered) + self.__pushAllAct.setToolTip(self.tr( + "Push all changes to a remote repository")) + self.actionsButton.setIcon( UI.PixmapCache.getIcon("actionsToolButton.png")) self.actionsButton.setMenu(self.__actionsMenu) @@ -651,11 +680,15 @@ msgtxt = msg[0] if len(msgtxt) > 30: msgtxt = "{0}...".format(msgtxt[:30]) + if phase in self.phases: + phaseStr = self.phases[phase] + else: + phaseStr = phase columnLabels = [ "", branches[0] + closedStr, "{0:>7}:{1}".format(rev, node), - phase, + phaseStr, author, date, msgtxt, @@ -1192,9 +1225,9 @@ public = 0 for itm in self.logTree.selectedItems(): phase = itm.text(self.PhaseColumn) - if phase == "draft": + if phase == self.phases["draft"]: draft += 1 - elif phase == "secret": + elif phase == self.phases["secret"]: secret += 1 else: public += 1 @@ -1229,6 +1262,11 @@ else: self.__lfPullAct.setEnabled(False) + self.__pushAct.setEnabled( + len(self.logTree.selectedItems()) == 1 and + self.logTree.selectedItems()[0].text(self.PhaseColumn) == + self.phases["draft"]) + self.actionsButton.setEnabled(True) else: self.actionsButton.setEnabled(False) @@ -1608,11 +1646,11 @@ self.__phaseAct.setEnabled(False) return - if currentPhase == "draft": - newPhase = "secret" + if currentPhase == self.phases["draft"]: + newPhase = self.phases["secret"] data = (revs, "s", True) else: - newPhase = "draft" + newPhase = self.phases["draft"] data = (revs, "d", False) res = self.vcs.hgPhase(self.repodir, data) if res: @@ -1684,6 +1722,7 @@ self.on_refreshButton_clicked() + @pyqtSlot() def __lfPullActTriggered(self): """ Private slot to pull large files of selected revisions. @@ -1698,6 +1737,33 @@ self.vcs.getExtensionObject("largefiles").hgLfPull( self.repodir, revisions=revs) + @pyqtSlot() + def __pullActTriggered(self): + """ + Private slot to pull changes from a remote repository. + """ + res = self.vcs.hgPull(self.repodir) + if res: + self.on_refreshButton_clicked() + + @pyqtSlot() + def __pushActTriggered(self): + """ + Private slot to push changes to a remote repository up to a selected + changeset. + """ + itm = self.logTree.selectedItems()[0] + rev = itm.text(self.RevisionColumn).strip().split(":", 1)[0] + if rev: + self.vcs.hgPush(self.repodir, rev=rev) + + @pyqtSlot() + def __pushAllActTriggered(self): + """ + Private slot to push all changes to a remote repository. + """ + self.vcs.hgPush(self.repodir) + def __actionMode(self): """ Private method to get the selected action mode.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Aug 30 19:33:16 2015 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Aug 31 18:32:20 2015 +0200 @@ -2001,13 +2001,14 @@ self.checkVCSStatus() return res - def hgPush(self, name, force=False, newBranch=False): + def hgPush(self, name, force=False, newBranch=False, rev=None): """ Public method used to push changes to a remote Mercurial repository. @param name directory name of the project to be pushed from (string) @keyparam force flag indicating a forced push (boolean) @keyparam newBranch flag indicating to push a new branch (boolean) + @keyparam rev revision to be pushed (including all ancestors) (string) """ args = self.initCommand("push") args.append('-v') @@ -2015,6 +2016,9 @@ args.append('-f') if newBranch: args.append('--new-branch') + if rev: + args.append('--rev') + args.append(rev) # find the root of the repo repodir = self.splitPath(name)[0]
--- a/changelog Sun Aug 30 19:33:16 2015 +0200 +++ b/changelog Mon Aug 31 18:32:20 2015 +0200 @@ -59,6 +59,7 @@ --- added capability to search in the output of Diff dialogs -- Mercurial --- enhanced the log browser functionality by a search mode + --- enhanced the log browser functionality by pull and push actions --- enhanced the status dialog functionality by a diff view - Web Browser -- added support for HTML5 feature permissions
--- a/i18n/eric6_cs.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_cs.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8901,7 +8901,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -8991,197 +8991,197 @@ <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Přidat soubory...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Přidat zástupce souboru...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -9201,12 +9201,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -9281,7 +9281,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -9291,12 +9291,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -9336,32 +9336,32 @@ <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -9391,42 +9391,42 @@ <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9451,27 +9451,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9496,7 +9496,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> @@ -9511,32 +9511,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19749,122 +19749,122 @@ <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <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="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <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="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <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="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <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="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <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="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <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="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19874,72 +19874,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19969,7 +19969,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19994,7 +19994,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20004,67 +20004,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20089,12 +20089,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -22109,7 +22109,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation></translation> </message> @@ -22139,17 +22139,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revize</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -22274,42 +22274,42 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Smazáno</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Smazáno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <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/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -22349,32 +22349,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22384,28 +22384,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -22425,42 +22425,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22485,45 +22485,90 @@ <translation type="unfinished">Stisknout pro vyhledání následujícího výskytu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished">Filtr</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished">Soubor</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32156,57 +32201,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Zavřít</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Zavřít vše</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Uložit jako...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Uložit vše</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Tisk</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Beze jména {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation type="unfinished">Kopírovat cestu do schránky</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation type="unfinished">Zavřít ostatní</translation> </message> @@ -54804,7 +54849,7 @@ <translation>Beze jména {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -63903,6 +63948,26 @@ <comment>Edit|Calltip</comment> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64624,12 +64689,12 @@ <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="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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> @@ -64641,23 +64706,23 @@ <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="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64665,7 +64730,7 @@ <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="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_de.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8773,7 +8773,7 @@ <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Datei geändert</translation> </message> @@ -8838,57 +8838,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Makrodateien (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Lade Makrodatei</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Makrodatei schreiben</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -8948,42 +8948,42 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> </message> @@ -9013,7 +9013,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -9023,12 +9023,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -9058,17 +9058,17 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> @@ -9078,22 +9078,22 @@ <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makrodatei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makrodatei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -9133,82 +9133,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Ressourcen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Dateien hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Aliased-Datei hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Lokalisierte Ressource hinzufügen...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Dateiressource hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Aliased-Dateiressourcen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Ressourcenrahmen hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -9258,12 +9258,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -9343,7 +9343,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -9353,12 +9353,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -9403,42 +9403,42 @@ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Makrodatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Warnung: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>Aktivierung eines Providers für Calltips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Ein Provider für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen Sie Ihre Konfiguration.</translation> </message> @@ -9463,27 +9463,27 @@ <translation>Vorherige Änderung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Zeilen sortieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>Keine Warnmeldungen verfügbar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Stil: {0}</translation> </message> @@ -9508,7 +9508,7 @@ <translation>Öffnen mit Kodierung</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric6 geöffnet war. Neu einlesen?</p></translation> </message> @@ -9523,32 +9523,32 @@ <translation>Vervollständigen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation>Provider für automatische Vervollständigungen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Provider für automatische Vervollständigungen namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation>Calltipps-Provider</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>Der Calltipps-Provider namens '{0}' ist bereits registriert. Die Wiederholung wird ignoriert.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation>Maus Klick Handler registrieren</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Ein Maus Klick Handler für "{0}" wurde bereits durch "{1}" registriert. Die Anfrage durch "{2}" wird abgebrochen...</translation> </message> @@ -19768,122 +19768,122 @@ <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <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="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <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="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <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="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <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="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <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="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19893,72 +19893,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19988,7 +19988,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -20013,7 +20013,7 @@ <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> @@ -20023,67 +20023,67 @@ <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -20108,12 +20108,12 @@ <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> @@ -22121,7 +22121,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> @@ -22151,17 +22151,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revision</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -22271,42 +22271,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Gelöscht</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -22356,32 +22356,32 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial-Log (Eingang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> @@ -22391,28 +22391,28 @@ <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -22432,42 +22432,42 @@ <translation>Wähle eine Aktion aus dem Menü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation>Marke setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -22492,45 +22492,90 @@ <translation>Drücken, um das nächste Vorkommen zu suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation>Suchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Datum</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Zweig</b></td><td>{3}</td></tr><tr><td><b>Eltern</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <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/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <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/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation>Datei</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation>Entwurf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation>Öffentlich</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation>Geheim</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation>Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation>Änderungen von einem entfernten Repository herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation>Ausgewählte Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32137,57 +32182,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Unbenannt {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Schließen</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Alle schließen</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Speichern unter...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Alle speichern</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Drucken</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Öffne „Ablehnungs“-Datei</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Andere schließen</translation> </message> @@ -54939,7 +54984,7 @@ <translation>Unbenannt {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -64039,22 +64084,22 @@ <message> <location filename="../ViewManager/ViewManager.py" line="687"/> <source>Save Copy</source> - <translation type="unfinished">Kopie speichern</translation> + <translation>Kopie speichern</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="687"/> <source>Save &Copy...</source> - <translation type="unfinished">&Kopie speichern...</translation> + <translation>&Kopie speichern...</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="692"/> <source>Save a copy of the current file</source> - <translation type="unfinished">Speichert eine Kopie der aktuellen Datei</translation> + <translation>Speichert eine Kopie der aktuellen Datei</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="694"/> <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> - <translation type="unfinished"><b>Kopie speichern</b><p>Speichern einer Kopie des Inhalts des aktuellen Editorfensters. Die Datei kann mit einem Dateiauswahldialog eingegeben werden.</p></translation> + <translation><b>Kopie speichern</b><p>Speichern einer Kopie des Inhalts des aktuellen Editorfensters. Die Datei kann mit einem Dateiauswahldialog eingegeben werden.</p></translation> </message> </context> <context> @@ -64782,12 +64827,12 @@ <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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> @@ -64801,24 +64846,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64829,7 +64874,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <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>
--- a/i18n/eric6_en.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_en.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8667,7 +8667,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -8897,7 +8897,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation type="unfinished"></translation> </message> @@ -9072,287 +9072,287 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9377,27 +9377,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9422,7 +9422,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -9437,32 +9437,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19660,122 +19660,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19785,72 +19785,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19880,7 +19880,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19905,7 +19905,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -19915,67 +19915,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20000,12 +20000,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -21989,7 +21989,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -22029,17 +22029,17 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> - <source>Revision</source> + <source>Author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -22184,72 +22184,72 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <source>Added</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> - <source>Added</source> + <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22259,28 +22259,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22300,42 +22300,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22360,45 +22360,90 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -31979,57 +32024,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation type="unfinished"></translation> </message> @@ -54433,7 +54478,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> @@ -63475,6 +63520,26 @@ <comment>Edit|Calltip</comment> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64196,12 +64261,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -64213,23 +64278,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64237,7 +64302,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_es.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8915,7 +8915,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -9015,207 +9015,207 @@ <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Añadir archivo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Añadir archivos...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -9290,7 +9290,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -9300,12 +9300,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -9345,32 +9345,32 @@ <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -9400,42 +9400,42 @@ <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>Activando el Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de autocompletado no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>Activando Proveedor de Calltip</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>El proveedor de calltip no puede ser conectado porque ya hay uno activo. Por favor revise la configuración.</translation> </message> @@ -9460,27 +9460,27 @@ <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9505,7 +9505,7 @@ <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?</p></translation> </message> @@ -9520,32 +9520,32 @@ <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> @@ -19772,7 +19772,7 @@ <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> @@ -19787,117 +19787,117 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <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="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <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="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <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="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <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="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <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="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <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> @@ -19907,72 +19907,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <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> @@ -20002,7 +20002,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -20027,7 +20027,7 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> @@ -20037,67 +20037,67 @@ <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation>Cancelando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -20122,12 +20122,12 @@ <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> @@ -22135,7 +22135,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> @@ -22165,17 +22165,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -22285,27 +22285,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Añadido</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Borrado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Borrado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -22320,17 +22320,17 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <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/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <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/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -22370,32 +22370,32 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation>Pulsar para actualizar la lista de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> @@ -22405,29 +22405,29 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation>Cambiar la fase de las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Cambiar Fase</b> <p>Cambia la fase de las revisiones seleccionadas. Las revisiones seleccionadas deben tener la misma fase actual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -22447,42 +22447,42 @@ <translation>Seleccionar acción del menú</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation>Pulsar para copiar los changesets seleccionados a la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation>Aplicar Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation>Hacer switch del directorio de trabajo a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -22507,45 +22507,90 @@ <translation>Pulsar para encontrar la ocurrencia siguiente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation>Buscar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation><table><tr><td><b>Revisión</b></td><td>{0}</td></tr><tr><td><b>Fecha</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <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/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <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/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation>Archivo</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished">Borrador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished">Público</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished">Secreto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Hacer pull de cambios desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32153,57 +32198,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Cerrar todo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Guardar como...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Guardar todo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Sin título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Abrir archivo 'de rechazo'</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Cerrar Otras</translation> </message> @@ -54913,7 +54958,7 @@ <translation>Sin título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -64007,6 +64052,26 @@ <comment>Edit|Calltip</comment> <translation>Meta+Alt+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64730,17 +64795,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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="2139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <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> @@ -64751,19 +64816,19 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <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> @@ -64784,7 +64849,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <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>
--- a/i18n/eric6_fr.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_fr.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8817,7 +8817,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -8892,97 +8892,97 @@ <translation>Fichier Modifié</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -9002,7 +9002,7 @@ <translation>Supprimer les flags d'erreurs de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -9012,12 +9012,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -9047,17 +9047,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -9092,72 +9092,72 @@ <translation>Pas de langage</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Ajouter un fichier...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Ajouter des fichiers...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Ajouter un fichier alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -9207,12 +9207,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -9287,7 +9287,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -9297,12 +9297,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -9342,32 +9342,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -9397,42 +9397,42 @@ <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9457,27 +9457,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation type="unfinished">Warning</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9502,7 +9502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -9517,32 +9517,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19774,122 +19774,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19899,72 +19899,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19994,7 +19994,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20019,7 +20019,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20029,67 +20029,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -20114,12 +20114,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -22131,7 +22131,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -22161,17 +22161,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation type="unfinished">Auteur</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation type="unfinished">Auteur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -22296,42 +22296,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -22371,32 +22371,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22406,28 +22406,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22447,42 +22447,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22507,45 +22507,90 @@ <translation type="unfinished">Cliquer pour rechercher l'occurence suivante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished">Fichier</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32164,57 +32209,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Fermer</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Tout fermer</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Enregistrer</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Enregistrer sous...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Tout enregistrer</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Imprimer</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copier chemin dans le Presse-Papiers</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation type="unfinished"></translation> </message> @@ -54862,7 +54907,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> @@ -63983,6 +64028,26 @@ <comment>Edit|Complete from Document and APIs</comment> <translation type="unfinished">Alt+Shift+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64714,12 +64779,12 @@ <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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> @@ -64733,23 +64798,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64760,7 +64825,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <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>
--- a/i18n/eric6_it.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_it.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8868,7 +8868,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -8943,97 +8943,97 @@ <translation>File modificato</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -9053,7 +9053,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -9063,12 +9063,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -9098,17 +9098,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -9143,72 +9143,72 @@ <translation>Nessun linguaggio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Aggiungi file...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Aggiungi files...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Aggiungi file sinonimo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -9258,12 +9258,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -9338,7 +9338,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -9348,12 +9348,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -9393,32 +9393,32 @@ <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Il file macro <b>{0}</b> è danneggiato.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Il file macro <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias per il file <b>{0}</b>:</translation> </message> @@ -9448,42 +9448,42 @@ <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file delle macro <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Attenzione: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Errore: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>Fornitore Autocompletamento in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>Fornitore CallTip in attivazione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Il fornitore di autocompletamento non può essere connesso perchè è gia attivo un altro. Per cortesia controlla la configurazione.</translation> </message> @@ -9508,27 +9508,27 @@ <translation>Modifica precedente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Righe ordinate</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selezione contiene dati non validi per un ordinamento numerico.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>Nessun messaggio di attenzione disponibile.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Stile: {0}</translation> </message> @@ -9553,7 +9553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> è stato modificato mentre era aperto in eric5. Rileggerlo ?</p> {0}?} {6.?}</translation> </message> @@ -9568,32 +9568,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19829,122 +19829,122 @@ <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <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="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <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="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <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="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <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="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <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="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <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="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <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="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19954,72 +19954,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20049,7 +20049,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20074,7 +20074,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20084,67 +20084,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -20169,12 +20169,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -22204,7 +22204,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -22234,17 +22234,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autore</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -22369,42 +22369,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Cancellato</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Cancellato</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <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/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -22444,32 +22444,32 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Tutti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial Log (Incoming)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22479,28 +22479,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -22520,42 +22520,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished">Tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22580,45 +22580,90 @@ <translation type="unfinished">Premi per trovare la prossima occorrenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished">Trova</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished">Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Pull changes da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32253,57 +32298,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Chiudi</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Chiudi tutto</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Salva come...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Salva tutto</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Stampa</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Senza titolo {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Apri file 'scarto'</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Copia il percorso nella Clipboard</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Chiudi altri</translation> </message> @@ -54963,7 +55008,7 @@ <translation>Senza titolo {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -64081,6 +64126,26 @@ <comment>Edit|Complete from Document and APIs</comment> <translation type="unfinished">Alt+Shift+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64811,12 +64876,12 @@ <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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> @@ -64830,24 +64895,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64857,7 +64922,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric6_pt.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_pt.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8752,7 +8752,7 @@ <translation>Desselecionar tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Verificação ortográfica...</translation> </message> @@ -8992,7 +8992,7 @@ <translation>Editar ponto de interrupção...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Habilitar pontos de interrupção</translation> </message> @@ -9167,287 +9167,287 @@ <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar não está disponivel porque a fonte de autocompletar não está definida.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Inabilitar ponto de interrupção</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Foram cobertas as linhas todas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Dados de Perfil</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Escolha um ficheiro de perfil por favor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Erro de Sintaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Não está disponível a mensagem de erro de sintaxe.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Nome de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Selecionar um nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Carregar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Ficheiros Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Erro ao carregar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não se pode ler.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>O ficheiro macro <b>{0}</b> está corrompido.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Gravar ficheiro macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>O ficheiro macro <b>{0}</b> já existe. Sobreescrever-lo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Erro ao gravar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>O ficheiro macro <b>{0}</b> não pode ser escrito.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Iniciar Registo de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>A gravação de macro já está ativada. Começar nova?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Gravação de Macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Introduza o nome de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Ficheiro alterado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Adicionar Ficheiro...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Adicionar Ficheiros...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Adicionar ficheiro com pseudónimo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Adicionar recursos localizado...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Adicionar recurso de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Adicionar recursos de ficheiro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Adicionar recurso de ficheiro com pseudónimo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Pseudónimo para o ficheiro <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Diagrama do Pacote</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Incluir atributos de classes?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Diagrama de Imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Incluir imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Diagrama da Aplicação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Incluir nome dos módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Adicionar dicionário</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Ignorar Tudo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Aviso: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Erro: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Aviso:</b> Perderá todas as alterações uma vez que o volte a abrir.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>A ativar o Fornecedor de Preenchimento Automático</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Não se pode conetar o fornecedor de autocompletar porque já há outro ativo. Por favor verifique a sua configuração.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>A ativar Fornecedor de Dicas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>O fornecedor de dicas não pode ser conetado porque já há outro activado. Por favor verifique a sua configuração.</translation> </message> @@ -9472,27 +9472,27 @@ <translation>Alteração anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Ordenar Linhas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>A seleção contém dados ilegais para uma ordenação numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>Não estão disponíveis mensagens de aviso.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> @@ -9517,7 +9517,7 @@ <translation>Reabrir Com Codificação</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>O ficheiro <b>{0}</b> foi alterado enquanto estava aberto em eric6. Recarregar?</p></translation> </message> @@ -9532,32 +9532,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19797,122 +19797,122 @@ <translation>A puxar dum repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19922,72 +19922,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20017,7 +20017,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20067,82 +20067,82 @@ <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -22176,7 +22176,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Registo de Mercurial</translation> </message> @@ -22216,17 +22216,17 @@ <translation>Selecionar o campo a filtrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Revisão</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Autor</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Mensagem</translation> </message> @@ -22371,72 +22371,72 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Adicionado</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Apagado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Apagado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Alterado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Tudo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation>Não se pôde iniciar o executável hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>Registo de Mercurial (Entrante)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>Registo de Mercurial (Sainte)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> @@ -22446,29 +22446,29 @@ <translation>Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation>Alterar a fase das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Mudar Fase</b> <p>Muda a fase das revisões selecionadas. As revisões selecionadas devem ter a mesma fase atual.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -22488,42 +22488,42 @@ <translation>Selecionar ação do menu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation>Etiquetar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation>Etiqueta a revisão selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation>Puxar Ficheiros Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> @@ -22548,45 +22548,90 @@ <translation>Pressionar para encontrar a ocurrência seguinte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation>Encontrar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation>Filtro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation><table><tr><td><b>Revisão</b></td><td>{0}</td></tr><tr><td><b>Data</b></td><td>{1}</td></tr><tr><td><b>Autor</b></td><td>{2}</td></tr><tr><td><b>Ramo</b></td><td>{3}</td></tr><tr><td><b>Pais</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <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/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <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/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished">Rascunho</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished">Público</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished">Secreto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Puxar alterações do repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32185,57 +32230,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Fechar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Fechar Tudo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Gravar Como...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Gravar Tudo</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Sem título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Abrir ficheiro de 'rejeição'</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Copiar Rota à Área de Transferência</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Fechar Outros</translation> </message> @@ -54677,7 +54722,7 @@ <translation>Sem título {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation></translation> </message> @@ -63733,6 +63778,26 @@ <comment>Edit|Calltip</comment> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64464,12 +64529,12 @@ <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> @@ -64483,24 +64548,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <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> @@ -64511,7 +64576,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <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>
--- a/i18n/eric6_ru.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_ru.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8851,7 +8851,7 @@ <translation>Файл изменён</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Файл изменён</translation> </message> @@ -8896,7 +8896,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -8926,92 +8926,92 @@ <translation>Левая клавиша мыши ставит точки останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Автозавершение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Автозавершение недоступно, так как не задан источник автозавершения.</translation> </message> @@ -9041,7 +9041,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -9051,12 +9051,12 @@ <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> @@ -9086,17 +9086,17 @@ <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> @@ -9106,22 +9106,22 @@ <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -9161,82 +9161,82 @@ <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Добавить файл под другим именем...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> @@ -9286,12 +9286,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -9371,7 +9371,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -9381,12 +9381,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -9431,42 +9431,42 @@ <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Макро <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation>Активация Автозавершения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Автозавершение не может быть подключено, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation>Активация подсказок</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Подсказки не могут быть подключены, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> @@ -9491,27 +9491,27 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation>Сортировать строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>Выборка содержит данные неподходящие для сортировки как числа.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation>Нет предупреждающего сообщения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation>Стиль: {0}</translation> </message> @@ -9536,7 +9536,7 @@ <translation>Открыть заново с кодировкой</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в Eric. Обновить?</p></translation> </message> @@ -9551,32 +9551,32 @@ <translation>Завершить</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19831,7 +19831,7 @@ <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> @@ -19846,117 +19846,117 @@ <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> @@ -19966,72 +19966,72 @@ <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation>Mercurial сервер</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Невозможно перезапустить Mercurial сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Невозможно запустить Mercurial сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation>Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation>Экспортировать патчи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation>Копировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation>Копировать изменения (продолжить)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation>Добавить Sub-репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл .hgsub sub-репозитория.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл .hgsub sub-репозитория уже содержит запись.<b>{0}</b>Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл .hgsub sub-репозитория.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation>Удалить Sub-репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл .hgsub sub-репозитория. Отмена...</p></translation> </message> @@ -20061,7 +20061,7 @@ <translation>Вы действительно хотите оттянуть все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation>Создать архив</translation> </message> @@ -20086,7 +20086,7 @@ <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation>Создана ветвь <{0}>.</translation> </message> @@ -20096,67 +20096,67 @@ <translation>Вершина текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation>Отмена незавершённого слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation>Mercurial закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку, которая будет удалена:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation>Удалить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation>Переименовать Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation>Переместить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation>Тянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку, для перетаскивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку, для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -20181,12 +20181,12 @@ <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation>Помечаем как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation>Помечаем как 'resolved'</translation> </message> @@ -22193,7 +22193,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Mercurial: Журнал</translation> </message> @@ -22223,17 +22223,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Автор</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Автор</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -22344,27 +22344,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Удалено</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Удалено</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -22379,17 +22379,17 @@ <translation>Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -22429,32 +22429,32 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation>лог (входящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation>лог (исходящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation>Обновить список изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation>&Обновить</translation> </message> @@ -22464,29 +22464,29 @@ <translation>Фаза</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation>Изменить фазу выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Изменить фазу</b> <p>Изменить фазу выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation>Копировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -22506,42 +22506,42 @@ <translation>Выберите действие из меню</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation>Скопировать выбранные изменения в текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation>Метка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation>Помеченная ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation>Загружать большие файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation>Загружать большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -22566,45 +22566,90 @@ <translation>Перейти к следующему вхождению</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr><tr><td><b>Предки</b></td><td>{4}</td></tr>{5}</table></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <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/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <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/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation>Найти фиксацию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation>Файл</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished">Черновик</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished">Публичная</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished">Приватная</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Загрузка изменений из удалённого репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32231,57 +32276,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Без имени {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Сохранить как...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation>Открыть 'отбракованный' файл</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation>Закрыть остальные</translation> </message> @@ -55060,7 +55105,7 @@ <translation>Без имени - {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> @@ -64221,6 +64266,26 @@ <comment>Edit|Calltip</comment> <translation>Meta+Alt+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64944,17 +65009,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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="2139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <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> @@ -64965,18 +65030,18 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> @@ -64998,7 +65063,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric6_tr.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_tr.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8732,7 +8732,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>Yazım Kontrolü...</translation> </message> @@ -8972,7 +8972,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını etkinleştir</translation> </message> @@ -9142,247 +9142,247 @@ <translation><p>Dosya <b>{0}</b> kaydedilemiyor.</p><p>Sebep: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Makro dosyası <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Makro dosyası <b>{0}</b> bozuk.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Makro dosyası <b>{0}</b> yazılamıyor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>Dosya ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>Dosyaları ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>Kısaltmalar dosyasına ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation><b>{0} dosyası için takma ad</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>Şemayı İçe Aktar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>Hepsini Yoksay</translation> </message> @@ -9392,42 +9392,42 @@ <translation><p><b>{0}</b> dosyası halen mevcut. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation>Dikkat: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation>Hata: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Makro dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9452,27 +9452,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation type="unfinished">Dikkat</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9497,7 +9497,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Eric5 ile açıldıktan sonra <b>{0}</b> dosyasında değişiklik olmuş. Yeniden açılsın mı?</p> {0}?} {6.?}</translation> </message> @@ -9512,32 +9512,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19751,122 +19751,122 @@ <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <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="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <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="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19876,72 +19876,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19971,7 +19971,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19996,7 +19996,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20006,67 +20006,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20091,12 +20091,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -22123,7 +22123,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> @@ -22153,17 +22153,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation>Yazar</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation>Yazar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -22308,42 +22308,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation>Silindi</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation>Silindi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -22358,32 +22358,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22393,28 +22393,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -22434,42 +22434,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished">Etiket</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22494,45 +22494,90 @@ <translation type="unfinished">Sonraki eşlişmeyi bulmak için basınız</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished">Süzgeç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished">Dosya</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32145,57 +32190,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>Kapat</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>Hepsini Kapat</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>Farklı Kaydet...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>Hepsini kaydet</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>Yazdır</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation>Başlıksız {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation type="unfinished">Yolu Panoya kopyala</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation type="unfinished">Diğerlerini Kapat</translation> </message> @@ -54653,7 +54698,7 @@ <translation>Başlıksız {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> @@ -63738,6 +63783,26 @@ <source><b>Complete from Document and APIs</b><p>Performs a completion from document and APIs of the word containing the cursor.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64460,12 +64525,12 @@ <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <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> @@ -64479,23 +64544,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64506,7 +64571,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_zh_CN.GB2312.ts Sun Aug 30 19:33:16 2015 +0200 +++ b/i18n/eric6_zh_CN.GB2312.ts Mon Aug 31 18:32:20 2015 +0200 @@ -8698,7 +8698,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7200"/> + <location filename="../QScintilla/Editor.py" line="7201"/> <source>Check spelling...</source> <translation>正在进行拼写检查……</translation> </message> @@ -8933,7 +8933,7 @@ <translation>编辑断点……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5135"/> + <location filename="../QScintilla/Editor.py" line="5136"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -9058,217 +9058,217 @@ <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4409"/> + <location filename="../QScintilla/Editor.py" line="4410"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效，没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5138"/> + <location filename="../QScintilla/Editor.py" line="5139"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5489"/> + <location filename="../QScintilla/Editor.py" line="5490"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5549"/> + <location filename="../QScintilla/Editor.py" line="5550"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5556"/> + <location filename="../QScintilla/Editor.py" line="5557"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5672"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5831"/> + <location filename="../QScintilla/Editor.py" line="5832"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6146"/> + <location filename="../QScintilla/Editor.py" line="6147"/> <source>Select a macro name:</source> <translation>选择一个宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6174"/> + <location filename="../QScintilla/Editor.py" line="6175"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6218"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6263"/> + <location filename="../QScintilla/Editor.py" line="6264"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6289"/> + <location filename="../QScintilla/Editor.py" line="6290"/> <source>Enter name of the macro:</source> <translation>输入宏名称：</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6425"/> + <location filename="../QScintilla/Editor.py" line="6426"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6748"/> + <location filename="../QScintilla/Editor.py" line="6749"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6750"/> + <location filename="../QScintilla/Editor.py" line="6751"/> <source>Add file...</source> <translation>添加文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6752"/> + <location filename="../QScintilla/Editor.py" line="6753"/> <source>Add files...</source> <translation>添加文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6754"/> + <location filename="../QScintilla/Editor.py" line="6755"/> <source>Add aliased file...</source> <translation>添加别名文件……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6757"/> + <location filename="../QScintilla/Editor.py" line="6758"/> <source>Add localized resource...</source> <translation>添加本地资源……</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6761"/> + <location filename="../QScintilla/Editor.py" line="6762"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6781"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6797"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6888"/> + <location filename="../QScintilla/Editor.py" line="6889"/> <source>Include class attributes?</source> <translation>包含类属性？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6908"/> + <location filename="../QScintilla/Editor.py" line="6909"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6922"/> + <location filename="../QScintilla/Editor.py" line="6923"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7203"/> + <location filename="../QScintilla/Editor.py" line="7204"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7205"/> + <location filename="../QScintilla/Editor.py" line="7206"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -9308,32 +9308,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6188"/> + <location filename="../QScintilla/Editor.py" line="6189"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6197"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6250"/> + <location filename="../QScintilla/Editor.py" line="6251"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6587"/> + <location filename="../QScintilla/Editor.py" line="6588"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6727"/> + <location filename="../QScintilla/Editor.py" line="6728"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6824"/> + <location filename="../QScintilla/Editor.py" line="6825"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -9363,42 +9363,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6234"/> + <location filename="../QScintilla/Editor.py" line="6235"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6085"/> + <location filename="../QScintilla/Editor.py" line="6086"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6092"/> + <location filename="../QScintilla/Editor.py" line="6093"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6421"/> + <location filename="../QScintilla/Editor.py" line="6422"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Activating Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4514"/> + <location filename="../QScintilla/Editor.py" line="4515"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Activating Calltip Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4834"/> + <location filename="../QScintilla/Editor.py" line="4835"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation type="unfinished"></translation> </message> @@ -9423,27 +9423,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7617"/> + <location filename="../QScintilla/Editor.py" line="7618"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>Warning</source> <translation type="unfinished">警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6021"/> + <location filename="../QScintilla/Editor.py" line="6022"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6082"/> + <location filename="../QScintilla/Editor.py" line="6083"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9468,7 +9468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6415"/> + <location filename="../QScintilla/Editor.py" line="6416"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -9483,32 +9483,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4563"/> + <location filename="../QScintilla/Editor.py" line="4564"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4877"/> + <location filename="../QScintilla/Editor.py" line="4878"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7704"/> + <location filename="../QScintilla/Editor.py" line="7705"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -19722,122 +19722,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <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="2794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2848"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <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="2875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19847,72 +19847,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3528"/> <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="2943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <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="3214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <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="3285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19942,7 +19942,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19967,7 +19967,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -19977,67 +19977,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3656"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3695"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3813"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -20062,12 +20062,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2196"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -22084,7 +22084,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -22114,17 +22114,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <source>Author</source> + <translation type="unfinished">作者</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Author</source> - <translation type="unfinished">作者</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -22249,42 +22249,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> + <source>Deleted</source> + <translation type="unfinished">已删除</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> - <source>Deleted</source> - <translation type="unfinished">已删除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="883"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -22324,32 +22324,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>All</source> <translation type="unfinished">全部</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="83"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22359,28 +22359,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1693"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -22400,42 +22400,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="207"/> <source>Tag</source> <translation type="unfinished">标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1730"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="973"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -22460,45 +22460,90 @@ <translation type="unfinished">点击查找下一次出现</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Find</source> <translation type="unfinished">查找</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="110"/> <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1873"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> <source>File</source> <translation type="unfinished">文件</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="164"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -32092,57 +32137,57 @@ <context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> <source>Close</source> <translation>关闭</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="245"/> <source>Close All</source> <translation>全部关闭</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> <source>Save</source> <translation>保存</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="250"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Save As...</source> <translation>另存为……</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="253"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="254"/> <source>Save All</source> <translation>全部保存</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="262"/> <source>Print</source> <translation>打印</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="398"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="399"/> <source>Untitled {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="519"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="520"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="257"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="258"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="266"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> <source>Close Others</source> <translation type="unfinished"></translation> </message> @@ -54790,7 +54835,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1276"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> @@ -63902,6 +63947,26 @@ <comment>Edit|Complete from Document and APIs</comment> <translation type="unfinished">Alt+Shift+Space</translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="687"/> + <source>Save &Copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="692"/> + <source>Save a copy of the current file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="694"/> + <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileSidebarsDialog</name> @@ -64624,12 +64689,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> <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="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -64641,23 +64706,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <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="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <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="2135"/> - <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="2139"/> + <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="2143"/> <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> @@ -64665,7 +64730,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
