Sat, 01 Sep 2018 10:24:02 +0200
Merged with "default" branch to prepare the next release.
--- a/APIs/Python3/eric6.api Thu Aug 02 18:38:40 2018 +0200 +++ b/APIs/Python3/eric6.api Sat Sep 01 10:24:02 2018 +0200 @@ -3707,6 +3707,7 @@ eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_nicknameUpButton_clicked?4() eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_nicknamesList_itemSelectionChanged?4() eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_renameButton_clicked?4() +eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_showPasswordButton_clicked?4(checked) eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog?1(manager, identityName, parent=None) eric6.Network.IRC.IrcMessageEdit.IrcMessageEdit.MaxHistory?7 eric6.Network.IRC.IrcMessageEdit.IrcMessageEdit.keyPressEvent?4(evt) @@ -5756,7 +5757,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_changesetsEdit_textChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_directoryPicker_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_patternEdit_textChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(bookmarksList, bookmarkAvailable, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension.shutdown?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper._updateVCSStatus?5(name) @@ -6153,7 +6154,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag1Combo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Button_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Combo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog?1(tagsList, branchesList, bookmarksList, version, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initActions?4() eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initMenu?4(mainMenu) eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.menuTitle?4() @@ -6260,7 +6261,9 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetCurrentBranch?4(repodir) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir, withType=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path, revs=None) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftAbort?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftContinue?4(path) +eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftStop?4(path) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgImport?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) @@ -6956,6 +6959,7 @@ eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate1?7 eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate2?7 eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate3?7 +eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataInfoTemplate?7 eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataListTemplate?7 eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataTemplate?7 eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.mainTemplate?7
--- a/Cooperation/Connection.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Cooperation/Connection.py Sat Sep 01 10:24:02 2018 +0200 @@ -26,6 +26,7 @@ PongTimeout = 60 * 1000 PingInterval = 5 * 1000 SeparatorToken = '|||' +SeparatorToken_b = b'|||' class Connection(QTcpSocket): @@ -262,8 +263,8 @@ self.abort() return - self.write("{0}{1}1{1}p".format( - Connection.ProtocolPing, SeparatorToken)) + self.write(QByteArray("{0}{1}1{1}p".format( + Connection.ProtocolPing, SeparatorToken).encode("utf-8"))) def __sendGreetingMessage(self): """ @@ -293,7 +294,7 @@ while self.bytesAvailable() and self.__buffer.size() < maxSize: self.__buffer.append(self.read(1)) - if self.__buffer.endsWith(SeparatorToken): + if self.__buffer.endsWith(SeparatorToken_b): break return self.__buffer.size() - numBytesBeforeRead @@ -306,10 +307,10 @@ """ if self.bytesAvailable() <= 0 or \ self.__readDataIntoBuffer() <= 0 or \ - not self.__buffer.endsWith(SeparatorToken): + not self.__buffer.endsWith(SeparatorToken_b): return 0 - self.__buffer.chop(len(SeparatorToken)) + self.__buffer.chop(len(SeparatorToken_b)) number = self.__buffer.toInt()[0] self.__buffer.clear() return number @@ -329,19 +330,20 @@ return False self.__buffer.chop(len(SeparatorToken)) - if self.__buffer == Connection.ProtocolPing: + protocolHeader = str(self.__buffer, encoding="utf-8") + if protocolHeader == Connection.ProtocolPing: self.__currentDataType = Connection.Ping - elif self.__buffer == Connection.ProtocolPong: + elif protocolHeader == Connection.ProtocolPong: self.__currentDataType = Connection.Pong - elif self.__buffer == Connection.ProtocolMessage: + elif protocolHeader == Connection.ProtocolMessage: self.__currentDataType = Connection.PlainText - elif self.__buffer == Connection.ProtocolGreeting: + elif protocolHeader == Connection.ProtocolGreeting: self.__currentDataType = Connection.Greeting - elif self.__buffer == Connection.ProtocolGetParticipants: + elif protocolHeader == Connection.ProtocolGetParticipants: self.__currentDataType = Connection.GetParticipants - elif self.__buffer == Connection.ProtocolParticipants: + elif protocolHeader == Connection.ProtocolParticipants: self.__currentDataType = Connection.Participants - elif self.__buffer == Connection.ProtocolEditor: + elif protocolHeader == Connection.ProtocolEditor: self.__currentDataType = Connection.Editor else: self.__currentDataType = Connection.Undefined @@ -388,8 +390,8 @@ self.newMessage.emit( self.__username, str(self.__buffer, encoding="utf-8")) elif self.__currentDataType == Connection.Ping: - self.write("{0}{1}1{1}p".format( - Connection.ProtocolPong, SeparatorToken)) + self.write(QByteArray("{0}{1}1{1}p".format( + Connection.ProtocolPong, SeparatorToken).encode("utf-8"))) elif self.__currentDataType == Connection.Pong: self.__pongTime.restart() elif self.__currentDataType == Connection.GetParticipants: @@ -414,10 +416,11 @@ """ Public method to request a list of participants. """ - self.write( + self.write(QByteArray( "{0}{1}1{1}l".format( - Connection.ProtocolGetParticipants, SeparatorToken) - ) + Connection.ProtocolGetParticipants, SeparatorToken + ).encode("utf-8") + )) def sendParticipants(self, participants): """
--- a/Documentation/Help/source.qhp Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Help/source.qhp Sat Sep 01 10:24:02 2018 +0200 @@ -8338,6 +8338,7 @@ <keyword name="Hg.__getInOutBookmarks" id="Hg.__getInOutBookmarks" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getInOutBookmarks" /> <keyword name="Hg.__getMostRecentCommitMessage" id="Hg.__getMostRecentCommitMessage" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__getMostRecentCommitMessage" /> <keyword name="Hg.__hgGetFileForRevision" id="Hg.__hgGetFileForRevision" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgGetFileForRevision" /> + <keyword name="Hg.__hgGraftSubCommand" id="Hg.__hgGraftSubCommand" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__hgGraftSubCommand" /> <keyword name="Hg.__iniFileChanged" id="Hg.__iniFileChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__iniFileChanged" /> <keyword name="Hg.__monitorRepoIniFile" id="Hg.__monitorRepoIniFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__monitorRepoIniFile" /> <keyword name="Hg.__vcsCommit_Step2" id="Hg.__vcsCommit_Step2" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__vcsCommit_Step2" /> @@ -8381,7 +8382,9 @@ <keyword name="Hg.hgGetCurrentBranch" id="Hg.hgGetCurrentBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetCurrentBranch" /> <keyword name="Hg.hgGetTagsList" id="Hg.hgGetTagsList" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetTagsList" /> <keyword name="Hg.hgGraft" id="Hg.hgGraft" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraft" /> + <keyword name="Hg.hgGraftAbort" id="Hg.hgGraftAbort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraftAbort" /> <keyword name="Hg.hgGraftContinue" id="Hg.hgGraftContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraftContinue" /> + <keyword name="Hg.hgGraftStop" id="Hg.hgGraftStop" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraftStop" /> <keyword name="Hg.hgIdentify" id="Hg.hgIdentify" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentify" /> <keyword name="Hg.hgImport" id="Hg.hgImport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgImport" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> @@ -9000,7 +9003,9 @@ <keyword name="HgProjectHelper.__hgExport" id="HgProjectHelper.__hgExport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExport" /> <keyword name="HgProjectHelper.__hgExtendedDiff" id="HgProjectHelper.__hgExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExtendedDiff" /> <keyword name="HgProjectHelper.__hgGraft" id="HgProjectHelper.__hgGraft" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraft" /> + <keyword name="HgProjectHelper.__hgGraftAbort" id="HgProjectHelper.__hgGraftAbort" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraftAbort" /> <keyword name="HgProjectHelper.__hgGraftContinue" id="HgProjectHelper.__hgGraftContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraftContinue" /> + <keyword name="HgProjectHelper.__hgGraftStop" id="HgProjectHelper.__hgGraftStop" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraftStop" /> <keyword name="HgProjectHelper.__hgHeads" id="HgProjectHelper.__hgHeads" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgHeads" /> <keyword name="HgProjectHelper.__hgIdentify" id="HgProjectHelper.__hgIdentify" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentify" /> <keyword name="HgProjectHelper.__hgImport" id="HgProjectHelper.__hgImport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgImport" /> @@ -10178,6 +10183,7 @@ <keyword name="IrcIdentitiesEditDialog.on_nicknameUpButton_clicked" id="IrcIdentitiesEditDialog.on_nicknameUpButton_clicked" ref="eric6.Network.IRC.IrcIdentitiesEditDialog.html#IrcIdentitiesEditDialog.on_nicknameUpButton_clicked" /> <keyword name="IrcIdentitiesEditDialog.on_nicknamesList_itemSelectionChanged" id="IrcIdentitiesEditDialog.on_nicknamesList_itemSelectionChanged" ref="eric6.Network.IRC.IrcIdentitiesEditDialog.html#IrcIdentitiesEditDialog.on_nicknamesList_itemSelectionChanged" /> <keyword name="IrcIdentitiesEditDialog.on_renameButton_clicked" id="IrcIdentitiesEditDialog.on_renameButton_clicked" ref="eric6.Network.IRC.IrcIdentitiesEditDialog.html#IrcIdentitiesEditDialog.on_renameButton_clicked" /> + <keyword name="IrcIdentitiesEditDialog.on_showPasswordButton_clicked" id="IrcIdentitiesEditDialog.on_showPasswordButton_clicked" ref="eric6.Network.IRC.IrcIdentitiesEditDialog.html#IrcIdentitiesEditDialog.on_showPasswordButton_clicked" /> <keyword name="IrcIdentity" id="IrcIdentity" ref="eric6.Network.IRC.IrcNetworkManager.html#IrcIdentity" /> <keyword name="IrcIdentity (Constructor)" id="IrcIdentity (Constructor)" ref="eric6.Network.IRC.IrcNetworkManager.html#IrcIdentity.__init__" /> <keyword name="IrcIdentity.createDefaultIdentity" id="IrcIdentity.createDefaultIdentity" ref="eric6.Network.IRC.IrcNetworkManager.html#IrcIdentity.createDefaultIdentity" /> @@ -14258,6 +14264,7 @@ <keyword name="Shell.__write" id="Shell.__write" ref="eric6.QScintilla.Shell.html#Shell.__write" /> <keyword name="Shell.__writeBanner" id="Shell.__writeBanner" ref="eric6.QScintilla.Shell.html#Shell.__writeBanner" /> <keyword name="Shell.__writePrompt" id="Shell.__writePrompt" ref="eric6.QScintilla.Shell.html#Shell.__writePrompt" /> + <keyword name="Shell.__writeQueued" id="Shell.__writeQueued" ref="eric6.QScintilla.Shell.html#Shell.__writeQueued" /> <keyword name="Shell.__writeStdErr" id="Shell.__writeStdErr" ref="eric6.QScintilla.Shell.html#Shell.__writeStdErr" /> <keyword name="Shell.__writeStdOut" id="Shell.__writeStdOut" ref="eric6.QScintilla.Shell.html#Shell.__writeStdOut" /> <keyword name="Shell.clear" id="Shell.clear" ref="eric6.QScintilla.Shell.html#Shell.clear" />
--- a/Documentation/Source/eric6.Network.IRC.IrcIdentitiesEditDialog.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcIdentitiesEditDialog.html Sat Sep 01 10:24:02 2018 +0200 @@ -113,6 +113,9 @@ </tr><tr> <td><a href="#IrcIdentitiesEditDialog.on_renameButton_clicked">on_renameButton_clicked</a></td> <td>Private slot to rename the selected identity.</td> +</tr><tr> +<td><a href="#IrcIdentitiesEditDialog.on_showPasswordButton_clicked">on_showPasswordButton_clicked</a></td> +<td>Private slot to show or hide the password.</td> </tr> </table> <h3>Static Methods</h3> @@ -256,7 +259,17 @@ <b>on_renameButton_clicked</b>(<i></i>) <p> Private slot to rename the selected identity. -</p> +</p><a NAME="IrcIdentitiesEditDialog.on_showPasswordButton_clicked" ID="IrcIdentitiesEditDialog.on_showPasswordButton_clicked"></a> +<h4>IrcIdentitiesEditDialog.on_showPasswordButton_clicked</h4> +<b>on_showPasswordButton_clicked</b>(<i>checked</i>) +<p> + Private slot to show or hide the password. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +state of the button +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html Sat Sep 01 10:24:02 2018 +0200 @@ -82,13 +82,20 @@ </table> <a NAME="HgExportDialog.__init__" ID="HgExportDialog.__init__"></a> <h4>HgExportDialog (Constructor)</h4> -<b>HgExportDialog</b>(<i>parent=None</i>) +<b>HgExportDialog</b>(<i>bookmarksList, bookmarkAvailable, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>bookmarksList</i> (list of str)</dt> +<dd> +list of defined bookmarks +</dd><dt><i>bookmarkAvailable</i> (bool)</dt> <dd> -reference to the parent widget (QWidget) +flag indicating the availability of the + "--bookmark" option +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget </dd> </dl><a NAME="HgExportDialog.__updateOK" ID="HgExportDialog.__updateOK"></a> <h4>HgExportDialog.__updateOK</h4> @@ -104,10 +111,15 @@ <dt>Returns:</dt> <dd> tuple naming the output file name, the list of revisions to - export, and flags indicating to compare against the second parent, - to treat all files as text, to omit dates in the diff headers and - to use the git extended diff format (string, list of strings, - boolean, boolean, boolean, boolean) + export, the name of a bookmarked branch and flags indicating to + compare against the second parent, to treat all files as text, + to omit dates in the diff headers and to use the git extended + diff format +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, list of str, str, bool, bool, bool, bool) </dd> </dl><a NAME="HgExportDialog.on_changesetsEdit_textChanged" ID="HgExportDialog.on_changesetsEdit_textChanged"></a> <h4>HgExportDialog.on_changesetsEdit_textChanged</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Sat Sep 01 10:24:02 2018 +0200 @@ -67,7 +67,7 @@ <td>Public method to retrieve the entered data.</td> </tr><tr> <td><a href="#HgGraftDialog.on_currentUserCheckBox_toggled">on_currentUserCheckBox_toggled</a></td> -<td>Private slot to handle changes of the currentuser state.</td> +<td>Private slot to handle changes of the current user state.</td> </tr><tr> <td><a href="#HgGraftDialog.on_revisionsEdit_textChanged">on_revisionsEdit_textChanged</a></td> <td>Private slot to react upon changes of revisions.</td> @@ -89,16 +89,15 @@ <p> Constructor </p><dl> -<dt><i>vcs</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> -reference to the VCS object (Hg) -</dd><dt><i>revs</i></dt> +reference to the VCS object +</dd><dt><i>revs</i> (list of str)</dt> <dd> -list of revisions to show in the revisions pane (list of - strings) -</dd><dt><i>parent</i></dt> +list of revisions to show in the revisions pane +</dd><dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget </dd> </dl><a NAME="HgGraftDialog.__updateOk" ID="HgGraftDialog.__updateOk"></a> <h4>HgGraftDialog.__updateOk</h4> @@ -118,19 +117,24 @@ current user and the user name, another tuple giving a flag indicating to set the date, a flag indicating to use the current date and the date, a flag indicating to append graft info - to the log message and a flag indicating a dry-run (list of - strings, (boolean, boolean, string), (boolean, boolean, string), - boolean, boolean) + to the log message, a flag indicating a dry-run and a flag + indicating to not commit the copied changesets +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (list of str, (bool, bool, str), (bool, bool, str), + bool, bool, bool) </dd> </dl><a NAME="HgGraftDialog.on_currentUserCheckBox_toggled" ID="HgGraftDialog.on_currentUserCheckBox_toggled"></a> <h4>HgGraftDialog.on_currentUserCheckBox_toggled</h4> <b>on_currentUserCheckBox_toggled</b>(<i>checked</i>) <p> - Private slot to handle changes of the currentuser state. + Private slot to handle changes of the current user state. </p><dl> -<dt><i>checked</i></dt> +<dt><i>checked</i> (bool)</dt> <dd> -flag giving the checked state (boolean) +flag giving the checked state </dd> </dl><a NAME="HgGraftDialog.on_revisionsEdit_textChanged" ID="HgGraftDialog.on_revisionsEdit_textChanged"></a> <h4>HgGraftDialog.on_revisionsEdit_textChanged</h4> @@ -153,9 +157,9 @@ <p> Private slot to handle changes of the user group state. </p><dl> -<dt><i>checked</i></dt> +<dt><i>checked</i> (bool)</dt> <dd> -flag giving the checked state (boolean) +flag giving the checked state </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sat Sep 01 10:24:02 2018 +0200 @@ -156,9 +156,15 @@ <td><a href="#HgProjectHelper.__hgGraft">__hgGraft</a></td> <td>Private slot used to copy changesets from another branch.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgGraftAbort">__hgGraftAbort</a></td> +<td>Private slot used to abort an interrupted copying session and perform a rollback.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgGraftContinue">__hgGraftContinue</a></td> <td>Private slot used to continue the last copying session after conflicts were resolved.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgGraftStop">__hgGraftStop</a></td> +<td>Private slot used to stop an interrupted copying session.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgHeads">__hgHeads</a></td> <td>Private slot used to show the heads of the repository.</td> </tr><tr> @@ -461,12 +467,23 @@ <b>__hgGraft</b>(<i></i>) <p> Private slot used to copy changesets from another branch. +</p><a NAME="HgProjectHelper.__hgGraftAbort" ID="HgProjectHelper.__hgGraftAbort"></a> +<h4>HgProjectHelper.__hgGraftAbort</h4> +<b>__hgGraftAbort</b>(<i></i>) +<p> + Private slot used to abort an interrupted copying session and perform + a rollback. </p><a NAME="HgProjectHelper.__hgGraftContinue" ID="HgProjectHelper.__hgGraftContinue"></a> <h4>HgProjectHelper.__hgGraftContinue</h4> <b>__hgGraftContinue</b>(<i></i>) <p> Private slot used to continue the last copying session after conflicts were resolved. +</p><a NAME="HgProjectHelper.__hgGraftStop" ID="HgProjectHelper.__hgGraftStop"></a> +<h4>HgProjectHelper.__hgGraftStop</h4> +<b>__hgGraftStop</b>(<i></i>) +<p> + Private slot used to stop an interrupted copying session. </p><a NAME="HgProjectHelper.__hgHeads" ID="HgProjectHelper.__hgHeads"></a> <h4>HgProjectHelper.__hgHeads</h4> <b>__hgHeads</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html Sat Sep 01 10:24:02 2018 +0200 @@ -124,22 +124,25 @@ </table> <a NAME="HgRebaseDialog.__init__" ID="HgRebaseDialog.__init__"></a> <h4>HgRebaseDialog (Constructor)</h4> -<b>HgRebaseDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) +<b>HgRebaseDialog</b>(<i>tagsList, branchesList, bookmarksList, version, parent=None</i>) <p> Constructor </p><dl> -<dt><i>tagsList</i></dt> +<dt><i>tagsList</i> (list of str)</dt> <dd> -list of tags (list of strings) -</dd><dt><i>branchesList</i></dt> +list of tags +</dd><dt><i>branchesList</i> (list of str)</dt> +<dd> +list of branches +</dd><dt><i>bookmarksList</i> (list of str)</dt> <dd> -list of branches (list of strings) -</dd><dt><i>bookmarksList</i></dt> +list of bookmarks +</dd><dt><i>version</i> (tuple of int)</dt> <dd> -list of bookmarks (list of strings) -</dd><dt><i>parent</i></dt> +tuple giving the Mercurial version +</dd><dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget </dd> </dl><a NAME="HgRebaseDialog.__getRevision" ID="HgRebaseDialog.__getRevision"></a> <h4>HgRebaseDialog.__getRevision</h4> @@ -172,9 +175,15 @@ tuple with a source indicator of "S" or "B", the source revision, the destination revision, a flag indicating to collapse, a flag indicating to keep the original changesets, a flag - indicating to keep the original branch name and a flag indicating - to detach the source (string, string, string, boolean, boolean, - boolean, boolean) + indicating to keep the original branch name, a flag indicating + to detach the source, a flag indicating to perform a dry-run only + and a flag indicating to perform a dry-run first, than ask for + confirmation +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str, bool, bool, bool, bool, bool, bool) </dd> </dl><a NAME="HgRebaseDialog.on_bookmark1Button_toggled" ID="HgRebaseDialog.on_bookmark1Button_toggled"></a> <h4>HgRebaseDialog.on_bookmark1Button_toggled</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Sep 01 10:24:02 2018 +0200 @@ -89,6 +89,9 @@ <td><a href="#Hg.__hgGetFileForRevision">__hgGetFileForRevision</a></td> <td>Private method to get a file for a specific revision from the repository.</td> </tr><tr> +<td><a href="#Hg.__hgGraftSubCommand">__hgGraftSubCommand</a></td> +<td>Private method to perform a Mercurial graft subcommand.</td> +</tr><tr> <td><a href="#Hg.__iniFileChanged">__iniFileChanged</a></td> <td>Private slot to handle a change of the Mercurial configuration file.</td> </tr><tr> @@ -218,9 +221,15 @@ <td><a href="#Hg.hgGraft">hgGraft</a></td> <td>Public method to copy changesets from another branch.</td> </tr><tr> +<td><a href="#Hg.hgGraftAbort">hgGraftAbort</a></td> +<td>Public method to abort an interrupted copying session and perform a rollback.</td> +</tr><tr> <td><a href="#Hg.hgGraftContinue">hgGraftContinue</a></td> <td>Public method to continue copying changesets from another branch.</td> </tr><tr> +<td><a href="#Hg.hgGraftStop">hgGraftStop</a></td> +<td>Public method to stop an interrupted copying session.</td> +</tr><tr> <td><a href="#Hg.hgIdentify">hgIdentify</a></td> <td>Public method to identify the current working directory.</td> </tr><tr> @@ -493,6 +502,32 @@ <dd> contents of the file (string) and an error message (string) </dd> +</dl><a NAME="Hg.__hgGraftSubCommand" ID="Hg.__hgGraftSubCommand"></a> +<h4>Hg.__hgGraftSubCommand</h4> +<b>__hgGraftSubCommand</b>(<i>path, subcommand, title</i>) +<p> + Private method to perform a Mercurial graft subcommand. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd><dt><i>subcommand</i> (str)</dt> +<dd> +subcommand flag +</dd><dt><i>title</i> (str)</dt> +<dd> +tirle of the dialog +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="Hg.__iniFileChanged" ID="Hg.__iniFileChanged"></a> <h4>Hg.__iniFileChanged</h4> <b>__iniFileChanged</b>(<i>path</i>) @@ -1033,20 +1068,66 @@ <dd> flag indicating that the project should be reread (boolean) </dd> +</dl><a NAME="Hg.hgGraftAbort" ID="Hg.hgGraftAbort"></a> +<h4>Hg.hgGraftAbort</h4> +<b>hgGraftAbort</b>(<i>path</i>) +<p> + Public method to abort an interrupted copying session and perform + a rollback. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="Hg.hgGraftContinue" ID="Hg.hgGraftContinue"></a> <h4>Hg.hgGraftContinue</h4> <b>hgGraftContinue</b>(<i>path</i>) <p> Public method to continue copying changesets from another branch. </p><dl> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -directory name of the project (string) +directory name of the project </dd> </dl><dl> <dt>Returns:</dt> <dd> -flag indicating that the project should be reread (boolean) +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="Hg.hgGraftStop" ID="Hg.hgGraftStop"></a> +<h4>Hg.hgGraftStop</h4> +<b>hgGraftStop</b>(<i>path</i>) +<p> + Public method to stop an interrupted copying session. +</p><dl> +<dt><i>path</i> (str)</dt> +<dd> +directory name of the project +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="Hg.hgIdentify" ID="Hg.hgIdentify"></a> <h4>Hg.hgIdentify</h4>
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.html Sat Sep 01 10:24:02 2018 +0200 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>apiFilesTemplate</td></tr><tr><td>configTemplate0</td></tr><tr><td>configTemplate1</td></tr><tr><td>configTemplate2</td></tr><tr><td>configTemplate3</td></tr><tr><td>exeDisplayDataListTemplate</td></tr><tr><td>exeDisplayDataTemplate</td></tr><tr><td>mainTemplate</td></tr><tr><td>moduleSetupTemplate</td></tr><tr><td>onDemandTemplate</td></tr><tr><td>previewPixmapTemplate</td></tr> +<tr><td>apiFilesTemplate</td></tr><tr><td>configTemplate0</td></tr><tr><td>configTemplate1</td></tr><tr><td>configTemplate2</td></tr><tr><td>configTemplate3</td></tr><tr><td>exeDisplayDataInfoTemplate</td></tr><tr><td>exeDisplayDataListTemplate</td></tr><tr><td>exeDisplayDataTemplate</td></tr><tr><td>mainTemplate</td></tr><tr><td>moduleSetupTemplate</td></tr><tr><td>onDemandTemplate</td></tr><tr><td>previewPixmapTemplate</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric6.Project.IdlCompilerOptionsDialog.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.Project.IdlCompilerOptionsDialog.html Sat Sep 01 10:24:02 2018 +0200 @@ -153,9 +153,9 @@ </dd><dt><i>undefinedNames</i> (list of str)</dt> <dd> list of undefined names -</dd><dt><i>projectDirectory</i> (str)</dt> +</dd><dt><i>project</i> (Project)</dt> <dd> -directory name of the project +reference to the project object </dd><dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget
--- a/Documentation/Source/eric6.QScintilla.Shell.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.QScintilla.Shell.html Sat Sep 01 10:24:02 2018 +0200 @@ -195,7 +195,7 @@ <td>Private slot to handle the selection from the completion list.</td> </tr><tr> <td><a href="#Shell.__concatenateText">__concatenateText</a></td> -<td>Private slot to get all available text and process it in one step.</td> +<td>Private slot to queue text and process it in one step.</td> </tr><tr> <td><a href="#Shell.__configure">__configure</a></td> <td>Private method to open the configuration dialog.</td> @@ -297,7 +297,7 @@ <td>Private method to display a command from the history.</td> </tr><tr> <td><a href="#Shell.__write">__write</a></td> -<td>Private method to display some text.</td> +<td>Private method to display some text without queuing.</td> </tr><tr> <td><a href="#Shell.__writeBanner">__writeBanner</a></td> <td>Private method to write a banner with info from the debug client.</td> @@ -305,6 +305,9 @@ <td><a href="#Shell.__writePrompt">__writePrompt</a></td> <td>Private method to write the prompt.</td> </tr><tr> +<td><a href="#Shell.__writeQueued">__writeQueued</a></td> +<td>Private method to display some text using a write queue.</td> +</tr><tr> <td><a href="#Shell.__writeStdErr">__writeStdErr</a></td> <td>Private method to display some text with StdErr label.</td> </tr><tr> @@ -775,7 +778,7 @@ <h4>Shell.__concatenateText</h4> <b>__concatenateText</b>(<i>text</i>) <p> - Private slot to get all available text and process it in one step. + Private slot to queue text and process it in one step. </p><dl> <dt><i>text</i> (str)</dt> <dd> @@ -1097,11 +1100,11 @@ <h4>Shell.__write</h4> <b>__write</b>(<i>s</i>) <p> - Private method to display some text. + Private method to display some text without queuing. </p><dl> -<dt><i>s</i></dt> +<dt><i>s</i> (str)</dt> <dd> -text to be displayed (string) +text to be displayed </dd> </dl><a NAME="Shell.__writeBanner" ID="Shell.__writeBanner"></a> <h4>Shell.__writeBanner</h4> @@ -1124,7 +1127,17 @@ <b>__writePrompt</b>(<i></i>) <p> Private method to write the prompt. -</p><a NAME="Shell.__writeStdErr" ID="Shell.__writeStdErr"></a> +</p><a NAME="Shell.__writeQueued" ID="Shell.__writeQueued"></a> +<h4>Shell.__writeQueued</h4> +<b>__writeQueued</b>(<i>s</i>) +<p> + Private method to display some text using a write queue. +</p><dl> +<dt><i>s</i></dt> +<dd> +text to be displayed (string) +</dd> +</dl><a NAME="Shell.__writeStdErr" ID="Shell.__writeStdErr"></a> <h4>Shell.__writeStdErr</h4> <b>__writeStdErr</b>(<i>s</i>) <p>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Thu Aug 02 18:38:40 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sat Sep 01 10:24:02 2018 +0200 @@ -823,7 +823,7 @@ <h4>WebBrowserView.__quotaRequested</h4> <b>__quotaRequested</b>(<i>quotaRequest</i>) <p> - Private slot to handle quota requests of the web page. + Private slot to handle quota requests of the web page. </p><dl> <dt><i>quotaRequest</i> (QWebEngineQuotaRequest)</dt> <dd> @@ -833,7 +833,8 @@ <h4>WebBrowserView.__registerProtocolHandlerRequested</h4> <b>__registerProtocolHandlerRequested</b>(<i>request</i>) <p> - Private slot to handle requests for registration of a protocol handler. + Private slot to handle requests for registration of a protocol + handler. </p><dl> <dt><i>request</i> (QWebEngineRegisterProtocolHandlerRequest)</dt> <dd>
--- a/E5Gui/E5PathPickerDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/E5Gui/E5PathPickerDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -13,6 +13,7 @@ from .E5PathPicker import E5PathPicker, E5PathPickerModes + class E5PathPickerDialog(QDialog): """ Class implementing a dialog to enter a file system path using a file
--- a/Globals/__init__.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Globals/__init__.py Sat Sep 01 10:24:02 2018 +0200 @@ -16,6 +16,7 @@ import sys import os import re +import shutil from PyQt5.QtCore import QDir, QLibraryInfo, QByteArray, QCoreApplication, \ QT_VERSION_STR, QT_VERSION @@ -174,7 +175,11 @@ hpOld = os.path.join(os.path.expanduser("~"), cdnOld) if os.path.exists(hpOld): hpNew = os.path.join(os.path.expanduser("~"), cdn) - os.rename(hpOld, hpNew) + if os.path.exists(hpNew): + # simply delete the old config directory + shutil.rmtree(hpOld, True) + else: + os.rename(hpOld, hpNew) hp = os.path.join(os.path.expanduser("~"), cdn) if not os.path.exists(hp):
--- a/Network/IRC/IrcChannelWidget.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Network/IRC/IrcChannelWidget.py Sat Sep 01 10:24:02 2018 +0200 @@ -234,6 +234,8 @@ self.__markerLine = "" self.__hidden = True + self.__serviceNamesLower = ["nickserv", "chanserv", "memoserv"] + self.__patterns = [ # :foo_!n=foo@foohost.bar.net PRIVMSG #eric-ide :some long message # :foo_!n=foo@foohost.bar.net PRIVMSG bar_ :some long message @@ -365,12 +367,21 @@ """Messages starting with a '/' are not allowed""" """ in private chats.""")) else: - msgList = msg.split(None, 1) + msgList = msg.split() cmd = msgList[0][1:].upper() if cmd == "MSG": cmd = "PRIVMSG" - msgList[0] = cmd - self.sendData.emit(" ".join(msgList)) + if (len(msgList) > 1 and + msgList[1].strip().lower() in + self.__serviceNamesLower): + msg = "PRIVMSG " + msgList[1].strip().lower() + \ + " :" + " ".join(msgList[2:]) + else: + msgList[0] = cmd + msg = " ".join(msgList) + else: + msg = msg[1:] + self.sendData.emit(msg) else: if self.__private: self.sendData.emit(
--- a/Network/IRC/IrcIdentitiesEditDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Network/IRC/IrcIdentitiesEditDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -49,6 +49,8 @@ self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) self.nicknameDownButton.setIcon( UI.PixmapCache.getIcon("1downarrow.png")) + self.showPasswordButton.setIcon( + UI.PixmapCache.getIcon("showPassword.png")) self.__manager = manager @@ -453,6 +455,27 @@ self.nicknamesList.insertItem(row, itm) self.nicknamesList.setCurrentItem(itm) + @pyqtSlot(bool) + def on_showPasswordButton_clicked(self, checked): + """ + Private slot to show or hide the password. + + @param checked state of the button + @type bool + """ + if checked: + self.passwordEdit.setEchoMode(QLineEdit.Normal) + self.showPasswordButton.setIcon( + UI.PixmapCache.getIcon("hidePassword.png")) + self.showPasswordButton.setToolTip( + self.tr("Press to hide the password")) + else: + self.passwordEdit.setEchoMode(QLineEdit.Password) + self.showPasswordButton.setIcon( + UI.PixmapCache.getIcon("showPassword.png")) + self.showPasswordButton.setToolTip( + self.tr("Press to show the password")) + def accept(self): """ Public slot handling the acceptance of the dialog.
--- a/Network/IRC/IrcIdentitiesEditDialog.ui Thu Aug 02 18:38:40 2018 +0200 +++ b/Network/IRC/IrcIdentitiesEditDialog.ui Sat Sep 01 10:24:02 2018 +0200 @@ -200,6 +200,16 @@ </property> </widget> </item> + <item> + <widget class="QToolButton" name="showPasswordButton"> + <property name="toolTip"> + <string>Press to show the password</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> </item> @@ -344,12 +354,12 @@ <tabstop>nicknameDownButton</tabstop> <tabstop>serviceEdit</tabstop> <tabstop>passwordEdit</tabstop> + <tabstop>showPasswordButton</tabstop> <tabstop>rememberPosOnAwayCheckBox</tabstop> <tabstop>awayEdit</tabstop> <tabstop>identEdit</tabstop> <tabstop>quitEdit</tabstop> <tabstop>partEdit</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections>
--- a/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GlosbeEngine.py Sat Sep 01 10:24:02 2018 +0200 @@ -82,8 +82,8 @@ text) url = QUrl(self.TranslatorUrl + params) response, ok = requestObject.get(url) - response = str(response, "utf-8", "replace") if ok: + response = str(response, "utf-8", "replace") try: responseDict = json.loads(response) except ValueError:
--- a/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py Sat Sep 01 10:24:02 2018 +0200 @@ -76,8 +76,8 @@ originalLanguage, translationLanguage, text, apiKey) url = QUrl(self.TranslatorUrl + params) response, ok = requestObject.get(url) - response = str(response, "utf-8", "replace") if ok: + response = str(response, "utf-8", "replace") try: responseDict = json.loads(response) except ValueError:
--- a/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py Sat Sep 01 10:24:02 2018 +0200 @@ -161,13 +161,14 @@ text) url = QUrl(self.TranslatorUrl + params) response, ok = requestObject.get(url, extraHeaders=[authHeader]) - response = str(response, "utf-8", "replace") - if ok and response.startswith("<string") and \ - response.endswith("</string>"): - result = response.split(">", 1)[1].rsplit("<", 1)[0] - else: - result = self.tr("No translation available.") - ok = False + if ok: + response = str(response, "utf-8", "replace").strip() + if response.startswith("<string") and \ + response.endswith("</string>"): + result = response.split(">", 1)[1].rsplit("<", 1)[0] + else: + result = self.tr("No translation available.") + ok = False return result, ok def getTextToSpeechData(self, requestObject, text, language):
--- a/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py Sat Sep 01 10:24:02 2018 +0200 @@ -92,8 +92,8 @@ keyParam, emailParam) url = QUrl(self.TranslatorUrl + params) response, ok = requestObject.get(url) - response = str(response, "utf-8", "replace") if ok: + response = str(response, "utf-8", "replace") try: responseDict = json.loads(response) except ValueError:
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -23,11 +23,17 @@ """ Class implementing a dialog to enter data for the Mercurial export command. """ - def __init__(self, parent=None): + def __init__(self, bookmarksList, bookmarkAvailable, parent=None): """ Constructor - @param parent reference to the parent widget (QWidget) + @param bookmarksList list of defined bookmarks + @type list of str + @param bookmarkAvailable flag indicating the availability of the + "--bookmark" option + @type bool + @param parent reference to the parent widget + @type QWidget """ super(HgExportDialog, self).__init__(parent) self.setupUi(self) @@ -39,6 +45,10 @@ # set default values for directory and pattern self.patternEdit.setText("%b_%r_%h_%n_of_%N.diff") self.directoryPicker.setText(QDir.tempPath()) + + self.bookmarkCombo.addItem("") + self.bookmarkCombo.addItems(sorted(bookmarksList)) + self.bookmarkCombo.setenabled(bookmarkAvailable) def __updateOK(self): """ @@ -50,7 +60,8 @@ enabled = False elif self.patternEdit.text() == "": enabled = False - elif self.changesetsEdit.toPlainText() == "": + elif self.changesetsEdit.toPlainText() == "" and \ + self.bookmarkCombo.currentText() == "": enabled = False self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) @@ -85,16 +96,18 @@ Public method to retrieve the export data. @return tuple naming the output file name, the list of revisions to - export, and flags indicating to compare against the second parent, - to treat all files as text, to omit dates in the diff headers and - to use the git extended diff format (string, list of strings, - boolean, boolean, boolean, boolean) + export, the name of a bookmarked branch and flags indicating to + compare against the second parent, to treat all files as text, + to omit dates in the diff headers and to use the git extended + diff format + @rtype tuple of (str, list of str, str, bool, bool, bool, bool) """ return ( os.path.join( self.directoryPicker.text(), self.patternEdit.text()), self.changesetsEdit.toPlainText().splitlines(), + self.bookmarkCombo.currentText(), self.switchParentCheckBox.isChecked(), self.textCheckBox.isChecked(), self.datesCheckBox.isChecked(),
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Sat Sep 01 10:24:02 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>450</width> - <height>350</height> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -99,6 +99,26 @@ </property> </widget> </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="bookmarkCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select a bookmark name</string> + </property> + </widget> + </item> </layout> </item> <item> @@ -159,6 +179,7 @@ <tabstop>directoryPicker</tabstop> <tabstop>patternEdit</tabstop> <tabstop>changesetsEdit</tabstop> + <tabstop>bookmarkCombo</tabstop> <tabstop>switchParentCheckBox</tabstop> <tabstop>textCheckBox</tabstop> <tabstop>datesCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -23,10 +23,12 @@ """ Constructor - @param vcs reference to the VCS object (Hg) - @param revs list of revisions to show in the revisions pane (list of - strings) - @param parent reference to the parent widget (QWidget) + @param vcs reference to the VCS object + @type Hg + @param revs list of revisions to show in the revisions pane + @type list of str + @param parent reference to the parent widget + @type QWidget """ super(HgGraftDialog, self).__init__(parent) self.setupUi(self) @@ -35,6 +37,8 @@ if revs: self.revisionsEdit.setPlainText("\n".join(sorted(revs))) + + self.noCommitCheckBox.setEnabled(vcs.version >= (4, 7, 0)) self.__updateOk() @@ -62,16 +66,18 @@ """ Private slot to handle changes of the user group state. - @param checked flag giving the checked state (boolean) + @param checked flag giving the checked state + @type bool """ self.__updateOk() @pyqtSlot(bool) def on_currentUserCheckBox_toggled(self, checked): """ - Private slot to handle changes of the currentuser state. + Private slot to handle changes of the current user state. - @param checked flag giving the checked state (boolean) + @param checked flag giving the checked state + @type bool """ self.__updateOk() @@ -93,17 +99,28 @@ current user and the user name, another tuple giving a flag indicating to set the date, a flag indicating to use the current date and the date, a flag indicating to append graft info - to the log message and a flag indicating a dry-run (list of - strings, (boolean, boolean, string), (boolean, boolean, string), - boolean, boolean) + to the log message, a flag indicating a dry-run and a flag + indicating to not commit the copied changesets + @rtype tuple of (list of str, (bool, bool, str), (bool, bool, str), + bool, bool, bool) """ - userData = (self.userGroup.isChecked(), - self.currentUserCheckBox.isChecked(), - self.userEdit.text()) - dateData = (self.dateGroup.isChecked(), - self.currentDateCheckBox.isChecked(), - self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) - return (self.revisionsEdit.toPlainText().strip().splitlines(), - userData, dateData, - self.logCheckBox.isChecked(), - self.dryRunCheckBox.isChecked()) + userData = ( + self.userGroup.isChecked(), + self.currentUserCheckBox.isChecked(), + self.userEdit.text(), + ) + + dateData = ( + self.dateGroup.isChecked(), + self.currentDateCheckBox.isChecked(), + self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm"), + ) + + return ( + self.revisionsEdit.toPlainText().strip().splitlines(), + userData, + dateData, + self.logCheckBox.isChecked(), + self.dryRunCheckBox.isChecked(), + self.noCommitCheckBox.isChecked(), + )
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui Sat Sep 01 10:24:02 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>450</width> - <height>400</height> + <height>500</height> </rect> </property> <property name="windowTitle"> @@ -166,6 +166,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="noCommitCheckBox"> + <property name="toolTip"> + <string>Select to not commit the copied changesets</string> + </property> + <property name="text"> + <string>Don't Commit</string> + </property> + </widget> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Sep 01 10:24:02 2018 +0200 @@ -93,6 +93,10 @@ self.actions.append(self.hgBookmarkPushCurrentAct) self.__toolbarManager.addAction(self.hgBookmarkPushCurrentAct, title) + + if self.vcs.version < (4, 7, 0): + self.hgGraftStopAct.setEnabled(False) + self.hgGraftAbortAct.setEnabled(False) def getProject(self): """ @@ -1003,6 +1007,35 @@ self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) self.actions.append(self.hgGraftContinueAct) + self.hgGraftStopAct = E5Action( + self.tr('Stop Copying Session'), + self.tr('Stop Copying Session'), + 0, 0, self, 'mercurial_graft_stop') + self.hgGraftStopAct.setStatusTip(self.tr( + 'Stop the interrupted copying session' + )) + self.hgGraftStopAct.setWhatsThis(self.tr( + """<b>Stop Copying Session</b>""" + """<p>This stops the interrupted copying session.</p>""" + )) + self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) + self.actions.append(self.hgGraftStopAct) + + self.hgGraftAbortAct = E5Action( + self.tr('Abort Copying Session'), + self.tr('Abort Copying Session'), + 0, 0, self, 'mercurial_graft_abort') + self.hgGraftAbortAct.setStatusTip(self.tr( + 'Abort the interrupted copying session and rollback' + )) + self.hgGraftAbortAct.setWhatsThis(self.tr( + """<b>Abort Copying Session</b>""" + """<p>This aborts the interrupted copying session and""" + """ rollbacks to the state before the copy.</p>""" + )) + self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) + self.actions.append(self.hgGraftAbortAct) + self.hgAddSubrepoAct = E5Action( self.tr('Add'), UI.PixmapCache.getIcon("vcsAdd.png"), @@ -1375,29 +1408,29 @@ self.__extensionsMenu)) self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) - graftMenu = QMenu(self.tr("Graft"), menu) + graftMenu = QMenu(self.tr("Copy Changesets"), menu) graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) graftMenu.setTearOffEnabled(True) graftMenu.addAction(self.hgGraftAct) graftMenu.addAction(self.hgGraftContinueAct) + if self.vcs.version >= (4, 7, 0): + graftMenu.addAction(self.hgGraftStopAct) + graftMenu.addAction(self.hgGraftAbortAct) subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) subrepoMenu.setTearOffEnabled(True) subrepoMenu.addAction(self.hgAddSubrepoAct) subrepoMenu.addAction(self.hgRemoveSubreposAct) - changesMenu = QMenu(self.tr("Manage Changes"), menu) - changesMenu.setTearOffEnabled(True) - changesMenu.addAction(self.vcsRevertAct) - changesMenu.addSeparator() - changesMenu.addAction(self.vcsMergeAct) - changesMenu.addAction(self.hgShowConflictsAct) - changesMenu.addAction(self.vcsResolveAct) - changesMenu.addAction(self.hgUnresolveAct) - changesMenu.addAction(self.hgReMergeAct) - changesMenu.addAction(self.hgCancelMergeAct) - changesMenu.addSeparator() - changesMenu.addAction(self.hgPhaseAct) + mergeMenu = QMenu(self.tr("Merge Changesets"), menu) + mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge.png")) + mergeMenu.setTearOffEnabled(True) + mergeMenu.addAction(self.vcsMergeAct) + mergeMenu.addAction(self.hgShowConflictsAct) + mergeMenu.addAction(self.vcsResolveAct) + mergeMenu.addAction(self.hgUnresolveAct) + mergeMenu.addAction(self.hgReMergeAct) + mergeMenu.addAction(self.hgCancelMergeAct) act = menu.addAction( UI.PixmapCache.getIcon( @@ -1417,11 +1450,11 @@ menu.addAction(self.hgOutgoingAct) menu.addAction(self.hgPushAct) menu.addSeparator() - menu.addMenu(changesMenu) + menu.addAction(self.vcsRevertAct) + menu.addMenu(mergeMenu) + menu.addMenu(graftMenu) + menu.addAction(self.hgPhaseAct) menu.addSeparator() - if graftMenu is not None: - menu.addMenu(graftMenu) - menu.addSeparator() menu.addMenu(bundleMenu) menu.addMenu(patchMenu) menu.addSeparator() @@ -1909,6 +1942,35 @@ if res: self.project.reopenProject() + def __hgGraftStop(self): + """ + Private slot used to stop an interrupted copying session. + """ + shouldReopen = self.vcs.hgGraftStop(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Changesets (Stop)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgGraftAbort(self): + """ + Private slot used to abort an interrupted copying session and perform + a rollback. + """ + shouldReopen = self.vcs.hgGraftAbort(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo( + None, + self.tr("Copy Changesets (Abort)"), + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + def __hgAddSubrepository(self): """ Private slot used to add a sub-repository.
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -19,15 +19,21 @@ """ Class implementing a dialog to enter the data for a rebase session. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, + def __init__(self, tagsList, branchesList, bookmarksList, version, parent=None): """ Constructor - @param tagsList list of tags (list of strings) - @param branchesList list of branches (list of strings) - @param bookmarksList list of bookmarks (list of strings) - @param parent reference to the parent widget (QWidget) + @param tagsList list of tags + @type list of str + @param branchesList list of branches + @type list of str + @param bookmarksList list of bookmarks + @type list of str + @param version tuple giving the Mercurial version + @type tuple of int + @param parent reference to the parent widget + @type QWidget """ super(HgRebaseDialog, self).__init__(parent) self.setupUi(self) @@ -41,14 +47,10 @@ self.tag2Combo.addItems(sorted(tagsList)) self.branch1Combo.addItems(["default"] + sorted(branchesList)) self.branch2Combo.addItems(["default"] + sorted(branchesList)) - if bookmarksList is not None: - self.bookmark1Combo.addItems(sorted(bookmarksList)) - self.bookmark2Combo.addItems(sorted(bookmarksList)) - else: - self.bookmark1Button.setHidden(True) - self.bookmark1Combo.setHidden(True) - self.bookmark2Button.setHidden(True) - self.bookmark2Combo.setHidden(True) + self.bookmark1Combo.addItems(sorted(bookmarksList)) + self.bookmark2Combo.addItems(sorted(bookmarksList)) + + self.dryRunGroup.setEnabled(version >= (4, 7, 0)) msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) @@ -275,9 +277,11 @@ @return tuple with a source indicator of "S" or "B", the source revision, the destination revision, a flag indicating to collapse, a flag indicating to keep the original changesets, a flag - indicating to keep the original branch name and a flag indicating - to detach the source (string, string, string, boolean, boolean, - boolean, boolean) + indicating to keep the original branch name, a flag indicating + to detach the source, a flag indicating to perform a dry-run only + and a flag indicating to perform a dry-run first, than ask for + confirmation + @rtype tuple of (str, str, str, bool, bool, bool, bool, bool, bool) """ if self.sourceButton.isChecked(): indicator = "S" @@ -297,5 +301,7 @@ self.collapseCheckBox.isChecked(), self.keepChangesetsCheckBox.isChecked(), self.keepBranchCheckBox.isChecked(), - self.detachCheckBox.isChecked() + self.detachCheckBox.isChecked(), + self.dryRunOnlyButton.isChecked(), + self.dryRunConfirmButton.isChecked(), )
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui Sat Sep 01 10:24:02 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>650</width> - <height>394</height> + <height>477</height> </rect> </property> <property name="windowTitle"> @@ -423,6 +423,48 @@ </layout> </item> <item row="1" column="0" colspan="2"> + <widget class="QGroupBox" name="dryRunGroup"> + <property name="title"> + <string>Dry-Run</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QRadioButton" name="noDryRunButton"> + <property name="toolTip"> + <string>Select to not do a dry-run</string> + </property> + <property name="text"> + <string>No</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="dryRunOnlyButton"> + <property name="toolTip"> + <string>Select to just do a dry-run</string> + </property> + <property name="text"> + <string>Dry-Run Only</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="dryRunConfirmButton"> + <property name="toolTip"> + <string>Select to do a dry-run first, then ask the user for confirmation to perform the rebase</string> + </property> + <property name="text"> + <string>Dry-Run First, then Confirm</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum>
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Sat Sep 01 10:24:02 2018 +0200 @@ -47,10 +47,11 @@ from .HgRebaseDialog import HgRebaseDialog dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), - self.vcs.hgGetBookmarksList(repodir)) + self.vcs.hgGetBookmarksList(repodir), + self.vcs.version) if dlg.exec_() == QDialog.Accepted: (indicator, sourceRev, destRev, collapse, keep, keepBranches, - detach) = dlg.getData() + detach, dryRunOnly, dryRunConfirm) = dlg.getData() args = self.vcs.initCommand("rebase") if indicator == "S": @@ -70,6 +71,10 @@ args.append("--keepbranches") if detach: args.append("--detach") + if dryRunOnly: + args.append("--dry-run") + elif dryRunConfirm: + args.append("--confirm") args.append("--verbose") dia = HgDialog(self.tr('Rebase Changesets'), self.vcs)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Sep 01 10:24:02 2018 +0200 @@ -2906,10 +2906,11 @@ return from .HgExportDialog import HgExportDialog - dlg = HgExportDialog() + dlg = HgExportDialog(self.hgGetBookmarksList(repodir), + self.version >= (4, 7, 0)) if dlg.exec_() == QDialog.Accepted: - filePattern, revisions, switchParent, allText, noDates, git = \ - dlg.getParameters() + filePattern, revisions, bookmark, switchParent, allText, noDates, \ + git = dlg.getParameters() args = self.initCommand("export") args.append("--output") @@ -2923,8 +2924,12 @@ args.append("--nodates") if git: args.append("--git") - for rev in revisions: - args.append(rev) + if bookmark: + args.append("--bookmark") + args.append(bookmark) + else: + for rev in revisions: + args.append(rev) dia = HgDialog(self.tr("Export Patches"), self) res = dia.startProcess(args, repodir) @@ -3004,7 +3009,8 @@ dlg = HgGraftDialog(self, revs) if dlg.exec_() == QDialog.Accepted: revs, (userData, currentUser, userName), \ - (dateData, currentDate, dateStr), log, dryrun = dlg.getData() + (dateData, currentDate, dateStr), log, dryrun, \ + noCommit = dlg.getData() args = self.initCommand("graft") args.append("--verbose") @@ -3024,6 +3030,8 @@ args.append("--log") if dryrun: args.append("--dry-run") + if noCommit: + args.append("--no-commit") args.extend(revs) dia = HgDialog(self.tr('Copy Changesets'), self) @@ -3034,12 +3042,18 @@ self.checkVCSStatus() return res - def hgGraftContinue(self, path): + def __hgGraftSubCommand(self, path, subcommand, title): """ - Public method to continue copying changesets from another branch. - - @param path directory name of the project (string) - @return flag indicating that the project should be reread (boolean) + Private method to perform a Mercurial graft subcommand. + + @param path directory name of the project + @type str + @param subcommand subcommand flag + @type str + @param title tirle of the dialog + @type str + @return flag indicating that the project should be reread + @rtype bool """ # find the root of the repo repodir = self.splitPath(path)[0] @@ -3049,10 +3063,10 @@ return args = self.initCommand("graft") - args.append("--continue") + args.append(subcommand) args.append("--verbose") - dia = HgDialog(self.tr('Copy Changesets (Continue)'), self) + dia = HgDialog(title, self) res = dia.startProcess(args, repodir) if res: dia.exec_() @@ -3060,6 +3074,43 @@ self.checkVCSStatus() return res + def hgGraftContinue(self, path): + """ + Public method to continue copying changesets from another branch. + + @param path directory name of the project + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + return self.__hgGraftSubCommand( + path, "--continue", self.tr('Copy Changesets (Continue)')) + + def hgGraftStop(self, path): + """ + Public method to stop an interrupted copying session. + + @param path directory name of the project + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + return self.__hgGraftSubCommand( + path, "--stop", self.tr('Copy Changesets (Stop)')) + + def hgGraftAbort(self, path): + """ + Public method to abort an interrupted copying session and perform + a rollback. + + @param path directory name of the project + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + return self.__hgGraftSubCommand( + path, "--abort", self.tr('Copy Changesets (Abort)')) + def hgArchive(self): """ Public method to create an unversioned archive from the repository.
--- a/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -19,7 +19,7 @@ from .Templates import mainTemplate, configTemplate0, configTemplate1, \ configTemplate2, configTemplate3, onDemandTemplate, \ previewPixmapTemplate, moduleSetupTemplate, exeDisplayDataTemplate, \ - exeDisplayDataListTemplate, apiFilesTemplate + exeDisplayDataInfoTemplate, exeDisplayDataListTemplate, apiFilesTemplate class PluginWizardDialog(QDialog, Ui_PluginWizardDialog): @@ -165,12 +165,13 @@ templateData["modulesetup"] = "" templateData["exeData"] = "" - templateData["exeDataList"] = "" if self.exeGroup.isChecked(): if self.exeRadioButton.isChecked(): templateData["exeData"] = exeDisplayDataTemplate + elif self.exeInfoRadioButton.isChecked(): + templateData["exeData"] = exeDisplayDataInfoTemplate elif self.exeListRadioButton.isChecked(): - templateData["exeDataList"] = exeDisplayDataListTemplate + templateData["exeData"] = exeDisplayDataListTemplate if self.apiFilesCheckBox.isChecked(): templateData["apiFiles"] = apiFilesTemplate
--- a/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui Sat Sep 01 10:24:02 2018 +0200 @@ -16,7 +16,7 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> <widget class="QTabWidget" name="dataTabWidget"> <property name="currentIndex"> @@ -359,7 +359,7 @@ <attribute name="title"> <string>Various</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> <widget class="QCheckBox" name="pixmapCheckBox"> <property name="toolTip"> @@ -391,14 +391,14 @@ <property name="checked"> <bool>false</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QRadioButton" name="exeRadioButton"> <property name="toolTip"> <string>Select to create an 'exeDisplayData()' function skeleton</string> </property> <property name="text"> - <string>'exeDisplayData()' function</string> + <string>'exeDisplayData()' function returning program data to determine version information</string> </property> <property name="checked"> <bool>true</bool> @@ -406,6 +406,16 @@ </widget> </item> <item> + <widget class="QRadioButton" name="exeInfoRadioButton"> + <property name="toolTip"> + <string>Select to create an 'exeDisplayData()' function skeleton returning version info</string> + </property> + <property name="text"> + <string>'exeDisplayData()' function returning version information</string> + </property> + </widget> + </item> + <item> <widget class="QRadioButton" name="exeListRadioButton"> <property name="toolTip"> <string>Select to create an 'exeDisplayDataList()' function skeleton</string> @@ -508,9 +518,9 @@ <tabstop>moduleSetupCheckBox</tabstop> <tabstop>exeGroup</tabstop> <tabstop>exeRadioButton</tabstop> + <tabstop>exeInfoRadioButton</tabstop> <tabstop>exeListRadioButton</tabstop> <tabstop>apiFilesCheckBox</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections>
--- a/Plugins/WizardPlugins/EricPluginWizard/Templates.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Plugins/WizardPlugins/EricPluginWizard/Templates.py Sat Sep 01 10:24:02 2018 +0200 @@ -46,7 +46,6 @@ {modulesetup}\ {exeData}\ -{exeDataList}\ {apiFiles}\ {preview}\ {config1}\ @@ -177,6 +176,7 @@ "versionPosition": -1, "version": "", "versionCleanup": None, + "exeModule": None, } for exePath in ["exe1", "exe2"]: data["exe"] = exePath @@ -205,6 +205,26 @@ "versionPosition": -1, "version": "", "versionCleanup": None, + "exeModule": None, + } + + return data + + +''' + +exeDisplayDataInfoTemplate = '''def exeDisplayData(): + """ + Module function to support the display of some executable info. + + @return dictionary containing the data to be shown + @rtype dict + """ + data = { + "programEntry": False, + "header": "<translated header string>", + "text": "<translated entry string>", + "version": "", } return data
--- a/Project/IdlCompilerDefineNameDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Project/IdlCompilerDefineNameDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -8,6 +8,8 @@ for the IDL compiler. """ +from __future__ import unicode_literals + from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog, QDialogButtonBox
--- a/Project/IdlCompilerOptionsDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Project/IdlCompilerOptionsDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -7,6 +7,8 @@ Module implementing a dialog to enter some IDL compiler options. """ +from __future__ import unicode_literals + from PyQt5.QtCore import pyqtSlot, Qt from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QInputDialog @@ -36,8 +38,8 @@ @type list of str @param undefinedNames list of undefined names @type list of str - @param projectDirectory directory name of the project - @type str + @param project reference to the project object + @type Project @param parent reference to the parent widget @type QWidget """
--- a/Project/Project.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Project/Project.py Sat Sep 01 10:24:02 2018 +0200 @@ -1737,10 +1737,22 @@ # first perform the addition of source self.__addSingleDirectory(filetype, source, target, True) + ignore_patterns = [pattern for pattern, filetype in + self.pdata["FILETYPES"].items() + if filetype == '__IGNORE__'] + # now recurse into subdirectories for name in os.listdir(source): ns = os.path.join(source, name) if os.path.isdir(ns): + skip = False + for ignore_pattern in ignore_patterns: + if fnmatch.fnmatch(name, ignore_pattern): + skip = True + break + if skip: + continue + nt = os.path.join(target, name) self.__addRecursiveDirectory(filetype, ns, nt) @@ -4488,8 +4500,20 @@ recursiveSearch = Preferences.getProject("SearchNewFilesRecursively") newFiles = [] + ignore_patterns = [pattern for pattern, filetype in + self.pdata["FILETYPES"].items() + if filetype == '__IGNORE__'] + dirs = self.subdirs[:] for directory in dirs: + skip = False + for ignore_pattern in ignore_patterns: + if fnmatch.fnmatch(directory, ignore_pattern): + skip = True + break + if skip: + continue + curpath = os.path.join(self.ppath, directory) try: newSources = os.listdir(curpath)
--- a/QScintilla/Editor.py Thu Aug 02 18:38:40 2018 +0200 +++ b/QScintilla/Editor.py Sat Sep 01 10:24:02 2018 +0200 @@ -4695,10 +4695,14 @@ """ line, col = self.getCursorPosition() text = self.text(line) - if self.__isStartChar(text[col - 1]): - self.__acText = self.getWordLeft(line, col - 1) + text[col - 1] - else: - self.__acText = self.getWordLeft(line, col) + try: + if self.__isStartChar(text[col - 1]): + self.__acText = self.getWordLeft(line, col - 1) + text[col - 1] + else: + self.__acText = self.getWordLeft(line, col) + except IndexError: + self.__acText = "" + self.__acCompletions.clear() self.__acCompletionsFinished = 0
--- a/QScintilla/Shell.py Thu Aug 02 18:38:40 2018 +0200 +++ b/QScintilla/Shell.py Sat Sep 01 10:24:02 2018 +0200 @@ -208,7 +208,7 @@ if self.__showStdOutErr: dbs.clientProcessStdout.connect(self.__writeStdOut) dbs.clientProcessStderr.connect(self.__writeStdErr) - dbs.clientOutput.connect(self.__write) + dbs.clientOutput.connect(self.__writeQueued) dbs.clientStatement.connect(self.__clientStatement) dbs.clientGone.connect(self.__initialise) dbs.clientRawInput.connect(self.__raw_input) @@ -906,9 +906,9 @@ line = self.lines() - 1 return (line, len(self.text(line))) - def __write(self, s): + def __writeQueued(self, s): """ - Private method to display some text. + Private method to display some text using a write queue. @param s text to be displayed (string) """ @@ -916,7 +916,7 @@ def __concatenateText(self, text): """ - Private slot to get all available text and process it in one step. + Private slot to queue text and process it in one step. @param text text to be appended @type str @@ -930,16 +930,25 @@ QApplication.processEvents() # Finally process the accumulated text + self.__write(self.__queuedText) + + self.__queuedText = '' + self.__blockTextProcessing = False + + def __write(self, s): + """ + Private method to display some text without queuing. + + @param s text to be displayed + @type str + """ line, col = self.__getEndPos() self.setCursorPosition(line, col) - self.insert(Utilities.filterAnsiSequences(self.__queuedText)) + self.insert(Utilities.filterAnsiSequences(s)) self.prline, self.prcol = self.getCursorPosition() self.ensureCursorVisible() self.ensureLineVisible(self.prline) - self.__queuedText = '' - self.__blockTextProcessing = False - def __writeStdOut(self, s): """ Private method to display some text with StdOut label. @@ -963,6 +972,9 @@ @param s prompt to be displayed (string) @param echo Flag indicating echoing of the input (boolean) """ + # Get all text which is still waiting for output + QApplication.processEvents() + self.setFocus() self.inRawMode = True self.echoInput = echo
--- a/UI/CodeDocumentationViewer.py Thu Aug 02 18:38:40 2018 +0200 +++ b/UI/CodeDocumentationViewer.py Sat Sep 01 10:24:02 2018 +0200 @@ -316,8 +316,11 @@ """ Public method to finalize the setup of the documentation viewer. """ - self.__showTextViewer( - Preferences.getDocuViewer("ShowInfoAsRichText")) + if self.__richTextViewer is None: + showRichText = False + else: + showRichText = Preferences.getDocuViewer("ShowInfoAsRichText") + self.__showTextViewer(showRichText) self.__startingUp = False provider = Preferences.getDocuViewer("Provider") @@ -613,9 +616,12 @@ """ Public slot to handle a change of preferences. """ - showMarkdown = Preferences.getDocuViewer("ShowInfoAsRichText") - if showMarkdown != self.__showMarkdown: - self.__showTextViewer(showMarkdown) + if self.__richTextViewer is None: + showRichText = False + else: + showRichText = Preferences.getDocuViewer("ShowInfoAsRichText") + if showRichText != self.__showMarkdown: + self.__showTextViewer(showRichText) provider = Preferences.getDocuViewer("Provider") self.__selectProvider(provider)
--- a/UI/UserInterface.py Thu Aug 02 18:38:40 2018 +0200 +++ b/UI/UserInterface.py Sat Sep 01 10:24:02 2018 +0200 @@ -1111,7 +1111,8 @@ @param icon icon to be used (QIcon) @param label label text to be shown (string) """ - assert side in [UserInterface.LeftSide, UserInterface.BottomSide] + assert side in [UserInterface.LeftSide, UserInterface.BottomSide, + UserInterface.RightSide] if self.__layoutType == "Toolboxes": if side == UserInterface.LeftSide: @@ -3333,11 +3334,16 @@ except (ImportError, AttributeError): sip_version_str = "sip version not available" + if sys.maxsize > 2**32: + sizeStr = "64-Bit" + else: + sizeStr = "32-Bit" + versionText = self.tr( """<h3>Version Numbers</h3>""" """<table>""") - versionText += """<tr><td><b>Python</b></td><td>{0}</td></tr>"""\ - .format(sys.version.split()[0]) + versionText += """<tr><td><b>Python</b></td><td>{0}, {1}</td></tr>"""\ + .format(sys.version.split()[0], sizeStr) versionText += """<tr><td><b>Qt</b></td><td>{0}</td></tr>"""\ .format(qVersion()) versionText += """<tr><td><b>PyQt</b></td><td>{0}</td></tr>"""\
--- a/Utilities/__init__.py Thu Aug 02 18:38:40 2018 +0200 +++ b/Utilities/__init__.py Sat Sep 01 10:24:02 2018 +0200 @@ -1853,8 +1853,13 @@ except (ImportError, AttributeError): sip_version_str = "sip version not available" - info = "Version Numbers:{0} Python {1}{2}".format( - linesep, sys.version.split()[0], linesep) + if sys.maxsize > 2**32: + sizeStr = "64-Bit" + else: + sizeStr = "32-Bit" + + info = "Version Numbers:{0} Python {1}, {2}{3}".format( + linesep, sys.version.split()[0], sizeStr, linesep) info += " Qt {0}{1} PyQt {2}{3}".format( qVersion(), linesep, PYQT_VERSION_STR, linesep) info += " sip {0}{1} QScintilla {2}{3}".format(
--- a/WebBrowser/SpellCheck/ManageDictionariesDialog.py Thu Aug 02 18:38:40 2018 +0200 +++ b/WebBrowser/SpellCheck/ManageDictionariesDialog.py Sat Sep 01 10:24:02 2018 +0200 @@ -233,7 +233,7 @@ self.tr( """<p>Could not download the dictionaries list""" """ from {0}.</p><p>Error: {1}</p>""" - ).format(self.repositoryUrlEdit.text(), + ).format(self.dictionariesUrlEdit.text(), reply.errorString()) ) self.downloadProgress.setValue(0)
--- a/WebBrowser/WebBrowserView.py Thu Aug 02 18:38:40 2018 +0200 +++ b/WebBrowser/WebBrowserView.py Sat Sep 01 10:24:02 2018 +0200 @@ -2258,7 +2258,8 @@ @pyqtSlot("QWebEngineRegisterProtocolHandlerRequest") def __registerProtocolHandlerRequested(self, request): """ - Private slot to handle requests for registration of a protocol handler. + Private slot to handle requests for registration of a protocol + handler. @param request reference to the protocol handler request object @type QWebEngineRegisterProtocolHandlerRequest @@ -2277,8 +2278,8 @@ ok = E5MessageBox.yesNo( self, self.tr("Protocol Handler Request"), - self.tr("""<p> Allow the website at <b>{0}</b> to open all""" - """ <b>{1}</b> links?</p>""") + self.tr("""<p> Allow the website at <b>{0}</b> to open""" + """ all <b>{1}</b> links?</p>""") .format(request.origin().host(), request.scheme()) )
--- a/changelog Thu Aug 02 18:38:40 2018 +0200 +++ b/changelog Sat Sep 01 10:24:02 2018 +0200 @@ -1,5 +1,11 @@ Change Log ---------- +Version 18.09: +- bug fixes +- Mercurial Interface + -- added support for Mercurial 4.7 extended commands 'graft', 'rebase' and + 'export' + Version 18.08: - bug fixes - General
--- a/i18n/eric6_cs.ts Thu Aug 02 18:38:40 2018 +0200 +++ b/i18n/eric6_cs.ts Sat Sep 01 10:24:02 2018 +0200 @@ -3102,29 +3102,29 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="480"/> + <location filename="../UI/CodeDocumentationViewer.py" line="483"/> <source>No documentation available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="507"/> - <source>Definition: {0}{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/CodeDocumentationViewer.py" line="510"/> + <source>Definition: {0}{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/CodeDocumentationViewer.py" line="513"/> <source>Definition: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="557"/> + <location filename="../UI/CodeDocumentationViewer.py" line="560"/> <source>No source code documentation provider has been registered. This function has been disabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="562"/> + <location filename="../UI/CodeDocumentationViewer.py" line="565"/> <source>This function has been disabled.</source> <translation type="unfinished"></translation> </message> @@ -3146,13 +3146,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="518"/> + <location filename="../UI/CodeDocumentationViewer.py" line="521"/> <source>Type: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/CodeDocumentationViewer.py" line="526"/> + <location filename="../UI/CodeDocumentationViewer.py" line="529"/> <source>Note: {0} </source> <translation type="unfinished"></translation> @@ -4916,32 +4916,32 @@ <context> <name>Connection</name> <message> - <location filename="../Cooperation/Connection.py" line="83"/> + <location filename="../Cooperation/Connection.py" line="84"/> <source>undefined</source> <translation>nedefinovaný</translation> </message> <message> - <location filename="../Cooperation/Connection.py" line="84"/> + <location filename="../Cooperation/Connection.py" line="85"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../Cooperation/Connection.py" line="222"/> + <location filename="../Cooperation/Connection.py" line="223"/> <source>New Connection</source> <translation>Nové spojení</translation> </message> <message> - <location filename="../Cooperation/Connection.py" line="222"/> + <location filename="../Cooperation/Connection.py" line="223"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation><p>Přijmout připojení z <strong>{0}@{1}</strong>?</p></translation> </message> <message> - <location filename="../Cooperation/Connection.py" line="461"/> + <location filename="../Cooperation/Connection.py" line="464"/> <source>* Connection to {0}:{1} refused.</source> <translation>* Připojení z {0}:{1} odmítnuto.</translation> </message> <message> - <location filename="../Cooperation/Connection.py" line="212"/> + <location filename="../Cooperation/Connection.py" line="213"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Pokus o připojení od zakázaného uživatele '{0}'.</translation> </message> @@ -10728,7 +10728,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5305"/> + <location filename="../QScintilla/Editor.py" line="5310"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -10828,187 +10828,187 @@ <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5308"/> + <location filename="../QScintilla/Editor.py" line="5313"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5665"/> + <location filename="../QScintilla/Editor.py" line="5670"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5665"/> + <location filename="../QScintilla/Editor.py" line="5670"/> <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="5728"/> + <location filename="../QScintilla/Editor.py" line="5733"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5721"/> + <location filename="../QScintilla/Editor.py" line="5726"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5728"/> + <location filename="../QScintilla/Editor.py" line="5733"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5843"/> + <location filename="../QScintilla/Editor.py" line="5848"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5843"/> + <location filename="../QScintilla/Editor.py" line="5848"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6003"/> + <location filename="../QScintilla/Editor.py" line="6008"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6003"/> + <location filename="../QScintilla/Editor.py" line="6008"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6391"/> + <location filename="../QScintilla/Editor.py" line="6396"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6391"/> + <location filename="../QScintilla/Editor.py" line="6396"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6419"/> + <location filename="../QScintilla/Editor.py" line="6424"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6467"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6442"/> + <location filename="../QScintilla/Editor.py" line="6447"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6462"/> + <location filename="../QScintilla/Editor.py" line="6467"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6479"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6495"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6508"/> + <location filename="../QScintilla/Editor.py" line="6513"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6508"/> + <location filename="../QScintilla/Editor.py" line="6513"/> <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="6534"/> + <location filename="../QScintilla/Editor.py" line="6539"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6539"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6672"/> + <location filename="../QScintilla/Editor.py" line="6677"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6976"/> + <location filename="../QScintilla/Editor.py" line="6981"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6997"/> + <location filename="../QScintilla/Editor.py" line="7002"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6999"/> + <location filename="../QScintilla/Editor.py" line="7004"/> <source>Add file...</source> <translation>Přidat soubor...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7001"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7003"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7006"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7008"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7011"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7010"/> + <location filename="../QScintilla/Editor.py" line="7015"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7029"/> + <location filename="../QScintilla/Editor.py" line="7034"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7045"/> + <location filename="../QScintilla/Editor.py" line="7050"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7073"/> + <location filename="../QScintilla/Editor.py" line="7078"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7137"/> + <location filename="../QScintilla/Editor.py" line="7142"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7137"/> + <location filename="../QScintilla/Editor.py" line="7142"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7171"/> + <location filename="../QScintilla/Editor.py" line="7176"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7171"/> + <location filename="../QScintilla/Editor.py" line="7176"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -11028,12 +11028,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7157"/> + <location filename="../QScintilla/Editor.py" line="7162"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7157"/> + <location filename="../QScintilla/Editor.py" line="7162"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -11108,7 +11108,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7464"/> + <location filename="../QScintilla/Editor.py" line="7469"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -11118,12 +11118,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7472"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7469"/> + <location filename="../QScintilla/Editor.py" line="7474"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -11163,32 +11163,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="6433"/> + <location filename="../QScintilla/Editor.py" line="6438"/> <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="6442"/> + <location filename="../QScintilla/Editor.py" line="6447"/> <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="6495"/> + <location filename="../QScintilla/Editor.py" line="6500"/> <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="6836"/> + <location filename="../QScintilla/Editor.py" line="6841"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6976"/> + <location filename="../QScintilla/Editor.py" line="6981"/> <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="7073"/> + <location filename="../QScintilla/Editor.py" line="7078"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -11218,22 +11218,22 @@ <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="6479"/> + <location filename="../QScintilla/Editor.py" line="6484"/> <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="6281"/> + <location filename="../QScintilla/Editor.py" line="6286"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6288"/> + <location filename="../QScintilla/Editor.py" line="6293"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6668"/> + <location filename="../QScintilla/Editor.py" line="6673"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11258,27 +11258,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7881"/> + <location filename="../QScintilla/Editor.py" line="7886"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7881"/> + <location filename="../QScintilla/Editor.py" line="7886"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6222"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6217"/> + <location filename="../QScintilla/Editor.py" line="6222"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6278"/> + <location filename="../QScintilla/Editor.py" line="6283"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11303,7 +11303,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6662"/> + <location filename="../QScintilla/Editor.py" line="6667"/> <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> @@ -11328,22 +11328,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4890"/> + <location filename="../QScintilla/Editor.py" line="4895"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4890"/> + <location filename="../QScintilla/Editor.py" line="4895"/> <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="7968"/> + <location filename="../QScintilla/Editor.py" line="7973"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7968"/> + <location filename="../QScintilla/Editor.py" line="7973"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11373,12 +11373,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8089"/> + <location filename="../QScintilla/Editor.py" line="8094"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8089"/> + <location filename="../QScintilla/Editor.py" line="8094"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -30659,17 +30659,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3401"/> <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="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30679,52 +30679,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2960"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3007"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3063"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3112"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3303"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3291"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -30754,7 +30754,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -30789,62 +30789,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3698"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3731"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3773"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3912"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3924"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -30879,12 +30879,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3184"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -30893,6 +30893,16 @@ <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3124"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3137"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -32481,22 +32491,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="130"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="140"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="147"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="154"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -32511,6 +32521,16 @@ <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="105"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="118"/> + <source>Select a bookmark name</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgFetchDialog</name> @@ -32893,6 +32913,16 @@ <source>Perform Dry-Run</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="171"/> + <source>Select to not commit the copied changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="174"/> + <source>Don't Commit</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgHisteditCommitEditor</name> @@ -34562,152 +34592,152 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="129"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="196"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="204"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209"/> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> @@ -34717,1253 +34747,1288 @@ <translation type="obsolete"><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="275"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="289"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> - <source>Show heads</source> - <translation>Zobrazit hlavy</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> + <source>Show heads</source> + <translation>Zobrazit hlavy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> - <source>Show parents</source> - <translation>Zobrazit předky</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <source>Show parents</source> + <translation>Zobrazit předky</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> - <source>Show tip</source> - <translation>Zobrazit ukazatel tip</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <source>Show tip</source> + <translation>Zobrazit ukazatel tip</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="412"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>List tags...</source> + <translation>Seznam tagů...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> - <source>List branches...</source> - <translation>Seznam větví...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <source>List branches...</source> + <translation>Seznam větví...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source>Close branch</source> - <translation>Zavřít větev</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Close branch</source> + <translation>Zavřít větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Configure...</source> + <translation>Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source>Show paths...</source> - <translation>Zobrazit cesty...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> + <source>Show paths...</source> + <translation>Zobrazit cesty...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Verify repository</source> - <translation>Ověřit repozitář</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify repository</source> + <translation>Ověřit repozitář</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> - <source>Recover...</source> - <translation>Zotavit...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <source>Recover...</source> + <translation>Zotavit...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> - <source>Create .hgignore</source> - <translation>Vytvořit .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <source>Create .hgignore</source> + <translation>Vytvořit .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1826"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> - <source>Reset</source> - <translation>Reset</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <source>Reset</source> + <translation>Reset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1355"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source>Identify...</source> - <translation>Identifikovat...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <source>Identify...</source> + <translation>Identifikovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Back out changeset</source> - <translation>Vycouvat z množiny změn</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <source>Back out changeset</source> + <translation>Vycouvat z množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1643"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1966"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> - <source>Push the current branch of the local project as a new named branch</source> + <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show the combined configuration settings from all configuration files</source> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1882"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1902"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1904"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1937"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> + <source>Remove sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Sub-Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <source>Show summary...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/> + <source>Show summary information of the working directory status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="339"/> + <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> + <source>Create unversioned archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> + <source>Create unversioned archive...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> + <source>Create an unversioned archive from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> + <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1308"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <source>List bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <source>Define bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <source>Define bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <source>Delete bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <source>Delete bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Tags</source> + <translation type="unfinished">Tagy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1370"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1507"/> + <source>Mercurial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <source>Pull current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <source>Pull the current bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> + <source>Push current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> + <source>Push the current bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <source>Delete all backup bundles stored in the backup area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1384"/> - <source>Sub-Repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> - <source>Show summary...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> - <source>Show summary information of the working directory status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Create unversioned archive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> - <source>Create unversioned archive...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> - <source>Create an unversioned archive from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> - <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> - <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> - <source>Administration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> - <source>Show differences (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> - <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> - <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>List bookmarks...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> - <source>List bookmarks of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Define bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Bookmarks</source> - <translation type="unfinished">Záložky</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> - <source>Tags</source> - <translation type="unfinished">Tagy</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>Re-Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> - <source>Show a dialog listing all files with conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> - <source>Manage Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1474"/> - <source>Mercurial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> - <source>Pull current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> - <source>Pull the current bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> - <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> - <source>Push current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> - <source>Push the current bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> - <source>Delete all backup bundles stored in the backup area</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> - <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1425"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1951"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1966"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -36689,6 +36754,41 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="428"/> + <source>Dry-Run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="434"/> + <source>Select to not do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="437"/> + <source>No</source> + <translation type="unfinished">Ne</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="447"/> + <source>Select to just do a dry-run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="450"/> + <source>Dry-Run Only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="457"/> + <source>Select to do a dry-run first, then ask the user for confirmation to perform the rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="460"/> + <source>Dry-Run First, then Confirm</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -40672,22 +40772,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/IdlCompilerOptionsDialog.py" line="177"/> + <location filename="../Project/IdlCompilerOptionsDialog.py" line="179"/> <source>Include Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/IdlCompilerOptionsDialog.py" line="177"/> + <location filename="../Project/IdlCompilerOptionsDialog.py" line="179"/> <source>Select Include Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/IdlCompilerOptionsDialog.py" line="391"/> + <location filename="../Project/IdlCompilerOptionsDialog.py" line="393"/> <source>Undefine Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/IdlCompilerOptionsDialog.py" line="391"/> + <location filename="../Project/IdlCompilerOptionsDialog.py" line="393"/> <source>Enter a variable name to be undefined:</source> <translation type="unfinished"></translation> </message> @@ -41637,122 +41737,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="367"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> <source>Send Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="367"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="394"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> <source>Leave IRC channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="394"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="535"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> <source>Channel Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="540"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> <source>Nick mentioned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="565"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> <source>{0} has joined the channel {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="571"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> <source>You have joined the channel {0} ({1}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="578"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> <source>Join Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="597"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> <source>{0} has left {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="605"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> <source>{0} has left {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="611"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> <source>Leave Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="630"/> - <source>{0} has quit {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="635"/> - <source>{0} has quit {1}: {2}.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <source>{0} has quit {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <source>{0} has quit {1}: {2}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> <source>Quit</source> <translation type="unfinished">Konec</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="659"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> <source>You are now known as {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="665"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> <source>User {0} is now known as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="703"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> <source>Away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="703"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> <source>{0} is away: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="720"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> <source>The channel topic is: "{0}".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="736"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> <source>The topic was set by {0} on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="753"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> <source>Channel URL: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="778"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> <source>password protected ({0})</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> <source>limited to %n user(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41761,77 +41861,77 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> <source>Channel modes: {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> <source>This channel was created on {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="840"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="844"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> <source>{0} sets a ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="853"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> <source>{0} removes the ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="858"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="862"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="867"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> <source>{0} sets a ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="871"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>{0} removes the ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="876"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="880"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="885"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> <source>{0} sets the channel key to '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="889"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> <source>{0} removes the channel key.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="893"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41840,242 +41940,242 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="897"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> <source>{0} removes the channel limit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="901"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="905"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="910"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="914"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> <source>{0} sets the channel mode to 'allow messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="919"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> <source>{0} sets the channel mode to 'private'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="923"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> <source>{0} sets the channel mode to 'public'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> - <source>{0} sets the channel mode to 'quiet'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="932"/> - <source>{0} removes the 'quiet' mode from the channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> - <source>{0} sets the channel mode to 'secret'.</source> + <source>{0} sets the channel mode to 'quiet'.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> + <source>{0} removes the 'quiet' mode from the channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> + <source>{0} sets the channel mode to 'secret'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> <source>{0} sets the channel mode to 'visible'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="948"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> <source>{0} switches on 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> <source>{0} switches off 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="956"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> <source>{0} sets invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="960"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> <source>{0} removes the invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="964"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> <source>Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="982"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> <source>{0} sets mode for {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1009"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1143"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> <source>--- New From Here ---</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1226"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1209"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1226"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1245"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1245"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1259"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1270"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1264"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> <source>Cut all</source> <translation type="unfinished">Vyjmout vše</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1268"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> <source>Copy all</source> <translation type="unfinished">Kopírovat vše</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1273"/> - <source>Clear</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1278"/> - <source>Save</source> - <translation type="unfinished">Uložit</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1282"/> - <source>Mark Current Position</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> + <source>Clear</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>Save</source> + <translation type="unfinished">Uložit</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <source>Mark Current Position</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> <source>Remove Position Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1334"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> <source>Who Is</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1337"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> <source>Private Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1452"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> <source>Who</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1426"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> <source>End of WHO list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1449"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> <source> (Away)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1452"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> <source>Whois</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1474"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> <source>{0} is {1}@{2} ({3}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1520"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> <source>{0} is a user on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1525"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> <source>{0} has voice on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1530"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> <source>{0} is a halfop on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1535"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> <source>{0} is an operator on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1540"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> <source>{0} is owner of channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1545"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> <source>{0} is admin on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1564"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> <source>{0} is online via {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1583"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> <source>{0} is an IRC Operator.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42084,7 +42184,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1630"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42093,7 +42193,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1642"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42102,7 +42202,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1643"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42111,25 +42211,25 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1633"/> - <source>{0} has been idle for {1}, {2}, and {3}.</source> - <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <source>{0} has been idle for {1}, {2}, and {3}.</source> + <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> <source>{0} has been idle for %n second(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42138,67 +42238,67 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1659"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> <source>{0} has been online since {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1680"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>End of WHOIS list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1698"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> <source>{0} is an identified user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1716"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> <source>{0} is available for help.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1734"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> <source>{0} is logged in as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1753"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1771"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> <source>{0} is using a secure connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1057"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1041"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1049"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1057"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -42208,17 +42308,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1340"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1811"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> <source>Edit Channel Topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1811"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> <source>Enter the topic for this channel:</source> <translation type="unfinished"></translation> </message> @@ -42336,125 +42436,135 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="210"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="220"/> <source>Away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="222"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="232"/> <source>Mark the current position in chat windows when going away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="229"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="239"/> <source>Away Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="236"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="246"/> <source>Enter the message to be sent when going away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="257"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="267"/> <source>Advanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="263"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="273"/> <source>Ident:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="270"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="280"/> <source>Enter the identity to be used to log-on to the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="277"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="287"/> <source>Reason for Quit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="284"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="294"/> <source>Enter a message to be sent when quitting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="291"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="301"/> <source>Reason for Part:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="298"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="308"/> <source>Enter message to be sent when leaving a channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="188"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="190"/> <source>Edit Identity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="171"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="173"/> <source>The identity must contain at least one nick name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="188"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="190"/> <source>The identity must have a real name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="236"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="238"/> <source>Add Identity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="286"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="288"/> <source>Identity Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="296"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="298"/> <source>An identity named <b>{0}</b> already exists. You must provide a different name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="311"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="313"/> <source>The identity has to have a name.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="311"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="313"/> <source>Copy Identity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="296"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="298"/> <source>Rename Identity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="335"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="337"/> <source>This identity is in use. If you remove it, the network settings using it will fall back to the default identity. Should it be deleted anyway?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="340"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="342"/> <source>Do you really want to delete all information for this identity?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="343"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="345"/> <source>Delete Identity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="216"/> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.ui" line="226"/> <source>Select to mark the current position in the chat, when you send an AWAY command.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="476"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcIdentitiesEditDialog.py" line="470"/> + <source>Press to hide the password</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>IrcIdentity</name> @@ -45764,22 +45874,22 @@ <context> <name>MicrosoftEngine</name> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="188"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="189"/> <source>You have not registered for the Microsoft Translation service.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="194"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="195"/> <source>No valid access token available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="171"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="172"/> <source>No translation available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="206"/> + <location filename="../Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py" line="207"/> <source>No Text-to-Speech for the selected language available.</source> <translation type="unfinished"></translation> </message> @@ -51304,39 +51414,49 @@ </message> <message> <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="401"/> - <source>'exeDisplayData()' function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="411"/> + <source>'exeDisplayData()' function returning program data to determine version information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="421"/> <source>Select to create an 'exeDisplayDataList()' function skeleton</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="414"/> - <source>'exeDisplayDataList()' function</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="424"/> + <source>'exeDisplayDataList()' function</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="434"/> <source>Select to create an 'apiFiles()' function skeleton</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="427"/> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="437"/> <source>Include 'apiFiles()' function</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="453"/> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="463"/> <source>Press to populate entry fields from project data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="456"/> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="466"/> <source>Populate from Project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="411"/> + <source>Select to create an 'exeDisplayData()' function skeleton returning version info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.ui" line="414"/> + <source>'exeDisplayData()' function returning version information</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Preferences</name> @@ -51904,112 +52024,112 @@ <translation>Přidat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1773"/> + <location filename="../Project/Project.py" line="1785"/> <source>The target directory must not be empty.</source> <translation>Cílový adresář nesmí být prázdný.</translation> </message> <message> - <location filename="../Project/Project.py" line="1784"/> + <location filename="../Project/Project.py" line="1796"/> <source>Add directory</source> <translation>Přidat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="1784"/> + <location filename="../Project/Project.py" line="1796"/> <source>The source directory must not be empty.</source> <translation>Cílový adresář nesmí být prázdný.</translation> </message> <message> - <location filename="../Project/Project.py" line="1921"/> + <location filename="../Project/Project.py" line="1933"/> <source>Rename file</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1945"/> + <location filename="../Project/Project.py" line="1957"/> <source>Rename File</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2188"/> + <location filename="../Project/Project.py" line="2200"/> <source>Delete file</source> <translation>Smazat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2218"/> + <location filename="../Project/Project.py" line="2230"/> <source>Delete directory</source> <translation>Smazat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="2305"/> + <location filename="../Project/Project.py" line="2317"/> <source>Create project directory</source> <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="2892"/> + <location filename="../Project/Project.py" line="2904"/> <source>New Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2420"/> + <location filename="../Project/Project.py" line="2432"/> <source>Add existing files to the project?</source> <translation>Přidat existující soubory do projektu?</translation> </message> <message> - <location filename="../Project/Project.py" line="2539"/> + <location filename="../Project/Project.py" line="2551"/> <source>Would you like to edit the VCS command options?</source> <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="../Project/Project.py" line="3742"/> + <location filename="../Project/Project.py" line="3754"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2487"/> + <location filename="../Project/Project.py" line="2499"/> <source>Shall the project file be added to the repository?</source> <translation>Má být projekt přidán do repozitáře?</translation> </message> <message> - <location filename="../Project/Project.py" line="2511"/> + <location filename="../Project/Project.py" line="2523"/> <source>Select version control system for the project</source> <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3756"/> + <location filename="../Project/Project.py" line="3768"/> <source>Open project</source> <translation>Otevřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3035"/> + <location filename="../Project/Project.py" line="3047"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3793"/> + <location filename="../Project/Project.py" line="3805"/> <source>Save project as</source> <translation>Uložit projekt jako</translation> </message> <message> - <location filename="../Project/Project.py" line="3050"/> + <location filename="../Project/Project.py" line="3062"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="3086"/> + <location filename="../Project/Project.py" line="3098"/> <source>Close Project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3086"/> + <location filename="../Project/Project.py" line="3098"/> <source>The current project has unsaved changes.</source> <translation>Aktuální projekt obsahuje neuložené změny.</translation> </message> <message> - <location filename="../Project/Project.py" line="3261"/> + <location filename="../Project/Project.py" line="3273"/> <source>Syntax errors detected</source> <translation>Zjištěny syntaktické chyby</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3261"/> + <location filename="../Project/Project.py" line="3273"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Projekt obsahuje %n soubor se syntaktickými chybami.</numerusform> @@ -52018,162 +52138,162 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3742"/> + <location filename="../Project/Project.py" line="3754"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../Project/Project.py" line="3747"/> + <location filename="../Project/Project.py" line="3759"/> <source>Generate a new project</source> <translation>Vygenerovat nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3748"/> + <location filename="../Project/Project.py" line="3760"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3756"/> + <location filename="../Project/Project.py" line="3768"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../Project/Project.py" line="3761"/> - <source>Open an existing project</source> - <translation>Otevřít existující projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3762"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3769"/> - <source>Close project</source> - <translation>Zavřít projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3769"/> - <source>&Close</source> - <translation>&Zavřít</translation> - </message> - <message> <location filename="../Project/Project.py" line="3773"/> - <source>Close the current project</source> - <translation>Uzavře aktuální projekt</translation> + <source>Open an existing project</source> + <translation>Otevřít existující projekt</translation> </message> <message> <location filename="../Project/Project.py" line="3774"/> - <source><b>Close</b><p>This closes the current project.</p></source> - <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3781"/> + <source>Close project</source> + <translation>Zavřít projekt</translation> </message> <message> <location filename="../Project/Project.py" line="3781"/> - <source>Save project</source> - <translation>Uložit projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3973"/> - <source>&Save</source> - <translation>&Uložit</translation> + <source>&Close</source> + <translation>&Zavřít</translation> </message> <message> <location filename="../Project/Project.py" line="3785"/> - <source>Save the current project</source> - <translation>Uložit aktuální projekt</translation> + <source>Close the current project</source> + <translation>Uzavře aktuální projekt</translation> </message> <message> <location filename="../Project/Project.py" line="3786"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> + <source><b>Close</b><p>This closes the current project.</p></source> + <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3793"/> - <source>Save &as...</source> - <translation>Uložit j&ako...</translation> + <source>Save project</source> + <translation>Uložit projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3985"/> + <source>&Save</source> + <translation>&Uložit</translation> </message> <message> <location filename="../Project/Project.py" line="3797"/> + <source>Save the current project</source> + <translation>Uložit aktuální projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3798"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3805"/> + <source>Save &as...</source> + <translation>Uložit j&ako...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3809"/> <source>Save the current project to a new file</source> <translation>Uloží aktuální projekt do nového souboru</translation> </message> <message> - <location filename="../Project/Project.py" line="3799"/> + <location filename="../Project/Project.py" line="3811"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Uložit jako</b><p>Uloží aktuální projekt do nového souboru.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3808"/> + <location filename="../Project/Project.py" line="3820"/> <source>Add files to project</source> <translation>Přidat soubory do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3808"/> + <location filename="../Project/Project.py" line="3820"/> <source>Add &files...</source> <translation>&Přidat soubory...</translation> </message> <message> - <location filename="../Project/Project.py" line="3813"/> + <location filename="../Project/Project.py" line="3825"/> <source>Add files to the current project</source> <translation>Přidat soubory do aktuálního projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3815"/> + <location filename="../Project/Project.py" line="3827"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Přidat soubory...</b><p>Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3824"/> + <location filename="../Project/Project.py" line="3836"/> <source>Add directory to project</source> <translation>Přidat adresář do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3824"/> + <location filename="../Project/Project.py" line="3836"/> <source>Add directory...</source> <translation>Přidat adresář...</translation> </message> <message> - <location filename="../Project/Project.py" line="3829"/> + <location filename="../Project/Project.py" line="3841"/> <source>Add a directory to the current project</source> <translation>Přidat adresář do aktuálního projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3831"/> + <location filename="../Project/Project.py" line="3843"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Přidat adresář...</b><p>Otevře dialog pro přičtení adresáře do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3839"/> + <location filename="../Project/Project.py" line="3851"/> <source>Add translation to project</source> <translation>Přidat překlad do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3839"/> + <location filename="../Project/Project.py" line="3851"/> <source>Add &translation...</source> <translation>Přida&t překlad...</translation> </message> <message> - <location filename="../Project/Project.py" line="3844"/> + <location filename="../Project/Project.py" line="3856"/> <source>Add a translation to the current project</source> <translation>Přidat překlad do aktuálního projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3846"/> - <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> - <translation><b>Přidat překlad</b><p>Otevře dialog pro přidání překladu do aktuálního projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Search new files</source> - <translation>Hledat nové soubory</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Searc&h new files...</source> - <translation>&Hledat nové soubory...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3858"/> + <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> + <translation><b>Přidat překlad</b><p>Otevře dialog pro přidání překladu do aktuálního projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3866"/> + <source>Search new files</source> + <translation>Hledat nové soubory</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3866"/> + <source>Searc&h new files...</source> + <translation>&Hledat nové soubory...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3870"/> <source>Search new files in the project directory.</source> <translation>Hledat nové soubory v adresáři projektu.</translation> </message> @@ -52183,57 +52303,57 @@ <translation type="obsolete"><b>Hledat nové soubory...</b><p>Hledají se nové soubory (zdrojové, *.ui, *.idl) v adresáři projektu a v registrovaných podadresářích.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3884"/> + <location filename="../Project/Project.py" line="3896"/> <source>Project properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3884"/> + <location filename="../Project/Project.py" line="3896"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3889"/> + <location filename="../Project/Project.py" line="3901"/> <source>Show the project properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3890"/> - <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> - <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3897"/> - <source>User project properties</source> - <translation>Uživatelská nastavení projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3897"/> - <source>&User Properties...</source> - <translation>Uživat&elská nastavení...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3902"/> + <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3909"/> + <source>User project properties</source> + <translation>Uživatelská nastavení projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3909"/> + <source>&User Properties...</source> + <translation>Uživat&elská nastavení...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3914"/> <source>Show the user specific project properties</source> <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3904"/> - <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> - <translation><b>Uživatelská nastavení...</b><p>Zobrazí dialog s editací uživatelských nastavení projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3912"/> - <source>Filetype Associations</source> - <translation>Asociace typů souborů</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3912"/> - <source>Filetype Associations...</source> - <translation>Asociace typů souborů...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3916"/> + <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> + <translation><b>Uživatelská nastavení...</b><p>Zobrazí dialog s editací uživatelských nastavení projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3924"/> + <source>Filetype Associations</source> + <translation>Asociace typů souborů</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3924"/> + <source>Filetype Associations...</source> + <translation>Asociace typů souborů...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3928"/> <source>Show the project filetype associations</source> <translation>Zobrazit asociace typů souborů</translation> </message> @@ -52243,347 +52363,347 @@ <translation type="obsolete"><b>Asociace typů souborů...</b><p>Zobrazí se dialog s editací asociace typů souborů v projektu. Na základě vzorku souborového jména tyto asociace určují typ souboru (zdrojový kód, formulář, interface nebo jiné). Tyto asociace jsou použity při přidávání souborů do projektu a při vyhledávání.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3948"/> + <location filename="../Project/Project.py" line="3960"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3948"/> + <location filename="../Project/Project.py" line="3960"/> <source>Debugger &Properties...</source> <translation>Nastavení &debuggeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3952"/> + <location filename="../Project/Project.py" line="3964"/> <source>Show the debugger properties</source> <translation>Zobrazit nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3953"/> - <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> - <translation><b>Nastavení debugeru...</b><p>Zobrazí dialog s editací nastavení debugeru.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3961"/> - <source>Load</source> - <translation>Načíst</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3961"/> - <source>&Load</source> - <translation>&Načíst</translation> - </message> - <message> <location filename="../Project/Project.py" line="3965"/> - <source>Load the debugger properties</source> - <translation>Načíst nastavení debugeru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3966"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> + <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> + <translation><b>Nastavení debugeru...</b><p>Zobrazí dialog s editací nastavení debugeru.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3973"/> - <source>Save</source> - <translation>Uložit</translation> + <source>Load</source> + <translation>Načíst</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3973"/> + <source>&Load</source> + <translation>&Načíst</translation> </message> <message> <location filename="../Project/Project.py" line="3977"/> - <source>Save the debugger properties</source> - <translation>Uložit nastavení debugeru</translation> + <source>Load the debugger properties</source> + <translation>Načíst nastavení debugeru</translation> </message> <message> <location filename="../Project/Project.py" line="3978"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3985"/> - <source>Delete</source> - <translation>Smazat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3985"/> - <source>&Delete</source> - <translation>Sma&zat</translation> + <source>Save</source> + <translation>Uložit</translation> </message> <message> <location filename="../Project/Project.py" line="3989"/> - <source>Delete the debugger properties</source> - <translation>Smazat nastavení debugeru</translation> + <source>Save the debugger properties</source> + <translation>Uložit nastavení debugeru</translation> </message> <message> <location filename="../Project/Project.py" line="3990"/> - <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> - <translation><b>Smazat nastavení debugeru</b><p>Smaže se soubor obsahující nastavení debugeru v daném projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3998"/> - <source>Reset</source> - <translation></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3998"/> - <source>&Reset</source> - <translation>&Reset</translation> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3997"/> + <source>Delete</source> + <translation>Smazat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3997"/> + <source>&Delete</source> + <translation>Sma&zat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4001"/> + <source>Delete the debugger properties</source> + <translation>Smazat nastavení debugeru</translation> </message> <message> <location filename="../Project/Project.py" line="4002"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation><b>Smazat nastavení debugeru</b><p>Smaže se soubor obsahující nastavení debugeru v daném projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4010"/> + <source>Reset</source> + <translation></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4010"/> + <source>&Reset</source> + <translation>&Reset</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4014"/> <source>Reset the debugger properties</source> <translation>Reset nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="4003"/> + <location filename="../Project/Project.py" line="4015"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Reset nastavení debugeru</b><p>Zresetuje nastavení debugeru v projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4012"/> + <location filename="../Project/Project.py" line="4024"/> <source>Load session</source> <translation>Načíst relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4016"/> + <location filename="../Project/Project.py" line="4028"/> <source>Load the projects session file.</source> <translation>Načíst soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4017"/> + <location filename="../Project/Project.py" line="4029"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Načíst relaci</b><p>Načte soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4030"/> + <location filename="../Project/Project.py" line="4042"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4034"/> + <location filename="../Project/Project.py" line="4046"/> <source>Save the projects session file.</source> <translation>Uložit soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4035"/> + <location filename="../Project/Project.py" line="4047"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Uložit relaci</b><p>Uloží soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4048"/> + <location filename="../Project/Project.py" line="4060"/> <source>Delete session</source> <translation>Smazat relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="4052"/> + <location filename="../Project/Project.py" line="4064"/> <source>Delete the projects session file.</source> <translation>Smaže soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4053"/> + <location filename="../Project/Project.py" line="4065"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Smazat relaci</b><p>Smaže soubor s relací projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4062"/> + <location filename="../Project/Project.py" line="4074"/> <source>Code Metrics</source> <translation>Metriky kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4062"/> + <location filename="../Project/Project.py" line="4074"/> <source>&Code Metrics...</source> <translation>Metriky &kódu...</translation> </message> <message> - <location filename="../Project/Project.py" line="4066"/> + <location filename="../Project/Project.py" line="4078"/> <source>Show some code metrics for the project.</source> <translation>Zobrazit metriky kódu projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4068"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation><b>Metriky kódu...</b><p>Zobrazí se metriky kódu všech python souborů v projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4076"/> - <source>Python Code Coverage</source> - <translation>Pokrytí python kódu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4076"/> - <source>Code Co&verage...</source> - <translation>Pokr&ytí kódu...</translation> - </message> - <message> <location filename="../Project/Project.py" line="4080"/> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation><b>Metriky kódu...</b><p>Zobrazí se metriky kódu všech python souborů v projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4088"/> + <source>Python Code Coverage</source> + <translation>Pokrytí python kódu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4088"/> + <source>Code Co&verage...</source> + <translation>Pokr&ytí kódu...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4092"/> <source>Show code coverage information for the project.</source> <translation>Zobrazit informace pokrytí kódu projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4082"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4923"/> - <source>Profile Data</source> - <translation>Profilovat data</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4090"/> - <source>&Profile Data...</source> - <translation>&Profilovat data...</translation> - </message> - <message> <location filename="../Project/Project.py" line="4094"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4947"/> + <source>Profile Data</source> + <translation>Profilovat data</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4102"/> + <source>&Profile Data...</source> + <translation>&Profilovat data...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4106"/> <source>Show profiling data for the project.</source> <translation>Zobrazit profilování dat projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4096"/> + <location filename="../Project/Project.py" line="4108"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4977"/> + <location filename="../Project/Project.py" line="5001"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../Project/Project.py" line="4105"/> + <location filename="../Project/Project.py" line="4117"/> <source>&Application Diagram...</source> <translation>Diagram &aplikace...</translation> </message> <message> - <location filename="../Project/Project.py" line="4109"/> + <location filename="../Project/Project.py" line="4121"/> <source>Show a diagram of the project.</source> <translation>Zobrazit diagram projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="4111"/> + <location filename="../Project/Project.py" line="4123"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagram aplikace...</b><p>Zobrazí diagram projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4235"/> + <location filename="../Project/Project.py" line="4247"/> <source>&Project</source> <translation>&Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="4236"/> - <source>Open &Recent Projects</source> - <translation>Otevřít poslední p&rojekty</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4237"/> - <source>&Version Control</source> - <translation>Kontrola &verzí</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4241"/> - <source>Chec&k</source> - <translation>Zkontro&lovat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4243"/> - <source>Sho&w</source> - <translation>Zo&brazit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4244"/> - <source>&Diagrams</source> - <translation>&Diagramy</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4245"/> - <source>Session</source> - <translation>Relace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4246"/> - <source>Source &Documentation</source> - <translation>Zd&rojová dokumentace</translation> - </message> - <message> <location filename="../Project/Project.py" line="4248"/> - <source>Debugger</source> - <translation></translation> + <source>Open &Recent Projects</source> + <translation>Otevřít poslední p&rojekty</translation> </message> <message> <location filename="../Project/Project.py" line="4249"/> + <source>&Version Control</source> + <translation>Kontrola &verzí</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4253"/> + <source>Chec&k</source> + <translation>Zkontro&lovat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4255"/> + <source>Sho&w</source> + <translation>Zo&brazit</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4256"/> + <source>&Diagrams</source> + <translation>&Diagramy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4257"/> + <source>Session</source> + <translation>Relace</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4258"/> + <source>Source &Documentation</source> + <translation>Zd&rojová dokumentace</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4260"/> + <source>Debugger</source> + <translation></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4261"/> <source>Pac&kagers</source> <translation>Balíč&ky</translation> </message> <message> - <location filename="../Project/Project.py" line="4368"/> + <location filename="../Project/Project.py" line="4380"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="4434"/> + <location filename="../Project/Project.py" line="4446"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="../Project/Project.py" line="4585"/> + <location filename="../Project/Project.py" line="4609"/> <source>Search New Files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="4585"/> + <location filename="../Project/Project.py" line="4609"/> <source>There were no new files found to be added.</source> <translation>Nebyly nalezeny žádné soubory, které je možné přidat.</translation> </message> <message> - <location filename="../Project/Project.py" line="4731"/> + <location filename="../Project/Project.py" line="4755"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="4850"/> + <location filename="../Project/Project.py" line="4874"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4900"/> + <location filename="../Project/Project.py" line="4924"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation> </message> <message> - <location filename="../Project/Project.py" line="4873"/> + <location filename="../Project/Project.py" line="4897"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4873"/> + <location filename="../Project/Project.py" line="4897"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4923"/> + <location filename="../Project/Project.py" line="4947"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../Project/Project.py" line="4977"/> + <location filename="../Project/Project.py" line="5001"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="../Project/Project.py" line="5171"/> + <location filename="../Project/Project.py" line="5195"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> <message> - <location filename="../Project/Project.py" line="4134"/> + <location filename="../Project/Project.py" line="4146"/> <source>Create &Package List</source> <translation type="unfinished">Vytvořit Plugin &archiv</translation> </message> <message> - <location filename="../Project/Project.py" line="5448"/> + <location filename="../Project/Project.py" line="5472"/> <source>Create Plugin Archive</source> <translation>Vytvořit Plugin archiv</translation> </message> <message> - <location filename="../Project/Project.py" line="5122"/> + <location filename="../Project/Project.py" line="5146"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> </message> @@ -52593,7 +52713,7 @@ <translation type="obsolete"><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5190"/> + <location filename="../Project/Project.py" line="5214"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> </message> @@ -52603,12 +52723,12 @@ <translation><p>Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2892"/> + <location filename="../Project/Project.py" line="2904"/> <source>Select Version Control System</source> <translation>Vybrat Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="2518"/> + <location filename="../Project/Project.py" line="2530"/> <source>None</source> <translation>None</translation> </message> @@ -52618,7 +52738,7 @@ <translation>Zaregistrovat typ projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="4150"/> + <location filename="../Project/Project.py" line="4162"/> <source>Create Plugin &Archives</source> <translation type="unfinished"></translation> </message> @@ -52628,32 +52748,32 @@ <translation>Nejdříve musíte specifikovat vzor překladu.</translation> </message> <message> - <location filename="../Project/Project.py" line="2617"/> + <location filename="../Project/Project.py" line="2629"/> <source>Translation Pattern</source> <translation>Vzor překladu</translation> </message> <message> - <location filename="../Project/Project.py" line="2617"/> + <location filename="../Project/Project.py" line="2629"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation>Zadejte vzor cesty pro soubory s překlady (použijte '%language%' na místě s kódem jazyka):</translation> </message> <message> - <location filename="../Project/Project.py" line="3930"/> + <location filename="../Project/Project.py" line="3942"/> <source>Lexer Associations</source> <translation>Spojení lexeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3930"/> + <location filename="../Project/Project.py" line="3942"/> <source>Lexer Associations...</source> <translation>Spojení lexeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3934"/> + <location filename="../Project/Project.py" line="3946"/> <source>Show the project lexer associations (overriding defaults)</source> <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> </message> <message> - <location filename="../Project/Project.py" line="3936"/> + <location filename="../Project/Project.py" line="3948"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Spojení lexeru...</b><p>Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.</p></translation> </message> @@ -52743,12 +52863,12 @@ <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3050"/> + <location filename="../Project/Project.py" line="3062"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1945"/> + <location filename="../Project/Project.py" line="1957"/> <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> @@ -52763,17 +52883,17 @@ <translation type="obsolete"><p>Vybraný adresář <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2305"/> + <location filename="../Project/Project.py" line="2317"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4731"/> + <location filename="../Project/Project.py" line="4755"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5171"/> + <location filename="../Project/Project.py" line="5195"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> </message> @@ -52783,12 +52903,12 @@ <translation type="obsolete"><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5332"/> + <location filename="../Project/Project.py" line="5356"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="5406"/> + <location filename="../Project/Project.py" line="5430"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> </message> @@ -52808,32 +52928,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2386"/> + <location filename="../Project/Project.py" line="2398"/> <source>Create main script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2386"/> + <location filename="../Project/Project.py" line="2398"/> <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4119"/> + <location filename="../Project/Project.py" line="4131"/> <source>Load Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4119"/> + <location filename="../Project/Project.py" line="4131"/> <source>&Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4123"/> + <location filename="../Project/Project.py" line="4135"/> <source>Load a diagram from file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4125"/> + <location filename="../Project/Project.py" line="4137"/> <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> <translation type="unfinished"></translation> </message> @@ -52863,37 +52983,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4719"/> + <location filename="../Project/Project.py" line="4743"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5448"/> + <location filename="../Project/Project.py" line="5472"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4139"/> + <location filename="../Project/Project.py" line="4151"/> <source>Create an initial PKGLIST file for an eric6 plugin.</source> <translation type="unfinished">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="4141"/> + <location filename="../Project/Project.py" line="4153"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"><b>Vytvořit Plugin archiv</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Jméno archivu je odvozeno ze jména hlavního skriptu.</p> {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="4155"/> + <location filename="../Project/Project.py" line="4167"/> <source>Create eric6 plugin archive files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4157"/> + <location filename="../Project/Project.py" line="4169"/> <source><b>Create Plugin Archives</b><p>This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5297"/> + <location filename="../Project/Project.py" line="5321"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Soubor s eric5 plugin archivem <b>{0}</b> nelze vytvořit. Zrušeno...</p><p>Důvod: {1}</p> {6 ?} {0}?} {1}?}</translation> </message> @@ -52918,83 +53038,83 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2862"/> + <location filename="../Project/Project.py" line="2874"/> <source>Create project management directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2862"/> + <location filename="../Project/Project.py" line="2874"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3869"/> + <location filename="../Project/Project.py" line="3881"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3875"/> + <location filename="../Project/Project.py" line="3887"/> <source>Search for a file in the project list of files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3877"/> + <location filename="../Project/Project.py" line="3889"/> <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3869"/> + <location filename="../Project/Project.py" line="3881"/> <source>Search Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3869"/> + <location filename="../Project/Project.py" line="3881"/> <source>Search Project File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5226"/> + <location filename="../Project/Project.py" line="5250"/> <source>Create Plugin Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4167"/> + <location filename="../Project/Project.py" line="4179"/> <source>Create Plugin Archives (Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4167"/> + <location filename="../Project/Project.py" line="4179"/> <source>Create Plugin Archives (&Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4172"/> + <location filename="../Project/Project.py" line="4184"/> <source>Create eric6 plugin archive files (snapshot releases).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4174"/> + <location filename="../Project/Project.py" line="4186"/> <source><b>Create Plugin Archives (Snapshot)</b><p>This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5204"/> + <location filename="../Project/Project.py" line="5228"/> <source>Select package lists:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5222"/> + <location filename="../Project/Project.py" line="5246"/> <source>Creating plugin archives...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5222"/> + <location filename="../Project/Project.py" line="5246"/> <source>Abort</source> <translation type="unfinished">Přerušit</translation> </message> <message> - <location filename="../Project/Project.py" line="5222"/> + <location filename="../Project/Project.py" line="5246"/> <source>%v/%m Archives</source> <translation type="unfinished"></translation> </message> @@ -53004,37 +53124,37 @@ <translation type="obsolete">Pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="5239"/> + <location filename="../Project/Project.py" line="5263"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5351"/> + <location filename="../Project/Project.py" line="5375"/> <source><p>The eric6 plugin archive files were created with some errors.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5354"/> + <location filename="../Project/Project.py" line="5378"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5215"/> + <location filename="../Project/Project.py" line="5239"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5269"/> + <location filename="../Project/Project.py" line="5293"/> <source><p>The file <b>{0}</b> is not ready yet.</p><p>Please rework it and delete the'; initial_list' line of the header.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3860"/> + <location filename="../Project/Project.py" line="3872"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl, *.proto) in the project directory and registered subdirectories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3918"/> + <location filename="../Project/Project.py" line="3930"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the file type associations of the project. These associations determine the type (source, form, interface, protocol or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation type="unfinished"></translation> </message> @@ -53044,92 +53164,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2188"/> + <location filename="../Project/Project.py" line="2200"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2218"/> + <location filename="../Project/Project.py" line="2230"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2688"/> + <location filename="../Project/Project.py" line="2700"/> <source>Create Makefile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2688"/> + <location filename="../Project/Project.py" line="2700"/> <source><p>The makefile <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5631"/> + <location filename="../Project/Project.py" line="5655"/> <source>Execute Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4188"/> + <location filename="../Project/Project.py" line="4200"/> <source>&Execute Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4192"/> + <location filename="../Project/Project.py" line="4204"/> <source>Perform a 'make' run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4194"/> - <source><b>Execute Make</b><p>This performs a 'make' run to rebuild the configured target.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="5611"/> - <source>Test for Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4202"/> - <source>&Test for Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="4206"/> + <source><b>Execute Make</b><p>This performs a 'make' run to rebuild the configured target.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="5635"/> + <source>Test for Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4214"/> + <source>&Test for Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4218"/> <source>Question 'make', if a rebuild is needed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4208"/> + <location filename="../Project/Project.py" line="4220"/> <source><b>Test for Changes</b><p>This questions 'make', if a rebuild of the configured target is necessary.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4250"/> + <location filename="../Project/Project.py" line="4262"/> <source>Make</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5559"/> + <location filename="../Project/Project.py" line="5583"/> <source>The make process did not start.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5604"/> + <location filename="../Project/Project.py" line="5628"/> <source>The make process crashed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5614"/> + <location filename="../Project/Project.py" line="5638"/> <source><p>There are changes that require the configured make target <b>{0}</b> to be rebuilt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5619"/> + <location filename="../Project/Project.py" line="5643"/> <source><p>There are changes that require the default make target to be rebuilt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5631"/> + <location filename="../Project/Project.py" line="5655"/> <source>The makefile contains errors.</source> <translation type="unfinished"></translation> </message> @@ -61285,17 +61405,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="106"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="132"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -62963,7 +63083,7 @@ <translation>Č.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2047"/> + <location filename="../QScintilla/Shell.py" line="2059"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> @@ -63024,23 +63144,23 @@ <translation>{0} na {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="955"/> + <location filename="../QScintilla/Shell.py" line="964"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="963"/> + <location filename="../QScintilla/Shell.py" line="972"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1731"/> + <location filename="../QScintilla/Shell.py" line="1743"/> <source>Shell language "{0}" not supported. </source> <translation>Shell jazyk "{0}" není podporován.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2047"/> + <location filename="../QScintilla/Shell.py" line="2059"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> @@ -75904,573 +76024,573 @@ <translation>Inicializace jednouživatelského aplikačního serveru...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1497"/> + <location filename="../UI/UserInterface.py" line="1498"/> <source>Project-Viewer</source> <translation>Prohlížeč projektu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1532"/> + <location filename="../UI/UserInterface.py" line="1533"/> <source>Debug-Viewer</source> <translation>Prohlížeč debugeru</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1584"/> + <location filename="../UI/UserInterface.py" line="1585"/> <source>Log-Viewer</source> <translation>Prohlížeč logu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1602"/> + <location filename="../UI/UserInterface.py" line="1603"/> <source>Task-Viewer</source> <translation>Prohlížeč úloh</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1621"/> + <location filename="../UI/UserInterface.py" line="1622"/> <source>Template-Viewer</source> <translation>Prohlížeč šablon</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1550"/> + <location filename="../UI/UserInterface.py" line="1551"/> <source>Shell</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1567"/> + <location filename="../UI/UserInterface.py" line="1568"/> <source>File-Browser</source> <translation>Browser souborů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1385"/> + <location filename="../UI/UserInterface.py" line="1386"/> <source>Quit</source> <translation>Konec</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1385"/> + <location filename="../UI/UserInterface.py" line="1386"/> <source>&Quit</source> <translation>&Konec</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1385"/> + <location filename="../UI/UserInterface.py" line="1386"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1391"/> - <source>Quit the IDE</source> - <translation>Ukončit IDE</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1392"/> + <source>Quit the IDE</source> + <translation>Ukončit IDE</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1393"/> <source><b>Quit the IDE</b><p>This quits the IDE. Any unsaved changes may be saved first. Any Python program being debugged will be stopped and the preferences will be written to disc.</p></source> <translation><b>Ukončit IDE</b><p>Ukončí se IDE. Nejdříve by se měly uložit neuložené změny. Python programy běžící v debug procesu budou ukončeny a nastavení budou uložena.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1463"/> + <location filename="../UI/UserInterface.py" line="1464"/> <source>Edit Profile</source> <translation>Editační profil</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1469"/> + <location filename="../UI/UserInterface.py" line="1470"/> <source>Activate the edit view profile</source> <translation>Aktivovat profil editace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1471"/> + <location filename="../UI/UserInterface.py" line="1472"/> <source><b>Edit Profile</b><p>Activate the "Edit View Profile". Windows being shown, if this profile is active, may be configured with the "View Profile Configuration" dialog.</p></source> <translation><b>Editační profil</b><p>Aktivování skupiny 'Editační profil'. Okna, která se v tomto profilu zobrazí lze nastavit v dialogu 'Konfigurace profilu pohledů'.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1480"/> + <location filename="../UI/UserInterface.py" line="1481"/> <source>Debug Profile</source> <translation>Debugovací profil</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1486"/> + <location filename="../UI/UserInterface.py" line="1487"/> <source>Activate the debug view profile</source> <translation>Aktivovat debugovací profil</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1488"/> + <location filename="../UI/UserInterface.py" line="1489"/> <source><b>Debug Profile</b><p>Activate the "Debug View Profile". Windows being shown, if this profile is active, may be configured with the "View Profile Configuration" dialog.</p></source> <translation><b>Debugovací profil</b><p>Aktivování skupiny 'Debugovací profil'. Okna, která se v tomto profilu zobrazí lze nastavit v dialogu 'Konfigurace profilu pohledů'.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1497"/> + <location filename="../UI/UserInterface.py" line="1498"/> <source>&Project-Viewer</source> <translation>Prohlížeč &projektu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1497"/> + <location filename="../UI/UserInterface.py" line="1498"/> <source>Alt+Shift+P</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1532"/> + <location filename="../UI/UserInterface.py" line="1533"/> <source>Alt+Shift+D</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1550"/> + <location filename="../UI/UserInterface.py" line="1551"/> <source>&Shell</source> <translation>&Shell</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1550"/> + <location filename="../UI/UserInterface.py" line="1551"/> <source>Alt+Shift+S</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1567"/> + <location filename="../UI/UserInterface.py" line="1568"/> <source>Alt+Shift+F</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1584"/> + <location filename="../UI/UserInterface.py" line="1585"/> <source>Alt+Shift+G</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1602"/> + <location filename="../UI/UserInterface.py" line="1603"/> <source>Alt+Shift+T</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1514"/> + <location filename="../UI/UserInterface.py" line="1515"/> <source>Alt+Shift+M</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1794"/> + <location filename="../UI/UserInterface.py" line="1795"/> <source>What's This?</source> <translation>Co je to?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1794"/> + <location filename="../UI/UserInterface.py" line="1795"/> <source>&What's This?</source> <translation>&Co je to?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1794"/> + <location filename="../UI/UserInterface.py" line="1795"/> <source>Shift+F1</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1800"/> - <source>Context sensitive help</source> - <translation>Kontextově senzitivní nápověda</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1801"/> + <source>Context sensitive help</source> + <translation>Kontextově senzitivní nápověda</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1802"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Zobrazit kontextově senzitivní nápovědu</b><p>V režimu "Co je to?" se nad různými prvky aplikace u kurzoru zobrazí otazník. Když pak kliknete na tyto prvky, zobrazí se krátký popis co daný prvek znamená a jak jej použít. V dialogových oknech se tato funkce spustí tlačítkem kontextové nápovědy na horní liště.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1813"/> + <location filename="../UI/UserInterface.py" line="1814"/> <source>Helpviewer</source> <translation>Prohlížeč nápovědy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1813"/> + <location filename="../UI/UserInterface.py" line="1814"/> <source>&Helpviewer...</source> <translation>Pro&hlížeč nápovědy...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1813"/> + <location filename="../UI/UserInterface.py" line="1814"/> <source>F1</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1819"/> + <location filename="../UI/UserInterface.py" line="1820"/> <source>Open the helpviewer window</source> <translation>Otevřít okno prohlížeče nápovědy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1841"/> + <location filename="../UI/UserInterface.py" line="1842"/> <source>Show Versions</source> <translation>Zobrazit verze</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1841"/> + <location filename="../UI/UserInterface.py" line="1842"/> <source>Show &Versions</source> <translation>Zobrazit &verze</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1845"/> + <location filename="../UI/UserInterface.py" line="1846"/> <source>Display version information</source> <translation>Zobrazit informace o verzích</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1847"/> + <location filename="../UI/UserInterface.py" line="1848"/> <source><b>Show Versions</b><p>Display version information.</p></source> <translation><b>Zobrazit verze</b><p>Zobrazí informace o verzích.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1857"/> + <location filename="../UI/UserInterface.py" line="1858"/> <source>Check for Updates</source> <translation>Zjistit aktualizace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1854"/> + <location filename="../UI/UserInterface.py" line="1855"/> <source>Check for &Updates...</source> <translation>Zjistit akt&ualizace...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3398"/> + <location filename="../UI/UserInterface.py" line="3404"/> <source>Report Bug</source> <translation>Reportovat Bugy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1892"/> + <location filename="../UI/UserInterface.py" line="1893"/> <source>Report &Bug...</source> <translation>Reportovat &Bugy...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1896"/> - <source>Report a bug</source> - <translation>Reportovat bug</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1897"/> + <source>Report a bug</source> + <translation>Reportovat bug</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1898"/> <source><b>Report Bug...</b><p>Opens a dialog to report a bug.</p></source> <translation><b>Reportovat bug...</b><p>Otevře se dialog pro reportování bugu.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2963"/> + <location filename="../UI/UserInterface.py" line="2964"/> <source>Unittest</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1919"/> + <location filename="../UI/UserInterface.py" line="1920"/> <source>&Unittest...</source> <translation>&Unittest...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1924"/> - <source>Start unittest dialog</source> - <translation>Otevřít dialog unittestu</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1925"/> + <source>Start unittest dialog</source> + <translation>Otevřít dialog unittestu</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1926"/> <source><b>Unittest</b><p>Perform unit tests. The dialog gives you the ability to select and run a unittest suite.</p></source> <translation><b>Unittest</b><p>Provést unittesty. V dialogovém okně se nastaví který test se má provést.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1933"/> + <location filename="../UI/UserInterface.py" line="1934"/> <source>Unittest Restart</source> <translation>Restart unittestu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1933"/> + <location filename="../UI/UserInterface.py" line="1934"/> <source>&Restart Unittest...</source> <translation>&Restart unittestu...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1938"/> - <source>Restart last unittest</source> - <translation>Restart posledního unittestu</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1939"/> + <source>Restart last unittest</source> + <translation>Restart posledního unittestu</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1940"/> <source><b>Restart Unittest</b><p>Restart the unittest performed last.</p></source> <translation><b>Restart unittestu</b><p>Restartuje se poslední provedený unittest.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1963"/> + <location filename="../UI/UserInterface.py" line="1964"/> <source>Unittest Script</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1963"/> + <location filename="../UI/UserInterface.py" line="1964"/> <source>Unittest &Script...</source> <translation>Unittest &Script...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1968"/> + <location filename="../UI/UserInterface.py" line="1969"/> <source>Run unittest with current script</source> <translation>Spustit unittest s aktuálním skriptem</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1970"/> + <location filename="../UI/UserInterface.py" line="1971"/> <source><b>Unittest Script</b><p>Run unittest with current script.</p></source> <translation><b>Unittest Script</b><p>Spustit unittest s aktuálním skriptem.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4517"/> + <location filename="../UI/UserInterface.py" line="4523"/> <source>Unittest Project</source> <translation>Unittest Projekt</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1978"/> + <location filename="../UI/UserInterface.py" line="1979"/> <source>Unittest &Project...</source> <translation>Unittest &Projekt...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1983"/> + <location filename="../UI/UserInterface.py" line="1984"/> <source>Run unittest with current project</source> <translation>Spustit unittest s aktuálním projektem</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1985"/> + <location filename="../UI/UserInterface.py" line="1986"/> <source><b>Unittest Project</b><p>Run unittest with current project.</p></source> <translation><b>Unittest projekt</b><p>Spustit unittest s aktuálním projektem.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2046"/> + <location filename="../UI/UserInterface.py" line="2047"/> <source>UI Previewer</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2046"/> + <location filename="../UI/UserInterface.py" line="2047"/> <source>&UI Previewer...</source> <translation>&UI Previewer...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2051"/> - <source>Start the UI Previewer</source> - <translation>Spustit UI Previewer</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2052"/> + <source>Start the UI Previewer</source> + <translation>Spustit UI Previewer</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2053"/> <source><b>UI Previewer</b><p>Start the UI Previewer.</p></source> <translation><b>UI Previewer</b><p>Spustit UI Previewer.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2059"/> + <location filename="../UI/UserInterface.py" line="2060"/> <source>Translations Previewer</source> <translation>Náhled překladů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2059"/> + <location filename="../UI/UserInterface.py" line="2060"/> <source>&Translations Previewer...</source> <translation>Náhled &překladů...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2064"/> + <location filename="../UI/UserInterface.py" line="2065"/> <source>Start the Translations Previewer</source> <translation>Spustit Previewer překladů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2066"/> + <location filename="../UI/UserInterface.py" line="2067"/> <source><b>Translations Previewer</b><p>Start the Translations Previewer.</p></source> <translation><b>Previewer překladů</b><p>Spustit Previewer překladů.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2073"/> + <location filename="../UI/UserInterface.py" line="2074"/> <source>Compare Files</source> <translation>Porovnat soubory</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2073"/> + <location filename="../UI/UserInterface.py" line="2074"/> <source>&Compare Files...</source> <translation>&Porovnat soubory...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2091"/> - <source>Compare two files</source> - <translation>Porovnat dva soubory</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2079"/> - <source><b>Compare Files</b><p>Open a dialog to compare two files.</p></source> - <translation><b>Porovnat soubory</b><p>Otevře dialog pro porovnání dvou souborů.</p></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2086"/> - <source>Compare Files side by side</source> - <translation>Porovnat soubory stranu proti straně</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2092"/> + <source>Compare two files</source> + <translation>Porovnat dva soubory</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2080"/> + <source><b>Compare Files</b><p>Open a dialog to compare two files.</p></source> + <translation><b>Porovnat soubory</b><p>Otevře dialog pro porovnání dvou souborů.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2087"/> + <source>Compare Files side by side</source> + <translation>Porovnat soubory stranu proti straně</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2093"/> <source><b>Compare Files side by side</b><p>Open a dialog to compare two files and show the result side by side.</p></source> <translation><b>Porovnat soubory stranu proti straně</b><p>Otevře dialog pro porovnání souborů a zobrazení rozdílů strany proti straně.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2187"/> + <location filename="../UI/UserInterface.py" line="2188"/> <source>Preferences</source> <translation>Nastavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2187"/> + <location filename="../UI/UserInterface.py" line="2188"/> <source>&Preferences...</source> <translation>Na&stavení...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2192"/> + <location filename="../UI/UserInterface.py" line="2193"/> <source>Set the prefered configuration</source> <translation>Nastavení konfigurace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2194"/> + <location filename="../UI/UserInterface.py" line="2195"/> <source><b>Preferences</b><p>Set the configuration items of the application with your prefered values.</p></source> <translation><b>Nastavení</b><p>Upravit konfiguraci aplikace podle požadavků uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2231"/> + <location filename="../UI/UserInterface.py" line="2232"/> <source>Reload APIs</source> <translation>Obnovit API</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2231"/> + <location filename="../UI/UserInterface.py" line="2232"/> <source>Reload &APIs</source> <translation>Obnovit &API</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2235"/> + <location filename="../UI/UserInterface.py" line="2236"/> <source>Reload the API information</source> <translation>Obnovit API nastavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2237"/> + <location filename="../UI/UserInterface.py" line="2238"/> <source><b>Reload APIs</b><p>Reload the API information.</p></source> <translation><b>Obnovit API</b><p>Obnovit API nastavení.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2260"/> + <location filename="../UI/UserInterface.py" line="2261"/> <source>View Profiles</source> <translation>Profily pohledů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2260"/> + <location filename="../UI/UserInterface.py" line="2261"/> <source>&View Profiles...</source> <translation>Profily &pohledů...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2265"/> + <location filename="../UI/UserInterface.py" line="2266"/> <source>Configure view profiles</source> <translation>Konfigurace profilů pohledů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2267"/> + <location filename="../UI/UserInterface.py" line="2268"/> <source><b>View Profiles</b><p>Configure the view profiles. With this dialog you may set the visibility of the various windows for the predetermined view profiles.</p></source> <translation><b>Profily pohledů</b><p>Konfigurace profilu pohledů. V tomto dialogu můžete nastavit zobrazování různých typů pohledů - editačních oken.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2292"/> + <location filename="../UI/UserInterface.py" line="2293"/> <source>Keyboard Shortcuts</source> <translation>Klávesové zkratky</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2292"/> + <location filename="../UI/UserInterface.py" line="2293"/> <source>Keyboard &Shortcuts...</source> <translation>Klávesové &zkratky...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2297"/> + <location filename="../UI/UserInterface.py" line="2298"/> <source>Set the keyboard shortcuts</source> <translation>Nastavení klávesových zkratek</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2299"/> + <location filename="../UI/UserInterface.py" line="2300"/> <source><b>Keyboard Shortcuts</b><p>Set the keyboard shortcuts of the application with your prefered values.</p></source> <translation><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5921"/> + <location filename="../UI/UserInterface.py" line="5927"/> <source>Export Keyboard Shortcuts</source> <translation>Exportovat klávesové zkratky</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2307"/> + <location filename="../UI/UserInterface.py" line="2308"/> <source>&Export Keyboard Shortcuts...</source> <translation>&Exportovat klávesové zkratky...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2312"/> + <location filename="../UI/UserInterface.py" line="2313"/> <source>Export the keyboard shortcuts</source> <translation>Export klávesových zkratek</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2314"/> + <location filename="../UI/UserInterface.py" line="2315"/> <source><b>Export Keyboard Shortcuts</b><p>Export the keyboard shortcuts of the application.</p></source> <translation><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5945"/> + <location filename="../UI/UserInterface.py" line="5951"/> <source>Import Keyboard Shortcuts</source> <translation>Import klávesových zkratek</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2321"/> + <location filename="../UI/UserInterface.py" line="2322"/> <source>&Import Keyboard Shortcuts...</source> <translation>&Import klávesových zkratek...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2326"/> + <location filename="../UI/UserInterface.py" line="2327"/> <source>Import the keyboard shortcuts</source> <translation>Import klávesových zkratek</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2328"/> + <location filename="../UI/UserInterface.py" line="2329"/> <source><b>Import Keyboard Shortcuts</b><p>Import the keyboard shortcuts of the application.</p></source> <translation><b>Import klávesových zkratek</b><p>Do aplikace se importují klávesové zkratky.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2386"/> + <location filename="../UI/UserInterface.py" line="2387"/> <source>Activate current editor</source> <translation>Aktivovat aktuální editor</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2386"/> + <location filename="../UI/UserInterface.py" line="2387"/> <source>Alt+Shift+E</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2396"/> + <location filename="../UI/UserInterface.py" line="2397"/> <source>Ctrl+Alt+Tab</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2405"/> + <location filename="../UI/UserInterface.py" line="2406"/> <source>Shift+Ctrl+Alt+Tab</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2528"/> + <location filename="../UI/UserInterface.py" line="2529"/> <source>Qt4 Documentation</source> <translation>Qt4 dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2528"/> + <location filename="../UI/UserInterface.py" line="2529"/> <source>Qt&4 Documentation</source> <translation>Qt&4 dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2532"/> + <location filename="../UI/UserInterface.py" line="2533"/> <source>Open Qt4 Documentation</source> <translation>Otevřít Qt4 dokumentaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2560"/> + <location filename="../UI/UserInterface.py" line="2561"/> <source>PyQt4 Documentation</source> <translation>PyQt4 dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2564"/> + <location filename="../UI/UserInterface.py" line="2565"/> <source>Open PyQt4 Documentation</source> <translation>Otevřít PyQt4 dokumentaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2644"/> + <location filename="../UI/UserInterface.py" line="2645"/> <source>Eric API Documentation</source> <translation>Eric API dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2644"/> + <location filename="../UI/UserInterface.py" line="2645"/> <source>&Eric API Documentation</source> <translation>&Eric API dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2648"/> + <location filename="../UI/UserInterface.py" line="2649"/> <source>Open Eric API Documentation</source> <translation>Otevřít Eric API dokumentaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2740"/> + <location filename="../UI/UserInterface.py" line="2741"/> <source>&Unittest</source> <translation>&Unittest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2757"/> + <location filename="../UI/UserInterface.py" line="2758"/> <source>E&xtras</source> <translation>E&xtra funkce</translation> </message> @@ -76480,167 +76600,167 @@ <translation type="obsolete">&Nástroje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2773"/> + <location filename="../UI/UserInterface.py" line="2774"/> <source>Select Tool Group</source> <translation>Vybrat skupinu nástrojů</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2781"/> + <location filename="../UI/UserInterface.py" line="2782"/> <source>Se&ttings</source> <translation>Nas&tavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2806"/> + <location filename="../UI/UserInterface.py" line="2807"/> <source>&Window</source> <translation>O&kno</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2862"/> + <location filename="../UI/UserInterface.py" line="2863"/> <source>&Toolbars</source> <translation>&Toolbary</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2887"/> + <location filename="../UI/UserInterface.py" line="2888"/> <source>&Help</source> <translation>&Nápověda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2962"/> + <location filename="../UI/UserInterface.py" line="2963"/> <source>Tools</source> <translation>Nástroje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2964"/> + <location filename="../UI/UserInterface.py" line="2965"/> <source>Settings</source> <translation>Nastavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4769"/> + <location filename="../UI/UserInterface.py" line="4775"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2966"/> + <location filename="../UI/UserInterface.py" line="2967"/> <source>Profiles</source> <translation>Profily</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3343"/> + <location filename="../UI/UserInterface.py" line="3349"/>