Mercurial Repositories > eric / changeset
changeset
Added code to the cooperation functions to support IPv6.
Thu, 18 Aug 2011 18:03:22 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 18 Aug 2011 18:03:22 +0200
- changeset 1221
- 291dc0a51947
- parent 1219
- c051673f8aaf
- child 1222
- 161e4514253b
Added code to the cooperation functions to support IPv6.
--- a/APIs/Python3/eric5.api Thu Aug 18 12:36:53 2011 +0200 +++ b/APIs/Python3/eric5.api Thu Aug 18 18:03:22 2011 +0200 @@ -50,6 +50,7 @@ eric5.Cooperation.Connection.Connection.sendMessage?4(message) eric5.Cooperation.Connection.Connection.sendParticipants?4(participants) eric5.Cooperation.Connection.Connection.serverPort?4() +eric5.Cooperation.Connection.Connection.setClient?4(client) eric5.Cooperation.Connection.Connection.setGreetingMessage?4(message, serverPort) eric5.Cooperation.Connection.Connection.timerEvent?4(evt) eric5.Cooperation.Connection.Connection?1(parent=None) @@ -61,12 +62,16 @@ eric5.Cooperation.CooperationClient.CooperationClient.banKickUser?4(nick) eric5.Cooperation.CooperationClient.CooperationClient.banUser?4(nick) eric5.Cooperation.CooperationClient.CooperationClient.cannotConnect?7 +eric5.Cooperation.CooperationClient.CooperationClient.chatWidget?4() +eric5.Cooperation.CooperationClient.CooperationClient.close?4() eric5.Cooperation.CooperationClient.CooperationClient.connectToHost?4(host, port) eric5.Cooperation.CooperationClient.CooperationClient.connectionError?7 eric5.Cooperation.CooperationClient.CooperationClient.disconnectConnections?4() eric5.Cooperation.CooperationClient.CooperationClient.editorCommand?7 +eric5.Cooperation.CooperationClient.CooperationClient.errorString?4() eric5.Cooperation.CooperationClient.CooperationClient.hasConnection?4(senderIp, senderPort=-1) eric5.Cooperation.CooperationClient.CooperationClient.hasConnections?4() +eric5.Cooperation.CooperationClient.CooperationClient.isListening?4() eric5.Cooperation.CooperationClient.CooperationClient.kickUser?4(nick) eric5.Cooperation.CooperationClient.CooperationClient.newMessage?7 eric5.Cooperation.CooperationClient.CooperationClient.newParticipant?7 @@ -75,12 +80,12 @@ eric5.Cooperation.CooperationClient.CooperationClient.removeConnection?4(connection) eric5.Cooperation.CooperationClient.CooperationClient.sendEditorCommand?4(projectHash, filename, message) eric5.Cooperation.CooperationClient.CooperationClient.sendMessage?4(message) -eric5.Cooperation.CooperationClient.CooperationClient.server?4() +eric5.Cooperation.CooperationClient.CooperationClient.startListening?4(port=-1) eric5.Cooperation.CooperationClient.CooperationClient?1(parent=None) eric5.Cooperation.CooperationServer.CooperationServer.incomingConnection?4(socketDescriptor) eric5.Cooperation.CooperationServer.CooperationServer.newConnection?7 -eric5.Cooperation.CooperationServer.CooperationServer.startListening?4(port=-1) -eric5.Cooperation.CooperationServer.CooperationServer?1(parent=None) +eric5.Cooperation.CooperationServer.CooperationServer.startListening?4(port=-1, findFreePort=False) +eric5.Cooperation.CooperationServer.CooperationServer?1(address, parent=None) eric5.DataViews.CodeMetrics.COMMENT?7 eric5.DataViews.CodeMetrics.DEDENT?7 eric5.DataViews.CodeMetrics.EMPTY?7 @@ -6494,6 +6499,7 @@ eric5.UI.UserInterface.Redirector.flush?4() eric5.UI.UserInterface.Redirector.write?4(s) eric5.UI.UserInterface.Redirector?1(stderr) +eric5.UI.UserInterface.UserInterface.activateCooperationViewer?4() eric5.UI.UserInterface.UserInterface.addE5Actions?4(actions, type) eric5.UI.UserInterface.UserInterface.appendStderr?7 eric5.UI.UserInterface.UserInterface.appendStdout?7
--- a/Cooperation/ChatWidget.py Thu Aug 18 12:36:53 2011 +0200 +++ b/Cooperation/ChatWidget.py Thu Aug 18 18:03:22 2011 +0200 @@ -241,17 +241,17 @@ @return tuple with hostname and port (string, integer) """ hostEntry = self.hostEdit.currentText() - if ":" in hostEntry: - host, port = hostEntry.split(":") + if "@" in hostEntry: + host, port = hostEntry.split("@") try: port = int(port) except ValueError: port = Preferences.getCooperation("ServerPort") - self.hostEdit.setEditText("{0}:{1}".format(host, port)) + self.hostEdit.setEditText("{0}@{1}".format(host, port)) else: host = hostEntry port = Preferences.getCooperation("ServerPort") - self.hostEdit.setEditText("{0}:{1}".format(host, port)) + self.hostEdit.setEditText("{0}@{1}".format(host, port)) return host, port @pyqtSlot() @@ -262,9 +262,9 @@ if not self.__connected: host, port = self.__getConnectionParameters() self.__setHostsHistory(self.hostEdit.currentText()) - if not self.__client.server().isListening(): + if not self.__client.isListening(): self.on_serverButton_clicked() - if self.__client.server().isListening(): + if self.__client.isListening(): self.__client.connectToHost(host, port) self.__setConnected(True) else: @@ -283,15 +283,15 @@ """ Private slot to start the server. """ - if self.__client.server().isListening(): - self.__client.server().close() + if self.__client.isListening(): + self.__client.close() self.serverButton.setText(self.trUtf8("Start Server")) self.serverPortSpin.setEnabled(True) if self.serverPortSpin.value() != Preferences.getCooperation("ServerPort"): self.serverPortSpin.setValue(Preferences.getCooperation("ServerPort")) self.serverLed.setColor(QColor(Qt.red)) else: - res, port = self.__client.server().startListening(self.serverPortSpin.value()) + res, port = self.__client.startListening(self.serverPortSpin.value()) if res: self.serverButton.setText(self.trUtf8("Stop Server")) self.serverPortSpin.setValue(port) @@ -300,7 +300,7 @@ else: self.__showErrorMessage( self.trUtf8("! Server Error: {0}\n").format( - self.__client.server().errorString()) + self.__client.errorString()) ) def __setConnected(self, connected): @@ -354,7 +354,7 @@ """ Public slot to handle a change of preferences. """ - if not self.__client.server().isListening(): + if not self.__client.isListening(): self.serverPortSpin.setValue(Preferences.getCooperation("ServerPort")) if Preferences.getCooperation("AutoStartServer"): self.on_serverButton_clicked()
--- a/Cooperation/Connection.py Thu Aug 18 12:36:53 2011 +0200 +++ b/Cooperation/Connection.py Thu Aug 18 18:03:22 2011 +0200 @@ -11,6 +11,7 @@ from PyQt4.QtNetwork import QTcpSocket from E5Gui import E5MessageBox +from E5Gui.E5Application import e5App import Preferences @@ -80,6 +81,7 @@ self.__pingTimer.setInterval(PingInterval) self.__pongTime = QTime() self.__buffer = QByteArray() + self.__client = None self.readyRead.connect(self.__processReadyRead) self.disconnected.connect(self.__disconnected) @@ -102,6 +104,14 @@ """ return self.__serverPort + def setClient(self, client): + """ + Public method to set the reference to the cooperation client. + + @param client reference to the cooperation client (CooperationClient) + """ + self.__client = client + def setGreetingMessage(self, message, serverPort): """ Public method to set the greeting message. @@ -164,7 +174,7 @@ return self.__serverPort = int(serverPort) - self.__username = "{0}@{1}:{2}".format( + self.__username = "{0}@{1}@{2}".format( user, self.peerAddress().toString(), self.peerPort() @@ -203,6 +213,11 @@ self.abort() return + if self.__client is not None: + chatWidget = self.__client.chatWidget() + if chatWidget is not None and not chatWidget.isVisible(): + e5App().getObject("UserInterface").activateCooperationViewer() + if not self.__isGreetingMessageSent: self.__sendGreetingMessage()
--- a/Cooperation/CooperationClient.py Thu Aug 18 12:36:53 2011 +0200 +++ b/Cooperation/CooperationClient.py Thu Aug 18 18:03:22 2011 +0200 @@ -10,7 +10,7 @@ import collections from PyQt4.QtCore import QObject, pyqtSignal, QProcess, QRegExp -from PyQt4.QtNetwork import QHostInfo, QHostAddress, QAbstractSocket +from PyQt4.QtNetwork import QHostInfo, QHostAddress, QAbstractSocket, QNetworkInterface from .CooperationServer import CooperationServer from .Connection import Connection @@ -46,7 +46,19 @@ """ super().__init__(parent) - self.__server = CooperationServer(self) + self.__chatWidget = parent + + self.__servers = [] + for networkInterface in QNetworkInterface.allInterfaces(): + for addressEntry in networkInterface.addressEntries(): + address = addressEntry.ip() + # fix scope of link local addresses + if address.toString().lower().startswith("fe80"): + address.setScopeId(networkInterface.humanReadableName()) + server = CooperationServer(address, self) + server.newConnection.connect(self.__newConnection) + self.__servers.append(server) + self.__peers = collections.defaultdict(list) self.__initialConnection = None @@ -70,15 +82,16 @@ if self.__username == "": self.__username = self.trUtf8("unknown") - self.__server.newConnection.connect(self.__newConnection) + self.__listening = False + self.__serversErrorString = "" - def server(self): + def chatWidget(self): """ - Public method to get a reference to the server. + Public method to get a reference to the chat widget. - @return reference to the server object (CooperationServer) + @return reference to the chat widget (ChatWidget) """ - return self.__server + return self.__chatWidget def sendMessage(self, message): """ @@ -99,10 +112,10 @@ @return nick name (string) """ - return "{0}@{1}:{2}".format( + return "{0}@{1}@{2}".format( self.__username, QHostInfo.localHostName(), - self.__server.serverPort() + self.__servers[0].serverPort() ) def hasConnection(self, senderIp, senderPort=-1): @@ -168,8 +181,9 @@ @param connection reference to the new connection (Connection) """ connection.setParent(self) + connection.setClient(self) connection.setGreetingMessage(self.__username, - self.__server.serverPort()) + self.__servers[0].serverPort()) connection.error.connect(self.__connectionError) connection.disconnected.connect(self.__disconnected) @@ -254,7 +268,7 @@ for connectionList in self.__peers.values(): for connection in connectionList: if connection != reqConnection: - participants.append("{0}:{1}".format( + participants.append("{0}@{1}".format( connection.peerAddress().toString(), connection.serverPort())) reqConnection.sendParticipants(participants) @@ -265,11 +279,11 @@ @param participants list of participants (list of strings of "host:port") """ for participant in participants: - host, port = participant.split(":") + host, port = participant.split("@") port = int(port) if port == 0: - msg = self.trUtf8("Illegal address: {0}:{1}\n").format(host, port) + msg = self.trUtf8("Illegal address: {0}@{1}\n").format(host, port) self.connectionError.emit(msg) else: if not self.hasConnection(QHostAddress(host), port): @@ -297,11 +311,11 @@ @param nick nick name in the format of self.nickName() (string) @return list of references to the connection objects (list of Connection) """ - if "@" not in nick or ":" not in nick: + if "@" not in nick: # nick given in wrong format return [] - user, host = nick.split(":")[0].split("@") + user, host, port = nick.split("@") senderIp = QHostAddress(host) if senderIp not in self.__peers: @@ -325,7 +339,7 @@ @param nick nick name in the format of self.nickName() (string) """ Preferences.syncPreferences() - user = nick.split(":")[0] + user = nick.split("@")[0] bannedUsers = Preferences.getCooperation("BannedUsers")[:] if user not in bannedUsers: bannedUsers.append(user) @@ -339,3 +353,54 @@ """ self.banUser(nick) self.kickUser(nick) + + def startListening(self, port=-1): + """ + Public method to start listening for new connections. + + @param port port to listen on (integer) + @return tuple giving a flag indicating success (boolean) and + the port the server listens on + """ + if self.__servers: + # do first server and determine free port + res, port = self.__servers[0].startListening(port, True) + if res and len(self.__servers) > 1: + for server in self.__servers[1:]: + res, port = server.startListening(port, False) + if not res: + self.__serversErrorString = server.errorString() + else: + self.__serversErrorString = self.__servers[0].errorString() + else: + res = False + self.__serversErrorString = self.trUtf8("No servers present.") + + if res: + self.__serversErrorString = "" + self.__listening = res + return res, port + + def isListening(self): + """ + Public method to check, if the client is listening for connections. + + @return flag indicating the listening state (boolean) + """ + return self.__listening + + def close(self): + """ + Public method to close all connections and stop listening. + """ + for server in self.__servers: + server.close() + self.__listening = False + + def errorString(self): + """ + Public method to get a human readable error message about the last server error. + + @return human readable error message about the last server error (string) + """ + return self.__serversErrorString
--- a/Cooperation/CooperationServer.py Thu Aug 18 12:36:53 2011 +0200 +++ b/Cooperation/CooperationServer.py Thu Aug 18 18:03:22 2011 +0200 @@ -8,7 +8,7 @@ """ from PyQt4.QtCore import pyqtSignal -from PyQt4.QtNetwork import QTcpServer, QHostAddress +from PyQt4.QtNetwork import QTcpServer from .Connection import Connection @@ -24,13 +24,16 @@ """ newConnection = pyqtSignal(Connection) - def __init__(self, parent=None): + def __init__(self, address, parent=None): """ Constructor + @param address address the server should listen on (QHostAddress) @param parent reference to the parent object (QObject) """ super().__init__(parent) + + self.__address = address def incomingConnection(self, socketDescriptor): """ @@ -42,18 +45,20 @@ connection.setSocketDescriptor(socketDescriptor) self.newConnection.emit(connection) - def startListening(self, port=-1): + def startListening(self, port=-1, findFreePort=False): """ Public method to start listening for new connections. @param port port to listen on (integer) + @param findFreePort flag indicating to search for a free port depending on + the configuration (boolean) @return tuple giving a flag indicating success (boolean) and the port the server listens on """ - res = self.listen(QHostAddress.Any, port) - if Preferences.getCooperation("TryOtherPorts"): + res = self.listen(self.__address, port) + if findFreePort and Preferences.getCooperation("TryOtherPorts"): endPort = port + Preferences.getCooperation("MaxPortsToTry") while not res and port < endPort: port += 1 - res = self.listen(QHostAddress.Any, port) + res = self.listen(self.__address, port) return res, port
--- a/Documentation/Help/source.qhp Thu Aug 18 12:36:53 2011 +0200 +++ b/Documentation/Help/source.qhp Thu Aug 18 18:03:22 2011 +0200 @@ -3356,6 +3356,7 @@ <keyword name="Connection.sendMessage" id="Connection.sendMessage" ref="eric5.Cooperation.Connection.html#Connection.sendMessage" /> <keyword name="Connection.sendParticipants" id="Connection.sendParticipants" ref="eric5.Cooperation.Connection.html#Connection.sendParticipants" /> <keyword name="Connection.serverPort" id="Connection.serverPort" ref="eric5.Cooperation.Connection.html#Connection.serverPort" /> + <keyword name="Connection.setClient" id="Connection.setClient" ref="eric5.Cooperation.Connection.html#Connection.setClient" /> <keyword name="Connection.setGreetingMessage" id="Connection.setGreetingMessage" ref="eric5.Cooperation.Connection.html#Connection.setGreetingMessage" /> <keyword name="Connection.timerEvent" id="Connection.timerEvent" ref="eric5.Cooperation.Connection.html#Connection.timerEvent" /> <keyword name="CooperationServer (Module)" id="CooperationServer (Module)" ref="eric5.Cooperation.CooperationServer.html" /> @@ -3376,16 +3377,20 @@ <keyword name="CooperationClient.__readyForUse" id="CooperationClient.__readyForUse" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.__readyForUse" /> <keyword name="CooperationClient.banKickUser" id="CooperationClient.banKickUser" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.banKickUser" /> <keyword name="CooperationClient.banUser" id="CooperationClient.banUser" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.banUser" /> + <keyword name="CooperationClient.chatWidget" id="CooperationClient.chatWidget" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.chatWidget" /> + <keyword name="CooperationClient.close" id="CooperationClient.close" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.close" /> <keyword name="CooperationClient.connectToHost" id="CooperationClient.connectToHost" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.connectToHost" /> <keyword name="CooperationClient.disconnectConnections" id="CooperationClient.disconnectConnections" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.disconnectConnections" /> + <keyword name="CooperationClient.errorString" id="CooperationClient.errorString" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.errorString" /> <keyword name="CooperationClient.hasConnection" id="CooperationClient.hasConnection" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.hasConnection" /> <keyword name="CooperationClient.hasConnections" id="CooperationClient.hasConnections" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.hasConnections" /> + <keyword name="CooperationClient.isListening" id="CooperationClient.isListening" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.isListening" /> <keyword name="CooperationClient.kickUser" id="CooperationClient.kickUser" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.kickUser" /> <keyword name="CooperationClient.nickName" id="CooperationClient.nickName" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.nickName" /> <keyword name="CooperationClient.removeConnection" id="CooperationClient.removeConnection" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.removeConnection" /> <keyword name="CooperationClient.sendEditorCommand" id="CooperationClient.sendEditorCommand" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.sendEditorCommand" /> <keyword name="CooperationClient.sendMessage" id="CooperationClient.sendMessage" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.sendMessage" /> - <keyword name="CooperationClient.server" id="CooperationClient.server" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.server" /> + <keyword name="CooperationClient.startListening" id="CooperationClient.startListening" ref="eric5.Cooperation.CooperationClient.html#CooperationClient.startListening" /> <keyword name="UtilitiesPython2 (Package)" id="UtilitiesPython2 (Package)" ref="index-eric5.UtilitiesPython2.html" /> <keyword name="Tools (Module)" id="Tools (Module)" ref="eric5.UtilitiesPython2.Tools.html" /> <keyword name="decode" id="decode" ref="eric5.UtilitiesPython2.Tools.html#decode" /> @@ -4168,7 +4173,6 @@ <keyword name="UserInterface.__TRPreviewer" id="UserInterface.__TRPreviewer" ref="eric5.UI.UserInterface.html#UserInterface.__TRPreviewer" /> <keyword name="UserInterface.__UIPreviewer" id="UserInterface.__UIPreviewer" ref="eric5.UI.UserInterface.html#UserInterface.__UIPreviewer" /> <keyword name="UserInterface.__activateBrowser" id="UserInterface.__activateBrowser" ref="eric5.UI.UserInterface.html#UserInterface.__activateBrowser" /> - <keyword name="UserInterface.__activateCooperationViewer" id="UserInterface.__activateCooperationViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateCooperationViewer" /> <keyword name="UserInterface.__activateDebugViewer" id="UserInterface.__activateDebugViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateDebugViewer" /> <keyword name="UserInterface.__activateLogViewer" id="UserInterface.__activateLogViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateLogViewer" /> <keyword name="UserInterface.__activateMultiProjectBrowser" id="UserInterface.__activateMultiProjectBrowser" ref="eric5.UI.UserInterface.html#UserInterface.__activateMultiProjectBrowser" /> @@ -4315,6 +4319,7 @@ <keyword name="UserInterface.__whatsThis" id="UserInterface.__whatsThis" ref="eric5.UI.UserInterface.html#UserInterface.__whatsThis" /> <keyword name="UserInterface.__writeSession" id="UserInterface.__writeSession" ref="eric5.UI.UserInterface.html#UserInterface.__writeSession" /> <keyword name="UserInterface.__writeTasks" id="UserInterface.__writeTasks" ref="eric5.UI.UserInterface.html#UserInterface.__writeTasks" /> + <keyword name="UserInterface.activateCooperationViewer" id="UserInterface.activateCooperationViewer" ref="eric5.UI.UserInterface.html#UserInterface.activateCooperationViewer" /> <keyword name="UserInterface.addE5Actions" id="UserInterface.addE5Actions" ref="eric5.UI.UserInterface.html#UserInterface.addE5Actions" /> <keyword name="UserInterface.appendToStderr" id="UserInterface.appendToStderr" ref="eric5.UI.UserInterface.html#UserInterface.appendToStderr" /> <keyword name="UserInterface.appendToStdout" id="UserInterface.appendToStdout" ref="eric5.UI.UserInterface.html#UserInterface.appendToStdout" />
--- a/Documentation/Source/eric5.Cooperation.Connection.html Thu Aug 18 12:36:53 2011 +0200 +++ b/Documentation/Source/eric5.Cooperation.Connection.html Thu Aug 18 18:03:22 2011 +0200 @@ -119,6 +119,9 @@ <td><a href="#Connection.serverPort">serverPort</a></td> <td>Public method to get the server port.</td> </tr><tr> +<td><a href="#Connection.setClient">setClient</a></td> +<td>Public method to set the reference to the cooperation client.</td> +</tr><tr> <td><a href="#Connection.setGreetingMessage">setGreetingMessage</a></td> <td>Public method to set the greeting message.</td> </tr><tr> @@ -273,6 +276,16 @@ <dd> server port (integer) </dd> +</dl><a NAME="Connection.setClient" ID="Connection.setClient"></a> +<h4>Connection.setClient</h4> +<b>setClient</b>(<i>client</i>) +<p> + Public method to set the reference to the cooperation client. +</p><dl> +<dt><i>client</i></dt> +<dd> +reference to the cooperation client (CooperationClient) +</dd> </dl><a NAME="Connection.setGreetingMessage" ID="Connection.setGreetingMessage"></a> <h4>Connection.setGreetingMessage</h4> <b>setGreetingMessage</b>(<i>message, serverPort</i>)
--- a/Documentation/Source/eric5.Cooperation.CooperationClient.html Thu Aug 18 12:36:53 2011 +0200 +++ b/Documentation/Source/eric5.Cooperation.CooperationClient.html Thu Aug 18 18:03:22 2011 +0200 @@ -110,18 +110,30 @@ <td><a href="#CooperationClient.banUser">banUser</a></td> <td>Public method to ban a user by its nick name.</td> </tr><tr> +<td><a href="#CooperationClient.chatWidget">chatWidget</a></td> +<td>Public method to get a reference to the chat widget.</td> +</tr><tr> +<td><a href="#CooperationClient.close">close</a></td> +<td>Public method to close all connections and stop listening.</td> +</tr><tr> <td><a href="#CooperationClient.connectToHost">connectToHost</a></td> <td>Public method to connect to a host.</td> </tr><tr> <td><a href="#CooperationClient.disconnectConnections">disconnectConnections</a></td> <td>Public slot to disconnect from the chat network.</td> </tr><tr> +<td><a href="#CooperationClient.errorString">errorString</a></td> +<td>Public method to get a human readable error message about the last server error.</td> +</tr><tr> <td><a href="#CooperationClient.hasConnection">hasConnection</a></td> <td>Public method to check for an existing connection.</td> </tr><tr> <td><a href="#CooperationClient.hasConnections">hasConnections</a></td> <td>Public method to check, if there are any connections established.</td> </tr><tr> +<td><a href="#CooperationClient.isListening">isListening</a></td> +<td>Public method to check, if the client is listening for connections.</td> +</tr><tr> <td><a href="#CooperationClient.kickUser">kickUser</a></td> <td>Public method to kick a user by its nick name.</td> </tr><tr> @@ -137,8 +149,8 @@ <td><a href="#CooperationClient.sendMessage">sendMessage</a></td> <td>Public method to send a message.</td> </tr><tr> -<td><a href="#CooperationClient.server">server</a></td> -<td>Public method to get a reference to the server.</td> +<td><a href="#CooperationClient.startListening">startListening</a></td> +<td>Public method to start listening for new connections.</td> </tr> </table> <a NAME="CooperationClient.__init__" ID="CooperationClient.__init__"></a> @@ -241,7 +253,22 @@ <dd> nick name in the format of self.nickName() (string) </dd> -</dl><a NAME="CooperationClient.connectToHost" ID="CooperationClient.connectToHost"></a> +</dl><a NAME="CooperationClient.chatWidget" ID="CooperationClient.chatWidget"></a> +<h4>CooperationClient.chatWidget</h4> +<b>chatWidget</b>(<i></i>) +<p> + Public method to get a reference to the chat widget. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the chat widget (ChatWidget) +</dd> +</dl><a NAME="CooperationClient.close" ID="CooperationClient.close"></a> +<h4>CooperationClient.close</h4> +<b>close</b>(<i></i>) +<p> + Public method to close all connections and stop listening. +</p><a NAME="CooperationClient.connectToHost" ID="CooperationClient.connectToHost"></a> <h4>CooperationClient.connectToHost</h4> <b>connectToHost</b>(<i>host, port</i>) <p> @@ -259,7 +286,17 @@ <b>disconnectConnections</b>(<i></i>) <p> Public slot to disconnect from the chat network. -</p><a NAME="CooperationClient.hasConnection" ID="CooperationClient.hasConnection"></a> +</p><a NAME="CooperationClient.errorString" ID="CooperationClient.errorString"></a> +<h4>CooperationClient.errorString</h4> +<b>errorString</b>(<i></i>) +<p> + Public method to get a human readable error message about the last server error. +</p><dl> +<dt>Returns:</dt> +<dd> +human readable error message about the last server error (string) +</dd> +</dl><a NAME="CooperationClient.hasConnection" ID="CooperationClient.hasConnection"></a> <h4>CooperationClient.hasConnection</h4> <b>hasConnection</b>(<i>senderIp, senderPort=-1</i>) <p> @@ -287,6 +324,16 @@ <dd> flag indicating the presence of connections (boolean) </dd> +</dl><a NAME="CooperationClient.isListening" ID="CooperationClient.isListening"></a> +<h4>CooperationClient.isListening</h4> +<b>isListening</b>(<i></i>) +<p> + Public method to check, if the client is listening for connections. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the listening state (boolean) +</dd> </dl><a NAME="CooperationClient.kickUser" ID="CooperationClient.kickUser"></a> <h4>CooperationClient.kickUser</h4> <b>kickUser</b>(<i>nick</i>) @@ -344,15 +391,21 @@ <dd> message to be sent (string) </dd> -</dl><a NAME="CooperationClient.server" ID="CooperationClient.server"></a> -<h4>CooperationClient.server</h4> -<b>server</b>(<i></i>) +</dl><a NAME="CooperationClient.startListening" ID="CooperationClient.startListening"></a> +<h4>CooperationClient.startListening</h4> +<b>startListening</b>(<i>port=-1</i>) <p> - Public method to get a reference to the server. + Public method to start listening for new connections. </p><dl> +<dt><i>port</i></dt> +<dd> +port to listen on (integer) +</dd> +</dl><dl> <dt>Returns:</dt> <dd> -reference to the server object (CooperationServer) +tuple giving a flag indicating success (boolean) and + the port the server listens on </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Cooperation.CooperationServer.html Thu Aug 18 12:36:53 2011 +0200 +++ b/Documentation/Source/eric5.Cooperation.CooperationServer.html Thu Aug 18 18:03:22 2011 +0200 @@ -73,11 +73,14 @@ </table> <a NAME="CooperationServer.__init__" ID="CooperationServer.__init__"></a> <h4>CooperationServer (Constructor)</h4> -<b>CooperationServer</b>(<i>parent=None</i>) +<b>CooperationServer</b>(<i>address, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>address</i></dt> +<dd> +address the server should listen on (QHostAddress) +</dd><dt><i>parent</i></dt> <dd> reference to the parent object (QObject) </dd> @@ -93,13 +96,17 @@ </dd> </dl><a NAME="CooperationServer.startListening" ID="CooperationServer.startListening"></a> <h4>CooperationServer.startListening</h4> -<b>startListening</b>(<i>port=-1</i>) +<b>startListening</b>(<i>port=-1, findFreePort=False</i>) <p> Public method to start listening for new connections. </p><dl> <dt><i>port</i></dt> <dd> port to listen on (integer) +</dd><dt><i>findFreePort</i></dt> +<dd> +flag indicating to search for a free port depending on + the configuration (boolean) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.UI.UserInterface.html Thu Aug 18 12:36:53 2011 +0200 +++ b/Documentation/Source/eric5.UI.UserInterface.html Thu Aug 18 18:03:22 2011 +0200 @@ -182,9 +182,6 @@ <td><a href="#UserInterface.__activateBrowser">__activateBrowser</a></td> <td>Private slot to handle the activation of the file browser.</td> </tr><tr> -<td><a href="#UserInterface.__activateCooperationViewer">__activateCooperationViewer</a></td> -<td>Private slot to handle the activation of the cooperation window.</td> -</tr><tr> <td><a href="#UserInterface.__activateDebugViewer">__activateDebugViewer</a></td> <td>Private slot to handle the activation of the debug viewer.</td> </tr><tr> @@ -623,6 +620,9 @@ <td><a href="#UserInterface.__writeTasks">__writeTasks</a></td> <td>Private slot to write the tasks data to an XML file (.e4t).</td> </tr><tr> +<td><a href="#UserInterface.activateCooperationViewer">activateCooperationViewer</a></td> +<td>Public slot to handle the activation of the cooperation window.</td> +</tr><tr> <td><a href="#UserInterface.addE5Actions">addE5Actions</a></td> <td>Public method to add actions to the list of actions.</td> </tr><tr> @@ -786,11 +786,6 @@ <b>__activateBrowser</b>(<i></i>) <p> Private slot to handle the activation of the file browser. -</p><a NAME="UserInterface.__activateCooperationViewer" ID="UserInterface.__activateCooperationViewer"></a> -<h4>UserInterface.__activateCooperationViewer</h4> -<b>__activateCooperationViewer</b>(<i></i>) -<p> - Private slot to handle the activation of the cooperation window. </p><a NAME="UserInterface.__activateDebugViewer" ID="UserInterface.__activateDebugViewer"></a> <h4>UserInterface.__activateDebugViewer</h4> <b>__activateDebugViewer</b>(<i></i>) @@ -1797,6 +1792,11 @@ <b>__writeTasks</b>(<i></i>) <p> Private slot to write the tasks data to an XML file (.e4t). +</p><a NAME="UserInterface.activateCooperationViewer" ID="UserInterface.activateCooperationViewer"></a> +<h4>UserInterface.activateCooperationViewer</h4> +<b>activateCooperationViewer</b>(<i></i>) +<p> + Public slot to handle the activation of the cooperation window. </p><a NAME="UserInterface.addE5Actions" ID="UserInterface.addE5Actions"></a> <h4>UserInterface.addE5Actions</h4> <b>addE5Actions</b>(<i>actions, type</i>)
--- a/Globals/__init__.py Thu Aug 18 12:36:53 2011 +0200 +++ b/Globals/__init__.py Thu Aug 18 18:03:22 2011 +0200 @@ -19,7 +19,7 @@ recentNameMultiProject = "MultiProjects" recentNameProject = "Projects" recentNameFiles = "Files" -recentNameHosts = "Hosts" +recentNameHosts = "Hosts6" def isWindowsPlatform():
--- a/UI/UserInterface.py Thu Aug 18 12:36:53 2011 +0200 +++ b/UI/UserInterface.py Thu Aug 18 18:03:22 2011 +0200 @@ -1599,7 +1599,7 @@ QKeySequence(self.trUtf8("Alt+Shift+O")), 0, self, 'cooperation_viewer_activate', True) - self.cooperationViewerActivateAct.triggered[()].connect(self.__activateCooperationViewer) + self.cooperationViewerActivateAct.triggered[()].connect(self.activateCooperationViewer) self.actions.append(self.cooperationViewerActivateAct) self.addAction(self.cooperationViewerActivateAct) @@ -3842,14 +3842,14 @@ else: shown = self.__toggleWindow(self.cooperation) if shown: - self.__activateCooperationViewer() + self.activateCooperationViewer() else: if hasFocus: self.__activateViewmanager() - def __activateCooperationViewer(self): - """ - Private slot to handle the activation of the cooperation window. + def activateCooperationViewer(self): + """ + Public slot to handle the activation of the cooperation window. """ if self.layout in ["DockWindows", "Toolboxes", "Sidebars"]: self.cooperationDock.show()
--- a/changelog Thu Aug 18 12:36:53 2011 +0200 +++ b/changelog Thu Aug 18 18:03:22 2011 +0200 @@ -6,6 +6,8 @@ -- added an action to preview the file in the eric web browser. File name extension to support this feature can be configured on the Editor->Filehandling page +- enhancements of the cooperation functions + -- added code to the cooperation functions to support IPv6 Version 5.2-snapshot-20110724: - bug fixes
--- a/i18n/eric5_cs.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_cs.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3142,32 +3142,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>nedefinovaný</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source>New Connection</source> + <translation>Nové spojení</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation><p>Přijmout připojení z <strong>{0}@{1}</strong>?</p></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* Připojení z {0}:{1} odmítnuto.</translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source>New Connection</source> - <translation>Nové spojení</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation><p>Přijmout připojení z <strong>{0}@{1}</strong>?</p></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation>* Připojení z {0}:{1} odmítnuto.</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Pokus o připojení od zakázaného uživatele '{0}'.</translation> </message> @@ -3508,7 +3508,7 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>neznámý</translation> </message> @@ -3516,9 +3516,20 @@ <location filename="Cooperation/CooperationClient.py" line="272"/> <source>Illegal address: {0}:{1} </source> - <translation>Nelegální adresa: {0}:{1} + <translation type="obsolete">Nelegální adresa: {0}:{1} </translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15703,27 +15714,27 @@ <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> @@ -15733,52 +15744,52 @@ <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15788,37 +15799,37 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -25077,42 +25088,42 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>SSL chyby</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Certifikáty</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro {0}', realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL chyby pro <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certifikáty:<br/>{0}<br/>Chcete akceptovat všechny certifikáty?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Vydatavel: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Neplatný před: {0}<br/>Platný do: {1}</translation> </message> @@ -25122,12 +25133,12 @@ <translation type="obsolete"><br/>Alternativní jména:<ul><li>{0}</li></ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -44059,7 +44070,7 @@ <translation><h3>Čísla verzí</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -44139,12 +44150,12 @@ <translation>Zahodit chybu</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Chyba během zjišťování aktualizací</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Byla nalezena aktualizace</translation> </message> @@ -44159,7 +44170,7 @@ <translation>Zobrazit externí nás&troje</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Kontrolu updatů nelze provést.</translation> </message> @@ -44169,7 +44180,7 @@ <translation>&Zrušit</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Spuštěno poprvé</translation> </message> @@ -44274,7 +44285,7 @@ <translation type="obsolete">Nelze stáhnout soubor s verzemi.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Dostupné verze</h3><table></translation> </message> @@ -44419,7 +44430,7 @@ <translation><p>Tato část status baru zobrazuje indikátor práva zápisu editoru do souboru.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>SSL chyby</translation> </message> @@ -44978,27 +44989,27 @@ <translation>Zkouším host {0}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Aktualizace <b>{0}</b> eric5 je připravena na <b>{1}</b>. Chcete ji stáhnout a nainstalovat?</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation>Eric5 je aktuální</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation>Používáte poslední verzi eric5</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL chyby:</p><p>{0}</p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>eric5 nebyl ještě nakonfigurován. Bude spuštěn konfigurační dialog.</translation> </message> @@ -45138,12 +45149,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -45157,6 +45168,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_de.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_de.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3133,32 +3133,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>unbestimmt</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source>New Connection</source> + <translation>Neue Verbindung</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> + <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="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* Verbindung zu {0}:{1} abgelehnt.</translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source>New Connection</source> - <translation>Neue Verbindung</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="196"/> - <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="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation>* Verbindung zu {0}:{1} abgelehnt.</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Verbindungsversuch durch gebannten Nutzer '{0}'.</translation> </message> @@ -3499,17 +3499,22 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="272"/> - <source>Illegal address: {0}:{1} + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} </source> - <translation>Ungültige Adresse: {0}:{1} + <translation>Ungültige Adresse: {0}@{1} </translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation>Keine Server vorhanden.</translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15400,27 +15405,27 @@ <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -15430,87 +15435,87 @@ <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -24570,52 +24575,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Gib Nutzernamen und Passwort für '{0}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Gib Nutzernamen und Passwort für '{0}' und Realm '{1}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Fehler für <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Sollen diese Fehler ignoriert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Zertifikate</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Zertifikate:<br/>{0}<br/>Sollen alle diese Zertifikate akzeptiert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Aussteller: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Gültig ab: {0}<br/>Gültig bis: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation>Name: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation><br/>Organisation: {0}</translation> </message> @@ -43625,12 +43630,12 @@ <translation><p>Der PyQt4 Dokumentations Startpunkt ist nicht konfiguriert.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Fehler während der Aktualisierungsprüfung</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Aktualisierung verfügbar</translation> </message> @@ -43640,7 +43645,7 @@ <translation><h3>Versions Nummern</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -43675,7 +43680,7 @@ <translation>Zeige externe &Werkzeuge</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Konnte keine Aktualisierungsprüfung durchführen.</translation> </message> @@ -43690,7 +43695,7 @@ <translation>Prüfe Host {0}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Erstmalige Nutzung</translation> </message> @@ -43785,7 +43790,7 @@ <translation>Zeige die verfügbaren eric4 Versionen</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Verfügbare Versionen</h3><table></translation> </message> @@ -43955,12 +43960,12 @@ <translation><p>Dieser Teil der Statusleiste zeigt an, ob die aktuelle Datei geschrieben werden kann.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Fehler</p><p>{0}</p><p>Wollen Sie diese Fehler ignorieren?</p></translation> </message> @@ -44371,22 +44376,22 @@ <translation>Qt v.3 wird von eric5 nicht unterstützt.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Eine Aktualisierung auf <b>{0}</b> von Eric5 ist unter <b>{1}</b> verfügbar. Wollen Sie sie laden?</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation>Eric5 ist aktuell</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation>Sie verwenden die aktuellste Version von eric5</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>eric5 wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation> </message> @@ -44526,12 +44531,12 @@ <translation><b>Python 2 Dokumentation</b><p>Zeigt die Python 2 Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 2 Dokumentation gesucht wird, unter Windows das Verzeichnis doc unter dem Verzeichnis, in dem der konfigurierte Python 2 Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html/python-docs-html</i>. Um dies zu überschreiben, können sie die Umgebungsvariable PYTHON2DOCDIR setzen.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation>Fehler beim Herunterladen der Versionsinformationen</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen sie online und versuchen sie es erneut.</translation> </message> @@ -44545,6 +44550,11 @@ <source>Could not start a web browser</source> <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation>Die Versionsinformationen konnten seit 7 Tagen nicht heruntergeladen werden. Bitte gehen sie online und versuchen sie es erneut.</translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_en.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_en.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3097,32 +3097,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="186"/> - <source>* Connection attempted by banned user '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/Connection.py" line="196"/> + <source>* Connection attempted by banned user '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="206"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="416"/> + <location filename="Cooperation/Connection.py" line="431"/> <source>* Connection to {0}:{1} refused.</source> <translation type="unfinished"></translation> </message> @@ -3463,16 +3463,21 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="272"/> - <source>Illegal address: {0}:{1} + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15321,112 +15326,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24445,52 +24450,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -43771,7 +43776,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation type="unfinished"></translation> </message> @@ -44043,57 +44048,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> @@ -44138,12 +44143,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -44157,6 +44162,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_es.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_es.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3133,32 +3133,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>No definido</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source>New Connection</source> + <translation>Nueva Conexión</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation><p>Aceptar conexión de <strong>{0}@{1}</strong>?</p></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* Conexión de {0}:{1} rechazada.</translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source>New Connection</source> - <translation>Nueva Conexión</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation><p>Aceptar conexión de <strong>{0}@{1}</strong>?</p></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation>* Conexión de {0}:{1} rechazada.</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Conexión intentada por un usuario baneado '{0}'.</translation> </message> @@ -3499,7 +3499,7 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -3507,9 +3507,20 @@ <location filename="Cooperation/CooperationClient.py" line="272"/> <source>Illegal address: {0}:{1} </source> - <translation>Dirección ilegal: {0}:{1} + <translation type="obsolete">Dirección ilegal: {0}:{1} </translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15525,27 +15536,27 @@ <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> @@ -15555,87 +15566,87 @@ <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -24761,52 +24772,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>Errores de SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Certificados</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}', reino {1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Errores de SSL para <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>¿Desea ignorar estos errores?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certificados:<br/>{0}<br/>¿Desea aceptar todos estos certificados?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Emisor: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>No válido antes de: {0}<br/>Válido Hasta: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation>Nombre: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation><br/>Organización: {0}</translation> </message> @@ -43752,7 +43763,7 @@ <translation><h3>Números de Versiones</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -43847,7 +43858,7 @@ <translation>Error de volcado</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Error durante la verificación de actualización</translation> </message> @@ -43867,22 +43878,22 @@ <translation type="obsolete">No se puede descargar el archivo de versiones.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Actualizaciones disponibles</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>No se puede llevar a cabo la verificación de actualizaciones.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versiones disponibles</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Usado por primera vez</translation> </message> @@ -44007,7 +44018,7 @@ <translation><p>Esta zona de la barra de estado muestra una indicación de las propiedades de escritura de los archivos del editor.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>Errores SSL</translation> </message> @@ -44540,27 +44551,27 @@ <translation>Probando host {0}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>La actualización para <b>{0}</b> de eric5 está disponible en <b>{1}</b>. ¿Le gustaría obtenerla?</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation>Eric5 está actualizado</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation>Está utilizando la última versión de eric5</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>Errores SSL:</p><p>{0}</p><p>¿Desea ignorar estos errores?</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>Eric5 todavía no está configurado. El diálogo de configuración va a ser iniciado.</translation> </message> @@ -44700,12 +44711,12 @@ <translation><b>Documentación de Python 2</b><p>Mostrar la documentación de Python 2. Si no se ha configurado un directorio con esta documentación, la ubicación de la documentación de Python 2 se asumirá en el directorio de documentación bajo la ubicación del ejecutable configurado de Python 2 en Windows, y en <i>/usr/share/doc/packages/python/html/python-docs-html</i> para Unix. Establezca el valor de la variable de entorno PYTHON2DOCDIR para sobreescribir estas opciones. </p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation>Error al obtener información de versiones</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation> </message> @@ -44719,6 +44730,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_fr.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_fr.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3370,32 +3370,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="206"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation type="unfinished"></translation> </message> @@ -3736,16 +3736,21 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="272"/> - <source>Illegal address: {0}:{1} + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -16891,27 +16896,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -16921,87 +16926,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -26557,52 +26562,52 @@ <translation type="obsolete"><b>Connexion au proxy '%1' en utilisant:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation type="unfinished">Erreurs SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -47751,7 +47756,7 @@ <translation type="obsolete">fichier de raccourcis eric4 (*.e4k);;fichier de raccourcis eric3 (*.e3k *.e3kz)</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Erreur durant la recherche de mises à jour</translation> </message> @@ -47761,7 +47766,7 @@ <translation type="obsolete">L'utilisation d'un proxy a été activée, mais aucun proxy n'est configuré.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Mise à jour disponible</translation> </message> @@ -47831,7 +47836,7 @@ <translation type="obsolete"><tr><td><b>%1</b></td><td>%2</td></tr></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -47891,12 +47896,12 @@ <translation type="obsolete">Connexion à l'hote %1</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Impossible de vérifier les mises à jour.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Première utilisation</translation> </message> @@ -48011,7 +48016,7 @@ <translation type="obsolete">Impossible de télécharger le fichier de versions.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versions disponibles</h3><table></translation> </message> @@ -48256,7 +48261,7 @@ <translation type="obsolete"><b>Connexion au proxy '%1' en utilisant:</b></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>Erreurs SSL</translation> </message> @@ -48793,27 +48798,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation type="unfinished">Eric4 est à jour {5 ?}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric4 n'a pas encore été configuré. La fenêtre de configuration va être ouverte. {5 ?}</translation> </message> @@ -48953,15 +48958,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_it.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_it.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3133,32 +3133,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>indefinito</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source>New Connection</source> + <translation>Nuova connessione</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation><p>Accetta connessione da <strong>{0}@{1}</strong>?</p></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* Connessiione a {0}:{1} rifiutata.</translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source>New Connection</source> - <translation>Nuova connessione</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation><p>Accetta connessione da <strong>{0}@{1}</strong>?</p></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation>* Connessiione a {0}:{1} rifiutata.</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Connessione tentata da un utente bannato '{0}'.</translation> </message> @@ -3499,7 +3499,7 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>sconosciuto</translation> </message> @@ -3507,9 +3507,20 @@ <location filename="Cooperation/CooperationClient.py" line="272"/> <source>Illegal address: {0}:{1} </source> - <translation>Indirizzo illegale: : {0}:{1} + <translation type="obsolete">Indirizzo illegale: : {0}:{1} </translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15464,27 +15475,27 @@ <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> @@ -15494,87 +15505,87 @@ <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24678,52 +24689,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>Errori SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Certificati</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Inserisci utente e password per '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Inserisci utente e password per '{0}', dominio '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Errori SSL per <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Vuoi ignorarli ?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certificati:<br/>{0}<br/>Vuoi accettare tutti questi certificati?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Emettitore: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Non valido prima: {0}<br/>Valido Fino: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation>Nome: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation><br/>Organizzazione: {0}</translation> </message> @@ -43624,12 +43635,12 @@ <translation><p>L'inizio della documentazione di PyQt4 non è stato configurato.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Errore nel controllo per gli update</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Aggiornamento disponibile</translation> </message> @@ -43639,7 +43650,7 @@ <translation><h3>Numeri di versione</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -43674,12 +43685,12 @@ <translation>&Cancella</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Non posso controllare per gli update.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Primo avvio</translation> </message> @@ -43784,7 +43795,7 @@ <translation type="obsolete">Non posso scaricare il file delle versioni.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versioni disponibili</h3><table></translation> </message> @@ -43929,7 +43940,7 @@ <translation><p>Questa zona della barra di stato mostra la possibilità di scrittura del file.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>Errori SSL</translation> </message> @@ -44462,27 +44473,27 @@ <translation>Tento su host {0}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>L'update alla versione <b>{0}</b> di eric5 è disponibile presso <b>{1}</b>. Vuoi prenderlo ?</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation>Eric5 è aggiornato</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation>Stai usando l'ultima versione di eric5</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>Errori SSL:</p><p>{0}</p><p>Vuoi ignorare questi errori ?</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>eric5 non è ancora stato configurato. Il dialogo di configurazione verrà avviato.</translation> </message> @@ -44622,12 +44633,12 @@ <translation><b>Documentazione Python 2</b><p>Mostra la documentazione Python 2. Se non è configurata una directory per la documentazione, viene assunto che la posizione della documentazione sia nella directory doc nella locazione dell'eseguibile Python 2 su Windows e <i>/usr/share/doc/packages/python/html</i> su Unix. Imposta PYTHONDOCDIR2 nel tuo ambiente per sovrascrivere questi valori.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -44641,6 +44652,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_ru.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_ru.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3141,32 +3141,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>неопределён</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source>New Connection</source> + <translation>Новое соединение</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation><p>Разрешить соединение от<strong>{0}@{1}</strong>?</p></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation>* В соединении к {0}:{1} отказано.</translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source>New Connection</source> - <translation>Новое соединение</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation><p>Разрешить соединение от<strong>{0}@{1}</strong>?</p></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation>* В соединении к {0}:{1} отказано.</translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation>* Попытка соединения от запрещённого пользователя '{0}'.</translation> </message> @@ -3507,7 +3507,7 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>неизвестный</translation> </message> @@ -3515,9 +3515,20 @@ <location filename="Cooperation/CooperationClient.py" line="272"/> <source>Illegal address: {0}:{1} </source> - <translation>Неправильный адрес: {0}:{1} + <translation type="obsolete">Неправильный адрес: {0}:{1} </translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -15571,27 +15582,27 @@ <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> @@ -15601,87 +15612,87 @@ <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24815,52 +24826,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>Ошибки SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Ошибки SSL для <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Игнорировать?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Сертификаты</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Сертификаты:<br/>{0}<br/>Принять?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Эмитент: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Не действительны ранее: {0}<br/>Действительны до: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation>Имя: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation><br/>Организация: {0}</translation> </message> @@ -43915,12 +43926,12 @@ <translation><p>Корень документации PyQt4 не найден.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Ошибка при проверке обновлений</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Обновления доступны</translation> </message> @@ -43930,7 +43941,7 @@ <translation><h3>Номера версий</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -43965,7 +43976,7 @@ <translation>Показать &внешние инструменты</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Невозможно запустить проверку обновлений.</translation> </message> @@ -43980,7 +43991,7 @@ <translation>Пробую узел {0}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>Первое использование</translation> </message> @@ -44081,7 +44092,7 @@ <translation type="obsolete">Невозможно скачать файл версий.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Доступные версии</h3><table></translation> </message> @@ -44251,12 +44262,12 @@ <translation><p>Эта часть строки статуса указывает на возможность записи открытого в редакторе файла.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>Ошибки SSL</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation><p>Ошибки SSL: </p><p>{0}</p><p>Игнорировать?</p></translation> </message> @@ -44670,22 +44681,22 @@ <translation>Qt3 не поддерживается в eric5.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>На сайте <b>{1}</b> доступно обновление eric5 до версии <b>{0}</b>. Скачать?</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation>Eric5 не требует обновлений</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation>Вы используете самую последнюю версию eric5</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>eric5 ещё не сконфигурирован. Будет запущен диалог конфигурации.</translation> </message> @@ -44827,12 +44838,12 @@ <translation><b>Документация Pyton 2</b><p>Показать Pyton 2 документацию. Если местонахождение документации не было настроено, то искать в подкаталоге <i>doc</i> каталога где находится исполняемый файл Python 2 под Windows и в подкаталоге <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной окружения PYTHON2DOCDIR.</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -44846,6 +44857,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
--- a/i18n/eric5_tr.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_tr.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3142,32 +3142,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation>tanımlanmamış</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="186"/> - <source>* Connection attempted by banned user '{0}'.</source> - <translation>* yasaklanmış kullanıcır '{0}' tarafından bağlantı teşebbüsü var.</translation> - </message> - <message> <location filename="Cooperation/Connection.py" line="196"/> + <source>* Connection attempted by banned user '{0}'.</source> + <translation>* yasaklanmış kullanıcır '{0}' tarafından bağlantı teşebbüsü var.</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="206"/> <source>New Connection</source> <translation>Yeni Bağlantı</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="206"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation><p><strong>{0}@{1} gelen </strong> bağlantısını kabul ediyor musunuz?</p></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="416"/> + <location filename="Cooperation/Connection.py" line="431"/> <source>* Connection to {0}:{1} refused.</source> <translation>* Bağlantı {0}ya:{1} reddedisldi.</translation> </message> @@ -3508,7 +3508,7 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> @@ -3516,7 +3516,18 @@ <location filename="Cooperation/CooperationClient.py" line="272"/> <source>Illegal address: {0}:{1} </source> - <translation>Geçersiz adres: {0}:{1}</translation> + <translation type="obsolete">Geçersiz adres: {0}:{1}</translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -15709,112 +15720,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -24948,12 +24959,12 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b> '{0}' için kullanıcı adını ve parolayı giriniz</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b> '{1}' alanı, '{0}' için kullanıcı adı ve parola giriniz</b></translation> </message> @@ -24963,42 +24974,42 @@ <translation type="obsolete"><b>'{0}' proxy'sini kullanarak bağlan:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation>SSL Hataları</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Hataları <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Bu hataları yoksaymak istiyor musunuz?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation>Sertifikalar</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Sertifalar:<br/>{0}<br/>Bu sertifikalrı kabul etmek istiyor musunuz?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation><br/>Yayımcı: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Geçerlilik başlangıcı: {0}<br/>Geçerlilek bitişi: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -44477,7 +44488,7 @@ <translation><h3>Sürüm Numaraları</h3><table></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -44754,37 +44765,37 @@ <translation type="obsolete">Sürüm dosyası indirilemiyor.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>Güncelleme mümkün değil</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>Güncellemeleri kontrol esnasında hata</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>Güncellemelere ulaşamıyorum.</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>Mümkün sürümler</h3><table></translation> </message> @@ -44794,22 +44805,22 @@ <translation type="obsolete"><b>'{0}' proxy'sini kullanarak bağlan:</b></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>SSL Hataları</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>İlk kullanım</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>Eric5 henüz ayarlanmadı. Ayarlar Diyaloğu başlatılıyor.</translation> </message> @@ -44919,12 +44930,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -44938,6 +44949,11 @@ <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -45004,7 +45020,7 @@ <message> <location filename="Utilities/__init__.py" line="1270"/> <source>Python2 interpreter did not finish within 30s.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Python2 yorumlayıcı 15 s. de bitmedi. {2 ?} {30s?}</translation> </message> </context> <context>
--- a/i18n/eric5_zh_CN.GB2312.ts Thu Aug 18 12:36:53 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Thu Aug 18 18:03:22 2011 +0200 @@ -3362,32 +3362,32 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="71"/> + <location filename="Cooperation/Connection.py" line="72"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="72"/> + <location filename="Cooperation/Connection.py" line="73"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="206"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Cooperation/Connection.py" line="206"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="431"/> + <source>* Connection to {0}:{1} refused.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Cooperation/Connection.py" line="196"/> - <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="416"/> - <source>* Connection to {0}:{1} refused.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/Connection.py" line="186"/> <source>* Connection attempted by banned user '{0}'.</source> <translation type="unfinished"></translation> </message> @@ -3728,16 +3728,21 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="71"/> + <location filename="Cooperation/CooperationClient.py" line="83"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="272"/> - <source>Illegal address: {0}:{1} + <location filename="Cooperation/CooperationClient.py" line="286"/> + <source>Illegal address: {0}@{1} </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/CooperationClient.py" line="377"/> + <source>No servers present.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CooperationPage</name> @@ -16857,27 +16862,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -16887,87 +16892,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -26529,52 +26534,52 @@ <translation type="obsolete"><b>连接到代理 '%1' ，使用：</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source>SSL Errors</source> <translation type="unfinished">SSL 错误</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -48088,7 +48093,7 @@ <translation type="obsolete"><tr><td><b>%1</b></td><td>%2</td></tr></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5657"/> + <location filename="UI/UserInterface.py" line="5673"/> <source></table></source> <translation></table></translation> </message> @@ -48342,7 +48347,7 @@ <translation type="obsolete"><p><b>%1</b> 不是一个文件。</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Error during updates check</source> <translation>检查更新时出错</translation> </message> @@ -48372,7 +48377,7 @@ <translation type="obsolete">无法下载版本文件。</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>Update available</source> <translation>可用更新</translation> </message> @@ -48392,12 +48397,12 @@ <translation type="obsolete">当前使用的是 Eric4 最新的版本</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5623"/> + <location filename="UI/UserInterface.py" line="5639"/> <source>Could not perform updates check.</source> <translation>无法完成更新检查。</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5644"/> + <location filename="UI/UserInterface.py" line="5660"/> <source><h3>Available versions</h3><table></source> <translation><h3>可用版本</h3><table></translation> </message> @@ -48412,7 +48417,7 @@ <translation type="obsolete"><b>连接到代理 '%1' ，使用：</b></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source>SSL Errors</source> <translation>SSL 错误</translation> </message> @@ -48422,7 +48427,7 @@ <translation type="obsolete"><p>SSL 错误：</p><p>%1</p><p>要忽略这些错误吗？</p></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>First time usage</source> <translation>第一次使用</translation> </message> @@ -48764,27 +48769,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5610"/> + <location filename="UI/UserInterface.py" line="5626"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>Eric5 is up to date</source> <translation type="unfinished">Eric4 已是最新版本 {5 ?}</translation> </message> <message> - <location filename="UI/UserInterface.py" line="5619"/> + <location filename="UI/UserInterface.py" line="5635"/> <source>You are using the latest version of eric5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5672"/> + <location filename="UI/UserInterface.py" line="5688"/> <source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5697"/> + <location filename="UI/UserInterface.py" line="5713"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">尚未配置 Eric4。将打开配置对话框。 {5 ?}</translation> </message> @@ -48924,15 +48929,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5553"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="UI/UserInterface.py" line="5537"/> + <location filename="UI/UserInterface.py" line="5547"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="UI/UserInterface.py" line="5553"/> + <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name>
