Sat, 22 Oct 2016 17:09:08 +0200
Finished the refactoring of the Mercurial user config management code.
--- a/APIs/Python3/eric6.api Fri Oct 21 23:14:16 2016 +0200 +++ b/APIs/Python3/eric6.api Sat Oct 22 17:09:08 2016 +0200 @@ -122,7 +122,6 @@ eric6.DebugClients.Python.AsyncFile.AsyncFile.fileno?4() eric6.DebugClients.Python.AsyncFile.AsyncFile.flush?4() eric6.DebugClients.Python.AsyncFile.AsyncFile.isatty?4() -eric6.DebugClients.Python.AsyncFile.AsyncFile.maxbuffersize?7 eric6.DebugClients.Python.AsyncFile.AsyncFile.maxtries?7 eric6.DebugClients.Python.AsyncFile.AsyncFile.pendingWrite?4() eric6.DebugClients.Python.AsyncFile.AsyncFile.read?4(size=-1) @@ -5000,10 +4999,18 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_currentIndexChanged?4(index) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_editTextChanged?4(text) eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, revision=None, tagName=None, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig._UserEditor?8 -eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.hgEditUserConfig?4(version=(0, 0)) -eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog.getData?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog?1(version=(0, 0), parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.accept?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.eventFilter?4(watched, event) +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_editorButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fingerprintsList_currentItemChanged?4(current, previous) +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpAddButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpDeleteButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpEditButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.readUserConfig?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.writeUserConfig?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog?1(version=(0, 0), parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog?1(parent=None, host="", fingerprint="") eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="") eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.LfConvertDataDialog.getData?4()
--- a/APIs/Python3/eric6.bas Fri Oct 21 23:14:16 2016 +0200 +++ b/APIs/Python3/eric6.bas Sat Oct 22 17:09:08 2016 +0200 @@ -399,7 +399,8 @@ HgTagBranchListDialog QDialog Ui_HgTagBranchListDialog HgTagDialog QDialog Ui_HgTagDialog HgUnshelveDataDialog QDialog Ui_HgUnshelveDataDialog -HgUserConfigDataDialog QDialog Ui_HgUserConfigDataDialog +HgUserConfigDialog QDialog Ui_HgUserConfigDialog +HgUserConfigHostFingerprintDialog QDialog Ui_HgUserConfigHostFingerprintDialog HighlightingStylesReader XMLStreamReaderBase HighlightingStylesWriter XMLStreamWriterBase HistoryCompleter QCompleter
--- a/Documentation/Help/source.qhp Fri Oct 21 23:14:16 2016 +0200 +++ b/Documentation/Help/source.qhp Sat Oct 22 17:09:08 2016 +0200 @@ -608,8 +608,8 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" /> @@ -1847,7 +1847,6 @@ <keyword name="AsyncFile (Constructor)" id="AsyncFile (Constructor)" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.__init__" /> <keyword name="AsyncFile (Module)" id="AsyncFile (Module)" ref="eric6.DebugClients.Python.AsyncFile.html" /> <keyword name="AsyncFile.__checkMode" id="AsyncFile.__checkMode" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.__checkMode" /> - <keyword name="AsyncFile.__nWrite" id="AsyncFile.__nWrite" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.__nWrite" /> <keyword name="AsyncFile.close" id="AsyncFile.close" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.close" /> <keyword name="AsyncFile.fileno" id="AsyncFile.fileno" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.fileno" /> <keyword name="AsyncFile.flush" id="AsyncFile.flush" ref="eric6.DebugClients.Python.AsyncFile.html#AsyncFile.flush" /> @@ -8000,11 +7999,25 @@ <keyword name="HgUnshelveDataDialog (Constructor)" id="HgUnshelveDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.__init__" /> <keyword name="HgUnshelveDataDialog (Module)" id="HgUnshelveDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html" /> <keyword name="HgUnshelveDataDialog.getData" id="HgUnshelveDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.getData" /> - <keyword name="HgUserConfig (Module)" id="HgUserConfig (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html" /> - <keyword name="HgUserConfigDataDialog" id="HgUserConfigDataDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog" /> - <keyword name="HgUserConfigDataDialog (Constructor)" id="HgUserConfigDataDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog.__init__" /> - <keyword name="HgUserConfigDataDialog (Module)" id="HgUserConfigDataDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" /> - <keyword name="HgUserConfigDataDialog.getData" id="HgUserConfigDataDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog.getData" /> + <keyword name="HgUserConfigDialog" id="HgUserConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog" /> + <keyword name="HgUserConfigDialog (Constructor)" id="HgUserConfigDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__init__" /> + <keyword name="HgUserConfigDialog (Module)" id="HgUserConfigDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" /> + <keyword name="HgUserConfigDialog.__clearDialog" id="HgUserConfigDialog.__clearDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearDialog" /> + <keyword name="HgUserConfigDialog.__finalizeFingerprintsColumns" id="HgUserConfigDialog.__finalizeFingerprintsColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__finalizeFingerprintsColumns" /> + <keyword name="HgUserConfigDialog.__updateFingerprintsButtons" id="HgUserConfigDialog.__updateFingerprintsButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__updateFingerprintsButtons" /> + <keyword name="HgUserConfigDialog.accept" id="HgUserConfigDialog.accept" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.accept" /> + <keyword name="HgUserConfigDialog.eventFilter" id="HgUserConfigDialog.eventFilter" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.eventFilter" /> + <keyword name="HgUserConfigDialog.on_editorButton_clicked" id="HgUserConfigDialog.on_editorButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_editorButton_clicked" /> + <keyword name="HgUserConfigDialog.on_fingerprintsList_currentItemChanged" id="HgUserConfigDialog.on_fingerprintsList_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fingerprintsList_currentItemChanged" /> + <keyword name="HgUserConfigDialog.on_fpAddButton_clicked" id="HgUserConfigDialog.on_fpAddButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpAddButton_clicked" /> + <keyword name="HgUserConfigDialog.on_fpDeleteButton_clicked" id="HgUserConfigDialog.on_fpDeleteButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpDeleteButton_clicked" /> + <keyword name="HgUserConfigDialog.on_fpEditButton_clicked" id="HgUserConfigDialog.on_fpEditButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpEditButton_clicked" /> + <keyword name="HgUserConfigDialog.readUserConfig" id="HgUserConfigDialog.readUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.readUserConfig" /> + <keyword name="HgUserConfigDialog.writeUserConfig" id="HgUserConfigDialog.writeUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.writeUserConfig" /> + <keyword name="HgUserConfigHostFingerprintDialog" id="HgUserConfigHostFingerprintDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog" /> + <keyword name="HgUserConfigHostFingerprintDialog (Constructor)" id="HgUserConfigHostFingerprintDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.__init__" /> + <keyword name="HgUserConfigHostFingerprintDialog (Module)" id="HgUserConfigHostFingerprintDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html" /> + <keyword name="HgUserConfigHostFingerprintDialog.getData" id="HgUserConfigHostFingerprintDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.getData" /> <keyword name="HgUtilities (Module)" id="HgUtilities (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" /> <keyword name="HighlightingStylesReader" id="HighlightingStylesReader" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader" /> <keyword name="HighlightingStylesReader (Constructor)" id="HighlightingStylesReader (Constructor)" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader.__init__" /> @@ -16337,7 +16350,6 @@ <keyword name="hashPassword" id="hashPassword" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPassword" /> <keyword name="hashPasswordTuple" id="hashPasswordTuple" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPasswordTuple" /> <keyword name="hg (Module)" id="hg (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html" /> - <keyword name="hgEditUserConfig" id="hgEditUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html#hgEditUserConfig" /> <keyword name="html_encode" id="html_encode" ref="eric6.Utilities.__init__.html#html_encode" /> <keyword name="html_udecode" id="html_udecode" ref="eric6.Utilities.__init__.html#html_udecode" /> <keyword name="html_uencode" id="html_uencode" ref="eric6.Utilities.__init__.html#html_uencode" /> @@ -17145,8 +17157,8 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfConvertDataDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html</file>
--- a/Documentation/Source/eric6.DebugClients.Python.AsyncFile.html Fri Oct 21 23:14:16 2016 +0200 +++ b/Documentation/Source/eric6.DebugClients.Python.AsyncFile.html Sat Oct 22 17:09:08 2016 +0200 @@ -52,7 +52,7 @@ object <h3>Class Attributes</h3> <table> -<tr><td>maxbuffersize</td></tr><tr><td>maxtries</td></tr> +<tr><td>maxtries</td></tr> </table> <h3>Class Methods</h3> <table> @@ -67,9 +67,6 @@ <td><a href="#AsyncFile.__checkMode">__checkMode</a></td> <td>Private method to check the mode.</td> </tr><tr> -<td><a href="#AsyncFile.__nWrite">__nWrite</a></td> -<td>Private method to write a specific number of pending bytes.</td> -</tr><tr> <td><a href="#AsyncFile.close">close</a></td> <td>Public method to close the file.</td> </tr><tr> @@ -77,13 +74,13 @@ <td>Public method returning the file number.</td> </tr><tr> <td><a href="#AsyncFile.flush">flush</a></td> -<td>Public method to write all pending bytes.</td> +<td>Public method to write all pending entries.</td> </tr><tr> <td><a href="#AsyncFile.isatty">isatty</a></td> <td>Public method to indicate whether a tty interface is supported.</td> </tr><tr> <td><a href="#AsyncFile.pendingWrite">pendingWrite</a></td> -<td>Public method that returns the number of bytes waiting to be written.</td> +<td>Public method that returns the number of strings waiting to be written.</td> </tr><tr> <td><a href="#AsyncFile.read">read</a></td> <td>Public method to read bytes from this file.</td> @@ -122,7 +119,7 @@ <td>Public method to write a string to the file.</td> </tr><tr> <td><a href="#AsyncFile.write_p">write_p</a></td> -<td>Public method to write a string to the file.</td> +<td>Public method to write a json-rpc 2.0 coded string to the file.</td> </tr><tr> <td><a href="#AsyncFile.writelines">writelines</a></td> <td>Public method to write a list of strings to the file.</td> @@ -138,15 +135,15 @@ <p> Constructor </p><dl> -<dt><i>sock</i></dt> +<dt><i>sock</i> (socket)</dt> <dd> the socket object being wrapped -</dd><dt><i>mode</i></dt> +</dd><dt><i>mode</i> (str)</dt> <dd> -mode of this file (string) -</dd><dt><i>name</i></dt> +mode of this file +</dd><dt><i>name</i> (str)</dt> <dd> -name of this file (string) +name of this file </dd> </dl><a NAME="AsyncFile.__checkMode" ID="AsyncFile.__checkMode"></a> <h4>AsyncFile.__checkMode</h4> @@ -157,35 +154,24 @@ This method checks, if an operation is permitted according to the mode of the file. If it is not, an IOError is raised. </p><dl> -<dt><i>mode</i></dt> +<dt><i>mode</i> (string)</dt> <dd> -the mode to be checked (string) +the mode to be checked </dd> </dl><dl> <dt>Raises <b>IOError</b>:</dt> <dd> raised to indicate a bad file descriptor </dd> -</dl><a NAME="AsyncFile.__nWrite" ID="AsyncFile.__nWrite"></a> -<h4>AsyncFile.__nWrite</h4> -<b>__nWrite</b>(<i>n</i>) -<p> - Private method to write a specific number of pending bytes. -</p><dl> -<dt><i>n</i></dt> -<dd> -the number of bytes to be written (int) -</dd> </dl><a NAME="AsyncFile.close" ID="AsyncFile.close"></a> <h4>AsyncFile.close</h4> <b>close</b>(<i>closeit=False</i>) <p> Public method to close the file. </p><dl> -<dt><i>closeit</i></dt> +<dt><i>closeit</i> (bool)</dt> <dd> flag to indicate a close ordered by the debugger code - (boolean) </dd> </dl><a NAME="AsyncFile.fileno" ID="AsyncFile.fileno"></a> <h4>AsyncFile.fileno</h4> @@ -195,13 +181,18 @@ </p><dl> <dt>Returns:</dt> <dd> -file number (int) +file number +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int </dd> </dl><a NAME="AsyncFile.flush" ID="AsyncFile.flush"></a> <h4>AsyncFile.flush</h4> <b>flush</b>(<i></i>) <p> - Public method to write all pending bytes. + Public method to write all pending entries. </p><a NAME="AsyncFile.isatty" ID="AsyncFile.isatty"></a> <h4>AsyncFile.isatty</h4> <b>isatty</b>(<i></i>) @@ -212,15 +203,25 @@ <dd> always false </dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="AsyncFile.pendingWrite" ID="AsyncFile.pendingWrite"></a> <h4>AsyncFile.pendingWrite</h4> <b>pendingWrite</b>(<i></i>) <p> - Public method that returns the number of bytes waiting to be written. + Public method that returns the number of strings waiting to be written. </p><dl> <dt>Returns:</dt> <dd> -the number of bytes to be written (int) +the number of strings to be written +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int </dd> </dl><a NAME="AsyncFile.read" ID="AsyncFile.read"></a> <h4>AsyncFile.read</h4> @@ -228,14 +229,19 @@ <p> Public method to read bytes from this file. </p><dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -maximum number of bytes to be read (int) +maximum number of bytes to be read </dd> </dl><dl> <dt>Returns:</dt> <dd> -the bytes read (any) +the bytes read +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="AsyncFile.read_p" ID="AsyncFile.read_p"></a> <h4>AsyncFile.read_p</h4> @@ -243,14 +249,19 @@ <p> Public method to read bytes from this file. </p><dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -maximum number of bytes to be read (int) +maximum number of bytes to be read </dd> </dl><dl> <dt>Returns:</dt> <dd> -the bytes read (any) +the bytes read +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="AsyncFile.readable" ID="AsyncFile.readable"></a> <h4>AsyncFile.readable</h4> @@ -260,7 +271,12 @@ </p><dl> <dt>Returns:</dt> <dd> -flag indicating a readable stream (boolean) +flag indicating a readable stream +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="AsyncFile.readline" ID="AsyncFile.readline"></a> <h4>AsyncFile.readline</h4> @@ -268,14 +284,19 @@ <p> Public method to read one line from this file. </p><dl> -<dt><i>sizehint</i></dt> +<dt><i>sizehint</i> (int)</dt> <dd> -hint of the numbers of bytes to be read (int) +hint of the numbers of bytes to be read </dd> </dl><dl> <dt>Returns:</dt> <dd> -one line read (string) +one line read +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="AsyncFile.readline_p" ID="AsyncFile.readline_p"></a> <h4>AsyncFile.readline_p</h4> @@ -286,14 +307,19 @@ <b>Note</b>: This method will not block and may return only a part of a line if that is all that is available. </p><dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -maximum number of bytes to be read (int) +maximum number of bytes to be read </dd> </dl><dl> <dt>Returns:</dt> <dd> -one line of text up to size bytes (string) +one line of text up to size bytes +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="AsyncFile.readlines" ID="AsyncFile.readlines"></a> <h4>AsyncFile.readlines</h4> @@ -301,14 +327,19 @@ <p> Public method to read all lines from this file. </p><dl> -<dt><i>sizehint</i></dt> +<dt><i>sizehint</i> (int)</dt> <dd> -hint of the numbers of bytes to be read (int) +hint of the numbers of bytes to be read </dd> </dl><dl> <dt>Returns:</dt> <dd> -list of lines read (list of strings) +list of lines read +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str </dd> </dl><a NAME="AsyncFile.seek" ID="AsyncFile.seek"></a> <h4>AsyncFile.seek</h4> @@ -316,10 +347,10 @@ <p> Public method to move the filepointer. </p><dl> -<dt><i>offset</i></dt> +<dt><i>offset</i> (int)</dt> <dd> -offset to move the filepointer to (integer) -</dd><dt><i>whence</i></dt> +offset to move the filepointer to +</dd><dt><i>whence</i> (int)</dt> <dd> position the offset relates to </dd> @@ -337,7 +368,12 @@ </p><dl> <dt>Returns:</dt> <dd> -flag indicating a seekable stream (boolean) +flag indicating a seekable stream +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="AsyncFile.tell" ID="AsyncFile.tell"></a> <h4>AsyncFile.tell</h4> @@ -356,9 +392,9 @@ <p> Public method to truncate the file. </p><dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -size to truncate to (integer) +size to truncate to </dd> </dl><dl> <dt>Raises <b>IOError</b>:</dt> @@ -374,7 +410,12 @@ </p><dl> <dt>Returns:</dt> <dd> -flag indicating a writable stream (boolean) +flag indicating a writable stream +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="AsyncFile.write" ID="AsyncFile.write"></a> <h4>AsyncFile.write</h4> @@ -382,24 +423,19 @@ <p> Public method to write a string to the file. </p><dl> -<dt><i>s</i></dt> +<dt><i>s</i> (str)</dt> <dd> -text to be written (string) +text to be written </dd> </dl><a NAME="AsyncFile.write_p" ID="AsyncFile.write_p"></a> <h4>AsyncFile.write_p</h4> <b>write_p</b>(<i>s</i>) <p> - Public method to write a string to the file. + Public method to write a json-rpc 2.0 coded string to the file. </p><dl> -<dt><i>s</i></dt> +<dt><i>s</i> (str)</dt> <dd> -text to be written (string) -</dd> -</dl><dl> -<dt>Raises <b>socket.error</b>:</dt> -<dd> -raised to indicate too many send attempts +text to be written </dd> </dl><a NAME="AsyncFile.writelines" ID="AsyncFile.writelines"></a> <h4>AsyncFile.writelines</h4> @@ -407,9 +443,9 @@ <p> Public method to write a list of strings to the file. </p><dl> -<dt><i>lines</i></dt> +<dt><i>lines</i> (list of str)</dt> <dd> -list of texts to be written (list of string) +list of texts to be written </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -420,14 +456,19 @@ <p> Module function to check for data to be written. </p><dl> -<dt><i>file</i></dt> +<dt><i>file</i> (file)</dt> <dd> -The file object to be checked (file) +The file object to be checked </dd> </dl><dl> <dt>Returns:</dt> <dd> -Flag indicating if there is data wating (int) +Flag indicating if there is data waiting +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html Fri Oct 21 23:14:16 2016 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html Sat Oct 22 17:09:08 2016 +0200 @@ -1,6 +1,6 @@ <!DOCTYPE html> <html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog</title> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog</title> <meta charset="UTF-8"> <style> body { @@ -19,7 +19,7 @@ </style> </head> <body><a NAME="top" ID="top"></a> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog</h1> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog</h1> <p> Module implementing a dialog to enter some user data. </p> @@ -30,7 +30,7 @@ <h3>Classes</h3> <table> <tr> -<td><a href="#HgUserConfigDataDialog">HgUserConfigDataDialog</a></td> +<td><a href="#HgUserConfigDialog">HgUserConfigDialog</a></td> <td>Class implementing a dialog to enter some user data.</td> </tr> </table> @@ -39,13 +39,13 @@ <tr><td>None</td></tr> </table> <hr /><hr /> -<a NAME="HgUserConfigDataDialog" ID="HgUserConfigDataDialog"></a> -<h2>HgUserConfigDataDialog</h2> +<a NAME="HgUserConfigDialog" ID="HgUserConfigDialog"></a> +<h2>HgUserConfigDialog</h2> <p> Class implementing a dialog to enter some user data. </p> <h3>Derived from</h3> -QDialog, Ui_HgUserConfigDataDialog +QDialog, Ui_HgUserConfigDialog <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -57,20 +57,53 @@ <h3>Methods</h3> <table> <tr> -<td><a href="#HgUserConfigDataDialog.__init__">HgUserConfigDataDialog</a></td> +<td><a href="#HgUserConfigDialog.__init__">HgUserConfigDialog</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#HgUserConfigDataDialog.getData">getData</a></td> -<td>Public method to retrieve the entered data.</td> +<td><a href="#HgUserConfigDialog.__clearDialog">__clearDialog</a></td> +<td>Private method to clear the data of the dialog.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.__finalizeFingerprintsColumns">__finalizeFingerprintsColumns</a></td> +<td>Private method to resize and sort the host fingerprints columns.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.__updateFingerprintsButtons">__updateFingerprintsButtons</a></td> +<td>Private slot to update the host fingerprints edit buttons.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.accept">accept</a></td> +<td>Public slot to accept the dialog.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.eventFilter">eventFilter</a></td> +<td>Public method called to filter the event queue.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.on_editorButton_clicked">on_editorButton_clicked</a></td> +<td>Private slot to open the user configuration file in a text editor.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.on_fingerprintsList_currentItemChanged">on_fingerprintsList_currentItemChanged</a></td> +<td>Private slot handling a change of the current fingerprints item.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.on_fpAddButton_clicked">on_fpAddButton_clicked</a></td> +<td>Private slot to add a fingerprints entry.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.on_fpDeleteButton_clicked">on_fpDeleteButton_clicked</a></td> +<td>Private slot to delete the current fingerprints item.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.on_fpEditButton_clicked">on_fpEditButton_clicked</a></td> +<td>Private slot to edit the current fingerprints item.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.readUserConfig">readUserConfig</a></td> +<td>Public method to read the user configuration file.</td> +</tr><tr> +<td><a href="#HgUserConfigDialog.writeUserConfig">writeUserConfig</a></td> +<td>Public method to write the user configuration file.</td> </tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="HgUserConfigDataDialog.__init__" ID="HgUserConfigDataDialog.__init__"></a> -<h4>HgUserConfigDataDialog (Constructor)</h4> -<b>HgUserConfigDataDialog</b>(<i>version=(0, 0), parent=None</i>) +<a NAME="HgUserConfigDialog.__init__" ID="HgUserConfigDialog.__init__"></a> +<h4>HgUserConfigDialog (Constructor)</h4> +<b>HgUserConfigDialog</b>(<i>version=(0, 0), parent=None</i>) <p> Constructor </p><dl> @@ -81,20 +114,93 @@ <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="HgUserConfigDataDialog.getData" ID="HgUserConfigDataDialog.getData"></a> -<h4>HgUserConfigDataDialog.getData</h4> -<b>getData</b>(<i></i>) +</dl><a NAME="HgUserConfigDialog.__clearDialog" ID="HgUserConfigDialog.__clearDialog"></a> +<h4>HgUserConfigDialog.__clearDialog</h4> +<b>__clearDialog</b>(<i></i>) +<p> + Private method to clear the data of the dialog. +</p><a NAME="HgUserConfigDialog.__finalizeFingerprintsColumns" ID="HgUserConfigDialog.__finalizeFingerprintsColumns"></a> +<h4>HgUserConfigDialog.__finalizeFingerprintsColumns</h4> +<b>__finalizeFingerprintsColumns</b>(<i></i>) +<p> + Private method to resize and sort the host fingerprints columns. +</p><a NAME="HgUserConfigDialog.__updateFingerprintsButtons" ID="HgUserConfigDialog.__updateFingerprintsButtons"></a> +<h4>HgUserConfigDialog.__updateFingerprintsButtons</h4> +<b>__updateFingerprintsButtons</b>(<i></i>) <p> - Public method to retrieve the entered data. + Private slot to update the host fingerprints edit buttons. +</p><a NAME="HgUserConfigDialog.accept" ID="HgUserConfigDialog.accept"></a> +<h4>HgUserConfigDialog.accept</h4> +<b>accept</b>(<i></i>) +<p> + Public slot to accept the dialog. +</p><a NAME="HgUserConfigDialog.eventFilter" ID="HgUserConfigDialog.eventFilter"></a> +<h4>HgUserConfigDialog.eventFilter</h4> +<b>eventFilter</b>(<i>watched, event</i>) +<p> + Public method called to filter the event queue. </p><dl> +<dt><i>watched</i> (QObject)</dt> +<dd> +reference to the object being watched +</dd><dt><i>event</i> (QEvent)</dt> +<dd> +event to be handled +</dd> +</dl><dl> <dt>Returns:</dt> <dd> -tuple with user's first name, last name, email address, - list of activated extensions and dictionary with extension data - (tuple of three strings, a list of strings and a dictionary with - extension name as key) +flag indicating, if we handled the event +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HgUserConfigDialog.on_editorButton_clicked" ID="HgUserConfigDialog.on_editorButton_clicked"></a> +<h4>HgUserConfigDialog.on_editorButton_clicked</h4> +<b>on_editorButton_clicked</b>(<i></i>) +<p> + Private slot to open the user configuration file in a text editor. +</p><a NAME="HgUserConfigDialog.on_fingerprintsList_currentItemChanged" ID="HgUserConfigDialog.on_fingerprintsList_currentItemChanged"></a> +<h4>HgUserConfigDialog.on_fingerprintsList_currentItemChanged</h4> +<b>on_fingerprintsList_currentItemChanged</b>(<i>current, previous</i>) +<p> + Private slot handling a change of the current fingerprints item. +</p><dl> +<dt><i>current</i> (QTreeWidgetItem)</dt> +<dd> +reference to the current item +</dd><dt><i>previous</i> (QTreeWidgetItem)</dt> +<dd> +reference to the previous current item </dd> -</dl> +</dl><a NAME="HgUserConfigDialog.on_fpAddButton_clicked" ID="HgUserConfigDialog.on_fpAddButton_clicked"></a> +<h4>HgUserConfigDialog.on_fpAddButton_clicked</h4> +<b>on_fpAddButton_clicked</b>(<i></i>) +<p> + Private slot to add a fingerprints entry. +</p><a NAME="HgUserConfigDialog.on_fpDeleteButton_clicked" ID="HgUserConfigDialog.on_fpDeleteButton_clicked"></a> +<h4>HgUserConfigDialog.on_fpDeleteButton_clicked</h4> +<b>on_fpDeleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the current fingerprints item. +</p><a NAME="HgUserConfigDialog.on_fpEditButton_clicked" ID="HgUserConfigDialog.on_fpEditButton_clicked"></a> +<h4>HgUserConfigDialog.on_fpEditButton_clicked</h4> +<b>on_fpEditButton_clicked</b>(<i></i>) +<p> + Private slot to edit the current fingerprints item. +</p><a NAME="HgUserConfigDialog.readUserConfig" ID="HgUserConfigDialog.readUserConfig"></a> +<h4>HgUserConfigDialog.readUserConfig</h4> +<b>readUserConfig</b>(<i></i>) +<p> + Public method to read the user configuration file. +</p><a NAME="HgUserConfigDialog.writeUserConfig" ID="HgUserConfigDialog.writeUserConfig"></a> +<h4>HgUserConfigDialog.writeUserConfig</h4> +<b>writeUserConfig</b>(<i></i>) +<p> + Public method to write the user configuration file. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html Sat Oct 22 17:09:08 2016 +0200 @@ -0,0 +1,105 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog</h1> +<p> +Module implementing a dialog to edit a host fingerprint. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgUserConfigHostFingerprintDialog">HgUserConfigHostFingerprintDialog</a></td> +<td>Class implementing a dialog to edit a host fingerprint.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgUserConfigHostFingerprintDialog" ID="HgUserConfigHostFingerprintDialog"></a> +<h2>HgUserConfigHostFingerprintDialog</h2> +<p> + Class implementing a dialog to edit a host fingerprint. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgUserConfigHostFingerprintDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgUserConfigHostFingerprintDialog.__init__">HgUserConfigHostFingerprintDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgUserConfigHostFingerprintDialog.getData">getData</a></td> +<td>Public method to retrieve the data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgUserConfigHostFingerprintDialog.__init__" ID="HgUserConfigHostFingerprintDialog.__init__"></a> +<h4>HgUserConfigHostFingerprintDialog (Constructor)</h4> +<b>HgUserConfigHostFingerprintDialog</b>(<i>parent=None, host="", fingerprint=""</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd><dt><i>host</i> (str)</dt> +<dd> +host name +</dd><dt><i>fingerprint</i> (str)</dt> +<dd> +fingerprint for the host +</dd> +</dl><a NAME="HgUserConfigHostFingerprintDialog.getData" ID="HgUserConfigHostFingerprintDialog.getData"></a> +<h4>HgUserConfigHostFingerprintDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containig the host name and the fingerprint +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of two str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Oct 21 23:14:16 2016 +0200 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sat Oct 22 17:09:08 2016 +0200 @@ -191,11 +191,11 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html">HgTagDialog</a></td> <td>Module implementing a dialog to enter the data for a tagging operation.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfig.html">HgUserConfig</a></td> -<td>Module implementing the Mercurial version control plugin.</td> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html">HgUserConfigDialog</a></td> +<td>Module implementing a dialog to enter some user data.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html">HgUserConfigDataDialog</a></td> -<td>Module implementing a dialog to enter some user data.</td> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html">HgUserConfigHostFingerprintDialog</a></td> +<td>Module implementing a dialog to edit a host fingerprint.</td> </tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html">HgUtilities</a></td> <td>Module implementing some common utility functions for the Mercurial package.</td>
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Fri Oct 21 23:14:16 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sat Oct 22 17:09:08 2016 +0200 @@ -9,15 +9,25 @@ from __future__ import unicode_literals -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog +import os + +from PyQt5.QtCore import pyqtSlot, Qt, QEvent +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem +from E5Gui.E5PathPicker import E5PathPickerModes +from E5Gui import E5MessageBox + +import Globals from Globals.E5ConfigParser import E5ConfigParser from .HgUtilities import getConfigPath +from .HgUserConfigHostFingerprintDialog import \ + HgUserConfigHostFingerprintDialog from .Ui_HgUserConfigDialog import Ui_HgUserConfigDialog +import UI.PixmapCache + class HgUserConfigDialog(QDialog, Ui_HgUserConfigDialog): """ @@ -33,11 +43,29 @@ super(HgUserConfigDialog, self).__init__(parent) self.setupUi(self) - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) + self.lfUserCachePicker.setMode(E5PathPickerModes.DirectoryMode) + if Globals.isLinuxPlatform(): + self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser( + "~/.cache/largefiles")) + elif Globals.isMacPlatform(): + self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser( + "~/Library/Caches/largefiles")) + else: + self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser( + "~\\AppData\\Local\\largefiles")) + + self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) + self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit.png")) + + self.tabWidget.setCurrentIndex(0) + + self.__editor = None self.__config = None self.readUserConfig() + + self.__updateFingerprintsButtons() def writeUserConfig(self): """ @@ -46,33 +74,112 @@ if self.__config is None: self.__config = E5ConfigParser() - self.__config["ui"] = { - "username": "{0} <{1}>".format( - self.userNameEdit.text(), - self.emailEdit.text(), - ) - } - self.__config["extensions"] = {} + ################################################################### + ## ui section + ################################################################### + if "ui" not in self.__config: + self.__config["ui"] = {} + self.__config["ui"]["username"] = "{0} <{1}>".format( + self.userNameEdit.text(), + self.emailEdit.text(), + ) + ################################################################### + ## extensions section + ################################################################### + if "extensions" not in self.__config: + self.__config["extensions"] = {} if self.fetchCheckBox.isChecked(): self.__config["extensions"]["fetch"] = "" + else: + if "fetch" in self.__config["extensions"]: + del self.__config["extensions"]["fetch"] + self.__config["extensions"]["#fetch"] = "" + if self.gpgCheckBox.isChecked(): self.__config["extensions"]["gpg"] = "" + else: + if "gpg" in self.__config["extensions"]: + del self.__config["extensions"]["gpg"] + self.__config["extensions"]["#gpg"] = "" + if self.purgeCheckBox.isChecked(): self.__config["extensions"]["purge"] = "" + else: + if "purge" in self.__config["extensions"]: + del self.__config["extensions"]["purge"] + self.__config["extensions"]["#purge"] = "" + if self.queuesCheckBox.isChecked(): self.__config["extensions"]["mq"] = "" + else: + if "mq" in self.__config["extensions"]: + del self.__config["extensions"]["mq"] + self.__config["extensions"]["#mq"] = "" + if self.rebaseCheckBox.isChecked(): self.__config["extensions"]["rebase"] = "" + else: + if "rebase" in self.__config["extensions"]: + del self.__config["extensions"]["rebase"] + self.__config["extensions"]["#rebase"] = "" + if self.shelveCheckBox.isChecked(): self.__config["extensions"]["shelve"] = "" + else: + if "shelve" in self.__config["extensions"]: + del self.__config["extensions"]["shelve"] + self.__config["extensions"]["#shelve"] = "" + if self.largefilesCheckBox.isChecked(): self.__config["extensions"]["largefiles"] = "" - self.__config["largefiles"] = { - "minsize": self.lfFileSizeSpinBox.value(), - } + ############################################################### + ## largefiles section + ############################################################### + if "largefiles" not in self.__config: + self.__config["largefiles"] = {} + self.__config["largefiles"]["minsize"] = \ + str(self.lfFileSizeSpinBox.value()) lfFilePatterns = self.lfFilePatternsEdit.text() if lfFilePatterns: self.__config["largefiles"]["patterns"] = lfFilePatterns + elif "patterns" in self.__config["largefiles"]: + del self.__config["largefiles"]["patterns"] + lfUserCache = self.lfUserCachePicker.text() + if lfUserCache: + self.__config["largefiles"]["usercache"] = lfUserCache + elif "usercache" in self.__config["largefiles"]: + del self.__config["largefiles"]["usercache"] + else: + if "largefiles" in self.__config["extensions"]: + del self.__config["extensions"]["largefiles"] + self.__config["extensions"]["#largefiles"] = "" + ################################################################### + ## http_proxy section + ################################################################### + if self.proxyHostEdit.text(): + self.__config["http_proxy"] = { + "host": self.proxyHostEdit.text(), + "user": self.proxyUserEdit.text(), + "passwd": self.proxyPasswordEdit.text() + } + if self.proxyBypassEdit.text(): + self.__config["http_proxy"]["no"] = \ + self.proxyBypassEdit.text() + else: + if "http_proxy" in self.__config: + del self.__config["http_proxy"] + ################################################################### + ## hostfingerprints section + ################################################################### + if self.fingerprintsList.topLevelItemCount() > 0: + self.__config["hostfingerprints"] = {} + for row in range(self.fingerprintsList.topLevelItemCount()): + itm = self.fingerprintsList.topLevelItem(row) + self.__config["hostfingerprints"][itm.text(0)] = itm.text(1) + else: + if "hostfingerprints" in self.__config: + del self.__config["hostfingerprints"] + ################################################################### cfgFile = getConfigPath() with open(cfgFile, "w") as configFile: @@ -124,6 +231,33 @@ if "patterns" in self.__config["largefiles"]: self.lfFilePatternsEdit.setText( self.__config["largefiles"]["patterns"]) + if "usercache" in self.__config["largefiles"]: + self.lfUserCachePicker.setText( + self.__config["largefiles"]["usercache"]) + + # step 4: extract http proxy information + if "http_proxy" in self.__config: + if "host" in self.__config["http_proxy"]: + self.proxyHostEdit.setText( + self.__config["http_proxy"]["host"]) + if "user" in self.__config["http_proxy"]: + self.proxyUserEdit.setText( + self.__config["http_proxy"]["user"]) + if "passwd" in self.__config["http_proxy"]: + self.proxyPasswordEdit.setText( + self.__config["http_proxy"]["passwd"]) + if "no" in self.__config["http_proxy"]: + self.proxyBypassEdit.setText( + self.__config["http_proxy"]["no"]) + + # step 5: extract host fingerprints + if "hostfingerprints" in self.__config: + for host in self.__config["hostfingerprints"]: + QTreeWidgetItem(self.fingerprintsList, [ + host, + self.__config["hostfingerprints"][host] + ]) + self.__finalizeFingerprintsColumns() @pyqtSlot() def accept(self): @@ -133,3 +267,156 @@ self.writeUserConfig() super(HgUserConfigDialog, self).accept() + + def __clearDialog(self): + """ + Private method to clear the data of the dialog. + """ + self.userNameEdit.clear() + self.emailEdit.clear() + + self.fetchCheckBox.setChecked(False) + self.gpgCheckBox.setChecked(False) + self.purgeCheckBox.setChecked(False) + self.queuesCheckBox.setChecked(False) + self.rebaseCheckBox.setChecked(False) + self.shelveCheckBox.setChecked(False) + self.largefilesCheckBox.setChecked(False) + self.lfFileSizeSpinBox.setValue(10) + self.lfFilePatternsEdit.clear() + self.lfUserCachePicker.clear() + + self.proxyHostEdit.clear() + self.proxyUserEdit.clear() + self.proxyPasswordEdit.clear() + self.proxyBypassEdit.clear() + + self.fingerprintsList.clear() + self.__updateFingerprintsButtons() + + ####################################################################### + ## Methods and slots for the host fingerprint handling below + ####################################################################### + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_fingerprintsList_currentItemChanged(self, current, previous): + """ + Private slot handling a change of the current fingerprints item. + + @param current reference to the current item + @type QTreeWidgetItem + @param previous reference to the previous current item + @type QTreeWidgetItem + """ + self.__updateFingerprintsButtons() + + @pyqtSlot() + def on_fpAddButton_clicked(self): + """ + Private slot to add a fingerprints entry. + """ + dlg = HgUserConfigHostFingerprintDialog(self) + if dlg.exec_() == QDialog.Accepted: + host, fingerprint = dlg.getData() + itm = QTreeWidgetItem(self.fingerprintsList, [host, fingerprint]) + self.__finalizeFingerprintsColumns() + self.fingerprintsList.setCurrentItem(itm) + self.fingerprintsList.scrollToItem(itm) + + @pyqtSlot() + def on_fpDeleteButton_clicked(self): + """ + Private slot to delete the current fingerprints item. + """ + itm = self.fingerprintsList.currentItem() + if itm is not None: + host = itm.text(0) + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Host Fingerprint"), + self.tr("""<p>Shall the fingerprint for host <b>{0}</b>""" + """ really be deleted?</p>""").format(host)) + if yes: + self.fingerprintsList.takeTopLevelItem( + self.fingerprintsList.indexOfTopLevelItem(itm)) + del itm + + @pyqtSlot() + def on_fpEditButton_clicked(self): + """ + Private slot to edit the current fingerprints item. + """ + itm = self.fingerprintsList.currentItem() + if itm is not None: + host = itm.text(0) + fingerprint = itm.text(1) + dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint) + if dlg.exec_() == QDialog.Accepted: + host, fingerprint = dlg.getData() + itm.setText(0, host) + itm.setText(1, fingerprint) + self.__finalizeFingerprintsColumns() + self.fingerprintsList.scrollToItem(itm) + + def __finalizeFingerprintsColumns(self): + """ + Private method to resize and sort the host fingerprints columns. + """ + for col in range(self.fingerprintsList.columnCount()): + self.fingerprintsList.resizeColumnToContents(col) + self.fingerprintsList.sortItems(0, Qt.AscendingOrder) + + def __updateFingerprintsButtons(self): + """ + Private slot to update the host fingerprints edit buttons. + """ + enable = self.fingerprintsList.currentItem() is not None + self.fpDeleteButton.setEnabled(enable) + self.fpEditButton.setEnabled(enable) + + ####################################################################### + ## Slot to edit the user configuration in an editor below + ####################################################################### + + @pyqtSlot() + def on_editorButton_clicked(self): + """ + Private slot to open the user configuration file in a text editor. + """ + from QScintilla.MiniEditor import MiniEditor + cfgFile = getConfigPath() + + yes = E5MessageBox.yesNo( + self, + self.tr("Edit User Configuration"), + self.tr("""You will loose all changes made in this dialog.""" + """ Shall the data be saved first?"""), + icon=E5MessageBox.Warning, + yesDefault=True) + if yes: + self.writeUserConfig() + + self.__editor = MiniEditor(cfgFile, "Properties", self) + self.__editor.setWindowModality(Qt.WindowModal) + self.__editor.installEventFilter(self) + self.__editor.show() + + def eventFilter(self, watched, event): + """ + Public method called to filter the event queue. + + @param watched reference to the object being watched + @type QObject + @param event event to be handled + @type QEvent + @return flag indicating, if we handled the event + @rtype bool + """ + if watched is self.__editor and event.type() == QEvent.Close: + self.__editor.closeEvent(event) + if event.isAccepted(): + self.__clearDialog() + self.readUserConfig() + return True + + return False
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri Oct 21 23:14:16 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sat Oct 22 17:09:08 2016 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> - <height>436</height> + <width>500</width> + <height>500</height> </rect> </property> <property name="windowTitle"> @@ -16,186 +16,474 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>User Data</string> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>1</number> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="E5ClearableLineEdit" name="userNameEdit"> - <property name="toolTip"> - <string>Enter the user name</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Email:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="E5ClearableLineEdit" name="emailEdit"> - <property name="toolTip"> - <string>Enter the email address</string> - </property> - </widget> - </item> - </layout> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>User</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="topMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>6</number> + </property> + <property name="bottomMargin"> + <number>6</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>User Data</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="userNameEdit"> + <property name="toolTip"> + <string>Enter the user name</string> + </property> + <property name="placeholderText"> + <string>Enter your name</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Email:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="emailEdit"> + <property name="toolTip"> + <string>Enter the email address</string> + </property> + <property name="placeholderText"> + <string>Enter your email address</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>239</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_2"> + <attribute name="title"> + <string>Extensions</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="topMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>6</number> + </property> + <property name="bottomMargin"> + <number>6</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Extensions</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="fetchCheckBox"> + <property name="toolTip"> + <string>Select to activate the fetch extension</string> + </property> + <property name="text"> + <string>Fetch</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="gpgCheckBox"> + <property name="toolTip"> + <string>Select to activate the GPG extension</string> + </property> + <property name="text"> + <string>GPG</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="largefilesCheckBox"> + <property name="toolTip"> + <string>Select to activate the largefiles extension</string> + </property> + <property name="text"> + <string>Large Files</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="purgeCheckBox"> + <property name="toolTip"> + <string>Select to activate the Purge extension</string> + </property> + <property name="text"> + <string>Purge</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="queuesCheckBox"> + <property name="toolTip"> + <string>Select to activate the queues extension</string> + </property> + <property name="text"> + <string>Queues</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="rebaseCheckBox"> + <property name="toolTip"> + <string>Select to activate the rebase extension</string> + </property> + <property name="text"> + <string>Rebase</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="shelveCheckBox"> + <property name="toolTip"> + <string>Select to activate the shelve extension</string> + </property> + <property name="text"> + <string>Shelve</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="largefilesGroup"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="title"> + <string>Large Files</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Minimum file size:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="lfFileSizeSpinBox"> + <property name="toolTip"> + <string>Enter the minimum file size in MB for files to be treated as Large Files</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="suffix"> + <string> MB</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="value"> + <number>10</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>215</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Patterns:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="lfFilePatternsEdit"> + <property name="toolTip"> + <string>Enter file patterns (space separated) for files to be treated as Large Files</string> + </property> + <property name="placeholderText"> + <string>Enter file patterns for large files</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>User Cache:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="E5PathPicker" name="lfUserCachePicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the name of the user cache directory</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>39</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_3"> + <attribute name="title"> + <string>Network</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="topMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>6</number> + </property> + <property name="bottomMargin"> + <number>6</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Proxy</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Host:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="proxyHostEdit"> + <property name="toolTip"> + <string>Enter the network proxy host name</string> + </property> + <property name="placeholderText"> + <string>Enter Proxy Hostname</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>User:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="proxyUserEdit"> + <property name="toolTip"> + <string>Enter the user name for the network proxy</string> + </property> + <property name="placeholderText"> + <string>Enter Proxy Username</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="proxyPasswordEdit"> + <property name="toolTip"> + <string>Enter the password for the network proxy</string> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + <property name="placeholderText"> + <string>Enter Proxy Password</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Bypass:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="E5ClearableLineEdit" name="proxyBypassEdit"> + <property name="toolTip"> + <string>Enter the names of hosts bypassing the network proxy sparated by comma</string> + </property> + <property name="text"> + <string/> + </property> + <property name="placeholderText"> + <string>Enter hosts bypassing the proxy separated by comma</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Host Fingerprints</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QTreeWidget" name="fingerprintsList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <attribute name="headerStretchLastSection"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string>Host</string> + </property> + </column> + <column> + <property name="text"> + <string>Fingerprint</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QToolButton" name="fpAddButton"> + <property name="toolTip"> + <string>Add a host fingerprint entry</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="fpDeleteButton"> + <property name="toolTip"> + <string>Delete a host fingerprint entry</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="fpEditButton"> + <property name="toolTip"> + <string>Edit a host fingerprint entry</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + </layout> + </widget> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Extensions</string> + <widget class="QPushButton" name="editorButton"> + <property name="toolTip"> + <string>Open the user configuration file in a text editor</string> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QCheckBox" name="fetchCheckBox"> - <property name="toolTip"> - <string>Select to activate the fetch extension</string> - </property> - <property name="text"> - <string>Fetch</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="gpgCheckBox"> - <property name="toolTip"> - <string>Select to activate the GPG extension</string> - </property> - <property name="text"> - <string>GPG</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="largefilesCheckBox"> - <property name="toolTip"> - <string>Select to activate the largefiles extension</string> - </property> - <property name="text"> - <string>Large Files</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="purgeCheckBox"> - <property name="toolTip"> - <string>Select to activate the Purge extension</string> - </property> - <property name="text"> - <string>Purge</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="queuesCheckBox"> - <property name="toolTip"> - <string>Select to activate the queues extension</string> - </property> - <property name="text"> - <string>Queues</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QCheckBox" name="rebaseCheckBox"> - <property name="toolTip"> - <string>Select to activate the rebase extension</string> - </property> - <property name="text"> - <string>Rebase</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="shelveCheckBox"> - <property name="toolTip"> - <string>Select to activate the shelve extension</string> - </property> - <property name="text"> - <string>Shelve</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="largefilesGroup"> - <property name="enabled"> - <bool>false</bool> + <property name="text"> + <string>Open configuration file in editor</string> </property> - <property name="title"> - <string>Large Files</string> - </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Minimum file size:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="lfFileSizeSpinBox"> - <property name="toolTip"> - <string>Enter the minimum file size in MB for files to be treated as Large Files</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="suffix"> - <string> MB</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="value"> - <number>10</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>215</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Patterns:</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QLineEdit" name="lfFilePatternsEdit"> - <property name="toolTip"> - <string>Enter file patterns (space separated) for files to be treated as Large Files</string> - </property> - </widget> - </item> - </layout> </widget> </item> <item> @@ -216,8 +504,15 @@ <extends>QLineEdit</extends> <header>E5Gui/E5LineEdit.h</header> </customwidget> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> </customwidgets> <tabstops> + <tabstop>tabWidget</tabstop> <tabstop>userNameEdit</tabstop> <tabstop>emailEdit</tabstop> <tabstop>fetchCheckBox</tabstop> @@ -229,7 +524,7 @@ <tabstop>shelveCheckBox</tabstop> <tabstop>lfFileSizeSpinBox</tabstop> <tabstop>lfFilePatternsEdit</tabstop> - <tabstop>buttonBox</tabstop> + <tabstop>lfUserCachePicker</tabstop> </tabstops> <resources/> <connections>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Sat Oct 22 17:09:08 2016 +0200 @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to edit a host fingerprint. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QDialog + +from .Ui_HgUserConfigHostFingerprintDialog import \ + Ui_HgUserConfigHostFingerprintDialog + + +class HgUserConfigHostFingerprintDialog( + QDialog, Ui_HgUserConfigHostFingerprintDialog): + """ + Class implementing a dialog to edit a host fingerprint. + """ + def __init__(self, parent=None, host="", fingerprint=""): + """ + Constructor + + @param parent reference to the parent widget + @type QWidget + @param host host name + @type str + @param fingerprint fingerprint for the host + @type str + """ + super(HgUserConfigHostFingerprintDialog, self).__init__(parent) + self.setupUi(self) + + self.hostEdit.setText(host) + self.fingerprintEdit.setText(fingerprint) + + def getData(self): + """ + Public method to retrieve the data. + + @return tuple containig the host name and the fingerprint + @rtype tuple of two str + """ + return ( + self.hostEdit.text(), + self.fingerprintEdit.text(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui Sat Oct 22 17:09:08 2016 +0200 @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgUserConfigHostFingerprintDialog</class> + <widget class="QDialog" name="HgUserConfigHostFingerprintDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>110</height> + </rect> + </property> + <property name="windowTitle"> + <string>Host Fingerprint</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Host:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="hostEdit"> + <property name="toolTip"> + <string>Enter the host name</string> + </property> + <property name="placeholderText"> + <string>Enter Hostname</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Fingerprint:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="fingerprintEdit"> + <property name="toolTip"> + <string>Enter the host fingerprint</string> + </property> + <property name="placeholderText"> + <string>Enter Fingerprint</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgUserConfigHostFingerprintDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgUserConfigHostFingerprintDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/eric6.e4p Fri Oct 21 23:14:16 2016 +0200 +++ b/eric6.e4p Sat Oct 22 17:09:08 2016 +0200 @@ -574,6 +574,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgUtilities.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py</Source> @@ -1634,6 +1635,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui</Form>
--- a/i18n/eric6_cs.ts Fri Oct 21 23:14:16 2016 +0200 +++ b/i18n/eric6_cs.ts Sat Oct 22 17:09:08 2016 +0200 @@ -6531,7 +6531,7 @@ <context> <name>DebuggerInterfacePython2</name> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source>Start Debugger</source> <translation type="unfinished">Spustit debuger</translation> </message> @@ -6541,37 +6541,37 @@ <translation type="unfinished"><p>Python2 interpreter není nakonfigurován.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> <translation type="unfinished"><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="811"/> <source>Parent Process</source> <translation type="unfinished">Rodičovský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="816"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="812"/> <source>Child process</source> <translation type="unfinished">Dětský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="813"/> <source>Client forking</source> <translation type="unfinished">Větvení klienta</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="813"/> <source>Select the fork branch to follow.</source> <translation type="unfinished">Pokračovat ve fork větvi.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="858"/> <source>Debug Protocol Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="858"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> <translation type="unfinished"></translation> </message> @@ -6579,32 +6579,32 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source>Start Debugger</source> <translation>Spustit debuger</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Debugovací backend nelze spustit.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> <source>Parent Process</source> <translation>Rodičovský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> <source>Child process</source> <translation>Dětský proces</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="813"/> <source>Client forking</source> <translation>Větvení klienta</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="813"/> <source>Select the fork branch to follow.</source> <translation>Pokračovat ve fork větvi.</translation> </message> @@ -6614,12 +6614,12 @@ <translation type="unfinished"><p>Python2 interpreter není nakonfigurován.</p> {3 ?}</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="858"/> <source>Debug Protocol Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="858"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> <translation type="unfinished"></translation> </message> @@ -6825,7 +6825,7 @@ <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="117"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="111"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> @@ -6863,7 +6863,7 @@ <translation>Typ Debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="98"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="68"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Zadání cesty ke klinetu debugeru. Ponechte prázdné chcete-li použít výchozí hodnotu.</translation> </message> @@ -6873,57 +6873,57 @@ <translation>Stisknout pro výběr klienta debugeru přes dialog výběru souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="62"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/> <source>Select the standard debug client</source> <translation>Výběr standardního debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="65"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="78"/> <source>Standard</source> <translation>Standard</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation>Zapnout vybraného obvyklého debug klienta</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="85"/> + <source>Select the custom selected debug client</source> + <translation>Zapnout vybraného obvyklého debug klienta</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="88"/> <source>Custom</source> <translation>Obvyklý</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="72"/> <source>Select the multi threaded debug client</source> - <translation>Výběr multi threadového debug klienta</translation> + <translation type="obsolete">Výběr multi threadového debug klienta</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/> <source>Multi Threaded</source> - <translation>Multi Threadový</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="108"/> + <translation type="obsolete">Multi Threadový</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="98"/> <source>Source association</source> <translation>Asociace zdroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="104"/> <source>Enter the file extensions to be associated with the Python3 debugger separated by a space. They must not overlap with the ones for Python2.</source> <translation>Zadejte extenze (oddělené mezerou) pro asociaci s Python3 debugerem. Pozor! Musí být jiné, než ty pro Python2. </translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="123"/> + <source>Redirect stdin/stdout/stderr</source> + <translation>Přesměrování stdin/stdout/stderr</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="130"/> + <source>Select to not set the debug client encoding</source> + <translation>Nenastavovat kódování debug klienta</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="133"/> - <source>Redirect stdin/stdout/stderr</source> - <translation>Přesměrování stdin/stdout/stderr</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="140"/> - <source>Select to not set the debug client encoding</source> - <translation>Nenastavovat kódování debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="143"/> <source>Don't set the encoding of the debug client</source> <translation>Nenastavovat kódování debug klienta</translation> </message> @@ -6948,7 +6948,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="130"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="120"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> <translation type="unfinished">Vyberte pro přesměrování stdin, stdout, a stderr programu, který je debugován v eric5 IDE {6 ?}</translation> </message> @@ -6976,7 +6976,7 @@ <translation>Typ Debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="98"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="68"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Zadání cesty k Debug klinetovi, který se má použít. Ponechte prázdné chcete-li použít default.</translation> </message> @@ -6986,47 +6986,47 @@ <translation>Stisknout pro výběr klienta debugeru přes dialog výběru souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="62"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> <source>Select the standard debug client</source> <translation>Výběr standardního debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="65"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="78"/> <source>Standard</source> <translation>Standard</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation>Zapnout vybraného běžného debug klienta</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="85"/> + <source>Select the custom selected debug client</source> + <translation>Zapnout vybraného běžného debug klienta</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="88"/> <source>Custom</source> <translation>Běžný</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="72"/> <source>Select the multi threaded debug client</source> - <translation>Výběr multi threadového debug klienta</translation> + <translation type="obsolete">Výběr multi threadového debug klienta</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> <source>Multi Threaded</source> - <translation>Multi Threadový</translation> + <translation type="obsolete">Multi Threadový</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="123"/> + <source>Redirect stdin/stdout/stderr</source> + <translation>Přesměrování stdin/stdout/stderr</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> + <source>Select to not set the debug client encoding</source> + <translation>Nenastavovat kódování debug klienta</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="133"/> - <source>Redirect stdin/stdout/stderr</source> - <translation>Přesměrování stdin/stdout/stderr</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="140"/> - <source>Select to not set the debug client encoding</source> - <translation>Nenastavovat kódování debug klienta</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="143"/> <source>Don't set the encoding of the debug client</source> <translation>Nenastavovat kódování debug klienta</translation> </message> @@ -7041,12 +7041,12 @@ <translation type="obsolete">Výběr Debug klienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="98"/> <source>Source association</source> <translation>Asociace zdroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="104"/> <source>Enter the file extensions to be associated with the Python2 debugger separated by a space. They must not overlap with the ones for Python3.</source> <translation>Zadejte extenze (oddělené mezerou) pro asociaci s Python2 debugerem. Pozor! Musí být jiné, než ty pro Python3. </translation> </message> @@ -7061,7 +7061,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="120"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> <translation type="unfinished">Vyberte pro přesměrování stdin, stdout, a stderr programu, který je debugován v eric5 IDE {6 ?}</translation> </message> @@ -17710,22 +17710,22 @@ <translation>H&ledat:</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="194"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="202"/> <source>Open Link</source> <translation>Otevřít link</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="195"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="203"/> <source>Open Link in New Tab</source> <translation>Otevřít link v novém tabu</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="196"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="204"/> <source>Open Link in Background Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="198"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="206"/> <source>Open Link in New Window</source> <translation type="unfinished"></translation> </message> @@ -17814,22 +17814,22 @@ <context> <name>HelpSearchWidget</name> <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="145"/> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="144"/> <source>Open Link</source> <translation>Otevřít link</translation> </message> <message> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="145"/> + <source>Open Link in New Tab</source> + <translation>Otevřít link v novém tabu</translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="146"/> - <source>Open Link in New Tab</source> - <translation>Otevřít link v novém tabu</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="147"/> <source>Open Link in Background Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="149"/> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="148"/> <source>Open Link in New Window</source> <translation type="unfinished"></translation> </message> @@ -18011,22 +18011,22 @@ <context> <name>HelpTocWidget</name> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="162"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="158"/> <source>Open Link</source> <translation>Otevřít link</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="163"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="159"/> <source>Open Link in New Tab</source> <translation>Otevřít link v novém tabu</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="164"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="160"/> <source>Open Link in Background Tab</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="166"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="162"/> <source>Open Link in New Window</source> <translation type="unfinished"></translation> </message> @@ -21914,437 +21914,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="281"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="345"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="361"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="709"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="779"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="841"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2461"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2719"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Odebrat soubory jen z Mercurial úložiště</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Soubory Mercurial skupiny změn (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> + <source>Backing out changeset</source> + <translation>Zálohovat skupinu změn</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Odebrat soubory jen z Mercurial úložiště</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Soubory Mercurial skupiny změn (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887"/> - <source>Backing out changeset</source> - <translation>Zálohovat skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2867"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2880"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2873"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3369"/> <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="3548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3238"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <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="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <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="3324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <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="3324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1056"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1056"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2299"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1183"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1158"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -23517,27 +23517,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="54"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="248"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -29127,145 +29127,341 @@ <context> <name>HgUserConfigDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> - <source>User Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> - <source>First Name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> - <source>Enter the first name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> - <source>Last Name:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> - <source>Enter the last name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> - <source>Email:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> - <source>Select to activate the fetch extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> - <source>GPG</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> - <source>Select to activate the Purge extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> - <source>Purge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> - <source>Select to activate the queues extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> - <source>Queues</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> - <source>Select to activate the rebase extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> - <source>Shelve</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="156"/> - <source>Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="162"/> - <source>Minimum file size:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="169"/> - <source>Enter the minimum file size in MB for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="175"/> <source> MB</source> + <translation type="obsolete"> MB</translation> + </message> +</context> +<context> + <name>HgUserConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source>Delete Host Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>Edit User Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="27"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="45"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="51"/> + <source>Name:</source> + <translation type="unfinished">Jméno:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="58"/> + <source>Enter the user name</source> + <translation type="unfinished">Zadejte uživatelské jméno</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="61"/> + <source>Enter your name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="68"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="75"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="78"/> + <source>Enter your email address</source> + <translation type="unfinished">Zadejte vaši emailovou adresu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="120"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="202"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> + <source>Select to activate the rebase extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> + <source>Select to activate the shelve extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="208"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="215"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="221"/> + <source> MB</source> <translation type="unfinished"> MB</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="247"/> <source>Patterns:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="254"/> <source>Enter file patterns (space separated) for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="257"/> + <source>Enter file patterns for large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="264"/> + <source>User Cache:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="280"/> + <source>Enter the name of the user cache directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="304"/> + <source>Network</source> + <translation type="unfinished">Síť</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="322"/> + <source>Proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="328"/> + <source>Host:</source> + <translation type="unfinished">Host:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="335"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="338"/> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="345"/> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <source>Enter the user name for the network proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter Proxy Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="362"/> + <source>Password:</source> + <translation type="unfinished">Heslo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="369"/> + <source>Enter the password for the network proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> + <source>Enter Proxy Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> + <source>Bypass:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> + <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> + <source>Enter hosts bypassing the proxy separated by comma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <source>Host Fingerprints</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="424"/> + <source>Host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="429"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> + <source>Add a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="446"/> + <source>Delete a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="453"/> + <source>Edit a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="482"/> + <source>Open the user configuration file in a text editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="485"/> + <source>Open configuration file in editor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgUserConfigHostFingerprintDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="14"/> + <source>Host Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="23"/> + <source>Host:</source> + <translation type="unfinished">Host:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="30"/> + <source>Enter the host name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="33"/> + <source>Enter Hostname</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/> + <source>Fingerprint:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/> + <source>Enter the host fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/> + <source>Enter Fingerprint</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HistoryDialog</name> @@ -39387,205 +39583,205 @@ <message> <location filename="../Project/Project.py" line="166"/> <source>Ruby Files (*.rb);;</source> - <translation>Ruby soubory (*.rb);;</translation> - </message> - <message> - <location filename="../Project/Project.py" line="247"/> + <translation type="obsolete">Ruby soubory (*.rb);;</translation> + </message> + <message> + <location filename="../Project/Project.py" line="261"/> <source>Console</source> <translation>Konzole</translation> </message> <message> - <location filename="../Project/Project.py" line="248"/> + <location filename="../Project/Project.py" line="262"/> <source>Other</source> <translation>Ostatní</translation> </message> <message> - <location filename="../Project/Project.py" line="701"/> + <location filename="../Project/Project.py" line="715"/> <source>Read project file</source> <translation>Načíst soubor projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="801"/> + <location filename="../Project/Project.py" line="815"/> <source>Save project file</source> <translation>Uložit soubor projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="837"/> + <location filename="../Project/Project.py" line="851"/> <source>Read user project properties</source> <translation>Načíst uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="861"/> + <location filename="../Project/Project.py" line="875"/> <source>Save user project properties</source> <translation>Uložit uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="919"/> + <location filename="../Project/Project.py" line="933"/> <source>Read project session</source> <translation>Načíst relaci projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="1141"/> - <source>Please save the project first.</source> - <translation>Prosím, nejdříve uložte projekt.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="955"/> - <source>Save project session</source> - <translation>Uložit relaci projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="984"/> - <source>Delete project session</source> - <translation>Smazat relaci projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1018"/> - <source>Read tasks</source> - <translation>Načíst úlohy</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1038"/> - <source>Save tasks</source> - <translation>Uložit úlohy</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1095"/> - <source>Read debugger properties</source> - <translation>Načíst nastavení debuggeru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1129"/> - <source>Save debugger properties</source> - <translation>Uložit nastavení debuggeru</translation> - </message> - <message> <location filename="../Project/Project.py" line="1155"/> + <source>Please save the project first.</source> + <translation>Prosím, nejdříve uložte projekt.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="969"/> + <source>Save project session</source> + <translation>Uložit relaci projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="998"/> + <source>Delete project session</source> + <translation>Smazat relaci projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1032"/> + <source>Read tasks</source> + <translation>Načíst úlohy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1052"/> + <source>Save tasks</source> + <translation>Uložit úlohy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1109"/> + <source>Read debugger properties</source> + <translation>Načíst nastavení debuggeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1143"/> + <source>Save debugger properties</source> + <translation>Uložit nastavení debuggeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1169"/> <source>Delete debugger properties</source> <translation>Smazat nastavení debuggeru</translation> </message> <message> - <location filename="../Project/Project.py" line="1263"/> + <location filename="../Project/Project.py" line="1277"/> <source>Add Language</source> <translation>Přidat jazyk</translation> </message> <message> - <location filename="../Project/Project.py" line="1385"/> + <location filename="../Project/Project.py" line="1399"/> <source>Delete translation</source> <translation>Smazat překlad</translation> </message> <message> - <location filename="../Project/Project.py" line="1536"/> + <location filename="../Project/Project.py" line="1550"/> <source>Add file</source> <translation>Přidat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1653"/> + <location filename="../Project/Project.py" line="1667"/> <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="1664"/> + <location filename="../Project/Project.py" line="1678"/> <source>Add directory</source> <translation>Přidat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="1664"/> + <location filename="../Project/Project.py" line="1678"/> <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="1788"/> + <location filename="../Project/Project.py" line="1802"/> <source>Rename file</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1812"/> + <location filename="../Project/Project.py" line="1826"/> <source>Rename File</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2048"/> + <location filename="../Project/Project.py" line="2062"/> <source>Delete file</source> <translation>Smazat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2077"/> + <location filename="../Project/Project.py" line="2091"/> <source>Delete directory</source> <translation>Smazat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="2159"/> + <location filename="../Project/Project.py" line="2173"/> <source>Create project directory</source> <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="2683"/> + <location filename="../Project/Project.py" line="2697"/> <source>New Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2235"/> + <location filename="../Project/Project.py" line="2249"/> <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="2354"/> + <location filename="../Project/Project.py" line="2368"/> <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="3443"/> - <source>New project</source> - <translation>Nový projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2302"/> - <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="2326"/> - <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="3457"/> + <source>New project</source> + <translation>Nový projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2316"/> + <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="2340"/> + <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="3471"/> <source>Open project</source> <translation>Otevřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2819"/> + <location filename="../Project/Project.py" line="2833"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3494"/> + <location filename="../Project/Project.py" line="3508"/> <source>Save project as</source> <translation>Uložit projekt jako</translation> </message> <message> - <location filename="../Project/Project.py" line="2834"/> + <location filename="../Project/Project.py" line="2848"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2870"/> + <location filename="../Project/Project.py" line="2884"/> <source>Close Project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2870"/> + <location filename="../Project/Project.py" line="2884"/> <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="3035"/> + <location filename="../Project/Project.py" line="3049"/> <source>Syntax errors detected</source> <translation>Zjištěny syntaktické chyby</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3035"/> + <location filename="../Project/Project.py" line="3049"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Projekt obsahuje %n soubor se syntaktickými chybami.</numerusform> @@ -39594,577 +39790,572 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3443"/> + <location filename="../Project/Project.py" line="3457"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../Project/Project.py" line="3448"/> - <source>Generate a new project</source> - <translation>Vygenerovat nový projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3449"/> - <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="3457"/> - <source>&Open...</source> - <translation>&Otevřít...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3462"/> - <source>Open an existing project</source> - <translation>Otevřít existující projekt</translation> + <source>Generate a new project</source> + <translation>Vygenerovat nový projekt</translation> </message> <message> <location filename="../Project/Project.py" line="3463"/> + <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="3471"/> + <source>&Open...</source> + <translation>&Otevřít...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3476"/> + <source>Open an existing project</source> + <translation>Otevřít existující projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3477"/> <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="3470"/> + <location filename="../Project/Project.py" line="3484"/> <source>Close project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3470"/> + <location filename="../Project/Project.py" line="3484"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../Project/Project.py" line="3474"/> + <location filename="../Project/Project.py" line="3488"/> <source>Close the current project</source> <translation>Uzavře aktuální projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3475"/> + <location filename="../Project/Project.py" line="3489"/> <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="3482"/> + <location filename="../Project/Project.py" line="3496"/> <source>Save project</source> <translation>Uložit projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3673"/> + <location filename="../Project/Project.py" line="3687"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../Project/Project.py" line="3486"/> - <source>Save the current project</source> - <translation>Uložit aktuální projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3487"/> - <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="3494"/> - <source>Save &as...</source> - <translation>Uložit j&ako...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3498"/> - <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="3500"/> - <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="3509"/> - <source>Add files to project</source> - <translation>Přidat soubory do projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3509"/> - <source>Add &files...</source> - <translation>&Přidat soubory...</translation> + <source>Save the current project</source> + <translation>Uložit aktuální projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3501"/> + <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="3508"/> + <source>Save &as...</source> + <translation>Uložit j&ako...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3512"/> + <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="3514"/> + <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="3523"/> + <source>Add files to project</source> + <translation>Přidat soubory do projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3523"/> + <source>Add &files...</source> + <translation>&Přidat soubory...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3528"/> <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="3516"/> - <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="3525"/> - <source>Add directory to project</source> - <translation>Přidat adresář do projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3525"/> - <source>Add directory...</source> - <translation>Přidat adresář...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3530"/> + <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="3539"/> + <source>Add directory to project</source> + <translation>Přidat adresář do projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3539"/> + <source>Add directory...</source> + <translation>Přidat adresář...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3544"/> <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="3532"/> + <location filename="../Project/Project.py" line="3546"/> <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="3540"/> + <location filename="../Project/Project.py" line="3554"/> <source>Add translation to project</source> <translation>Přidat překlad do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3540"/> + <location filename="../Project/Project.py" line="3554"/> <source>Add &translation...</source> <translation>Přida&t překlad...</translation> </message> <message> - <location filename="../Project/Project.py" line="3545"/> - <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="3547"/> - <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="3555"/> - <source>Search new files</source> - <translation>Hledat nové soubory</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3555"/> - <source>Searc&h new files...</source> - <translation>&Hledat nové soubory...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3559"/> - <source>Search new files in the project directory.</source> - <translation>Hledat nové soubory v adresáři projektu.</translation> + <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="3561"/> + <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="3569"/> + <source>Search new files</source> + <translation>Hledat nové soubory</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3569"/> + <source>Searc&h new files...</source> + <translation>&Hledat nové soubory...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3573"/> + <source>Search new files in the project directory.</source> + <translation>Hledat nové soubory v adresáři projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3575"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><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="3584"/> + <location filename="../Project/Project.py" line="3598"/> <source>Project properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3584"/> + <location filename="../Project/Project.py" line="3598"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3589"/> + <location filename="../Project/Project.py" line="3603"/> <source>Show the project properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3590"/> - <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="3597"/> - <source>User project properties</source> - <translation>Uživatelská nastavení projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3597"/> - <source>&User Properties...</source> - <translation>Uživat&elská nastavení...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3602"/> - <source>Show the user specific project properties</source> - <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> - </message> - <message> <location filename="../Project/Project.py" line="3604"/> - <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="3612"/> - <source>Filetype Associations</source> - <translation>Asociace typů souborů</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3612"/> - <source>Filetype Associations...</source> - <translation>Asociace typů souborů...</translation> + <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="3611"/> + <source>User project properties</source> + <translation>Uživatelská nastavení projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3611"/> + <source>&User Properties...</source> + <translation>Uživat&elská nastavení...</translation> </message> <message> <location filename="../Project/Project.py" line="3616"/> - <source>Show the project filetype associations</source> - <translation>Zobrazit asociace typů souborů</translation> + <source>Show the user specific project properties</source> + <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> </message> <message> <location filename="../Project/Project.py" line="3618"/> + <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="3626"/> + <source>Filetype Associations</source> + <translation>Asociace typů souborů</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3626"/> + <source>Filetype Associations...</source> + <translation>Asociace typů souborů...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3630"/> + <source>Show the project filetype associations</source> + <translation>Zobrazit asociace typů souborů</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3632"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface 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><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="3648"/> + <location filename="../Project/Project.py" line="3662"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3648"/> + <location filename="../Project/Project.py" line="3662"/> <source>Debugger &Properties...</source> <translation>Nastavení &debuggeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3652"/> - <source>Show the debugger properties</source> - <translation>Zobrazit nastavení debugeru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3653"/> - <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="3661"/> - <source>Load</source> - <translation>Načíst</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3661"/> - <source>&Load</source> - <translation>&Načíst</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3665"/> - <source>Load the debugger properties</source> - <translation>Načíst nastavení debugeru</translation> - </message> - <message> <location filename="../Project/Project.py" line="3666"/> + <source>Show the debugger properties</source> + <translation>Zobrazit nastavení debugeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3667"/> + <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="3675"/> + <source>Load</source> + <translation>Načíst</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3675"/> + <source>&Load</source> + <translation>&Načíst</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3679"/> + <source>Load the debugger properties</source> + <translation>Načíst nastavení debugeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3680"/> <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="3673"/> + <location filename="../Project/Project.py" line="3687"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="../Project/Project.py" line="3677"/> + <location filename="../Project/Project.py" line="3691"/> <source>Save the debugger properties</source> <translation>Uložit nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3678"/> + <location filename="../Project/Project.py" line="3692"/> <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="3685"/> + <location filename="../Project/Project.py" line="3699"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="../Project/Project.py" line="3685"/> + <location filename="../Project/Project.py" line="3699"/> <source>&Delete</source> <translation>Sma&zat</translation> </message> <message> - <location filename="../Project/Project.py" line="3689"/> - <source>Delete the debugger properties</source> - <translation>Smazat nastavení debugeru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3690"/> - <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="3698"/> - <source>Reset</source> - <translation></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3698"/> - <source>&Reset</source> - <translation>&Reset</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3702"/> - <source>Reset the debugger properties</source> - <translation>Reset nastavení debugeru</translation> - </message> - <message> <location filename="../Project/Project.py" line="3703"/> - <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> + <source>Delete the debugger properties</source> + <translation>Smazat nastavení debugeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3704"/> + <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="3712"/> + <source>Reset</source> + <translation></translation> </message> <message> <location filename="../Project/Project.py" line="3712"/> - <source>Load session</source> - <translation>Načíst relaci</translation> + <source>&Reset</source> + <translation>&Reset</translation> </message> <message> <location filename="../Project/Project.py" line="3716"/> - <source>Load the projects session file.</source> - <translation>Načíst soubor s relací projektu.</translation> + <source>Reset the debugger properties</source> + <translation>Reset nastavení debugeru</translation> </message> <message> <location filename="../Project/Project.py" line="3717"/> - <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> + <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="3726"/> + <source>Load session</source> + <translation>Načíst relaci</translation> </message> <message> <location filename="../Project/Project.py" line="3730"/> + <source>Load the projects session file.</source> + <translation>Načíst soubor s relací projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3731"/> + <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="3744"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="3734"/> - <source>Save the projects session file.</source> - <translation>Uložit soubor s relací projektu.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3735"/> - <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="3748"/> - <source>Delete session</source> - <translation>Smazat relaci</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3752"/> - <source>Delete the projects session file.</source> - <translation>Smaže soubor s relací projektu.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3753"/> - <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="3762"/> - <source>Code Metrics</source> - <translation>Metriky kódu</translation> + <source>Save the projects session file.</source> + <translation>Uložit soubor s relací projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3749"/> + <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="3762"/> - <source>&Code Metrics...</source> - <translation>Metriky &kódu...</translation> + <source>Delete session</source> + <translation>Smazat relaci</translation> </message> <message> <location filename="../Project/Project.py" line="3766"/> - <source>Show some code metrics for the project.</source> - <translation>Zobrazit metriky kódu projektu.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3768"/> - <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> + <source>Delete the projects session file.</source> + <translation>Smaže soubor s relací projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3767"/> + <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="3776"/> - <source>Python Code Coverage</source> - <translation>Pokrytí python kódu</translation> + <source>Code Metrics</source> + <translation>Metriky kódu</translation> </message> <message> <location filename="../Project/Project.py" line="3776"/> - <source>Code Co&verage...</source> - <translation>Pokr&ytí kódu...</translation> + <source>&Code Metrics...</source> + <translation>Metriky &kódu...</translation> </message> <message> <location filename="../Project/Project.py" line="3780"/> - <source>Show code coverage information for the project.</source> - <translation>Zobrazit informace pokrytí kódu projektu.</translation> + <source>Show some code metrics for the project.</source> + <translation>Zobrazit metriky kódu projektu.</translation> </message> <message> <location filename="../Project/Project.py" line="3782"/> - <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="4568"/> - <source>Profile Data</source> - <translation>Profilovat data</translation> + <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="3790"/> - <source>&Profile Data...</source> - <translation>&Profilovat data...</translation> + <source>Python Code Coverage</source> + <translation>Pokrytí python kódu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3790"/> + <source>Code Co&verage...</source> + <translation>Pokr&ytí kódu...</translation> </message> <message> <location filename="../Project/Project.py" line="3794"/> - <source>Show profiling data for the project.</source> - <translation>Zobrazit profilování dat projektu.</translation> + <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="3796"/> + <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="4582"/> + <source>Profile Data</source> + <translation>Profilovat data</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3804"/> + <source>&Profile Data...</source> + <translation>&Profilovat data...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3808"/> + <source>Show profiling data for the project.</source> + <translation>Zobrazit profilování dat projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3810"/> <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="4622"/> + <location filename="../Project/Project.py" line="4636"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../Project/Project.py" line="3805"/> + <location filename="../Project/Project.py" line="3819"/> <source>&Application Diagram...</source> <translation>Diagram &aplikace...</translation> </message> <message> - <location filename="../Project/Project.py" line="3809"/> + <location filename="../Project/Project.py" line="3823"/> <source>Show a diagram of the project.</source> <translation>Zobrazit diagram projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3811"/> + <location filename="../Project/Project.py" line="3825"/> <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="3904"/> - <source>&Project</source> - <translation>&Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3905"/> - <source>Open &Recent Projects</source> - <translation>Otevřít poslední p&rojekty</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3906"/> - <source>&Version Control</source> - <translation>Kontrola &verzí</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3910"/> - <source>Chec&k</source> - <translation>Zkontro&lovat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3912"/> - <source>Sho&w</source> - <translation>Zo&brazit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3913"/> - <source>&Diagrams</source> - <translation>&Diagramy</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3914"/> - <source>Session</source> - <translation>Relace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3915"/> - <source>Source &Documentation</source> - <translation>Zd&rojová dokumentace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3917"/> - <source>Debugger</source> - <translation></translation> - </message> - <message> <location filename="../Project/Project.py" line="3918"/> + <source>&Project</source> + <translation>&Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3919"/> + <source>Open &Recent Projects</source> + <translation>Otevřít poslední p&rojekty</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3920"/> + <source>&Version Control</source> + <translation>Kontrola &verzí</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3924"/> + <source>Chec&k</source> + <translation>Zkontro&lovat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3926"/> + <source>Sho&w</source> + <translation>Zo&brazit</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3927"/> + <source>&Diagrams</source> + <translation>&Diagramy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3928"/> + <source>Session</source> + <translation>Relace</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3929"/> + <source>Source &Documentation</source> + <translation>Zd&rojová dokumentace</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3931"/> + <source>Debugger</source> + <translation></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3932"/> <source>Pac&kagers</source> <translation>Balíč&ky</translation> </message> <message> - <location filename="../Project/Project.py" line="4026"/> + <location filename="../Project/Project.py" line="4040"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="4092"/> + <location filename="../Project/Project.py" line="4106"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4245"/> <source>Search New Files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4245"/> <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="4377"/> + <location filename="../Project/Project.py" line="4391"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="4495"/> + <location filename="../Project/Project.py" line="4509"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4545"/> + <location filename="../Project/Project.py" line="4559"/> <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="4518"/> + <location filename="../Project/Project.py" line="4532"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4518"/> + <location filename="../Project/Project.py" line="4532"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4568"/> + <location filename="../Project/Project.py" line="4582"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../Project/Project.py" line="4622"/> + <location filename="../Project/Project.py" line="4636"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="../Project/Project.py" line="4780"/> + <location filename="../Project/Project.py" line="4794"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> <message> - <location filename="../Project/Project.py" line="3834"/> - <source>Create &Package List</source> - <translation>Vytvořit seznam &balíčků</translation> - </message> - <message> - <location filename="../Project/Project.py" line="5027"/> - <source>Create Plugin Archive</source> - <translation>Vytvořit Plugin archiv</translation> - </message> - <message> <location filename="../Project/Project.py" line="3848"/> - <source>Create Plugin &Archive</source> - <translation type="obsolete">Vytvořit Plugin &archiv</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4740"/> + <source>Create &Package List</source> + <translation type="unfinished">Vytvořit Plugin &archiv</translation> + </message> + <message> + <location filename="../Project/Project.py" line="5041"/> + <source>Create Plugin Archive</source> + <translation>Vytvořit Plugin archiv</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4754"/> <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> @@ -40174,82 +40365,77 @@ <translation type="obsolete"><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4799"/> + <location filename="../Project/Project.py" line="4813"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> </message> <message> - <location filename="../Project/Project.py" line="1567"/> + <location filename="../Project/Project.py" line="1581"/> <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> <translation><p>Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2683"/> + <location filename="../Project/Project.py" line="2697"/> <source>Select Version Control System</source> <translation>Vybrat Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="2333"/> + <location filename="../Project/Project.py" line="2347"/> <source>None</source> <translation>None</translation> </message> <message> - <location filename="../Project/Project.py" line="346"/> + <location filename="../Project/Project.py" line="360"/> <source>Registering Project Type</source> <translation>Zaregistrovat typ projektu</translation> </message> <message> <location filename="../Project/Project.py" line="3864"/> - <source>Create Plugin Archive (Snapshot)</source> - <translation type="obsolete">Vytvořit archiv pluginů (snímek)</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3864"/> - <source>Create Plugin Archive (&Snapshot)</source> - <translation type="obsolete">Vytvořit archiv pluginů (&snímek)</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1263"/> + <source>Create Plugin &Archives</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1277"/> <source>You have to specify a translation pattern first.</source> <translation>Nejdříve musíte specifikovat vzor překladu.</translation> </message> <message> - <location filename="../Project/Project.py" line="2432"/> + <location filename="../Project/Project.py" line="2446"/> <source>Translation Pattern</source> <translation>Vzor překladu</translation> </message> <message> - <location filename="../Project/Project.py" line="2432"/> + <location filename="../Project/Project.py" line="2446"/> <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="3630"/> + <location filename="../Project/Project.py" line="3644"/> <source>Lexer Associations</source> <translation>Spojení lexeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3630"/> + <location filename="../Project/Project.py" line="3644"/> <source>Lexer Associations...</source> <translation>Spojení lexeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3634"/> + <location filename="../Project/Project.py" line="3648"/> <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="3636"/> + <location filename="../Project/Project.py" line="3650"/> <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> <message> - <location filename="../Project/Project.py" line="262"/> + <location filename="../Project/Project.py" line="276"/> <source>PySide GUI</source> <translation></translation> </message> <message> - <location filename="../Project/Project.py" line="263"/> + <location filename="../Project/Project.py" line="277"/> <source>PySide Console</source> <translation>PySide konzole</translation> </message> @@ -40259,107 +40445,107 @@ <translation>Python3 soubory (*.py *.py3);;Python3 GUI soubory (*.pyw *.pyw3);;</translation> </message> <message> - <location filename="../Project/Project.py" line="701"/> + <location filename="../Project/Project.py" line="715"/> <source><p>The project file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor projektu <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="801"/> + <location filename="../Project/Project.py" line="815"/> <source><p>The project file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru projektu <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="837"/> + <location filename="../Project/Project.py" line="851"/> <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> <translation><p>Uživatelská nastavení projektu <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="861"/> + <location filename="../Project/Project.py" line="875"/> <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s uživatelskými nastaveními <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="919"/> + <location filename="../Project/Project.py" line="933"/> <source><p>The project session file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s relací projektu <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="955"/> + <location filename="../Project/Project.py" line="969"/> <source><p>The project session file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s relací projektu <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="984"/> + <location filename="../Project/Project.py" line="998"/> <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> <translation><p>Soubor s relací projektu <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1018"/> + <location filename="../Project/Project.py" line="1032"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s úlohami <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1038"/> + <location filename="../Project/Project.py" line="1052"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s úlohami <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1095"/> + <location filename="../Project/Project.py" line="1109"/> <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1129"/> + <location filename="../Project/Project.py" line="1143"/> <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s nastaveními debuggeru <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1155"/> + <location filename="../Project/Project.py" line="1169"/> <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1385"/> + <location filename="../Project/Project.py" line="1399"/> <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> <translation><p>Vybraný soubor s překladem <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1598"/> + <location filename="../Project/Project.py" line="1612"/> <source><p>The file <b>{0}</b> already exists.</p><p>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="2834"/> + <location filename="../Project/Project.py" line="2848"/> <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="1812"/> + <location filename="../Project/Project.py" line="1826"/> <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> <message> - <location filename="../Project/Project.py" line="2048"/> + <location filename="../Project/Project.py" line="2062"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> <translation><p>Vybraný soubor <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2077"/> + <location filename="../Project/Project.py" line="2091"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> <translation><p>Vybraný adresář <b>{0}</b> nelze smazat.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2159"/> + <location filename="../Project/Project.py" line="2173"/> <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="4377"/> + <location filename="../Project/Project.py" line="4391"/> <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="4780"/> + <location filename="../Project/Project.py" line="4794"/> <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> @@ -40369,22 +40555,22 @@ <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="4911"/> + <location filename="../Project/Project.py" line="4925"/> <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="4985"/> + <location filename="../Project/Project.py" line="4999"/> <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> <message> - <location filename="../Project/Project.py" line="1524"/> + <location filename="../Project/Project.py" line="1538"/> <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> <translation><p>Vybraný soubor <b>{0}</b> nelze přidat do <b>{1}</b>.</p><p>Důvod: {2}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1580"/> + <location filename="../Project/Project.py" line="1594"/> <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Cílový adresář <b>{0}</b> nelze vytvořit.</p><p>Důvod: {1}</p></translation> </message> @@ -40394,102 +40580,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2222"/> + <location filename="../Project/Project.py" line="2236"/> <source>Create main script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2222"/> + <location filename="../Project/Project.py" line="2236"/> <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="3819"/> + <location filename="../Project/Project.py" line="3833"/> <source>Load Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3819"/> + <location filename="../Project/Project.py" line="3833"/> <source>&Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3823"/> + <location filename="../Project/Project.py" line="3837"/> <source>Load a diagram from file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3825"/> - <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="323"/> - <source><p>The Programming Language <b>{0}</b> is not supported.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="346"/> - <source><p>The Project type <b>{0}</b> is already registered.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="334"/> - <source><p>The Project type <b>{0}</b> is already registered with Programming Language <b>{1}</b>.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="244"/> - <source>PyQt5 GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="245"/> - <source>PyQt5 Console</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4365"/> - <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="5027"/> - <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="3839"/> - <source>Create an initial PKGLIST file for an eric6 plugin.</source> - <translation type="unfinished">Vytvořit počáteční soubor PKGLIST pro eric5 plugin. {6 ?}</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3841"/> - <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 seznam balíčků</b><p>Vytvoří počáteční seznam souborů pro vložení do eric5 plugin archivu. Seznam je vytvořen ze souboru projektu.</p> {6 ?}</translation> + <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="337"/> + <source><p>The Programming Language <b>{0}</b> is not supported.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="360"/> + <source><p>The Project type <b>{0}</b> is already registered.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="348"/> + <source><p>The Project type <b>{0}</b> is already registered with Programming Language <b>{1}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="258"/> + <source>PyQt5 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="259"/> + <source>PyQt5 Console</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4379"/> + <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="5041"/> + <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="3853"/> - <source>Create an eric6 plugin archive file.</source> - <translation type="obsolete">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation> + <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="3855"/> - <source><b>Create Plugin Archive</b><p>This creates an eric6 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> - <translation type="obsolete"><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> + <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="3869"/> - <source>Create an eric6 plugin archive file (snapshot release).</source> - <translation type="obsolete">Vytvoří se soubor eric5 plugin archívu (snímek vydání). {6 ?}</translation> + <source>Create eric6 plugin archive files.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3871"/> - <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric6 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> - <translation type="obsolete"><b>Vytvořit Plugin archiv (Snímek)</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Údaj o verzi hlavního skriptu je změněn v souladu se snímkem vydání.</p> {6 ?}</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4881"/> + <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="4895"/> <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> @@ -40499,113 +40675,98 @@ <translation type="obsolete"><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p> {6 ?} {0}?}</translation> </message> <message> - <location filename="../Project/Project.py" line="242"/> + <location filename="../Project/Project.py" line="256"/> <source>PyQt4 GUI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="243"/> + <location filename="../Project/Project.py" line="257"/> <source>PyQt4 Console</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="246"/> + <location filename="../Project/Project.py" line="260"/> <source>Eric6 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2653"/> + <location filename="../Project/Project.py" line="2667"/> <source>Create project management directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2653"/> + <location filename="../Project/Project.py" line="2667"/> <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="3569"/> + <location filename="../Project/Project.py" line="3583"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3575"/> + <location filename="../Project/Project.py" line="3589"/> <source>Search for a file in the project list of files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3577"/> + <location filename="../Project/Project.py" line="3591"/> <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="3569"/> + <location filename="../Project/Project.py" line="3583"/> <source>Search Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3569"/> + <location filename="../Project/Project.py" line="3583"/> <source>Search Project File...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4834"/> + <location filename="../Project/Project.py" line="4848"/> <source>Create Plugin Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3850"/> - <source>Create Plugin &Archives</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3855"/> - <source>Create eric6 plugin archive files.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3857"/> - <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="3867"/> + <location filename="../Project/Project.py" line="3881"/> <source>Create Plugin Archives (Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3867"/> + <location filename="../Project/Project.py" line="3881"/> <source>Create Plugin Archives (&Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3872"/> + <location filename="../Project/Project.py" line="3886"/> <source>Create eric6 plugin archive files (snapshot releases).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3874"/> + <location filename="../Project/Project.py" line="3888"/> <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="4813"/> + <location filename="../Project/Project.py" line="4827"/> <source>Select package lists:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4830"/> + <location filename="../Project/Project.py" line="4844"/> <source>Creating plugin archives...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4830"/> + <location filename="../Project/Project.py" line="4844"/> <source>Abort</source> <translation type="unfinished">Přerušit</translation> </message> <message> - <location filename="../Project/Project.py" line="4830"/> + <location filename="../Project/Project.py" line="4844"/> <source>%v/%m Archives</source> <translation type="unfinished"></translation> </message> @@ -40615,22 +40776,22 @@ <translation type="obsolete">Pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4847"/> + <location filename="../Project/Project.py" line="4861"/> <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="4930"/> + <location filename="../Project/Project.py" line="4944"/> <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="4933"/> + <location filename="../Project/Project.py" line="4947"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4823"/> + <location filename="../Project/Project.py" line="4837"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -50833,17 +50994,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="87"/> + <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="88"/> <source>No error description available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="118"/> + <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="119"/> <source>Remove Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="123"/> + <location filename="../WebBrowser/Network/SslErrorExceptionsDialog.py" line="124"/> <source>Remove All</source> <translation type="unfinished"></translation> </message> @@ -71126,46 +71287,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1476"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1496"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71173,12 +71334,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71189,13 +71350,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_de.ts Fri Oct 21 23:14:16 2016 +0200 +++ b/i18n/eric6_de.ts Sat Oct 22 17:09:08 2016 +0200 @@ -6365,7 +6365,7 @@ <context> <name>DebuggerInterfacePython2</name> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> @@ -6375,37 +6375,37 @@ <translation><p>Kein Python 2-Interpreter gefunden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="811"/> <source>Parent Process</source> <translation>Vaterprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="816"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="812"/> <source>Child process</source> <translation>Kindprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="813"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="813"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Forkpfad.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="858"/> <source>Debug Protocol Error</source> <translation>Fehler im Debugprotokoll</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython2.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython2.py" line="858"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> <translation><p>Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.</p><p>Fehler: {0}</p><p>Daten:<br/>{0}</p></translation> </message> @@ -6413,32 +6413,32 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source>Start Debugger</source> <translation>Debugger starten</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="352"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="348"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Der Debugger konnte nicht gestartet werden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="815"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="811"/> <source>Parent Process</source> <translation>Vaterprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="816"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="812"/> <source>Child process</source> <translation>Kindprozess</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="813"/> <source>Client forking</source> <translation>Client forkt</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="817"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="813"/> <source>Select the fork branch to follow.</source> <translation>Wähle den zu folgenden Forkpfad.</translation> </message> @@ -6448,12 +6448,12 @@ <translation><p>Kein Python 3-Interpreter gefunden.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="858"/> <source>Debug Protocol Error</source> <translation>Fehler im Debugprotokoll</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="862"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="858"/> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{0}</p></source> <translation><p>Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.</p><p>Fehler: {0}</p><p>Daten:<br/>{0}</p></translation> </message> @@ -6461,7 +6461,7 @@ <context> <name>DebuggerPropertiesDialog</name> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="117"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="111"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> @@ -6669,7 +6669,7 @@ <translation>Debug-Client-Typ</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="98"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="68"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Gib den Pfad des zu verwendenden Debug-Clients an. Um den Standard zu verwenden, bitte leer lassen.</translation> </message> @@ -6679,57 +6679,47 @@ <translation>Den Debug-Client mittels eines Dateiauswahldialoges wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="62"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/> <source>Select the standard debug client</source> <translation>Wähle den Standard-Debug-Client</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="65"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="78"/> <source>Standard</source> <translation>Standard</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation>Wähle einen speziellen Debug-Client</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="85"/> + <source>Select the custom selected debug client</source> + <translation>Wähle einen speziellen Debug-Client</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="88"/> <source>Custom</source> <translation>Speziell</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="72"/> - <source>Select the multi threaded debug client</source> - <translation>Wähle den multi-threaded Debug-Client</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/> - <source>Multi Threaded</source> - <translation>Multi Threaded</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="98"/> <source>Source association</source> <translation>Quelltext Zuordnungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="104"/> <source>Enter the file extensions to be associated with the Python3 debugger separated by a space. They must not overlap with the ones for Python2.</source> <translation>Gib die Dateinamenerweiterungen, die mit dem Python 3-Debugger assoziiert werden sollen, durch Leerzeichen getrennt ein. Sie dürfen sich nicht mit denen für Python 2 überlappen.</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="123"/> + <source>Redirect stdin/stdout/stderr</source> + <translation>Stdin/Stdout/Stderr umleiten</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="130"/> + <source>Select to not set the debug client encoding</source> + <translation>Auswählen, um das Encoding des Debuggers nicht zu setzen</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="133"/> - <source>Redirect stdin/stdout/stderr</source> - <translation>Stdin/Stdout/Stderr umleiten</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="140"/> - <source>Select to not set the debug client encoding</source> - <translation>Auswählen, um das Encoding des Debuggers nicht zu setzen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="143"/> <source>Don't set the encoding of the debug client</source> <translation>Encoding des Debuggers nicht setzen</translation> </message> @@ -6744,7 +6734,7 @@ <translation>Gib den Pfad des zu verwendenden Python 3-Interpreter an. Um den Standard zu verwenden, bitte leer lassen.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="130"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="120"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> <translation>Auswählen, um Stdin, Stdout und Stderr des zu untersuchenden Programms zur eric6 IDE umzuleiten</translation> </message> @@ -6767,7 +6757,7 @@ <translation>Debug-Client-Typ</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="98"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="68"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Gib den Pfad des zu verwendenden Debug-Clients an. Um den Standard zu verwenden, bitte leer lassen.</translation> </message> @@ -6777,47 +6767,37 @@ <translation>Den Debug-Client mittels eines Dateiauswahldialoges wählen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="62"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> <source>Select the standard debug client</source> <translation>Wähle den Standard-Debug-Client</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="65"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="78"/> <source>Standard</source> <translation>Standard</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation>Wähle einen speziellen Debug-Client</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="85"/> + <source>Select the custom selected debug client</source> + <translation>Wähle einen speziellen Debug-Client</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="88"/> <source>Custom</source> <translation>Speziell</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="72"/> - <source>Select the multi threaded debug client</source> - <translation>Wähle den multi-threaded Debug-Client</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> - <source>Multi Threaded</source> - <translation>Multi Threaded</translation> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="123"/> + <source>Redirect stdin/stdout/stderr</source> + <translation>Stdin/Stdout/Stderr umleiten</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> + <source>Select to not set the debug client encoding</source> + <translation>Auswählen, um das Encoding des Debuggers nicht zu setzen</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="133"/> - <source>Redirect stdin/stdout/stderr</source> - <translation>Stdin/Stdout/Stderr umleiten</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="140"/> - <source>Select to not set the debug client encoding</source> - <translation>Auswählen, um das Encoding des Debuggers nicht zu setzen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="143"/> <source>Don't set the encoding of the debug client</source> <translation>Encoding des Debuggers nicht setzen</translation> </message> @@ -6827,12 +6807,12 @@ <translation><b>Python-Debugger-Einstellungen</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="98"/> <source>Source association</source> <translation>Quelltext Zuordnungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="114"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="104"/> <source>Enter the file extensions to be associated with the Python2 debugger separated by a space. They must not overlap with the ones for Python3.</source> <translation>Gib die Dateinamenerweiterungen, die mit dem Python 2-Debugger assoziiert werden sollen, durch Leerzeichen getrennt ein. Sie dürfen sich nicht mit denen für Python 3 überlappen.</translation> </message> @@ -6847,7 +6827,7 @@ <translation>Gib den Pfad des zu verwendenden Python-Interpreters an.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="120"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source> <translation>Auswählen, um Stdin, Stdout und Stderr des zu untersuchenden Programms zur eric IDE umzuleiten</translation> </message> @@ -17266,22 +17246,22 @@ <translation>Suche &nach:</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="194"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="202"/> <source>Open Link</source> <translation>Link öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="195"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="203"/> <source>Open Link in New Tab</source> <translation>Link in neuem Register öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="196"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="204"/> <source>Open Link in Background Tab</source> <translation>Link in Hintergrundregister öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="198"/> + <location filename="../WebBrowser/QtHelp/HelpIndexWidget.py" line="206"/> <source>Open Link in New Window</source> <translation>Link in neuem Fenster öffnen</translation> </message> @@ -17360,22 +17340,22 @@ <context> <name>HelpSearchWidget</name> <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="145"/> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="144"/> <source>Open Link</source> <translation>Link öffnen</translation> </message> <message> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="145"/> + <source>Open Link in New Tab</source> + <translation>Link in neuem Register öffnen</translation> + </message> + <message> <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="146"/> - <source>Open Link in New Tab</source> - <translation>Link in neuem Register öffnen</translation> - </message> - <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="147"/> <source>Open Link in Background Tab</source> <translation>Link in Hintergrundregister öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="149"/> + <location filename="../WebBrowser/QtHelp/HelpSearchWidget.py" line="148"/> <source>Open Link in New Window</source> <translation>Link in neuem Fenster öffnen</translation> </message> @@ -17559,22 +17539,22 @@ <context> <name>HelpTocWidget</name> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="162"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="158"/> <source>Open Link</source> <translation>Link öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="163"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="159"/> <source>Open Link in New Tab</source> <translation>Link in neuem Register öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="164"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="160"/> <source>Open Link in Background Tab</source> <translation>Link in Hintergrundregister öffnen</translation> </message> <message> - <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="166"/> + <location filename="../WebBrowser/QtHelp/HelpTocWidget.py" line="162"/> <source>Open Link in New Window</source> <translation>Link in neuem Fenster öffnen</translation> </message> @@ -21419,437 +21399,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="281"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="345"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="361"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="709"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="779"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="841"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2461"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2719"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> + <source>Backing out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887"/> - <source>Backing out changeset</source> - <translation>Änderungssatz umkehren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2867"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2880"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2873"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3369"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3238"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1056"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1056"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2299"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1183"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1158"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2232"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> @@ -22950,7 +22930,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation>Aufgelöst</translation> </message> @@ -22960,7 +22940,7 @@ <translation>Drücken, um die ausgewählten Einträge als 'nicht aufgelöst' zu markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation>Nicht Aufgelöst</translation> </message> @@ -23030,27 +23010,27 @@ <translation>Alt+K</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="54"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="56"/> <source>Press to refresh the list of conflicts</source> <translation>Drücken, um die Liste der Konflikte zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="157"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="248"/> <source>Unknown Status</source> <translation>Unbekanter Status</translation> </message> @@ -28593,146 +28573,334 @@ </message> </context> <context> - <name>HgUserConfigDataDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <name>HgUserConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source>Delete Host Fingerprint</source> + <translation>Fingerabdruck löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> + <translation><p>Soll der Fingerabdruck für den Host <b>{0}</b> wirklich gelöscht werden?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>Edit User Configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> + <translation>Sie werden alle Änderungen, die in diesem Dialog vorgenommen wurden, verlieren. Sollen die Daten vorher gesichert werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="14"/> <source>Mercurial User Data</source> <translation>Mercurial Nutzerdaten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="27"/> + <source>User</source> + <translation>Nutzer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="45"/> <source>User Data</source> <translation>Nutzer Daten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> - <source>First Name:</source> - <translation>Vorname:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> - <source>Enter the first name</source> - <translation>Gib den Vornamen ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> - <source>Last Name:</source> - <translation>Nachname:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> - <source>Enter the last name</source> - <translation>Gib den Nachnamen ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="51"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="58"/> + <source>Enter the user name</source> + <translation>Gib den Benutzernamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="61"/> + <source>Enter your name</source> + <translation>Gib den Namen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="68"/> <source>Email:</source> <translation>E-Mail:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="75"/> <source>Enter the email address</source> <translation>Gib die Email Adresse ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="78"/> + <source>Enter your email address</source> + <translation>Gib die E-Mail-Adresse ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="120"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/> <source>Select to activate the fetch extension</source> <translation>Auswählen, um die Fetch Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/> <source>Fetch</source> <translation>Fetch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the GPG extension</source> <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>GPG</source> <translation>GPG</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <source>Select to activate the largefiles extension</source> + <translation>Auswählen, um die Erweiterung für große Dateien zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="202"/> + <source>Large Files</source> + <translation>Große Dateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> <source>Select to activate the Purge extension</source> <translation>Auswählen, um die Purge Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> <source>Purge</source> <translation>Purge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> <source>Select to activate the queues extension</source> <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> <source>Queues</source> <translation>Patchschlangen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> - <source>Rebase</source> - <translation>Umgruppieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> <source>Select to activate the rebase extension</source> <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> + <source>Rebase</source> + <translation>Umgruppieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> <source>Select to activate the shelve extension</source> <translation>Auswählen, um die Ablage (Shelve) Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> <source>Shelve</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> - <source>Select to activate the largefiles extension</source> - <translation>Auswählen, um die Binärriesen Erweiterung zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="156"/> - <source>Large Files</source> - <translation>Binärriesen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="208"/> <source>Minimum file size:</source> <translation>Mindestdateigröße:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="215"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> - <translation>Gib die Mindestdateigröße in MB ein, ab der Dateien als Binärriesen betrachtet werden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="175"/> + <translation>Gib die Mindestdateigröße in MB ein, ab der Dateien als große Dateien betrachtet werden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="221"/> <source> MB</source> <translation> MB</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="247"/> <source>Patterns:</source> <translation>Muster:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="254"/> <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation>Gib die Dateimuster (durch Leerzeichen getrennt) für Binärriesen ein</translation> + <translation>Gib die Dateimuster (durch Leerzeichen getrennt) für große Dateien ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="257"/> + <source>Enter file patterns for large files</source> + <translation>Dateimuster für große Dateien eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="264"/> + <source>User Cache:</source> + <translation>Nutzercache:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="280"/> + <source>Enter the name of the user cache directory</source> + <translation>Gib den Namen des nutzerbezogenen Cacheverzeichnisses ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="304"/> + <source>Network</source> + <translation>Netzwerk</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="322"/> + <source>Proxy</source> + <translation>Proxy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="328"/> + <source>Host:</source> + <translation>Rechner:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="335"/> + <source>Enter the network proxy host name</source> + <translation>Gib den Namen des Netzwerkproxyrechners ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="338"/> + <source>Enter Proxy Hostname</source> + <translation>Name des Proxyrechners eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="345"/> + <source>User:</source> + <translation>Nutzer:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <source>Enter the user name for the network proxy</source> + <translation>Gib den Nutzernamen für den Netzwerkproxy ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter Proxy Username</source> + <translation>Nutzername für Proxy eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="362"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="369"/> + <source>Enter the password for the network proxy</source> + <translation>Gib das Kennwort für den Netzwerkproxy ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> + <source>Enter Proxy Password</source> + <translation>Kennwort für Proxy eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> + <source>Bypass:</source> + <translation>Ausnahmen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> + <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> + <translation>Gib die Namen der Hosts durch Komma getrennt an, die den Proxy umgehen können</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> + <source>Enter hosts bypassing the proxy separated by comma</source> + <translation>Hostnamen durch Komma getrennt eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <source>Host Fingerprints</source> + <translation>Fingerabdrücke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="424"/> + <source>Host</source> + <translation>Rechner</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="429"/> + <source>Fingerprint</source> + <translation>Fingerabdruck</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> + <source>Add a host fingerprint entry</source> + <translation>Einen Fingerabdruck hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="446"/> + <source>Delete a host fingerprint entry</source> + <translation>Einen Fingerabdruck löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="453"/> + <source>Edit a host fingerprint entry</source> + <translation>Einen Fingerabdruck bearbeiten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="482"/> + <source>Open the user configuration file in a text editor</source> + <translation>Öffnet die Konfigurationsdatei des Nutzers in einem Texteditor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="485"/> + <source>Open configuration file in editor</source> + <translation>Konfigurationsdatei in Editor öffnen</translation> + </message> +</context> +<context> + <name>HgUserConfigHostFingerprintDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="14"/> + <source>Host Fingerprint</source> + <translation>Fingerabdruck</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="23"/> + <source>Host:</source> + <translation>Rechner:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="30"/> + <source>Enter the host name</source> + <translation>Gib den Rechnernamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="33"/> + <source>Enter Hostname</source> + <translation>Rechnernamen eingeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/> + <source>Fingerprint:</source> + <translation>Fingerabdruck:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/> + <source>Enter the host fingerprint</source> + <translation>Gib den Fingerabdruck des Rechners ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/> + <source>Enter Fingerprint</source> + <translation>Fingerabdruck eingeben</translation> </message> </context> <context> @@ -38769,852 +38937,847 @@ <context> <name>Project</name> <message> - <location filename="../Project/Project.py" line="701"/> + <location filename="../Project/Project.py" line="715"/> <source>Read project file</source> <translation>Projektdatei lesen</translation> </message> <message> - <location filename="../Project/Project.py" line="1385"/> + <location filename="../Project/Project.py" line="1399"/> <source>Delete translation</source> <translation>Übersetzung löschen</translation> </message> <message> - <location filename="../Project/Project.py" line="1536"/> + <location filename="../Project/Project.py" line="1550"/> <source>Add file</source> <translation>Datei hinzufügen</translation> </message> <message> - <location filename="../Project/Project.py" line="2048"/> + <location filename="../Project/Project.py" line="2062"/> <source>Delete file</source> <translation>Datei löschen</translation> </message> <message> - <location filename="../Project/Project.py" line="2159"/> + <location filename="../Project/Project.py" line="2173"/> <source>Create project directory</source> <translation>Projektverzeichnis erstellen</translation> </message> <message> + <location filename="../Project/Project.py" line="3471"/> + <source>Open project</source> + <translation>Projekt öffnen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3508"/> + <source>Save project as</source> + <translation>Projekt speichern unter</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2848"/> + <source>Save File</source> + <translation>Datei speichern</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2884"/> + <source>Close Project</source> + <translation>Projekt schließen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2884"/> + <source>The current project has unsaved changes.</source> + <translation>Das aktuelle Projekt hat ungesicherte Änderungen.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3687"/> + <source>&Save</source> + <translation>&Speichern</translation> + </message> + <message> <location filename="../Project/Project.py" line="3457"/> - <source>Open project</source> - <translation>Projekt öffnen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3494"/> - <source>Save project as</source> - <translation>Projekt speichern unter</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2834"/> - <source>Save File</source> - <translation>Datei speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2870"/> - <source>Close Project</source> - <translation>Projekt schließen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2870"/> - <source>The current project has unsaved changes.</source> - <translation>Das aktuelle Projekt hat ungesicherte Änderungen.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3673"/> - <source>&Save</source> - <translation>&Speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3443"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3443"/> - <source>&New...</source> - <translation>&Neu...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3448"/> - <source>Generate a new project</source> - <translation>Erstelle ein neues Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3449"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> - <translation><b>Neu...</b><p>Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Projektes.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3457"/> - <source>&Open...</source> - <translation>&Öffnen...</translation> + <source>&New...</source> + <translation>&Neu...</translation> </message> <message> <location filename="../Project/Project.py" line="3462"/> - <source>Open an existing project</source> - <translation>Öffnet ein bestehendes Projekt</translation> + <source>Generate a new project</source> + <translation>Erstelle ein neues Projekt</translation> </message> <message> <location filename="../Project/Project.py" line="3463"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> + <translation><b>Neu...</b><p>Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Projektes.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3471"/> + <source>&Open...</source> + <translation>&Öffnen...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3476"/> + <source>Open an existing project</source> + <translation>Öffnet ein bestehendes Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3477"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Öffnen...</b><p>Dies öffnet ein bestehendes Projekt.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3470"/> + <location filename="../Project/Project.py" line="3484"/> <source>Close project</source> <translation>Projekt schließen</translation> </message> <message> - <location filename="../Project/Project.py" line="3470"/> + <location filename="../Project/Project.py" line="3484"/> <source>&Close</source> <translation>Schl&ießen</translation> </message> <message> - <location filename="../Project/Project.py" line="3474"/> + <location filename="../Project/Project.py" line="3488"/> <source>Close the current project</source> <translation>Schließt das aktuelle Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3475"/> + <location filename="../Project/Project.py" line="3489"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Schließen</b><p>Dies schließt das aktuelle Projekt.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3482"/> + <location filename="../Project/Project.py" line="3496"/> <source>Save project</source> <translation>Projekt speichern</translation> </message> <message> - <location filename="../Project/Project.py" line="3486"/> - <source>Save the current project</source> - <translation>Speichert das aktuelle Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3487"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Speichern</b><p>Dies speichert das aktuelle Projekt.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3498"/> - <source>Save the current project to a new file</source> - <translation>Speichert das aktuelle Projekt in eine neue Datei</translation> - </message> - <message> <location filename="../Project/Project.py" line="3500"/> + <source>Save the current project</source> + <translation>Speichert das aktuelle Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3501"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Speichern</b><p>Dies speichert das aktuelle Projekt.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3512"/> + <source>Save the current project to a new file</source> + <translation>Speichert das aktuelle Projekt in eine neue Datei</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3514"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Speichern unter</b><p>Dies speichert das aktuelle Projekt in eine neue Datei.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3540"/> + <location filename="../Project/Project.py" line="3554"/> <source>Add translation to project</source> <translation>Übersetzung zum Projekt hinzufügen</translation> </message> <message> - <location filename="../Project/Project.py" line="3540"/> + <location filename="../Project/Project.py" line="3554"/> <source>Add &translation...</source> <translation>&Übersetzung hinzufügen...</translation> </message> <message> - <location filename="../Project/Project.py" line="3545"/> - <source>Add a translation to the current project</source> - <translation>Eine Übersetzung zum aktuellen Projekt hinzufügen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3547"/> - <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> - <translation><b>Übersetzung hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem eine Übersetzung zum aktuellen Projekt hinzugefügt werden kann.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3584"/> - <source>Project properties</source> - <translation>Projekteigenschaften</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3584"/> - <source>&Properties...</source> - <translation>&Eigenschaften...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3589"/> - <source>Show the project properties</source> - <translation>Zeigt die Projekteigenschaften an</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3590"/> - <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> - <translation><b>Eigenschaften...</b><p>Dies zeigt einen Dialog an, mit dem die Projekteigenschaften bearbeitet werden können.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3905"/> - <source>Open &Recent Projects</source> - <translation>Zu&letzt geöffnete Projekte</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1653"/> - <source>The target directory must not be empty.</source> - <translation>Das Zielverzeichnis darf nicht leer sein.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3555"/> - <source>Search new files</source> - <translation>Neue Dateien suchen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3555"/> - <source>Searc&h new files...</source> - <translation>Neue &Dateien suchen...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3559"/> + <source>Add a translation to the current project</source> + <translation>Eine Übersetzung zum aktuellen Projekt hinzufügen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3561"/> + <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> + <translation><b>Übersetzung hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem eine Übersetzung zum aktuellen Projekt hinzugefügt werden kann.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3598"/> + <source>Project properties</source> + <translation>Projekteigenschaften</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3598"/> + <source>&Properties...</source> + <translation>&Eigenschaften...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3603"/> + <source>Show the project properties</source> + <translation>Zeigt die Projekteigenschaften an</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3604"/> + <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <translation><b>Eigenschaften...</b><p>Dies zeigt einen Dialog an, mit dem die Projekteigenschaften bearbeitet werden können.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3919"/> + <source>Open &Recent Projects</source> + <translation>Zu&letzt geöffnete Projekte</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1667"/> + <source>The target directory must not be empty.</source> + <translation>Das Zielverzeichnis darf nicht leer sein.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3569"/> + <source>Search new files</source> + <translation>Neue Dateien suchen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3569"/> + <source>Searc&h new files...</source> + <translation>Neue &Dateien suchen...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3573"/> <source>Search new files in the project directory.</source> <translation>Sucht neue Dateien im Projektverzeichnis.</translation> </message> <message> - <location filename="../Project/Project.py" line="1664"/> + <location filename="../Project/Project.py" line="1678"/> <source>Add directory</source> <translation>Verzeichnis hinzufügen</translation> </message> <message> - <location filename="../Project/Project.py" line="1664"/> + <location filename="../Project/Project.py" line="1678"/> <source>The source directory must not be empty.</source> <translation>Das Quellverzeichnis darf nicht leer sein.</translation> </message> <message> - <location filename="../Project/Project.py" line="1263"/> + <location filename="../Project/Project.py" line="1277"/> <source>Add Language</source> <translation>Sprache hinzufügen</translation> </message> <message> - <location filename="../Project/Project.py" line="3494"/> + <location filename="../Project/Project.py" line="3508"/> <source>Save &as...</source> <translation>Speichern &unter...</translation> </message> <message> - <location filename="../Project/Project.py" line="4377"/> + <location filename="../Project/Project.py" line="4391"/> <source>Version Control System</source> <translation>Versionskontrollsystem</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4245"/> <source>Search New Files</source> <translation>Neue Dateien suchen</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4245"/> <source>There were no new files found to be added.</source> <translation>Es wurden keine neuen Dateien gefunden.</translation> </message> <message> - <location filename="../Project/Project.py" line="919"/> + <location filename="../Project/Project.py" line="933"/> <source>Read project session</source> <translation>Projekt Session lesen</translation> </message> <message> - <location filename="../Project/Project.py" line="1141"/> + <location filename="../Project/Project.py" line="1155"/> <source>Please save the project first.</source> <translation>Bitte speichern Sie zuerst das Projekt.</translation> </message> <message> - <location filename="../Project/Project.py" line="955"/> + <location filename="../Project/Project.py" line="969"/> <source>Save project session</source> <translation>Projekt Session speichern</translation> </message> <message> - <location filename="../Project/Project.py" line="3712"/> + <location filename="../Project/Project.py" line="3726"/> <source>Load session</source> <translation>Session laden</translation> </message> <message> - <location filename="../Project/Project.py" line="3716"/> - <source>Load the projects session file.</source> - <translation>Laden der Projekt Session.</translation> - </message> - <message> <location filename="../Project/Project.py" line="3730"/> + <source>Load the projects session file.</source> + <translation>Laden der Projekt Session.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3744"/> <source>Save session</source> <translation>Session speichern</translation> </message> <message> - <location filename="../Project/Project.py" line="3734"/> + <location filename="../Project/Project.py" line="3748"/> <source>Save the projects session file.</source> <translation>Speichern der Projekt Session.</translation> </message> <message> - <location filename="../Project/Project.py" line="3717"/> + <location filename="../Project/Project.py" line="3731"/> <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>Session laden</b><p>Dies lädt eine Projektsessiondatei. Die Session enthält die folgenden Daten.<br>- alle offenen Quelltextdateien<br>- alle Haltepunkte<br>- die Kommandozeilenparameter<br>- das Arbeitsverzeichnis<br>- das Ausnahmemeldungsflag</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3735"/> + <location filename="../Project/Project.py" line="3749"/> <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>Session speichern</b><p>Dies speichert eine Projektsessiondatei. Die Session enthält die folgenden Daten.<br>- alle offenen Quelltextdateien<br>- alle Haltepunkte<br>- die Kommandozeilenparameter<br>- das Arbeitsverzeichnis<br>- das Ausnahmemeldungsflag</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3915"/> + <location filename="../Project/Project.py" line="3929"/> <source>Source &Documentation</source> <translation>&Quelltextdokumentation</translation> </message> <message> - <location filename="../Project/Project.py" line="3910"/> + <location filename="../Project/Project.py" line="3924"/> <source>Chec&k</source> <translation>&Prüfen</translation> </message> <message> - <location filename="../Project/Project.py" line="3762"/> - <source>Code Metrics</source> - <translation>Quelltextmetriken</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3762"/> - <source>&Code Metrics...</source> - <translation>&Quelltextmetriken...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3766"/> - <source>Show some code metrics for the project.</source> - <translation>Zeige einige Quelltextmetriken für das Projekt.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3768"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation><b>Quelltextmetriken...</b><p>Dies zeigt einige Quelltextmetriken für alle Python-Dateien des Projektes.</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="3776"/> - <source>Python Code Coverage</source> - <translation>Python-Quelltext-Abdeckung</translation> + <source>Code Metrics</source> + <translation>Quelltextmetriken</translation> </message> <message> <location filename="../Project/Project.py" line="3776"/> - <source>Code Co&verage...</source> - <translation>&Quelltext Abdeckung...</translation> + <source>&Code Metrics...</source> + <translation>&Quelltextmetriken...</translation> </message> <message> <location filename="../Project/Project.py" line="3780"/> - <source>Show code coverage information for the project.</source> - <translation>Zeige die Quelltextabdeckung für das Projekt.</translation> + <source>Show some code metrics for the project.</source> + <translation>Zeige einige Quelltextmetriken für das Projekt.</translation> </message> <message> <location filename="../Project/Project.py" line="3782"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation><b>Quelltext Abdeckung...</b><p>Dies zeigt die Quelltextabdeckung für alle Python-Dateien des Projektes an.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4568"/> - <source>Profile Data</source> - <translation>Profildaten</translation> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation><b>Quelltextmetriken...</b><p>Dies zeigt einige Quelltextmetriken für alle Python-Dateien des Projektes.</p></translation> </message> <message> <location filename="../Project/Project.py" line="3790"/> - <source>&Profile Data...</source> - <translation>&Profildaten...</translation> + <source>Python Code Coverage</source> + <translation>Python-Quelltext-Abdeckung</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3790"/> + <source>Code Co&verage...</source> + <translation>&Quelltext Abdeckung...</translation> </message> <message> <location filename="../Project/Project.py" line="3794"/> - <source>Show profiling data for the project.</source> - <translation>Zeige Profildaten des aktuellen Projektes.</translation> + <source>Show code coverage information for the project.</source> + <translation>Zeige die Quelltextabdeckung für das Projekt.</translation> </message> <message> <location filename="../Project/Project.py" line="3796"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation><b>Quelltext Abdeckung...</b><p>Dies zeigt die Quelltextabdeckung für alle Python-Dateien des Projektes an.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4582"/> + <source>Profile Data</source> + <translation>Profildaten</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3804"/> + <source>&Profile Data...</source> + <translation>&Profildaten...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3808"/> + <source>Show profiling data for the project.</source> + <translation>Zeige Profildaten des aktuellen Projektes.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3810"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profildaten...</b><p>Dies zeigt die Profildaten des Projektes.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3912"/> + <location filename="../Project/Project.py" line="3926"/> <source>Sho&w</source> <translation>&Zeige</translation> </message> <message> - <location filename="../Project/Project.py" line="4545"/> + <location filename="../Project/Project.py" line="4559"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation> </message> <message> - <location filename="../Project/Project.py" line="4495"/> + <location filename="../Project/Project.py" line="4509"/> <source>Coverage Data</source> <translation>Quelltext Abdeckungsdaten</translation> </message> <message> - <location filename="../Project/Project.py" line="3906"/> + <location filename="../Project/Project.py" line="3920"/> <source>&Version Control</source> <translation>&Versionskontrolle</translation> </message> <message> - <location filename="../Project/Project.py" line="4622"/> + <location filename="../Project/Project.py" line="4636"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="../Project/Project.py" line="3805"/> + <location filename="../Project/Project.py" line="3819"/> <source>&Application Diagram...</source> <translation>&Applikations-Diagramm...</translation> </message> <message> - <location filename="../Project/Project.py" line="3809"/> + <location filename="../Project/Project.py" line="3823"/> <source>Show a diagram of the project.</source> <translation>Zeigt ein Diagramm des Projektes.</translation> </message> <message> - <location filename="../Project/Project.py" line="3811"/> + <location filename="../Project/Project.py" line="3825"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Applikations-Diagramm...</b><p>Dies zeigt ein Diagramm des Projektes.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3913"/> + <location filename="../Project/Project.py" line="3927"/> <source>&Diagrams</source> <translation>&Diagramme</translation> </message> <message> - <location filename="../Project/Project.py" line="801"/> + <location filename="../Project/Project.py" line="815"/> <source>Save project file</source> <translation>Projektdatei speichern</translation> </message> <message> - <location filename="../Project/Project.py" line="4518"/> + <location filename="../Project/Project.py" line="4532"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="../Project/Project.py" line="4518"/> + <location filename="../Project/Project.py" line="4532"/> <source>Please select a coverage file</source> <translation>Bitte wählen Sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="../Project/Project.py" line="4568"/> + <location filename="../Project/Project.py" line="4582"/> <source>Please select a profile file</source> <translation>Bitte wählen Sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="../Project/Project.py" line="3525"/> + <location filename="../Project/Project.py" line="3539"/> <source>Add directory to project</source> <translation>Verzeichnis zum Projekt hinzufügen</translation> </message> <message> - <location filename="../Project/Project.py" line="3525"/> + <location filename="../Project/Project.py" line="3539"/> <source>Add directory...</source> <translation>Verzeichnis hinzufügen...</translation> </message> <message> + <location filename="../Project/Project.py" line="3544"/> + <source>Add a directory to the current project</source> + <translation>Füge den Inhalt eines Verzeichnisses zum Projekt hinzu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3546"/> + <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> + <translation><b>Verzeichnis hinzufügen</b><p>Dies öffnet einen Dialog, mit dem ein Verzeichnis bzw. der Inhalt eines Verzeichnisses zum aktuellen Projekt hinzugefügt werden kann.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1802"/> + <source>Rename file</source> + <translation>Datei umbenennen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1826"/> + <source>Rename File</source> + <translation>Datei umbenennen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2316"/> + <source>Shall the project file be added to the repository?</source> + <translation>Soll die Projektdatei zum Repository hinzugefügt werden?</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2697"/> + <source>New Project</source> + <translation>Neues Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2249"/> + <source>Add existing files to the project?</source> + <translation>Existierende Dateien dem Projekt hinzufügen?</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2368"/> + <source>Would you like to edit the VCS command options?</source> + <translation>Möchten Sie die VCS-Befehlsoptionen bearbeiten?</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2340"/> + <source>Select version control system for the project</source> + <translation>Wähle das Versionskontrollsystem für das Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="715"/> + <source><p>The project file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Projektdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="815"/> + <source><p>The project file <b>{0}</b> could not be written.</p></source> + <translation><p>Die Projektdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="933"/> + <source><p>The project session file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="969"/> + <source><p>The project session file <b>{0}</b> could not be written.</p></source> + <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gespeichert werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1399"/> + <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Die ausgewählte Übersetzungsdatei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2848"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2062"/> + <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Die ausgewählte Datei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2173"/> + <source><p>The project directory <b>{0}</b> could not be created.</p></source> + <translation><p>Das Projektverzeichnis <b>{0}</b> konnte nicht erstellt werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="998"/> + <source>Delete project session</source> + <translation>Projekt Session löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="998"/> + <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3762"/> + <source>Delete session</source> + <translation>Session löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3766"/> + <source>Delete the projects session file.</source> + <translation>Löscht die Projektsessiondatei.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3767"/> + <source><b>Delete session</b><p>This deletes the projects session file</p></source> + <translation><b>Session löschen</b><p>Dies löscht die Sessiondatei des Projektes.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3575"/> + <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> + <translation><b>Neue Dateien suchen...</b><p>Dies sucht im Projektverzeichnis und in registrierten Unterverzeichnissen nach neuen Dateien (Quellen, *.ui, *.idl).</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="261"/> + <source>Console</source> + <translation>Konsole</translation> + </message> + <message> + <location filename="../Project/Project.py" line="262"/> + <source>Other</source> + <translation>Sonstige</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4636"/> + <source>Include module names?</source> + <translation>Modulnamen anzeigen?</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2091"/> + <source>Delete directory</source> + <translation>Verzeichnis löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2091"/> + <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> + <translation><p>Das ausgewählte Verzeichnis <b>{0}</b> konnte nicht gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1032"/> + <source>Read tasks</source> + <translation>Aufgaben lesen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1032"/> + <source><p>The tasks file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1052"/> + <source>Save tasks</source> + <translation>Aufgaben speichern</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1052"/> + <source><p>The tasks file <b>{0}</b> could not be written.</p></source> + <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1109"/> + <source>Read debugger properties</source> + <translation>Debugger-Eigenschaften lesen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1109"/> + <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> + <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gelesen werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1143"/> + <source>Save debugger properties</source> + <translation>Debugger-Eigenschaften speichern</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1143"/> + <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> + <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gespeichert werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1169"/> + <source>Delete debugger properties</source> + <translation>Debugger-Eigenschaften löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1169"/> + <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3662"/> + <source>Debugger Properties</source> + <translation>Debugger-Eigenschaften</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3662"/> + <source>Debugger &Properties...</source> + <translation>Debugger-&Eigenschaften...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3666"/> + <source>Show the debugger properties</source> + <translation>Debugger-Eigenschaften anzeigen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3667"/> + <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> + <translation><b>Debugger-Eigenschaften...</b><p>Dies zeigt einen Dialog an, um die projektspezifischen Debugger-Einstellungen zu bearbeiten.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3675"/> + <source>Load</source> + <translation>Laden</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3675"/> + <source>&Load</source> + <translation>&Laden</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3679"/> + <source>Load the debugger properties</source> + <translation>Debugger-Eigenschaften laden</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3687"/> + <source>Save</source> + <translation>Speichern</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3691"/> + <source>Save the debugger properties</source> + <translation>Debugger-Eigenschaften speichern</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3699"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3699"/> + <source>&Delete</source> + <translation>&Löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3703"/> + <source>Delete the debugger properties</source> + <translation>Debugger-Eigenschaften löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3712"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3712"/> + <source>&Reset</source> + <translation>&Zurücksetzen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3716"/> + <source>Reset the debugger properties</source> + <translation>Debugger-Eigenschaften zurücksetzen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3931"/> + <source>Debugger</source> + <translation>Debugger</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3928"/> + <source>Session</source> + <translation>Session</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3680"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Debugger-Eigenschaften laden</b><p>Dies lädt die projektspezifischen Debugger-Einstellungen.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3692"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Debugger-Eigenschaften speichern</b><p>Dies speichert die projektspezifischen Debugger-Einstellungen.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3704"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation><b>Debugger-Eigenschaften löschen</b><p>Dies löscht die Datei mit den projektspezifischen Debugger-Einstellungen.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3717"/> + <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> + <translation><b>Debugger-Eigenschaften zurücksetzen</b><p>Dies setzt die projektspezifischen Debugger-Einstellungen zurück.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3626"/> + <source>Filetype Associations</source> + <translation>Dateitypzuordnungen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3626"/> + <source>Filetype Associations...</source> + <translation>Dateitypzuordnungen...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3630"/> + <source>Show the project filetype associations</source> + <translation>Zeigt die Dateitypzuordnungen des Projektes</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3632"/> + <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface 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><b>Dateitypzuordnungen...</b><p>Dies zeigt einen Dialog zur Eingabe der Dateitypzuordnungen des Projektes. Diese Zuordnungen bestimmen den Typ (Quellen, Formulare, Schnittstellen oder Sonstige) über ein Dateinamenmuster. Sie werden genutzt, wenn eine Datei zum Projekt hinzugefügt oder wenn nach neuen Dateien gesucht wird.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3932"/> + <source>Pac&kagers</source> + <translation>Pa&ketierer</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3523"/> + <source>Add files to project</source> + <translation>Dateien zum Projekt hinzufügen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3523"/> + <source>Add &files...</source> + <translation>&Dateien hinzufügen...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3528"/> + <source>Add files to the current project</source> + <translation>Fügt Dateien zum aktuellen Projekt hinzu</translation> + </message> + <message> <location filename="../Project/Project.py" line="3530"/> - <source>Add a directory to the current project</source> - <translation>Füge den Inhalt eines Verzeichnisses zum Projekt hinzu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3532"/> - <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> - <translation><b>Verzeichnis hinzufügen</b><p>Dies öffnet einen Dialog, mit dem ein Verzeichnis bzw. der Inhalt eines Verzeichnisses zum aktuellen Projekt hinzugefügt werden kann.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1788"/> - <source>Rename file</source> - <translation>Datei umbenennen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1812"/> - <source>Rename File</source> - <translation>Datei umbenennen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2302"/> - <source>Shall the project file be added to the repository?</source> - <translation>Soll die Projektdatei zum Repository hinzugefügt werden?</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2683"/> - <source>New Project</source> - <translation>Neues Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2235"/> - <source>Add existing files to the project?</source> - <translation>Existierende Dateien dem Projekt hinzufügen?</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2354"/> - <source>Would you like to edit the VCS command options?</source> - <translation>Möchten Sie die VCS-Befehlsoptionen bearbeiten?</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2326"/> - <source>Select version control system for the project</source> - <translation>Wähle das Versionskontrollsystem für das Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="701"/> - <source><p>The project file <b>{0}</b> could not be read.</p></source> - <translation><p>Die Projektdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="801"/> - <source><p>The project file <b>{0}</b> could not be written.</p></source> - <translation><p>Die Projektdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="919"/> - <source><p>The project session file <b>{0}</b> could not be read.</p></source> - <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="955"/> - <source><p>The project session file <b>{0}</b> could not be written.</p></source> - <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gespeichert werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1385"/> - <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Die ausgewählte Übersetzungsdatei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2834"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <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>Dateien hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem Dateien zum aktuellen Projekt hinzugefügt werden kann. Der Ort, an dem sie eingefügt werden, wird durch die Dateinamenerweiterung bestimmt.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1826"/> + <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht umbenannt werden.<br />Ursache: {1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2833"/> + <source>Project Files (*.e4p)</source> + <translation>Projektdateien (*.e4p)</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3918"/> + <source>&Project</source> + <translation>&Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4040"/> + <source>Project</source> + <translation>Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4106"/> + <source>&Clear</source> + <translation>&Löschen</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1612"/> + <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2048"/> - <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Die ausgewählte Datei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2159"/> - <source><p>The project directory <b>{0}</b> could not be created.</p></source> - <translation><p>Das Projektverzeichnis <b>{0}</b> konnte nicht erstellt werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="984"/> - <source>Delete project session</source> - <translation>Projekt Session löschen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="984"/> - <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Die Projektsessiondatei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3748"/> - <source>Delete session</source> - <translation>Session löschen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3752"/> - <source>Delete the projects session file.</source> - <translation>Löscht die Projektsessiondatei.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3753"/> - <source><b>Delete session</b><p>This deletes the projects session file</p></source> - <translation><b>Session löschen</b><p>Dies löscht die Sessiondatei des Projektes.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="166"/> - <source>Ruby Files (*.rb);;</source> - <translation>Ruby-Dateien (*.rb);;</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3561"/> - <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> - <translation><b>Neue Dateien suchen...</b><p>Dies sucht im Projektverzeichnis und in registrierten Unterverzeichnissen nach neuen Dateien (Quellen, *.ui, *.idl).</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="247"/> - <source>Console</source> - <translation>Konsole</translation> - </message> - <message> - <location filename="../Project/Project.py" line="248"/> - <source>Other</source> - <translation>Sonstige</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4622"/> - <source>Include module names?</source> - <translation>Modulnamen anzeigen?</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2077"/> - <source>Delete directory</source> - <translation>Verzeichnis löschen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2077"/> - <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> - <translation><p>Das ausgewählte Verzeichnis <b>{0}</b> konnte nicht gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1018"/> - <source>Read tasks</source> - <translation>Aufgaben lesen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1018"/> - <source><p>The tasks file <b>{0}</b> could not be read.</p></source> - <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1038"/> - <source>Save tasks</source> - <translation>Aufgaben speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1038"/> - <source><p>The tasks file <b>{0}</b> could not be written.</p></source> - <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1095"/> - <source>Read debugger properties</source> - <translation>Debugger-Eigenschaften lesen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1095"/> - <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> - <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gelesen werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1129"/> - <source>Save debugger properties</source> - <translation>Debugger-Eigenschaften speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1129"/> - <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> - <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gespeichert werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1155"/> - <source>Delete debugger properties</source> - <translation>Debugger-Eigenschaften löschen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1155"/> - <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Die Datei mit den projektspezifischen Debugger-Eigenschaften <b>{0}</b> konnte nicht gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3648"/> - <source>Debugger Properties</source> - <translation>Debugger-Eigenschaften</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3648"/> - <source>Debugger &Properties...</source> - <translation>Debugger-&Eigenschaften...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3652"/> - <source>Show the debugger properties</source> - <translation>Debugger-Eigenschaften anzeigen</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3653"/> - <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> - <translation><b>Debugger-Eigenschaften...</b><p>Dies zeigt einen Dialog an, um die projektspezifischen Debugger-Einstellungen zu bearbeiten.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3661"/> - <source>Load</source> - <translation>Laden</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3661"/> - <source>&Load</source> - <translation>&Laden</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3665"/> - <source>Load the debugger properties</source> - <translation>Debugger-Eigenschaften laden</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3673"/> - <source>Save</source> - <translation>Speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3677"/> - <source>Save the debugger properties</source> - <translation>Debugger-Eigenschaften speichern</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3685"/> - <source>Delete</source> - <translation>Löschen</translation>
