Mercurial Repositories > eric / changeset
changeset
Fixed a few issues with the new cooperation stuff.
Wed, 31 Mar 2010 12:52:59 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 31 Mar 2010 12:52:59 +0000
- changeset 164
- b395b006d2a8
- parent 163
- 8f0630371845
- child 165
- 3302a726fd1e
Fixed a few issues with the new cooperation stuff.
--- a/APIs/Python3/eric5.api Wed Mar 31 12:03:43 2010 +0000 +++ b/APIs/Python3/eric5.api Wed Mar 31 12:52:59 2010 +0000 @@ -7,6 +7,7 @@ eric5.Cooperation.ChatWidget.ChatWidget.on_cancelEditButton_clicked?4() eric5.Cooperation.ChatWidget.ChatWidget.on_chatEdit_copyAvailable?4(yes) eric5.Cooperation.ChatWidget.ChatWidget.on_chatEdit_customContextMenuRequested?4(pos) +eric5.Cooperation.ChatWidget.ChatWidget.on_clearHostsButton_clicked?4() eric5.Cooperation.ChatWidget.ChatWidget.on_connectButton_clicked?4() eric5.Cooperation.ChatWidget.ChatWidget.on_hostEdit_editTextChanged?4(host) eric5.Cooperation.ChatWidget.ChatWidget.on_sendEditButton_clicked?4() @@ -42,6 +43,7 @@ eric5.Cooperation.Connection.Connection.newMessage?7 eric5.Cooperation.Connection.Connection.participants?7 eric5.Cooperation.Connection.Connection.readyForUse?7 +eric5.Cooperation.Connection.Connection.rejected?7 eric5.Cooperation.Connection.Connection.sendEditorCommand?4(projectHash, filename, message) eric5.Cooperation.Connection.Connection.sendGetParticipants?4() eric5.Cooperation.Connection.Connection.sendMessage?4(message)
--- a/Cooperation/ChatWidget.py Wed Mar 31 12:03:43 2010 +0000 +++ b/Cooperation/ChatWidget.py Wed Mar 31 12:52:59 2010 +0000 @@ -155,6 +155,8 @@ self.__recent.remove(host) self.__recent.insert(0, host) self.__saveHostsHistory() + self.hostEdit.clear() + self.hostEdit.addItems(self.__recent) def __clearHostsHistory(self): """ @@ -162,6 +164,8 @@ """ self.__recent = [] self.__saveHostsHistory() + self.hostEdit.clear() + self.hostEdit.addItems(self.__recent) def __handleMessage(self): """ @@ -281,17 +285,25 @@ Private slot initiating the connection. """ if not self.__connected: + host, port = self.__getConnectionParameters() self.__setHostsHistory(self.hostEdit.currentText()) if not self.__client.server().isListening(): self.on_serverButton_clicked() if self.__client.server().isListening(): - self.__client.connectToHost(*self.__getConnectionParameters()) + self.__client.connectToHost(host, port) self.__setConnected(True) else: self.__client.disconnectConnections() self.__setConnected(False) @pyqtSlot() + def on_clearHostsButton_clicked(self): + """ + Private slot to clear the hosts list. + """ + self.__clearHostsHistory() + + @pyqtSlot() def on_serverButton_clicked(self): """ Private slot to start the server. @@ -330,8 +342,9 @@ self.connectButton.setText(self.trUtf8("Connect")) self.connectButton.setEnabled(self.hostEdit.currentText() != "") self.connectionLed.setColor(QColor(Qt.red)) - self.cancelEditButton.click() - self.shareButton.click() + self.on_cancelEditButton_clicked() + self.shareButton.setChecked(False) + self.on_shareButton_clicked(False) self.__connected = connected self.hostEdit.setEnabled(not connected) self.serverButton.setEnabled(not connected)
--- a/Cooperation/Connection.py Wed Mar 31 12:03:43 2010 +0000 +++ b/Cooperation/Connection.py Wed Mar 31 12:52:59 2010 +0000 @@ -56,6 +56,7 @@ getParticipants = pyqtSignal() participants = pyqtSignal(list) editorCommand = pyqtSignal(str, str, str) + rejected = pyqtSignal(str) def __init__(self, parent = None): """ @@ -79,7 +80,7 @@ self.__buffer = QByteArray() self.readyRead.connect(self.__processReadyRead) - self.disconnected.connect(self.__pingTimer.stop) + self.disconnected.connect(self.__disconnected) self.__pingTimer.timeout.connect(self.__sendPing) self.connected.connect(self.__sendGreetingMessage) @@ -394,3 +395,12 @@ data = QByteArray("{0}{1}{2}{1}".format( Connection.ProtocolEditor, SeparatorToken, msg.size())) + msg self.write(data) + + def __disconnected(self): + """ + Private slot to handle the connection being dropped. + """ + self.__pingTimer.stop() + if self.__state == Connection.WaitingForGreeting: + self.rejected.emit(self.trUtf8("* Connection to {0}:{1} refused.").format( + self.peerName(), self.peerPort()))
--- a/Cooperation/CooperationClient.py Wed Mar 31 12:03:43 2010 +0000 +++ b/Cooperation/CooperationClient.py Wed Mar 31 12:52:59 2010 +0000 @@ -170,6 +170,15 @@ connection.error.connect(self.__connectionError) connection.disconnected.connect(self.__disconnected) connection.readyForUse.connect(self.__readyForUse) + connection.rejected.connect(self.__connectionRejected) + + def __connectionRejected(self, msg): + """ + Private slot to handle the rejection of a connection. + + @param msg error message (string) + """ + self.connectionError.emit(msg) def __connectionError(self, socketError): """ @@ -180,13 +189,13 @@ connection = self.sender() if socketError != QAbstractSocket.RemoteHostClosedError: if connection.peerPort() != 0: - msg = "{0}:{1}\n{2}\n".format( + msg = "* {0}:{1}\n{2}\n".format( connection.peerAddress().toString(), connection.peerPort(), connection.errorString() ) else: - msg = "{0}\n".format(connection.errorString()) + msg = "* {0}\n".format(connection.errorString()) self.connectionError.emit(msg) if connection == self.__initialConnection: self.cannotConnect.emit()
--- a/Documentation/Help/source.qhp Wed Mar 31 12:03:43 2010 +0000 +++ b/Documentation/Help/source.qhp Wed Mar 31 12:52:59 2010 +0000 @@ -3208,6 +3208,7 @@ <keyword name="ChatWidget.on_cancelEditButton_clicked" id="ChatWidget.on_cancelEditButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_cancelEditButton_clicked" /> <keyword name="ChatWidget.on_chatEdit_copyAvailable" id="ChatWidget.on_chatEdit_copyAvailable" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_chatEdit_copyAvailable" /> <keyword name="ChatWidget.on_chatEdit_customContextMenuRequested" id="ChatWidget.on_chatEdit_customContextMenuRequested" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_chatEdit_customContextMenuRequested" /> + <keyword name="ChatWidget.on_clearHostsButton_clicked" id="ChatWidget.on_clearHostsButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_clearHostsButton_clicked" /> <keyword name="ChatWidget.on_connectButton_clicked" id="ChatWidget.on_connectButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_connectButton_clicked" /> <keyword name="ChatWidget.on_hostEdit_editTextChanged" id="ChatWidget.on_hostEdit_editTextChanged" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_hostEdit_editTextChanged" /> <keyword name="ChatWidget.on_sendEditButton_clicked" id="ChatWidget.on_sendEditButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_sendEditButton_clicked" /> @@ -3219,6 +3220,7 @@ <keyword name="Connection" id="Connection" ref="eric5.Cooperation.Connection.html#Connection" /> <keyword name="Connection (Constructor)" id="Connection (Constructor)" ref="eric5.Cooperation.Connection.html#Connection.__init__" /> <keyword name="Connection.__dataLengthForCurrentDataType" id="Connection.__dataLengthForCurrentDataType" ref="eric5.Cooperation.Connection.html#Connection.__dataLengthForCurrentDataType" /> + <keyword name="Connection.__disconnected" id="Connection.__disconnected" ref="eric5.Cooperation.Connection.html#Connection.__disconnected" /> <keyword name="Connection.__hasEnoughData" id="Connection.__hasEnoughData" ref="eric5.Cooperation.Connection.html#Connection.__hasEnoughData" /> <keyword name="Connection.__processData" id="Connection.__processData" ref="eric5.Cooperation.Connection.html#Connection.__processData" /> <keyword name="Connection.__processReadyRead" id="Connection.__processReadyRead" ref="eric5.Cooperation.Connection.html#Connection.__processReadyRead" /> @@ -3243,6 +3245,7 @@ <keyword name="CooperationClient" id="CooperationClient" ref="eric5.Cooperation.CooperationClient.html#CooperationClient" /> <keyword name="CooperationClient (Constructor)" id="CooperationClient (Constructor)" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__init__" /> <keyword name="CooperationClient.__connectionError" id="CooperationClient.__connectionError" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__connectionError" /> + <keyword name="CooperationClient.__connectionRejected" id="CooperationClient.__connectionRejected" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__connectionRejected" /> <keyword name="CooperationClient.__disconnected" id="CooperationClient.__disconnected" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__disconnected" /> <keyword name="CooperationClient.__getParticipants" id="CooperationClient.__getParticipants" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__getParticipants" /> <keyword name="CooperationClient.__newConnection" id="CooperationClient.__newConnection" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__newConnection" />
--- a/Documentation/Source/eric5.Cooperation.ChatWidget.html Wed Mar 31 12:03:43 2010 +0000 +++ b/Documentation/Source/eric5.Cooperation.ChatWidget.html Wed Mar 31 12:52:59 2010 +0000 @@ -152,6 +152,9 @@ <td><a href="#ChatWidget.on_chatEdit_customContextMenuRequested">on_chatEdit_customContextMenuRequested</a></td> <td>Private slot to show the context menu for the chat.</td> </tr><tr> +<td><a href="#ChatWidget.on_clearHostsButton_clicked">on_clearHostsButton_clicked</a></td> +<td>Private slot to clear the hosts list.</td> +</tr><tr> <td><a href="#ChatWidget.on_connectButton_clicked">on_connectButton_clicked</a></td> <td>Private slot initiating the connection.</td> </tr><tr> @@ -371,7 +374,12 @@ <dd> the position of the mouse pointer (QPoint) </dd> -</dl><a NAME="ChatWidget.on_connectButton_clicked" ID="ChatWidget.on_connectButton_clicked"></a> +</dl><a NAME="ChatWidget.on_clearHostsButton_clicked" ID="ChatWidget.on_clearHostsButton_clicked"></a> +<h4>ChatWidget.on_clearHostsButton_clicked</h4> +<b>on_clearHostsButton_clicked</b>(<i></i>) +<p> + Private slot to clear the hosts list. +</p><a NAME="ChatWidget.on_connectButton_clicked" ID="ChatWidget.on_connectButton_clicked"></a> <h4>ChatWidget.on_connectButton_clicked</h4> <b>on_connectButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Cooperation.Connection.html Wed Mar 31 12:03:43 2010 +0000 +++ b/Documentation/Source/eric5.Cooperation.Connection.html Wed Mar 31 12:52:59 2010 +0000 @@ -66,7 +66,7 @@ QTcpSocket <h3>Class Attributes</h3> <table> -<tr><td>Editor</td></tr><tr><td>GetParticipants</td></tr><tr><td>Greeting</td></tr><tr><td>Participants</td></tr><tr><td>Ping</td></tr><tr><td>PlainText</td></tr><tr><td>Pong</td></tr><tr><td>ProtocolEditor</td></tr><tr><td>ProtocolGetParticipants</td></tr><tr><td>ProtocolGreeting</td></tr><tr><td>ProtocolMessage</td></tr><tr><td>ProtocolParticipants</td></tr><tr><td>ProtocolPing</td></tr><tr><td>ProtocolPong</td></tr><tr><td>ReadingGreeting</td></tr><tr><td>ReadyForUse</td></tr><tr><td>Undefined</td></tr><tr><td>WaitingForGreeting</td></tr><tr><td>editorCommand</td></tr><tr><td>getParticipants</td></tr><tr><td>newMessage</td></tr><tr><td>participants</td></tr><tr><td>readyForUse</td></tr> +<tr><td>Editor</td></tr><tr><td>GetParticipants</td></tr><tr><td>Greeting</td></tr><tr><td>Participants</td></tr><tr><td>Ping</td></tr><tr><td>PlainText</td></tr><tr><td>Pong</td></tr><tr><td>ProtocolEditor</td></tr><tr><td>ProtocolGetParticipants</td></tr><tr><td>ProtocolGreeting</td></tr><tr><td>ProtocolMessage</td></tr><tr><td>ProtocolParticipants</td></tr><tr><td>ProtocolPing</td></tr><tr><td>ProtocolPong</td></tr><tr><td>ReadingGreeting</td></tr><tr><td>ReadyForUse</td></tr><tr><td>Undefined</td></tr><tr><td>WaitingForGreeting</td></tr><tr><td>editorCommand</td></tr><tr><td>getParticipants</td></tr><tr><td>newMessage</td></tr><tr><td>participants</td></tr><tr><td>readyForUse</td></tr><tr><td>rejected</td></tr> </table> <h3>Methods</h3> <table> @@ -77,6 +77,9 @@ <td><a href="#Connection.__dataLengthForCurrentDataType">__dataLengthForCurrentDataType</a></td> <td>Private method to get the data length for the current data type.</td> </tr><tr> +<td><a href="#Connection.__disconnected">__disconnected</a></td> +<td>Private slot to handle the connection being dropped.</td> +</tr><tr> <td><a href="#Connection.__hasEnoughData">__hasEnoughData</a></td> <td>Private method to check, if enough data is available.</td> </tr><tr> @@ -143,7 +146,12 @@ <dd> data length (integer) </dd> -</dl><a NAME="Connection.__hasEnoughData" ID="Connection.__hasEnoughData"></a> +</dl><a NAME="Connection.__disconnected" ID="Connection.__disconnected"></a> +<h4>Connection.__disconnected</h4> +<b>__disconnected</b>(<i></i>) +<p> + Private slot to handle the connection being dropped. +</p><a NAME="Connection.__hasEnoughData" ID="Connection.__hasEnoughData"></a> <h4>Connection.__hasEnoughData</h4> <b>__hasEnoughData</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Cooperation.CooperationClient.html Wed Mar 31 12:03:43 2010 +0000 +++ b/Documentation/Source/eric5.Cooperation.CooperationClient.html Wed Mar 31 12:52:59 2010 +0000 @@ -83,6 +83,9 @@ <td><a href="#CooperationClient.__connectionError">__connectionError</a></td> <td>Private slot to handle a connection error.</td> </tr><tr> +<td><a href="#CooperationClient.__connectionRejected">__connectionRejected</a></td> +<td>Private slot to handle the rejection of a connection.</td> +</tr><tr> <td><a href="#CooperationClient.__disconnected">__disconnected</a></td> <td>Private slot to handle the disconnection of a chat client.</td> </tr><tr> @@ -146,6 +149,16 @@ <dd> reference to the error object (QAbstractSocket.SocketError) </dd> +</dl><a NAME="CooperationClient.__connectionRejected" ID="CooperationClient.__connectionRejected"></a> +<h4>CooperationClient.__connectionRejected</h4> +<b>__connectionRejected</b>(<i>msg</i>) +<p> + Private slot to handle the rejection of a connection. +</p><dl> +<dt><i>msg</i></dt> +<dd> +error message (string) +</dd> </dl><a NAME="CooperationClient.__disconnected" ID="CooperationClient.__disconnected"></a> <h4>CooperationClient.__disconnected</h4> <b>__disconnected</b>(<i></i>)
--- a/i18n/eric5_cs.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_cs.ts Wed Mar 31 12:52:59 2010 +0000 @@ -1995,46 +1995,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2084,27 +2084,27 @@ <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2982,25 +2982,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3343,7 +3348,7 @@ <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6425,7 +6430,7 @@ <context> <name>Editor</name> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -6700,7 +6705,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -6750,32 +6755,32 @@ <translation>LMB přepínač breakpointů</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Tisk je hotov</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Chyba během tisku</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Chyba během tisku</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> @@ -6785,7 +6790,7 @@ <translation type="obsolete"><p>Soubor <b>%1</b> nebyl otevřen.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> @@ -6800,7 +6805,7 @@ <translation type="obsolete"><p>Soubor <b>%1</b> již existuje.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> @@ -6810,87 +6815,87 @@ <translation type="obsolete"><p>Soubor <b>%1</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> @@ -6905,12 +6910,12 @@ <translation type="obsolete"><p>Soubor s makrem <b>%1</b> je poškozen.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> @@ -6920,7 +6925,7 @@ <translation type="obsolete"><p>Soubor s makrem <b>%1</b> již existuje.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> @@ -6930,32 +6935,32 @@ <translation type="obsolete"><p>So souboru s makrem <b>%1</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Pozor:</b> Ztratíte všechny změny pokud jej znovu otevřete.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> @@ -6965,7 +6970,7 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> @@ -6975,47 +6980,47 @@ <translation type="obsolete"><p><b>%1</b> není soubor.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Přidat soubor...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Přidat soubor...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Přidat lokalizované resource...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> @@ -7025,22 +7030,22 @@ <translation type="obsolete">Zástupce pro soubor <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -7065,12 +7070,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -7150,7 +7155,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -7160,12 +7165,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -7195,62 +7200,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7275,12 +7280,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_de.ts Wed Mar 31 12:52:59 2010 +0000 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="de"> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1549,7 +1550,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> <message> @@ -1600,7 +1601,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -1859,50 +1860,50 @@ <translation>Zeigt den Status des Servers</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation>Server starten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation>! Unbekannter Befehl: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation>* {0} ist beigetreten. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation>* {0} hat die Sitzung verlassen. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation>Server anhalten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation>! Serverfehler: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation>Unterbrechen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation>Verbinden</translation> </message> @@ -1947,27 +1948,27 @@ <translation>Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation>Chat speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation>Text Dateien (*.txt);;Alle Dateien (*)</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation>Fehlr beim Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Der Inhalt des Chats konnte nicht nach <b>{0}</b> geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits.</p></translation> </message> @@ -2801,25 +2802,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation>unbestimmt</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation>Neue Verbindung</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation><p>Verbindungswunsch von <strong>{0}@{1}</strong> annehmen?</p></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* Verbindung zu {0}:{1} abgelehnt.</translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3162,7 +3168,7 @@ <translation>unbekannt</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation>Ungültige Adresse: {0}:{1} @@ -5786,12 +5792,12 @@ <context> <name>Editor</name> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Datei sichern</translation> </message> @@ -5876,32 +5882,32 @@ <translation>Drucken</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Drucke...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Drucken beendet</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Fehler beim Drucken</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Fehler beim Drucken</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Drucken abgebrochen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Datei geändert</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Warnung:</b> Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation> </message> @@ -5911,7 +5917,7 @@ <translation>Prüfen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Datei geändert</translation> </message> @@ -5946,12 +5952,12 @@ <translation>Box Kommentar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Änderungsversuch für eine schreibgeschützte Datei</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern sie sie zuerst in eine andere Datei.</translation> </message> @@ -5966,57 +5972,57 @@ <translation>Zurück zum letzten gesichert Zustand</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Makro Name</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Wähle einen Makro Namen:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Makro Dateien (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Lade Makro Datei</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Fehler beim Makro Laden</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Makro Datei schreiben</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Makro speichern</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Fehler beim Makro speichern</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Makroaufzeichnung starten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Makroaufzeichnung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Gib einen Namen für das Makro ein:</translation> </message> @@ -6076,32 +6082,32 @@ <translation>Haltepunkt bearbeiten...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Haltepunkt aktivieren</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Haltepunkt deaktivieren</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Bitte wählen sie eine Datei mit Profildaten</translation> </message> @@ -6111,12 +6117,12 @@ <translation>Autom. Vervollständigung aktiv</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Autom. Vervollständigung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation> </message> @@ -6151,7 +6157,7 @@ <translation>Autom. Speicherung aktiv</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -6161,12 +6167,12 @@ <translation>Zeige Syntaxfehlermeldung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Syntaxfehler</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Keine Syntaxfehlermeldung verfügbar.</translation> </message> @@ -6196,52 +6202,52 @@ <translation>Vorige nichtabgedeckte Zeile</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Zeilen ohne Abdeckung Markieren</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Alle Zeilen sind abgedeckt.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Die Datei <b>{0}</b> enthält ungesicherte Änderungen.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Die Makro Datei <b>{0}</b> kann nicht gelesen werden.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Die Makro Datei <b>{0}</b> ist zerstört.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation><p>Die Makro Datei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Die Makro Datei <b>{0}</b> kann nicht geschrieben werden.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -6286,82 +6292,82 @@ <translation>Keine Sprache</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5018"/> + <source>Resources</source> + <translation>Resourcen</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Datei hinzufügen...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Dateien hinzufügen...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5024"/> - <source>Resources</source> - <translation>Resourcen</translation> + <source>Add aliased file...</source> + <translation>Aliased Datei hinzufügen...</translation> </message> <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Datei hinzufügen...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Dateien hinzufügen...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Aliased Datei hinzufügen...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Lokalisierte Resource hinzufügen...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Dateiresource hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Dateiresourcen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Aliased Dateiresourcen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias für Datei <b>{0}</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Package-Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Klassenattribute anzeigen?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Resource Rahmen hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation> </message> @@ -6416,12 +6422,12 @@ <translation>Kein Exportformat angegeben. Abbruch...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Imports Diagramm</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Imports externer Module anzeigen?</translation> </message> @@ -6501,7 +6507,7 @@ <translation>Wähle den anzuwendenden Pygments Lexer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Rechtschreibprüfung...</translation> </message> @@ -6511,12 +6517,12 @@ <translation>Rechtschreibprüfung für Auswahl...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Zum Wörterbuch hinzufügen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Alle ignorieren</translation> </message> @@ -6526,17 +6532,17 @@ <translation>Aus dem Wörterbuch entfernen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geöffnet werden.<br />Ursache: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gesichert werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Die Datei <b>{0}</b> wurde geändert, während sie in eric5 geöffnet war. Neu einlesen?</p></translation> </message> @@ -6561,12 +6567,12 @@ <translation>Warnungen löschen</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation>py3flakes Warnung</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation>Keine Py3flakes Warnung verfügbar.</translation> </message> @@ -10963,7 +10969,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="568"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message>
--- a/i18n/eric5_es.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_es.ts Wed Mar 31 12:52:59 2010 +0000 @@ -1856,46 +1856,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -1945,27 +1945,27 @@ <translation type="unfinished">Copiar</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"><p>El archivo <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2794,25 +2794,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">desconocido</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3155,7 +3160,7 @@ <translation type="unfinished">desconocido</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5775,7 +5780,7 @@ <context> <name>Editor</name> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> @@ -6050,7 +6055,7 @@ <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> @@ -6110,252 +6115,252 @@ <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Modificación de un archivo de solo lectura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Impresión completa</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Error al imprimir</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Error al imprimir</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5018"/> + <source>Resources</source> + <translation>Recursos</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Añadir archivo...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Añadir archivos...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5024"/> - <source>Resources</source> - <translation>Recursos</translation> + <source>Add aliased file...</source> + <translation>Añadir archivo con un alias...</translation> </message> <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Añadir archivo...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Añadir archivos...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Añadir archivo con un alias...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> @@ -6430,7 +6435,7 @@ <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> @@ -6440,12 +6445,12 @@ <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Añadir al diccionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> @@ -6470,62 +6475,62 @@ <translation>Alternativas ({0})</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>El archivo <b>{0}</b> tiene cambios sin guardar.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser abierto.<br />Causa: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation><p>El archivo <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric5. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> @@ -6550,12 +6555,12 @@ <translation>Limpiar advertencias</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation>Advertencia de py3flakes</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation>No hay un mensaje de advertencia de py3flakes disponible.</translation> </message>
--- a/i18n/eric5_fr.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_fr.ts Wed Mar 31 12:52:59 2010 +0000 @@ -2045,46 +2045,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2134,27 +2134,27 @@ <translation type="unfinished">Copier</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -3033,25 +3033,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3394,7 +3399,7 @@ <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6660,7 +6665,7 @@ <translation>Éditer le point d'arrêt...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Activer le point d'arrêt</translation> </message> @@ -6690,147 +6695,147 @@ <translation>Le click principal place les points d'arrêts</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Modification de la lecture seule</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Le fichier est en lecture seule. Sauvez d'abord votre fichier sous un autre nom.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Impression....</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Impression terminée</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Erreur durant l'impression</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Erreur durant l'impression</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Impression abandonnée</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Ouvrir Fichier</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Enregistrer Fichier</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Fichier Modifié</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Autocompletion</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocompletion n'est pas disponible car aucune source d'autocomplétion n'est définie.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Désactiver le point d'arrêt</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Profiler de données</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Nom de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Sélectionner un nom de macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Fichier Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Charger un fichier macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Erreur lors du chargement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Enregistrer le fichier macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Enregistrer la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Erreur lors de l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Démarrer l'enregistrement de la macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Enregistrement de macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Entrer le nom de la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Warning:</b> Toutes les modifications seront écrasées en réouvrant le fichier.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Fichier modifié</translation> </message> @@ -6870,7 +6875,7 @@ <translation type="obsolete">Prière de sélectionner un rapport Cyclops à supprimer</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -6880,12 +6885,12 @@ <translation>Afficher le message d'erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Erreur de syntaxe</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Aucun message d'erreur de syntaxe..</translation> </message> @@ -6915,17 +6920,17 @@ <translation>Ligne non executée précédente</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Afficher les annotations de Code Coverage</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Toutes les lignes ont été executées.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Impossible de trouver le fichier de coverage.</translation> </message> @@ -7025,42 +7030,42 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>Ressources</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Ajouter un fichier...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Ajouter des fichiers...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>Ajouter un fichier alias...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Ajouter un fichier...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Ajouter des fichiers...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Ajouter un fichier alias...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Ajouter une ressource localisée...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Ajoute un fichier ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Ajoute des fichiers ressources</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Ajoute un alias de fichier ressource</translation> </message> @@ -7070,32 +7075,32 @@ <translation type="obsolete">Alias pour le fichier <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Diagramme de package</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Inclure les attributs de classes ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Ajouter un cadre ressource</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>L'enregistrement de macro est déjà actif. En démarrer une nouvelle ?</translation> </message> @@ -7150,12 +7155,12 @@ <translation>Aucun format d'exportation indiqué. Abandon...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Diagramme des modules</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Inclure l'importation de modules externes?</translation> </message> @@ -7235,7 +7240,7 @@ <translation>Sélectionne l'analyseur Pygments à appliquer.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Correction orthographique...</translation> </message> @@ -7245,12 +7250,12 @@ <translation>Correction orthographique de la sélection...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Ajouter au dictionnaire</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Tout ignorer</translation> </message> @@ -7275,62 +7280,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7355,12 +7360,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_it.ts Wed Mar 31 12:52:59 2010 +0000 @@ -2000,46 +2000,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2089,27 +2089,27 @@ <translation type="unfinished">Copia</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2988,25 +2988,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">sconosciuto</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3349,7 +3354,7 @@ <translation type="unfinished">sconosciuto</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6618,7 +6623,7 @@ <translation>Modifica Breakpoint...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Abilita breakpoint</translation> </message> @@ -6648,147 +6653,147 @@ <translation>Toggle Breakpoint LMB</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Modifica di un file di sola lettura</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Stai tentando di modificare un file in sola lettura. Per favore prima salva come un file diverso.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>In stampa...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Stampa completata</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Errore durante la stampa</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Errore durante la stampa</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Stampa annullata</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Apri File</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Salva file</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>File modificato</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>L'autocomplentamento non è disponibile perchè non ci sono fonti impostate.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Disabilita breakpoint</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Nome Macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Seleziona un nome per la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>File Macro (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Carica un file di macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Errore nel caricamento della macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Salva un file di macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Salva macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Errore nel salvataggio della macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Avvia registrazione della macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Registrazione Macro</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Inserisci un nome per la macro:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Attenzione:</b> con la riapertura le modifiche andranno perse.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>File modificato</translation> </message> @@ -6808,7 +6813,7 @@ <translation>Elimina errori di sintassi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -6818,12 +6823,12 @@ <translation>Mostra i messaggi degli errori di sintassi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Errore di sintassi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Nessun messaggio degli errori di sintassi disponibile.</translation> </message> @@ -6853,17 +6858,17 @@ <translation>File non analizzato precedente</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Mostra le annotazioni dell'analisi del codice</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Tutte le linee sono state analizzate.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Non ci sono file di analisi disponibili.</translation> </message> @@ -6958,42 +6963,42 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>Risorse</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Aggiungi file...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Aggiungi files...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>Aggiungi file sinonimo...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Aggiungi file...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Aggiungi files...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Aggiungi file sinonimo...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Aggiungi una risorsa localizzata...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Aggiungi un file risorse</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Aggiundi dei file risorse</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Aggiungi file sinonimo delle risorse</translation> </message> @@ -7003,32 +7008,32 @@ <translation type="obsolete">Alias per il file <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Diagrammi del package</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Includi gli attributi della classe ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Aggiungi riquadro delle risorse</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Registrazione macro già attiva. Avvia nuovamente ?</translation> </message> @@ -7083,12 +7088,12 @@ <translation>Nessun formato di export impostato. Annullamento...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Importa diagrammi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Includi gli import dai moduli esterni ?</translation> </message> @@ -7168,7 +7173,7 @@ <translation>Selezione l'analizzatore lessicale di Pygments da applicare.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Controllo sillabazione...</translation> </message> @@ -7178,12 +7183,12 @@ <translation>Controllo sillabazione della selezione...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Aggiungi al dizionario</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Ignora tutto</translation> </message> @@ -7213,62 +7218,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7293,12 +7298,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_ru.ts Wed Mar 31 12:52:59 2010 +0000 @@ -2005,46 +2005,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2094,27 +2094,27 @@ <translation type="unfinished">Копировать</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2994,25 +2994,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3355,7 +3360,7 @@ <translation type="unfinished">неизвестный</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6600,57 +6605,57 @@ <translation>Печать</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Редактирование файла, открытого только на чтение</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Печать...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Печать завершена</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Ошибка печати</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Ошибка печати</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Печать отменена</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Файл изменён</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Файл изменён</translation> </message> @@ -6695,7 +6700,7 @@ <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> @@ -6725,82 +6730,82 @@ <translation>Левая клавиша мыши ставит точки останова</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> @@ -6810,12 +6815,12 @@ <translation>Автозавершение разрешено</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Автозавершение</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Автозавершение недоступно, так как не задан источник автозавершения.</translation> </message> @@ -6850,7 +6855,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -6860,12 +6865,12 @@ <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> @@ -6895,17 +6900,17 @@ <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> @@ -7000,42 +7005,42 @@ <translation type="obsolete">%1 (только чтение)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Добавить файл...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Добавить файлы...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>Добавить файл под другим именем...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Добавить файл...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Добавить файлы...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Добавить файл под другим именем...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> @@ -7045,32 +7050,32 @@ <translation type="obsolete">Другое имя для файла <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> @@ -7125,12 +7130,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -7210,7 +7215,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -7220,12 +7225,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -7255,62 +7260,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7335,12 +7340,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_tr.ts Wed Mar 31 12:52:59 2010 +0000 @@ -2036,46 +2036,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2125,27 +2125,27 @@ <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -3023,25 +3023,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3384,7 +3389,7 @@ <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6439,7 +6444,7 @@ <context> <name>Editor</name> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>Dosya Aç</translation> </message> @@ -6529,7 +6534,7 @@ <translation>Tüm seçimi iptal et</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>Yazım denetimi ...</translation> </message> @@ -6789,7 +6794,7 @@ <translation>Bekleme noktasını düzenle...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>Beklemenoktasını kabul et</translation> </message> @@ -6884,37 +6889,37 @@ <translation>Kullanmak için Pygment lexer seç</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>Yalnızca okunabilir dosyada değişiklik</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Yalnızca okunabilir bir dosyayı değiştirmeşe çalışıyorsunuz. Lütfen önce farklı bir isimde kaydediniz.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>Yazılıyor...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>Yazdırma tamalandı</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>Yazdırılırken hata</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>Yazdırılırken hata</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>Yazdırma iptal edildi</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>Dosya Değiştirildi</translation> </message> @@ -6929,7 +6934,7 @@ <translation type="obsolete"><p> <b>%1</b> dosyası açılamıyor.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> @@ -6944,52 +6949,52 @@ <translation type="obsolete"><p> <b>%1</b>dosyası burda zaten var.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Otomatiktamamlama uygun değil çünkü bu otomatiktamamlama kaynağı değil.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>Durmanoktasını iptal et</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>Kodların Dipnotunu Göster</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>Tüm satırlar korumaya alındı.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>Hazırda koruma dosyası yok.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> @@ -7014,37 +7019,37 @@ <translation type="obsolete">Lütfen, kaldırılacak Tepegöz rapor dosyasını seçin</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>Sözdizimi Hatası</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>Uygun söz dizimi hata mesajı yok.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>Makro Adı</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>Bir makro ismi seç:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>Makro dosyasını yükle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>Makro dosyaları (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>Makronun yüklenmesinde hata</translation> </message> @@ -7059,12 +7064,12 @@ <translation type="obsolete"><p> <b>%1</b>makro dosyası bozuk.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>Makro Dosyasını Kaydet</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>Makro Kaydet</translation> </message> @@ -7074,7 +7079,7 @@ <translation type="obsolete"><p><b>%1</b>makro dosyası zaten açık.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>Makronun kaydedilmesinde hata</translation> </message> @@ -7084,22 +7089,22 @@ <translation type="obsolete"><p> <b>%1</b> makro dosyası yazılamıyor.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>Makro Kaydı Başladı</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>Makro kaydı şuan aktif. Yeniden başlasın mı?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>Makro Kaydediliyor</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>Makronun ismini gir:</translation> </message> @@ -7109,12 +7114,12 @@ <translation type="obsolete"><p><b>%1</b> dosyası eric4 açıkken değiştirildi.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Uyarı:</b> Yapılan değişiklikleri yeniden açarken kaybedebilirsiniz.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>Dosya değiştirilmiş</translation> </message> @@ -7124,7 +7129,7 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> @@ -7134,47 +7139,47 @@ <translation type="obsolete"><p><b>%1</b>dosya değil.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>Kaynaklar</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>Dosya ekle...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>Dosyaları ekle...</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>Kısaltmalar dosyasına ekle...</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>Dosya ekle...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>Dosyaları ekle...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>Kısaltmalar dosyasına ekle...</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>Yaral kaynak ekle...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>Çerçeve kaynağı ekle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>Dosya kaynağını ekle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>Dosya kaynaklarını ekle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>Kısaltmalar dosyası kaynağını ekle</translation> </message> @@ -7184,42 +7189,42 @@ <translation type="obsolete">Kısaltmalar dosyası için <b>%1</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>Paket Şeması</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>Sınıf nitelikleri dahil edilsin mi?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>Şemayı İçeal</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>Harici modüllerdan içe aktarım dahil edilsin mi?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>Sözlüğe ekle</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>Hepsini Görmezden Gel</translation> </message> @@ -7239,62 +7244,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7319,12 +7324,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Mar 31 12:03:43 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Mar 31 12:52:59 2010 +0000 @@ -2038,46 +2038,46 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="315"/> + <location filename="Cooperation/ChatWidget.py" line="313"/> <source>Start Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="176"/> + <location filename="Cooperation/ChatWidget.py" line="179"/> <source>! Unknown command: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="197"/> + <location filename="Cooperation/ChatWidget.py" line="200"/> <source>* {0} has joined. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="226"/> + <location filename="Cooperation/ChatWidget.py" line="229"/> <source>* {0} has left. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="323"/> + <location filename="Cooperation/ChatWidget.py" line="321"/> <source>Stop Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="328"/> + <location filename="Cooperation/ChatWidget.py" line="326"/> <source>! Server Error: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="340"/> + <location filename="Cooperation/ChatWidget.py" line="338"/> <source>Disconnect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="344"/> + <location filename="Cooperation/ChatWidget.py" line="342"/> <source>Connect</source> <translation type="unfinished"></translation> </message> @@ -2127,27 +2127,27 @@ <translation type="unfinished">复制</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="527"/> + <location filename="Cooperation/ChatWidget.py" line="525"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="541"/> + <location filename="Cooperation/ChatWidget.py" line="539"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="558"/> + <location filename="Cooperation/ChatWidget.py" line="556"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -3025,25 +3025,30 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="68"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="69"/> + <location filename="Cooperation/Connection.py" line="70"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="181"/> + <location filename="Cooperation/Connection.py" line="182"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="405"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3386,7 +3391,7 @@ <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="259"/> + <location filename="Cooperation/CooperationClient.py" line="268"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -6447,7 +6452,7 @@ <context> <name>Editor</name> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source>Open File</source> <translation>打开文件</translation> </message> @@ -6537,7 +6542,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5427"/> + <location filename="QScintilla/Editor.py" line="5421"/> <source>Check spelling...</source> <translation>正在进行拼写检查……</translation> </message> @@ -6792,7 +6797,7 @@ <translation>编辑断点……</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3905"/> + <location filename="QScintilla/Editor.py" line="3899"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -6887,37 +6892,37 @@ <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="1485"/> + <location filename="QScintilla/Editor.py" line="1482"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>试图改变只读文件。请先保存到另一个文件中。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2032"/> + <location filename="QScintilla/Editor.py" line="2029"/> <source>Printing...</source> <translation>打印中……</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2049"/> + <location filename="QScintilla/Editor.py" line="2046"/> <source>Printing completed</source> <translation>打印已完成</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="2048"/> + <source>Error while printing</source> + <translation>打印时出错</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="2051"/> - <source>Error while printing</source> - <translation>打印时出错</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="2054"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source>File Modified</source> <translation>文件已改变</translation> </message> @@ -6932,7 +6937,7 @@ <translation type="obsolete"><p>文件 <b>%1</b> 无法打开。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -6947,52 +6952,52 @@ <translation type="obsolete"><p>文件 <b>%1</b> 已存在。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3440"/> + <location filename="QScintilla/Editor.py" line="3434"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效，没有设定自动完成源。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="3908"/> + <location filename="QScintilla/Editor.py" line="3902"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4148"/> + <location filename="QScintilla/Editor.py" line="4142"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4190"/> + <location filename="QScintilla/Editor.py" line="4184"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4194"/> + <location filename="QScintilla/Editor.py" line="4188"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4287"/> + <location filename="QScintilla/Editor.py" line="4281"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> @@ -7017,37 +7022,37 @@ <translation type="obsolete">请选择要移除的循环报告</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4403"/> + <location filename="QScintilla/Editor.py" line="4397"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4542"/> + <location filename="QScintilla/Editor.py" line="4536"/> <source>Select a macro name:</source> <translation>选择一个宏名称：</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4570"/> + <location filename="QScintilla/Editor.py" line="4564"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> @@ -7062,12 +7067,12 @@ <translation type="obsolete"><p>宏文件 <b>%1</b> 已损坏。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4610"/> + <location filename="QScintilla/Editor.py" line="4604"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source>Save macro</source> <translation>保存宏</translation> </message> @@ -7077,7 +7082,7 @@ <translation type="obsolete"><p>宏文件 <b>%1</b> 已存在。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> @@ -7087,22 +7092,22 @@ <translation type="obsolete"><p>无法写入宏文件 <b>%1</b> 。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4656"/> + <location filename="QScintilla/Editor.py" line="4650"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏？</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4683"/> + <location filename="QScintilla/Editor.py" line="4677"/> <source>Enter name of the macro:</source> <translation>输入宏名称：</translation> </message> @@ -7112,12 +7117,12 @@ <translation type="obsolete"><p>在 Eric4 中打开时文件 <b>%1</b> 已改变。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4806"/> + <location filename="QScintilla/Editor.py" line="4800"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>警告：</b> 重新打开将导致更改丢失。</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4810"/> + <location filename="QScintilla/Editor.py" line="4804"/> <source>File changed</source> <translation>文件已改变</translation> </message> @@ -7127,7 +7132,7 @@ <translation type="obsolete">%1 (ro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source>Drop Error</source> <translation>降落误差</translation> </message> @@ -7137,47 +7142,47 @@ <translation type="obsolete"><p><b>%1</b> 不是一个文件。</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5024"/> + <location filename="QScintilla/Editor.py" line="5018"/> <source>Resources</source> <translation>资源</translation> </message> <message> + <location filename="QScintilla/Editor.py" line="5020"/> + <source>Add file...</source> + <translation>添加文件……</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5022"/> + <source>Add files...</source> + <translation>添加文件……</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="5024"/> + <source>Add aliased file...</source> + <translation>添加别名文件……</translation> + </message> + <message> <location filename="QScintilla/Editor.py" line="5026"/> - <source>Add file...</source> - <translation>添加文件……</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5028"/> - <source>Add files...</source> - <translation>添加文件……</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5030"/> - <source>Add aliased file...</source> - <translation>添加别名文件……</translation> - </message> - <message> - <location filename="QScintilla/Editor.py" line="5032"/> <source>Add localized resource...</source> <translation>添加本地资源……</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5035"/> + <location filename="QScintilla/Editor.py" line="5029"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5053"/> + <location filename="QScintilla/Editor.py" line="5047"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5069"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> @@ -7187,42 +7192,42 @@ <translation type="obsolete">重命名文件 <b>%1</b>：</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5157"/> + <location filename="QScintilla/Editor.py" line="5151"/> <source>Include class attributes?</source> <translation>包含类属性？</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5178"/> + <location filename="QScintilla/Editor.py" line="5172"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用？</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5194"/> + <location filename="QScintilla/Editor.py" line="5188"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5429"/> + <location filename="QScintilla/Editor.py" line="5423"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5431"/> + <location filename="QScintilla/Editor.py" line="5425"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -7247,62 +7252,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2183"/> + <location filename="QScintilla/Editor.py" line="2180"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2239"/> + <location filename="QScintilla/Editor.py" line="2236"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2351"/> + <location filename="QScintilla/Editor.py" line="2348"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="2392"/> + <location filename="QScintilla/Editor.py" line="2389"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4584"/> + <location filename="QScintilla/Editor.py" line="4578"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4591"/> + <location filename="QScintilla/Editor.py" line="4585"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4627"/> + <location filename="QScintilla/Editor.py" line="4621"/> <source><p>The macro file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4645"/> + <location filename="QScintilla/Editor.py" line="4639"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4801"/> + <location filename="QScintilla/Editor.py" line="4795"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4889"/> + <location filename="QScintilla/Editor.py" line="4883"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5006"/> + <location filename="QScintilla/Editor.py" line="5000"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5096"/> + <location filename="QScintilla/Editor.py" line="5090"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -7327,12 +7332,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>py3flakes Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4523"/> + <location filename="QScintilla/Editor.py" line="4517"/> <source>No py3flakes warning message available.</source> <translation type="unfinished"></translation> </message>
