Mercurial Repositories > eric / changeset
changeset
Added functionality to cut/copy/... the chat and to interactively accept/reject connections.
Wed, 31 Mar 2010 11:59:53 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 31 Mar 2010 11:59:53 +0000
- changeset 162
- 28f235c426c4
- parent 161
- bb3cc98f4104
- child 163
- 8f0630371845
Added functionality to cut/copy/... the chat and to interactively accept/reject connections.
--- a/APIs/Python3/eric5.api Tue Mar 30 17:17:15 2010 +0000 +++ b/APIs/Python3/eric5.api Wed Mar 31 11:59:53 2010 +0000 @@ -5,9 +5,9 @@ eric5.Cooperation.ChatWidget.ChatWidget.editorCommand?7 eric5.Cooperation.ChatWidget.ChatWidget.getClient?4() eric5.Cooperation.ChatWidget.ChatWidget.on_cancelEditButton_clicked?4() +eric5.Cooperation.ChatWidget.ChatWidget.on_chatEdit_copyAvailable?4(yes) eric5.Cooperation.ChatWidget.ChatWidget.on_chatEdit_customContextMenuRequested?4(pos) eric5.Cooperation.ChatWidget.ChatWidget.on_connectButton_clicked?4() -eric5.Cooperation.ChatWidget.ChatWidget.on_hostEdit_currentIndexChanged?4(index) eric5.Cooperation.ChatWidget.ChatWidget.on_hostEdit_editTextChanged?4(host) eric5.Cooperation.ChatWidget.ChatWidget.on_sendEditButton_clicked?4() eric5.Cooperation.ChatWidget.ChatWidget.on_serverButton_clicked?4() @@ -69,7 +69,7 @@ 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?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)
--- a/Cooperation/ChatWidget.py Tue Mar 30 17:17:15 2010 +0000 +++ b/Cooperation/ChatWidget.py Wed Mar 31 11:59:53 2010 +0000 @@ -64,17 +64,42 @@ UI.PixmapCache.getIcon("sharedEditSend.png")) self.cancelEditButton.setIcon( UI.PixmapCache.getIcon("sharedEditCancel.png")) + self.clearMessageButton.setIcon( + UI.PixmapCache.getIcon("clearLeft.png")) + self.clearHostButton.setIcon( + UI.PixmapCache.getIcon("clearLeft.png")) - self.__client = CooperationClient() + self.__client = CooperationClient(self) self.__myNickName = self.__client.nickName() self.__chatMenu = QMenu(self) + self.__cutChatAct = \ + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("editCut.png"), + self.trUtf8("Cut"), self.__cutChat) + self.__copyChatAct = \ + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("editCopy.png"), + self.trUtf8("Copy"), self.__copyChat) + self.__chatMenu.addSeparator() + self.__cutAllChatAct = \ + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("editCut.png"), + self.trUtf8("Cut all"), self.__cutAllChat) + self.__copyAllChatAct = \ + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("editCopy.png"), + self.trUtf8("Copy all"), self.__copyAllChat) + self.__chatMenu.addSeparator() self.__clearChatAct = \ - self.__chatMenu.addAction(self.trUtf8("Clear"), self.__clearChat) + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("editDelete.png"), + self.trUtf8("Clear"), self.__clearChat) + self.__chatMenu.addSeparator() self.__saveChatAct = \ - self.__chatMenu.addAction(self.trUtf8("Save"), self.__saveChat) - self.__copyChatAct = \ - self.__chatMenu.addAction(self.trUtf8("Copy"), self.__copyChat) + self.__chatMenu.addAction( + UI.PixmapCache.getIcon("fileSave.png"), + self.trUtf8("Save"), self.__saveChat) self.messageEdit.returnPressed.connect(self.__handleMessage) self.sendButton.clicked.connect(self.__handleMessage) @@ -90,7 +115,7 @@ if port == -1: port = Preferences.getCooperation("ServerPort") - self.portSpin.setValue(port) +## self.portSpin.setValue(port) self.serverPortSpin.setValue(port) self.__setConnected(False) @@ -99,53 +124,45 @@ self.on_serverButton_clicked() self.recent = [] - self.__loadRecent() + self.__loadHostsHistory() - def __loadRecent(self): + def __loadHostsHistory(self): """ Private method to load the recently connected hosts. """ - self.recent = [] + self.__recent = [] Preferences.Prefs.rsettings.sync() rh = Preferences.Prefs.rsettings.value(recentNameHosts) if rh is not None: - self.recent = rh[:20] + self.__recent = rh[:20] self.hostEdit.clear() - self.hostEdit.addItem("", -1) - for entry in self.recent: - host, port = entry.split(":") - port = int(port) - hostStr = "{0} ({1})".format(host, port) - self.hostEdit.addItem(hostStr, port) + self.hostEdit.addItems(self.__recent) + self.hostEdit.clearEditText() - def __saveRecent(self): + def __saveHostsHistory(self): """ Private method to save the list of recently connected hosts. """ - Preferences.Prefs.rsettings.setValue(recentNameHosts, self.recent) + Preferences.Prefs.rsettings.setValue(recentNameHosts, self.__recent) Preferences.Prefs.rsettings.sync() - def __setHostsHistory(self, host, port): + def __setHostsHistory(self, host): """ - Private method to set the given host and port. + Private method to remember the given host as the most recent entry. - @param host host name to remember (string) - @param port port number to remember (integer) + @param host host entry to remember (string) """ - hostStr = "{0}:{1}".format(host, port) - if hostStr in self.recent: - self.recent.remove(hostStr) - self.recent.insert(0, hostStr) - - hostStr = "{0} ({1})".format(host, port) - index = self.hostEdit.findText(hostStr) - if index != -1: - self.hostEdit.removeItem(index) - if self.hostEdit.itemText(0) == host: - self.hostEdit.removeItem(0) - self.hostEdit.setEditText(hostStr) - self.hostEdit.insertItem(0, hostStr, port) - self.hostEdit.setCurrentIndex(0) + if host in self.__recent: + self.__recent.remove(host) + self.__recent.insert(0, host) + self.__saveHostsHistory() + + def __clearHostsHistory(self): + """ + Private slot to clear the hosts history. + """ + self.__recent = [] + self.__saveHostsHistory() def __handleMessage(self): """ @@ -239,19 +256,38 @@ if not self.__connected: self.connectButton.setEnabled(host != "") - @pyqtSlot(int) - def on_hostEdit_currentIndexChanged(self, index): - """ - Private slot to handle the selection of a host. - - @param index index of the selected entry (integer) +## @pyqtSlot(int) +## def on_hostEdit_currentIndexChanged(self, index): +## """ +## Private slot to handle the selection of a host. +## +## @param index index of the selected entry (integer) +## """ +## port = self.hostEdit.itemData(index) +## if port is not None: +## if port == -1: +## self.portSpin.setValue(Preferences.getCooperation("ServerPort")) +## else: +## self.portSpin.setValue(port) + def __getConnectionParameters(self): """ - port = self.hostEdit.itemData(index) - if port is not None: - if port == -1: - self.portSpin.setValue(Preferences.getCooperation("ServerPort")) - else: - self.portSpin.setValue(port) + Private method to determine the connection parameters. + + @return tuple with hostname and port (string, integer) + """ + hostEntry = self.hostEdit.currentText() + 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)) + else: + host = hostEntry + port = Preferences.getCooperation("ServerPort") + self.hostEdit.setEditText("{0}:{1}".format(host, port)) + return host, port @pyqtSlot() def on_connectButton_clicked(self): @@ -259,14 +295,11 @@ Private slot initiating the connection. """ if not self.__connected: - self.__setHostsHistory(self.hostEdit.currentText().split()[0], - self.portSpin.value()) - self.__saveRecent() + self.__setHostsHistory(self.hostEdit.currentText()) if not self.__client.server().isListening(): self.on_serverButton_clicked() if self.__client.server().isListening(): - self.__client.connectToHost(self.hostEdit.currentText().split()[0], - self.portSpin.value()) + self.__client.connectToHost(*self.__getConnectionParameters()) self.__setConnected(True) else: self.__client.disconnectConnections() @@ -315,7 +348,7 @@ self.shareButton.click() self.__connected = connected self.hostEdit.setEnabled(not connected) - self.portSpin.setEnabled(not connected) +## self.portSpin.setEnabled(not connected) self.serverButton.setEnabled(not connected) self.sharingGroup.setEnabled(connected) @@ -456,6 +489,16 @@ self.sendEditButton.setEnabled(editing) self.cancelEditButton.setEnabled(editing) + @pyqtSlot(bool) + def on_chatEdit_copyAvailable(self, yes): + """ + Private slot to react to text selection/deselection of the chat edit. + + @param yes flag signaling the availability of selected text (boolean) + """ + self.__copyChatAct.setEnabled(yes) + self.__cutChatAct.setEnabled(yes) + @pyqtSlot(QPoint) def on_chatEdit_customContextMenuRequested(self, pos): """ @@ -463,8 +506,10 @@ @param pos the position of the mouse pointer (QPoint) """ - self.__saveChatAct.setEnabled(self.chatEdit.toPlainText() != "") - self.__copyChatAct.setEnabled(self.chatEdit.toPlainText() != "") + enable = self.chatEdit.toPlainText() != "" + self.__saveChatAct.setEnabled(enable) + self.__copyAllChatAct.setEnabled(enable) + self.__cutAllChatAct.setEnabled(enable) self.__chatMenu.popup(self.chatEdit.mapToGlobal(pos)) def __clearChat(self): @@ -520,7 +565,29 @@ """ Private slot to copy the contents of the chat display to the clipboard. """ + self.chatEdit.copy() + + def __cutChat(self): + """ + Private slot to cut the contents of the chat display to the clipboard. + """ + self.chatEdit.cut() + + def __copyAllChat(self): + """ + Private slot to copy the contents of the chat display to the clipboard. + """ txt = self.chatEdit.toPlainText() if txt: cb = QApplication.clipboard() cb.setText(txt) + + def __cutAllChat(self): + """ + Private slot to cut the contents of the chat display to the clipboard. + """ + txt = self.chatEdit.toPlainText() + if txt: + cb = QApplication.clipboard() + cb.setText(txt) + self.chatEdit.clear()
--- a/Cooperation/ChatWidget.ui Tue Mar 30 17:17:15 2010 +0000 +++ b/Cooperation/ChatWidget.ui Wed Mar 31 11:59:53 2010 +0000 @@ -13,7 +13,7 @@ <property name="windowTitle"> <string>Chat</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QGroupBox" name="usersGroup"> <property name="sizePolicy"> @@ -47,8 +47,8 @@ <property name="title"> <string>Chat</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="2"> <widget class="QTextEdit" name="chatEdit"> <property name="focusPolicy"> <enum>Qt::NoFocus</enum> @@ -61,14 +61,27 @@ </property> </widget> </item> - <item> + <item row="1" column="0"> <widget class="QLineEdit" name="messageEdit"> <property name="toolTip"> <string>Enter the text to send</string> </property> </widget> </item> - <item> + <item row="1" column="1"> + <widget class="QToolButton" name="clearMessageButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string>Press to clear the message text</string> + </property> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> <widget class="QPushButton" name="sendButton"> <property name="toolTip"> <string>Press to send the text above</string> @@ -182,84 +195,92 @@ <property name="title"> <string>Connection</string> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Host:</string> - </property> - </widget> - </item> - <item row="0" column="1" colspan="3"> - <widget class="QComboBox" name="hostEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the host to connect to</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToMinimumContentsLength</enum> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Port:</string> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Host:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="hostEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the host and port to connect to in the form "host:port"</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + <property name="insertPolicy"> + <enum>QComboBox::InsertAtTop</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToMinimumContentsLength</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="clearHostButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="toolTip"> + <string>Press to clear the host</string> + </property> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> + </layout> </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="portSpin"> - <property name="toolTip"> - <string>Enter the port to connect to</string> - </property> - <property name="minimum"> - <number>1025</number> - </property> - <property name="maximum"> - <number>65535</number> - </property> - <property name="value"> - <number>42000</number> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="connectButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string/> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="E5Led" name="connectionLed" native="true"> - <property name="toolTip"> - <string>Shows the connection status</string> - </property> - </widget> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QPushButton" name="clearHostsButton"> + <property name="toolTip"> + <string>Press to clear the hosts list</string> + </property> + <property name="text"> + <string>Clear</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="connectButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="E5Led" name="connectionLed" native="true"> + <property name="toolTip"> + <string>Shows the connection status</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -336,15 +357,48 @@ <tabstop>serverButton</tabstop> <tabstop>serverPortSpin</tabstop> <tabstop>hostEdit</tabstop> - <tabstop>portSpin</tabstop> <tabstop>connectButton</tabstop> - <tabstop>messageEdit</tabstop> - <tabstop>sendButton</tabstop> + <tabstop>clearHostsButton</tabstop> <tabstop>shareButton</tabstop> <tabstop>startEditButton</tabstop> <tabstop>sendEditButton</tabstop> <tabstop>cancelEditButton</tabstop> + <tabstop>messageEdit</tabstop> + <tabstop>sendButton</tabstop> </tabstops> <resources/> - <connections/> + <connections> + <connection> + <sender>clearHostButton</sender> + <signal>pressed()</signal> + <receiver>hostEdit</receiver> + <slot>clearEditText()</slot> + <hints> + <hint type="sourcelabel"> + <x>279</x> + <y>651</y> + </hint> + <hint type="destinationlabel"> + <x>221</x> + <y>653</y> + </hint> + </hints> + </connection> + <connection> + <sender>clearMessageButton</sender> + <signal>pressed()</signal> + <receiver>messageEdit</receiver> + <slot>clear()</slot> + <hints> + <hint type="sourcelabel"> + <x>274</x> + <y>488</y> + </hint> + <hint type="destinationlabel"> + <x>241</x> + <y>489</y> + </hint> + </hints> + </connection> + </connections> </ui>
--- a/Cooperation/Connection.py Tue Mar 30 17:17:15 2010 +0000 +++ b/Cooperation/Connection.py Wed Mar 31 11:59:53 2010 +0000 @@ -8,15 +8,17 @@ """ from PyQt4.QtCore import pyqtSignal, QTimer, QTime, QByteArray +from PyQt4.QtGui import QMessageBox from PyQt4.QtNetwork import QTcpSocket +import Preferences + MaxBufferSize = 1024 * 1024 TransferTimeout = 30 * 1000 PongTimeout = 60 * 1000 PingInterval = 5 * 1000 SeparatorToken = '|||' - class Connection(QTcpSocket): """ Class representing a peer connection. @@ -152,8 +154,13 @@ self.abort() return - user, serverPort = str(self.__buffer, encoding = "utf-8").split(":") + try: + user, serverPort = str(self.__buffer, encoding = "utf-8").split(":") + except ValueError: + self.abort() + return self.__serverPort = int(serverPort) + self.__username = "{0}@{1}:{2}".format( user, self.peerAddress().toString(), @@ -167,6 +174,23 @@ self.abort() return + if self.__serverPort != self.peerPort() and \ + not Preferences.getCooperation("AutoAcceptConnections"): + # don't ask for reverse connections or + # if we shall accept automatically + res = QMessageBox.question(None, + self.trUtf8("New Connection"), + self.trUtf8("""<p>Accept connection from """ + """<strong>{0}@{1}</strong>?</p>""").format( + user, self.peerAddress().toString()), + QMessageBox.StandardButtons(\ + QMessageBox.No | \ + QMessageBox.Yes), + QMessageBox.Yes) + if res == QMessageBox.No: + self.abort() + return + if not self.__isGreetingMessageSent: self.__sendGreetingMessage()
--- a/Cooperation/CooperationClient.py Tue Mar 30 17:17:15 2010 +0000 +++ b/Cooperation/CooperationClient.py Wed Mar 31 11:59:53 2010 +0000 @@ -35,13 +35,15 @@ cannotConnect = pyqtSignal() editorCommand = pyqtSignal(str, str, str) - def __init__(self): + def __init__(self, parent = None): """ Constructor + + @param parent reference to the parent object (QObject) """ - QObject.__init__(self) + QObject.__init__(self, parent) - self.__server = CooperationServer() + self.__server = CooperationServer(self) self.__peers = collections.defaultdict(list) self.__initialConnection = None @@ -161,6 +163,7 @@ @param connection reference to the new connection (Connection) """ + connection.setParent(self) connection.setGreetingMessage(self.__username, self.__server.serverPort())
--- a/Documentation/Help/source.qhp Tue Mar 30 17:17:15 2010 +0000 +++ b/Documentation/Help/source.qhp Wed Mar 31 11:59:53 2010 +0000 @@ -3185,15 +3185,20 @@ <keyword name="ChatWidget" id="ChatWidget" ref="eric5.Cooperation.ChatWidget.html#ChatWidget" /> <keyword name="ChatWidget (Constructor)" id="ChatWidget (Constructor)" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__init__" /> <keyword name="ChatWidget.__clearChat" id="ChatWidget.__clearChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__clearChat" /> + <keyword name="ChatWidget.__clearHostsHistory" id="ChatWidget.__clearHostsHistory" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__clearHostsHistory" /> + <keyword name="ChatWidget.__copyAllChat" id="ChatWidget.__copyAllChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__copyAllChat" /> <keyword name="ChatWidget.__copyChat" id="ChatWidget.__copyChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__copyChat" /> + <keyword name="ChatWidget.__cutAllChat" id="ChatWidget.__cutAllChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__cutAllChat" /> + <keyword name="ChatWidget.__cutChat" id="ChatWidget.__cutChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__cutChat" /> <keyword name="ChatWidget.__editorCommandMessage" id="ChatWidget.__editorCommandMessage" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__editorCommandMessage" /> + <keyword name="ChatWidget.__getConnectionParameters" id="ChatWidget.__getConnectionParameters" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__getConnectionParameters" /> <keyword name="ChatWidget.__handleMessage" id="ChatWidget.__handleMessage" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__handleMessage" /> <keyword name="ChatWidget.__initialConnectionRefused" id="ChatWidget.__initialConnectionRefused" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__initialConnectionRefused" /> - <keyword name="ChatWidget.__loadRecent" id="ChatWidget.__loadRecent" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__loadRecent" /> + <keyword name="ChatWidget.__loadHostsHistory" id="ChatWidget.__loadHostsHistory" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__loadHostsHistory" /> <keyword name="ChatWidget.__newParticipant" id="ChatWidget.__newParticipant" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__newParticipant" /> <keyword name="ChatWidget.__participantLeft" id="ChatWidget.__participantLeft" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__participantLeft" /> <keyword name="ChatWidget.__saveChat" id="ChatWidget.__saveChat" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__saveChat" /> - <keyword name="ChatWidget.__saveRecent" id="ChatWidget.__saveRecent" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__saveRecent" /> + <keyword name="ChatWidget.__saveHostsHistory" id="ChatWidget.__saveHostsHistory" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__saveHostsHistory" /> <keyword name="ChatWidget.__setConnected" id="ChatWidget.__setConnected" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__setConnected" /> <keyword name="ChatWidget.__setHostsHistory" id="ChatWidget.__setHostsHistory" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__setHostsHistory" /> <keyword name="ChatWidget.__showErrorMessage" id="ChatWidget.__showErrorMessage" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.__showErrorMessage" /> @@ -3201,9 +3206,9 @@ <keyword name="ChatWidget.checkEditorActions" id="ChatWidget.checkEditorActions" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.checkEditorActions" /> <keyword name="ChatWidget.getClient" id="ChatWidget.getClient" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.getClient" /> <keyword name="ChatWidget.on_cancelEditButton_clicked" id="ChatWidget.on_cancelEditButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_cancelEditButton_clicked" /> + <keyword name="ChatWidget.on_chatEdit_copyAvailable" id="ChatWidget.on_chatEdit_copyAvailable" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_chatEdit_copyAvailable" /> <keyword name="ChatWidget.on_chatEdit_customContextMenuRequested" id="ChatWidget.on_chatEdit_customContextMenuRequested" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_chatEdit_customContextMenuRequested" /> <keyword name="ChatWidget.on_connectButton_clicked" id="ChatWidget.on_connectButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_connectButton_clicked" /> - <keyword name="ChatWidget.on_hostEdit_currentIndexChanged" id="ChatWidget.on_hostEdit_currentIndexChanged" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_hostEdit_currentIndexChanged" /> <keyword name="ChatWidget.on_hostEdit_editTextChanged" id="ChatWidget.on_hostEdit_editTextChanged" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_hostEdit_editTextChanged" /> <keyword name="ChatWidget.on_sendEditButton_clicked" id="ChatWidget.on_sendEditButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_sendEditButton_clicked" /> <keyword name="ChatWidget.on_serverButton_clicked" id="ChatWidget.on_serverButton_clicked" ref="eric5.Cooperation.ChatWidget.html#ChatWidget.on_serverButton_clicked" />
--- a/Documentation/Source/eric5.Cooperation.ChatWidget.html Tue Mar 30 17:17:15 2010 +0000 +++ b/Documentation/Source/eric5.Cooperation.ChatWidget.html Wed Mar 31 11:59:53 2010 +0000 @@ -83,19 +83,34 @@ <td><a href="#ChatWidget.__clearChat">__clearChat</a></td> <td>Private slot to clear the contents of the chat display.</td> </tr><tr> +<td><a href="#ChatWidget.__clearHostsHistory">__clearHostsHistory</a></td> +<td>Private slot to clear the hosts history.</td> +</tr><tr> +<td><a href="#ChatWidget.__copyAllChat">__copyAllChat</a></td> +<td>Private slot to copy the contents of the chat display to the clipboard.</td> +</tr><tr> <td><a href="#ChatWidget.__copyChat">__copyChat</a></td> <td>Private slot to copy the contents of the chat display to the clipboard.</td> </tr><tr> +<td><a href="#ChatWidget.__cutAllChat">__cutAllChat</a></td> +<td>Private slot to cut the contents of the chat display to the clipboard.</td> +</tr><tr> +<td><a href="#ChatWidget.__cutChat">__cutChat</a></td> +<td>Private slot to cut the contents of the chat display to the clipboard.</td> +</tr><tr> <td><a href="#ChatWidget.__editorCommandMessage">__editorCommandMessage</a></td> <td>Private slot to handle editor command messages from the client.</td> </tr><tr> +<td><a href="#ChatWidget.__getConnectionParameters">__getConnectionParameters</a></td> +<td>Private method to determine the connection parameters.</td> +</tr><tr> <td><a href="#ChatWidget.__handleMessage">__handleMessage</a></td> <td>Private slot handling the Return key pressed in the message edit.</td> </tr><tr> <td><a href="#ChatWidget.__initialConnectionRefused">__initialConnectionRefused</a></td> <td>Private slot to handle the refusal of the initial connection.</td> </tr><tr> -<td><a href="#ChatWidget.__loadRecent">__loadRecent</a></td> +<td><a href="#ChatWidget.__loadHostsHistory">__loadHostsHistory</a></td> <td>Private method to load the recently connected hosts.</td> </tr><tr> <td><a href="#ChatWidget.__newParticipant">__newParticipant</a></td> @@ -107,14 +122,14 @@ <td><a href="#ChatWidget.__saveChat">__saveChat</a></td> <td>Private slot to save the contents of the chat display.</td> </tr><tr> -<td><a href="#ChatWidget.__saveRecent">__saveRecent</a></td> +<td><a href="#ChatWidget.__saveHostsHistory">__saveHostsHistory</a></td> <td>Private method to save the list of recently connected hosts.</td> </tr><tr> <td><a href="#ChatWidget.__setConnected">__setConnected</a></td> <td>Private slot to set the connected state.</td> </tr><tr> <td><a href="#ChatWidget.__setHostsHistory">__setHostsHistory</a></td> -<td>Private method to set the given host and port.</td> +<td>Private method to remember the given host as the most recent entry.</td> </tr><tr> <td><a href="#ChatWidget.__showErrorMessage">__showErrorMessage</a></td> <td>Private slot to show an error message.</td> @@ -131,15 +146,15 @@ <td><a href="#ChatWidget.on_cancelEditButton_clicked">on_cancelEditButton_clicked</a></td> <td>Private slot to cancel a shared edit session.</td> </tr><tr> +<td><a href="#ChatWidget.on_chatEdit_copyAvailable">on_chatEdit_copyAvailable</a></td> +<td>Private slot to react to text selection/deselection of the chat edit.</td> +</tr><tr> <td><a href="#ChatWidget.on_chatEdit_customContextMenuRequested">on_chatEdit_customContextMenuRequested</a></td> <td>Private slot to show the context menu for the chat.</td> </tr><tr> <td><a href="#ChatWidget.on_connectButton_clicked">on_connectButton_clicked</a></td> <td>Private slot initiating the connection.</td> </tr><tr> -<td><a href="#ChatWidget.on_hostEdit_currentIndexChanged">on_hostEdit_currentIndexChanged</a></td> -<td>Private slot to handle the selection of a host.</td> -</tr><tr> <td><a href="#ChatWidget.on_hostEdit_editTextChanged">on_hostEdit_editTextChanged</a></td> <td>Private slot handling the entry of a host to connect to.</td> </tr><tr> @@ -177,11 +192,31 @@ <b>__clearChat</b>(<i></i>) <p> Private slot to clear the contents of the chat display. +</p><a NAME="ChatWidget.__clearHostsHistory" ID="ChatWidget.__clearHostsHistory"></a> +<h4>ChatWidget.__clearHostsHistory</h4> +<b>__clearHostsHistory</b>(<i></i>) +<p> + Private slot to clear the hosts history. +</p><a NAME="ChatWidget.__copyAllChat" ID="ChatWidget.__copyAllChat"></a> +<h4>ChatWidget.__copyAllChat</h4> +<b>__copyAllChat</b>(<i></i>) +<p> + Private slot to copy the contents of the chat display to the clipboard. </p><a NAME="ChatWidget.__copyChat" ID="ChatWidget.__copyChat"></a> <h4>ChatWidget.__copyChat</h4> <b>__copyChat</b>(<i></i>) <p> Private slot to copy the contents of the chat display to the clipboard. +</p><a NAME="ChatWidget.__cutAllChat" ID="ChatWidget.__cutAllChat"></a> +<h4>ChatWidget.__cutAllChat</h4> +<b>__cutAllChat</b>(<i></i>) +<p> + Private slot to cut the contents of the chat display to the clipboard. +</p><a NAME="ChatWidget.__cutChat" ID="ChatWidget.__cutChat"></a> +<h4>ChatWidget.__cutChat</h4> +<b>__cutChat</b>(<i></i>) +<p> + Private slot to cut the contents of the chat display to the clipboard. </p><a NAME="ChatWidget.__editorCommandMessage" ID="ChatWidget.__editorCommandMessage"></a> <h4>ChatWidget.__editorCommandMessage</h4> <b>__editorCommandMessage</b>(<i>hash, fileName, message</i>) @@ -198,6 +233,16 @@ <dd> command message (string) </dd> +</dl><a NAME="ChatWidget.__getConnectionParameters" ID="ChatWidget.__getConnectionParameters"></a> +<h4>ChatWidget.__getConnectionParameters</h4> +<b>__getConnectionParameters</b>(<i></i>) +<p> + Private method to determine the connection parameters. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with hostname and port (string, integer) +</dd> </dl><a NAME="ChatWidget.__handleMessage" ID="ChatWidget.__handleMessage"></a> <h4>ChatWidget.__handleMessage</h4> <b>__handleMessage</b>(<i></i>) @@ -208,9 +253,9 @@ <b>__initialConnectionRefused</b>(<i></i>) <p> Private slot to handle the refusal of the initial connection. -</p><a NAME="ChatWidget.__loadRecent" ID="ChatWidget.__loadRecent"></a> -<h4>ChatWidget.__loadRecent</h4> -<b>__loadRecent</b>(<i></i>) +</p><a NAME="ChatWidget.__loadHostsHistory" ID="ChatWidget.__loadHostsHistory"></a> +<h4>ChatWidget.__loadHostsHistory</h4> +<b>__loadHostsHistory</b>(<i></i>) <p> Private method to load the recently connected hosts. </p><a NAME="ChatWidget.__newParticipant" ID="ChatWidget.__newParticipant"></a> @@ -238,9 +283,9 @@ <b>__saveChat</b>(<i></i>) <p> Private slot to save the contents of the chat display. -</p><a NAME="ChatWidget.__saveRecent" ID="ChatWidget.__saveRecent"></a> -<h4>ChatWidget.__saveRecent</h4> -<b>__saveRecent</b>(<i></i>) +</p><a NAME="ChatWidget.__saveHostsHistory" ID="ChatWidget.__saveHostsHistory"></a> +<h4>ChatWidget.__saveHostsHistory</h4> +<b>__saveHostsHistory</b>(<i></i>) <p> Private method to save the list of recently connected hosts. </p><a NAME="ChatWidget.__setConnected" ID="ChatWidget.__setConnected"></a> @@ -255,16 +300,13 @@ </dd> </dl><a NAME="ChatWidget.__setHostsHistory" ID="ChatWidget.__setHostsHistory"></a> <h4>ChatWidget.__setHostsHistory</h4> -<b>__setHostsHistory</b>(<i>host, port</i>) +<b>__setHostsHistory</b>(<i>host</i>) <p> - Private method to set the given host and port. + Private method to remember the given host as the most recent entry. </p><dl> <dt><i>host</i></dt> <dd> -host name to remember (string) -</dd><dt><i>port</i></dt> -<dd> -port number to remember (integer) +host entry to remember (string) </dd> </dl><a NAME="ChatWidget.__showErrorMessage" ID="ChatWidget.__showErrorMessage"></a> <h4>ChatWidget.__showErrorMessage</h4> @@ -309,7 +351,17 @@ <b>on_cancelEditButton_clicked</b>(<i></i>) <p> Private slot to cancel a shared edit session. -</p><a NAME="ChatWidget.on_chatEdit_customContextMenuRequested" ID="ChatWidget.on_chatEdit_customContextMenuRequested"></a> +</p><a NAME="ChatWidget.on_chatEdit_copyAvailable" ID="ChatWidget.on_chatEdit_copyAvailable"></a> +<h4>ChatWidget.on_chatEdit_copyAvailable</h4> +<b>on_chatEdit_copyAvailable</b>(<i>yes</i>) +<p> + Private slot to react to text selection/deselection of the chat edit. +</p><dl> +<dt><i>yes</i></dt> +<dd> +flag signaling the availability of selected text (boolean) +</dd> +</dl><a NAME="ChatWidget.on_chatEdit_customContextMenuRequested" ID="ChatWidget.on_chatEdit_customContextMenuRequested"></a> <h4>ChatWidget.on_chatEdit_customContextMenuRequested</h4> <b>on_chatEdit_customContextMenuRequested</b>(<i>pos</i>) <p> @@ -324,17 +376,7 @@ <b>on_connectButton_clicked</b>(<i></i>) <p> Private slot initiating the connection. -</p><a NAME="ChatWidget.on_hostEdit_currentIndexChanged" ID="ChatWidget.on_hostEdit_currentIndexChanged"></a> -<h4>ChatWidget.on_hostEdit_currentIndexChanged</h4> -<b>on_hostEdit_currentIndexChanged</b>(<i>index</i>) -<p> - Private slot to handle the selection of a host. -</p><dl> -<dt><i>index</i></dt> -<dd> -index of the selected entry (integer) -</dd> -</dl><a NAME="ChatWidget.on_hostEdit_editTextChanged" ID="ChatWidget.on_hostEdit_editTextChanged"></a> +</p><a NAME="ChatWidget.on_hostEdit_editTextChanged" ID="ChatWidget.on_hostEdit_editTextChanged"></a> <h4>ChatWidget.on_hostEdit_editTextChanged</h4> <b>on_hostEdit_editTextChanged</b>(<i>host</i>) <p>
--- a/Documentation/Source/eric5.Cooperation.CooperationClient.html Tue Mar 30 17:17:15 2010 +0000 +++ b/Documentation/Source/eric5.Cooperation.CooperationClient.html Wed Mar 31 11:59:53 2010 +0000 @@ -128,10 +128,15 @@ </table> <a NAME="CooperationClient.__init__" ID="CooperationClient.__init__"></a> <h4>CooperationClient (Constructor)</h4> -<b>CooperationClient</b>(<i></i>) +<b>CooperationClient</b>(<i>parent = None</i>) <p> Constructor -</p><a NAME="CooperationClient.__connectionError" ID="CooperationClient.__connectionError"></a> +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent object (QObject) +</dd> +</dl><a NAME="CooperationClient.__connectionError" ID="CooperationClient.__connectionError"></a> <h4>CooperationClient.__connectionError</h4> <b>__connectionError</b>(<i>socketError</i>) <p>
--- a/Preferences/ConfigurationPages/CooperationPage.py Tue Mar 30 17:17:15 2010 +0000 +++ b/Preferences/ConfigurationPages/CooperationPage.py Wed Mar 31 11:59:53 2010 +0000 @@ -33,6 +33,8 @@ Preferences.getCooperation("ServerPort")) self.portToTrySpin.setValue( Preferences.getCooperation("MaxPortsToTry")) + self.autoAcceptCheckBox.setChecked( + Preferences.getCooperation("AutoAcceptConnections")) def save(self): """ @@ -42,6 +44,8 @@ self.autostartCheckBox.isChecked()) Preferences.setCooperation("TryOtherPorts", self.otherPortsCheckBox.isChecked()) + Preferences.setCooperation("AutoAcceptConnections", + self.autoAcceptCheckBox.isChecked()) Preferences.setCooperation("ServerPort", self.serverPortSpin.value()) Preferences.setCooperation("MaxPortsToTry",
--- a/Preferences/ConfigurationPages/CooperationPage.ui Tue Mar 30 17:17:15 2010 +0000 +++ b/Preferences/ConfigurationPages/CooperationPage.ui Wed Mar 31 11:59:53 2010 +0000 @@ -13,7 +13,7 @@ <property name="windowTitle"> <string/> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -35,106 +35,130 @@ </widget> </item> <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="3"> - <widget class="QCheckBox" name="autostartCheckBox"> - <property name="toolTip"> - <string>Select to start the server automatically</string> - </property> - <property name="text"> - <string>Start server automatically</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Server Port:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="serverPortSpin"> - <property name="toolTip"> - <string>Enter the port number to listen on</string> - </property> - <property name="minimum"> - <number>1025</number> - </property> - <property name="maximum"> - <number>65535</number> - </property> - <property name="singleStep"> - <number>1</number> - </property> - <property name="value"> - <number>42000</number> - </property> - </widget> - </item> - <item row="1" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0" colspan="3"> - <widget class="QCheckBox" name="otherPortsCheckBox"> - <property name="toolTip"> - <string>Select to incrementally try other ports for the server</string> - </property> - <property name="text"> - <string>Try other ports for server</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_2"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>No. ports to try:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="portToTrySpin"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter the maximum number of additional ports to try</string> - </property> - <property name="minimum"> - <number>10</number> - </property> - <property name="maximum"> - <number>1000</number> - </property> - </widget> - </item> - <item row="3" column="2"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <widget class="QGroupBox" name="serverGroup"> + <property name="title"> + <string>Server</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <widget class="QCheckBox" name="autostartCheckBox"> + <property name="toolTip"> + <string>Select to start the server automatically</string> + </property> + <property name="text"> + <string>Start server automatically</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Server Port:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="serverPortSpin"> + <property name="toolTip"> + <string>Enter the port number to listen on</string> + </property> + <property name="minimum"> + <number>1025</number> + </property> + <property name="maximum"> + <number>65535</number> + </property> + <property name="singleStep"> + <number>1</number> + </property> + <property name="value"> + <number>42000</number> + </property> + </widget> + </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>326</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="otherPortsCheckBox"> + <property name="toolTip"> + <string>Select to incrementally try other ports for the server</string> + </property> + <property name="text"> + <string>Try other ports for server</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_2"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>No. ports to try:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSpinBox" name="portToTrySpin"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter the maximum number of additional ports to try</string> + </property> + <property name="minimum"> + <number>10</number> + </property> + <property name="maximum"> + <number>1000</number> + </property> + </widget> + </item> + <item row="3" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>326</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="connectionsGroup"> + <property name="title"> + <string>Connections</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="autoAcceptCheckBox"> + <property name="toolTip"> + <string>Select to accept incomming connections automatically</string> + </property> + <property name="text"> + <string>Accept connections automatically</string> + </property> + </widget> + </item> + </layout> + </widget> </item> <item> <spacer name="verticalSpacer">
--- a/Preferences/__init__.py Tue Mar 30 17:17:15 2010 +0000 +++ b/Preferences/__init__.py Wed Mar 31 11:59:53 2010 +0000 @@ -200,6 +200,7 @@ "AutoStartServer" : False, "TryOtherPorts" : True, "MaxPortsToTry" : 100, + "AutoAcceptConnections" : False, } # defaults for the editor settings @@ -1168,7 +1169,7 @@ @param prefClass preferences class used as the storage area @return the requested UI setting """ - if key in ["AutoStartServer", "TryOtherPorts"]: + if key in ["AutoStartServer", "TryOtherPorts", "AutoAcceptConnections"]: return toBool(prefClass.settings.value("Cooperation/" + key, prefClass.cooperationDefaults[key])) elif key in ["ServerPort", "MaxPortsToTry"]:
--- a/QScintilla/Editor.py Tue Mar 30 17:17:15 2010 +0000 +++ b/QScintilla/Editor.py Wed Mar 31 11:59:53 2010 +0000 @@ -5497,7 +5497,9 @@ (boolean, boolean, boolean, boolean) """ project = e5App().getObject("Project") - return project.isOpen() and project.isProjectFile(self.fileName), \ + return self.fileName is not None and \ + project.isOpen() and \ + project.isProjectFile(self.fileName), \ self.__isShared, self.__inSharedEdit, self.__inRemoteSharedEdit def shareConnected(self, connected):
--- a/ViewManager/ViewManager.py Tue Mar 30 17:17:15 2010 +0000 +++ b/ViewManager/ViewManager.py Wed Mar 31 11:59:53 2010 +0000 @@ -4992,7 +4992,7 @@ aw = self.activeWindow() if aw is not None: fn = aw.getFileName() - if e5App().getObject("Project").isProjectFile(fn): + if fn and e5App().getObject("Project").isProjectFile(fn): aw.shareEditor(share) def startSharedEdit(self): @@ -5002,7 +5002,7 @@ aw = self.activeWindow() if aw is not None: fn = aw.getFileName() - if e5App().getObject("Project").isProjectFile(fn): + if fn and e5App().getObject("Project").isProjectFile(fn): aw.startSharedEdit() def sendSharedEdit(self): @@ -5013,7 +5013,7 @@ aw = self.activeWindow() if aw is not None: fn = aw.getFileName() - if e5App().getObject("Project").isProjectFile(fn): + if fn and e5App().getObject("Project").isProjectFile(fn): aw.sendSharedEdit() def cancelSharedEdit(self): @@ -5023,5 +5023,5 @@ aw = self.activeWindow() if aw is not None: fn = aw.getFileName() - if e5App().getObject("Project").isProjectFile(fn): + if fn and e5App().getObject("Project").isProjectFile(fn): aw.cancelSharedEdit()
--- a/i18n/eric5_cs.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_cs.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1955,156 +1955,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Odeslat</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Odeslat</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2114,20 +2114,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Vyjmout</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2957,15 +2982,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3303,12 +3338,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3322,45 +3357,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20121,12 +20176,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message>
--- a/i18n/eric5_de.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_de.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1550,7 +1549,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> <message> @@ -1601,7 +1600,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -1820,160 +1819,160 @@ <translation>Nutzer</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation>Drücken, um den obigen Text zu senden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> + <location filename="Cooperation/ChatWidget.ui" line="90"/> <source>Send</source> <translation>Senden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> + <location filename="Cooperation/ChatWidget.ui" line="196"/> <source>Connection</source> <translation>Verbindung</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> + <location filename="Cooperation/ChatWidget.ui" line="204"/> <source>Host:</source> <translation>Rechner:</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> + <location filename="Cooperation/ChatWidget.ui" line="297"/> <source>Port:</source> <translation>Port:</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> + <location filename="Cooperation/ChatWidget.ui" line="279"/> <source>Shows the connection status</source> <translation>Zeigt den Verbindungsstatus</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> + <location filename="Cooperation/ChatWidget.ui" line="291"/> <source>Server</source> <translation>Server</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> + <location filename="Cooperation/ChatWidget.ui" line="339"/> <source>Shows the status of the server</source> <translation>Zeigt den Status des Servers</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> + <location filename="Cooperation/ChatWidget.py" line="315"/> <source>Start Server</source> <translation>Server starten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> + <location filename="Cooperation/ChatWidget.py" line="176"/> <source>! Unknown command: {0} </source> <translation>! Unbekannter Befehl: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> + <location filename="Cooperation/ChatWidget.py" line="197"/> <source>* {0} has joined. </source> <translation>* {0} ist beigetreten. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> + <location filename="Cooperation/ChatWidget.py" line="226"/> <source>* {0} has left. </source> <translation>* {0} hat die Sitzung verlassen. </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> + <location filename="Cooperation/ChatWidget.py" line="323"/> <source>Stop Server</source> <translation>Server anhalten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> + <location filename="Cooperation/ChatWidget.py" line="328"/> <source>! Server Error: {0} </source> <translation>! Serverfehler: {0} </translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> + <location filename="Cooperation/ChatWidget.py" line="340"/> <source>Disconnect</source> <translation>Unterbrechen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> + <location filename="Cooperation/ChatWidget.py" line="344"/> <source>Connect</source> <translation>Verbinden</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="90"/> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation>Verteilter Editor</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation>Drücken, um den Freigabestatus des aktuellen Editors umzuschalten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> - <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation>Drücken, um eine verteilte Änderungssitzung zu starten</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation>Drücken, um eine verteilte Änderungssitzung zu beenden und die Änderungen zu senden</translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation>Drücken, um eine verteilte Änderungssitzung zu beenden und die Änderungen zu senden</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation>Drücken, um eine verteilte Änderungssitzung abzubrechen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation>Chat speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation>Text Dateien (*.txt);;Alle Dateien (*)</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation>Fehlr beim Speichern</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Der Inhalt des Chats konnte nicht nach <b>{0}</b> geschrieben werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation>Kopieren</translation> </message> @@ -1983,20 +1982,45 @@ <translation>Gib den zu sendenden Text ein</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation>Gib den Host ein, zu dem verbunden werden soll</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation>Gib den Port ein, zu dem auf Host verbunden werden soll</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation>Gib den Serverport ein</translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation>Drücken, um den Nachrichtentext zu löschen</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation>Gib den Host und den Port in der Form "Host:Port" für die Verbindung ein</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation>Drücken, um den Hosteintrag zu löschen</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation>Drücken, um die Hostsliste zu löschen</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation>Ausschneiden</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation>Alles ausschneiden</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation>Alles kopieren</translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2777,15 +2801,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation>unbestimmt</translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation>unbekannt</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation>Neue Verbindung</translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation><p>Verbindungswunsch von <strong>{0}@{1}</strong> annehmen?</p></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3123,12 +3157,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation>Ungültige Adresse: {0}:{1} @@ -3143,45 +3177,65 @@ <translation><b>Zusammenarbeitseinstellungen</b></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation>Auswählen, um den Server automatisch zu starten</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation>Server automatisch starten</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation>Server Port:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation>Gib die Portnummer ein, an der der Server lauscht</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation>Auswählen, um weitere Ports zu versuchen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation>Weitere Serverports versuchen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation># Ports zu versuchen:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation>Gib die maximale Anzahl an Ports ein, die versucht werden sollen</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation>Server</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation>Verbindungen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation>Auswählen, um eingehende Verbindungswünsche automatisch anzunehmen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation>Verbindungswünsche automatisch annehmen</translation> + </message> </context> <context> <name>CorbaPage</name> @@ -10909,7 +10963,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="568"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -18629,12 +18683,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message>
--- a/i18n/eric5_es.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_es.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1816,156 +1816,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Enviar</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Enviar</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">Guardar</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Copiar</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"><p>El archivo <b>{0}</b> ya existe.</p></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -1975,20 +1975,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Cortar</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2769,15 +2794,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">desconocido</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3115,12 +3150,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">desconocido</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3134,45 +3169,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -18639,12 +18694,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message>
--- a/i18n/eric5_fr.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_fr.ts Wed Mar 31 11:59:53 2010 +0000 @@ -2005,156 +2005,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Envoyer</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Envoyer</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">Effacer</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2164,20 +2164,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Couper</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -3008,15 +3033,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3354,12 +3389,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3373,45 +3408,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20446,12 +20501,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message>
--- a/i18n/eric5_it.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_it.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1960,156 +1960,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Spedisci</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Spedisci</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">Pulisci</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">Salva</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Copia</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2119,20 +2119,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Taglia</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2963,15 +2988,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">sconosciuto</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3309,12 +3344,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">sconosciuto</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3328,45 +3363,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20181,12 +20236,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message>
--- a/i18n/eric5_ru.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_ru.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1965,156 +1965,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Отправить</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Отправить</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">Очистить</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">Сохранить</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Копировать</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2124,20 +2124,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Вырезать</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2969,15 +2994,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3315,12 +3350,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3334,45 +3369,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20244,12 +20299,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message>
--- a/i18n/eric5_tr.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_tr.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1996,156 +1996,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">Gönder</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">Gönder</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">...</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">Temizle</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">Kaydet</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2155,20 +2155,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">Kes</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -2998,15 +3023,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3344,12 +3379,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3363,45 +3398,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20321,12 +20376,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>Tercihleri Dışarı Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>Tercihleri İçe Aktar</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Tue Mar 30 17:17:15 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Mar 31 11:59:53 2010 +0000 @@ -1998,156 +1998,156 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="74"/> + <location filename="Cooperation/ChatWidget.ui" line="87"/> <source>Press to send the text above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="77"/> - <source>Send</source> - <translation type="unfinished">发送</translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="183"/> - <source>Connection</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="189"/> - <source>Host:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="276"/> - <source>Port:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="260"/> - <source>Shows the connection status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="270"/> - <source>Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="318"/> - <source>Shows the status of the server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="282"/> - <source>Start Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="159"/> - <source>! Unknown command: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="180"/> - <source>* {0} has joined. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="209"/> - <source>* {0} has left. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="290"/> - <source>Stop Server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="295"/> - <source>! Server Error: {0} -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="307"/> - <source>Disconnect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.py" line="311"/> - <source>Connect</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="90"/> + <source>Send</source> + <translation type="unfinished">发送</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="196"/> + <source>Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="204"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="297"/> + <source>Port:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="279"/> + <source>Shows the connection status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="291"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="339"/> + <source>Shows the status of the server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="315"/> + <source>Start Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="176"/> + <source>! Unknown command: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="197"/> + <source>* {0} has joined. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="226"/> + <source>* {0} has left. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="323"/> + <source>Stop Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="328"/> + <source>! Server Error: {0} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="340"/> + <source>Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="344"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="103"/> <source>Share Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="112"/> + <location filename="Cooperation/ChatWidget.ui" line="125"/> <source>Press to toggle the shared status of the current editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="160"/> + <location filename="Cooperation/ChatWidget.ui" line="239"/> <source>...</source> <translation type="unfinished">……</translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="128"/> + <location filename="Cooperation/ChatWidget.ui" line="141"/> <source>Press to start a shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="144"/> - <source>Press to end the edit and send the changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="157"/> + <source>Press to end the edit and send the changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="170"/> <source>Press to cancel the shared edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="73"/> + <location filename="Cooperation/ChatWidget.py" line="95"/> <source>Clear</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="75"/> + <location filename="Cooperation/ChatWidget.py" line="100"/> <source>Save</source> <translation type="unfinished">保存</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="77"/> + <location filename="Cooperation/ChatWidget.py" line="81"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source>Save Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="482"/> + <location filename="Cooperation/ChatWidget.py" line="527"/> <source>Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="496"/> + <location filename="Cooperation/ChatWidget.py" line="541"/> <source><p>The file <b>{0}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source>Error saving Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.py" line="513"/> + <location filename="Cooperation/ChatWidget.py" line="558"/> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -2157,20 +2157,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="202"/> - <source>Enter the host to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="225"/> - <source>Enter the port to connect to</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Cooperation/ChatWidget.ui" line="283"/> + <location filename="Cooperation/ChatWidget.ui" line="304"/> <source>Enter the server port</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="77"/> + <source>Press to clear the message text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="217"/> + <source>Enter the host and port to connect to in the form "host:port"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="236"/> + <source>Press to clear the host</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="250"/> + <source>Press to clear the hosts list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="77"/> + <source>Cut</source> + <translation type="unfinished">剪切</translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="86"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/ChatWidget.py" line="90"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeMetricsDialog</name> @@ -3000,15 +3025,25 @@ <context> <name>Connection</name> <message> - <location filename="Cooperation/Connection.py" line="66"/> + <location filename="Cooperation/Connection.py" line="68"/> <source>undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="67"/> + <location filename="Cooperation/Connection.py" line="69"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source>New Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Cooperation/Connection.py" line="181"/> + <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CookieDetailsDialog</name> @@ -3346,12 +3381,12 @@ <context> <name>CooperationClient</name> <message> - <location filename="Cooperation/CooperationClient.py" line="66"/> + <location filename="Cooperation/CooperationClient.py" line="68"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="256"/> + <location filename="Cooperation/CooperationClient.py" line="259"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -3365,45 +3400,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="42"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="46"/> <source>Select to start the server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="45"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="49"/> <source>Start server automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="52"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="56"/> <source>Server Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="59"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="63"/> <source>Enter the port number to listen on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="91"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="95"/> <source>Select to incrementally try other ports for the server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="94"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="98"/> <source>Try other ports for server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="104"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="108"/> <source>No. ports to try:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="114"/> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="118"/> <source>Enter the maximum number of additional ports to try</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="40"/> + <source>Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="147"/> + <source>Connections</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="153"/> + <source>Select to accept incomming connections automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="156"/> + <source>Accept connections automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CorbaPage</name> @@ -20424,12 +20479,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="825"/> + <location filename="Preferences/__init__.py" line="826"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="844"/> + <location filename="Preferences/__init__.py" line="845"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message>
