Sun, 03 Nov 2024 12:34:02 +0100
IDE Server
- Extended the eric-ide server to be able to check, if received messages have been sent by a valid eric IDE.
--- a/docs/changelog.md Sat Nov 02 19:28:14 2024 +0100 +++ b/docs/changelog.md Sun Nov 03 12:34:02 2024 +0100 @@ -5,6 +5,9 @@ - Debugger - Added a configuration option to not stop at the first executable statement when debugging in passive mode. +- IDE Server + - Extended the eric-ide server to be able to check, if received messages have + been sent by a valid eric IDE. - MicroPython - Added support for ESP-C2, ESP32-C6, ESP32-H2, ESP32-P4 and ESP8684. - Project Type 'Eric7 Plugin'
--- a/src/eric7/APIs/Python3/eric7.api Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/APIs/Python3/eric7.api Sun Nov 03 12:34:02 2024 +0100 @@ -9948,7 +9948,7 @@ eric7.RemoteServer.EricServer.EricServer.sendJson?4(category, reply, params, reqestUuid="") eric7.RemoteServer.EricServer.EricServer.sendJsonCommand?4(jsonCommand, sock) eric7.RemoteServer.EricServer.EricServer.unregisterRequestHandler?4(requestCategory, ignoreError=False) -eric7.RemoteServer.EricServer.EricServer?1(port=42024, useIPv6=False) +eric7.RemoteServer.EricServer.EricServer?1(port=42024, useIPv6=False, clientId="") eric7.RemoteServer.EricServerBaseRequestHandler.EricServerBaseRequestHandler.handleRequest?4(request, params, reqestUuid) eric7.RemoteServer.EricServerBaseRequestHandler.EricServerBaseRequestHandler.sendError?4(request, reqestUuid="") eric7.RemoteServer.EricServerBaseRequestHandler.EricServerBaseRequestHandler?1(server) @@ -9962,7 +9962,7 @@ eric7.RemoteServer.EricServerFileSystemRequestHandler.EricServerFileSystemRequestHandler?1(server) eric7.RemoteServerInterface.EricServerConnectionDialog.EricServerConnectionDialog.getData?4() eric7.RemoteServerInterface.EricServerConnectionDialog.EricServerConnectionDialog.getProfileData?4() -eric7.RemoteServerInterface.EricServerConnectionDialog.EricServerConnectionDialog.setProfileData?4(name, hostname, port, timeout) +eric7.RemoteServerInterface.EricServerConnectionDialog.EricServerConnectionDialog.setProfileData?4(name, hostname, port, timeout, clientId="") eric7.RemoteServerInterface.EricServerConnectionDialog.EricServerConnectionDialog?1(profileNames=None, parent=None) eric7.RemoteServerInterface.EricServerCoverageInterface.EricServerCoverageInterface.analyzeDirectory?4(directory) eric7.RemoteServerInterface.EricServerCoverageInterface.EricServerCoverageInterface.analyzeFile?4(filename) @@ -10061,14 +10061,14 @@ eric7.RemoteServerInterface.EricServerFileSystemInterface.EricServerNotConnectedError?1() eric7.RemoteServerInterface.EricServerFileSystemInterface._RemoteFsCache?8 eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.aboutToDisconnect?7 -eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.connectToServer?4(host, port=None, timeout=None) +eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.connectToServer?4(host, port=None, timeout=None, clientId="") eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.connectionStateChanged?7 eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.disconnectFromServer?4() eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.getHost?4() eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.getHostName?4() eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.getServiceInterface?4(name) eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.initActions?4() -eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.initMenu?4() +eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.initMenus?4() eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.initToolbar?4(toolbarManager) eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.isServerConnected?4() eric7.RemoteServerInterface.EricServerInterface.EricServerInterface.parseHost?4(host) @@ -10091,7 +10091,7 @@ eric7.RemoteServerInterface.EricServerProfilesDialog.EricServerProfilesDialog.on_editButton_clicked?4() eric7.RemoteServerInterface.EricServerProfilesDialog.EricServerProfilesDialog.on_removeButton_clicked?4() eric7.RemoteServerInterface.EricServerProfilesDialog.EricServerProfilesDialog.on_resetButton_clicked?4() -eric7.RemoteServerInterface.EricServerProfilesDialog.EricServerProfilesDialog?1(profiles, parent=None) +eric7.RemoteServerInterface.EricServerProfilesDialog.EricServerProfilesDialog?1(connectionProfiles, parent=None) eric7.Sessions.SessionFile.SessionFile.readFile?4(filename: str) eric7.Sessions.SessionFile.SessionFile.writeFile?4(filename: str, withServer: bool = True) eric7.Sessions.SessionFile.SessionFile?1(isGlobal: bool, parent: QObject = None)
--- a/src/eric7/Documentation/Help/source.qhp Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/Documentation/Help/source.qhp Sun Nov 03 12:34:02 2024 +0100 @@ -6286,7 +6286,7 @@ <keyword name="EricServerInterface.getHostName" id="EricServerInterface.getHostName" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.getHostName" /> <keyword name="EricServerInterface.getServiceInterface" id="EricServerInterface.getServiceInterface" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.getServiceInterface" /> <keyword name="EricServerInterface.initActions" id="EricServerInterface.initActions" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.initActions" /> - <keyword name="EricServerInterface.initMenu" id="EricServerInterface.initMenu" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.initMenu" /> + <keyword name="EricServerInterface.initMenus" id="EricServerInterface.initMenus" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.initMenus" /> <keyword name="EricServerInterface.initToolbar" id="EricServerInterface.initToolbar" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.initToolbar" /> <keyword name="EricServerInterface.isServerConnected" id="EricServerInterface.isServerConnected" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.isServerConnected" /> <keyword name="EricServerInterface.parseHost" id="EricServerInterface.parseHost" ref="eric7.RemoteServerInterface.EricServerInterface.html#EricServerInterface.parseHost" />
--- a/src/eric7/Documentation/Source/eric7.RemoteServer.EricServer.html Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.RemoteServer.EricServer.html Sun Nov 03 12:34:02 2024 +0100 @@ -145,7 +145,7 @@ <a NAME="EricServer.__init__" ID="EricServer.__init__"></a> <h4>EricServer (Constructor)</h4> -<b>EricServer</b>(<i>port=42024, useIPv6=False</i>) +<b>EricServer</b>(<i>port=42024, useIPv6=False, clientId=""</i>) <p> Constructor </p> @@ -160,6 +160,11 @@ <dd> flag indicating to use IPv6 protocol (defaults to False) </dd> +<dt><i>clientId</i> (str (optional))</dt> +<dd> +ID string used to check each received message for being + sent by a valid eric IDE (defaults to "") +</dd> </dl> <a NAME="EricServer.__acceptIdeConnection" ID="EricServer.__acceptIdeConnection"></a> <h4>EricServer.__acceptIdeConnection</h4>
--- a/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerConnectionDialog.html Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerConnectionDialog.html Sun Nov 03 12:34:02 2024 +0100 @@ -116,14 +116,14 @@ <dl> <dt>Return:</dt> <dd> -tuple containing the entered host name or IP address, the port number - and the timeout (in seconds) +tuple containing the entered host name or IP address, the port number, + the timeout in seconds and the client ID string </dd> </dl> <dl> <dt>Return Type:</dt> <dd> -tuple of (str, int, int) +tuple of (str, int, int, str) </dd> </dl> <a NAME="EricServerConnectionDialog.getProfileData" ID="EricServerConnectionDialog.getProfileData"></a> @@ -137,18 +137,18 @@ <dt>Return:</dt> <dd> tuple containing the profile name, host name or IP address, - the port number and the timeout (in seconds) + the port number, the timeout in seconds and the client ID string </dd> </dl> <dl> <dt>Return Type:</dt> <dd> -tuple of (str, str, int, int) +tuple of (str, str, int, int, str) </dd> </dl> <a NAME="EricServerConnectionDialog.setProfileData" ID="EricServerConnectionDialog.setProfileData"></a> <h4>EricServerConnectionDialog.setProfileData</h4> -<b>setProfileData</b>(<i>name, hostname, port, timeout</i>) +<b>setProfileData</b>(<i>name, hostname, port, timeout, clientId=""</i>) <p> Public method to set the connection profile data to be edited. </p> @@ -171,6 +171,10 @@ <dd> timeout value in seconds </dd> +<dt><i>clientId</i> (str (optional))</dt> +<dd> +client ID string (defaults to "") +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerInterface.html Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerInterface.html Sun Nov 03 12:34:02 2024 +0100 @@ -198,8 +198,8 @@ <td>Public slot to initialize the eric-ide server actions.</td> </tr> <tr> -<td><a href="#EricServerInterface.initMenu">initMenu</a></td> -<td>Public slot to initialize the eric-ide server menu.</td> +<td><a href="#EricServerInterface.initMenus">initMenus</a></td> +<td>Public slot to initialize the eric-ide server menus.</td> </tr> <tr> <td><a href="#EricServerInterface.initToolbar">initToolbar</a></td> @@ -400,7 +400,7 @@ <a NAME="EricServerInterface.connectToServer" ID="EricServerInterface.connectToServer"></a> <h4>EricServerInterface.connectToServer</h4> -<b>connectToServer</b>(<i>host, port=None, timeout=None</i>) +<b>connectToServer</b>(<i>host, port=None, timeout=None, clientId=""</i>) <p> Public method to connect to the given host and port. </p> @@ -420,6 +420,11 @@ timeout im seconds for the connection attempt (defaults to None) </dd> +<dt><i>clientId</i> (str (optional))</dt> +<dd> +string prepended to each message for validity checking + (defaults to "") +</dd> </dl> <dl> <dt>Return:</dt> @@ -522,17 +527,17 @@ Public slot to initialize the eric-ide server actions. </p> -<a NAME="EricServerInterface.initMenu" ID="EricServerInterface.initMenu"></a> -<h4>EricServerInterface.initMenu</h4> -<b>initMenu</b>(<i></i>) +<a NAME="EricServerInterface.initMenus" ID="EricServerInterface.initMenus"></a> +<h4>EricServerInterface.initMenus</h4> +<b>initMenus</b>(<i></i>) <p> - Public slot to initialize the eric-ide server menu. + Public slot to initialize the eric-ide server menus. </p> <dl> <dt>Return:</dt> <dd> -the menu generated +reference to the main eric-ide server menu </dd> </dl> <dl>
--- a/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerProfilesDialog.html Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.RemoteServerInterface.EricServerProfilesDialog.html Sun Nov 03 12:34:02 2024 +0100 @@ -97,14 +97,14 @@ <a NAME="EricServerProfilesDialog.__init__" ID="EricServerProfilesDialog.__init__"></a> <h4>EricServerProfilesDialog (Constructor)</h4> -<b>EricServerProfilesDialog</b>(<i>profiles, parent=None</i>) +<b>EricServerProfilesDialog</b>(<i>connectionProfiles, parent=None</i>) <p> Constructor </p> <dl> -<dt><i>profiles</i> (dict)</dt> +<dt><i>connectionProfiles</i> (dict)</dt> <dd> dictionary containing the server connection profiles </dd>
--- a/src/eric7/MicroPython/Devices/__init__.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/MicroPython/Devices/__init__.py Sun Nov 03 12:34:02 2024 +0100 @@ -22,18 +22,14 @@ SupportedBoards = { "bbc_microbit": { - "ids": ( - (0x0D28, 0x0204), # micro:bit - ), + "ids": ((0x0D28, 0x0204),), # micro:bit "description": "BBC micro:bit", "icon": "microbitDevice", "port_description": "BBC micro:bit CMSIS-DAP", "module": ".MicrobitDevices", }, "calliope": { - "ids": ( - (0x0D28, 0x0204), # Calliope mini - ), + "ids": ((0x0D28, 0x0204),), # Calliope mini "description": "Calliope mini", "icon": "calliope_mini", "port_description": "DAPLink CMSIS-DAP", @@ -365,9 +361,7 @@ }, "generic": { # only manually configured devices use this - "ids": ( - (0xF055, 0x9802), # Board in FS mode - ), + "ids": ((0xF055, 0x9802),), # Board in FS mode "description": QCoreApplication.translate( "MicroPythonDevice", "Generic MicroPython Board" ), @@ -423,18 +417,14 @@ "module": ".RP2Devices", }, "stlink": { - "ids": ( - (0x0483, 0x374B), # STM32 STLink, - ), + "ids": ((0x0483, 0x374B),), # STM32 STLink, "description": "STM32 STLink", "icon": "micropython48", "port_description": "STM32 STLink", "module": ".STLinkDevices", }, "teensy": { - "ids": ( - (0xF055, 0x9802), # Pyboard in CDC+MSC mode - ), + "ids": ((0xF055, 0x9802),), # Pyboard in CDC+MSC mode "description": "Teensy", "icon": "micropython48", "port_description": "Teensy",
--- a/src/eric7/RemoteServer/EricServer.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServer/EricServer.py Sun Nov 03 12:34:02 2024 +0100 @@ -31,7 +31,7 @@ Class implementing the eric remote server. """ - def __init__(self, port=42024, useIPv6=False): + def __init__(self, port=42024, useIPv6=False, clientId=""): """ Constructor @@ -39,7 +39,14 @@ @type int (optional) @param useIPv6 flag indicating to use IPv6 protocol (defaults to False) @type bool (optional) + @param clientId ID string used to check each received message for being + sent by a valid eric IDE (defaults to "") + @type str (optional) """ + self.__clientId = clientId + self.__address = ("", port) + self.__useIPv6 = useIPv6 + self.__requestCategoryHandlerRegistry = {} # Dictionary containing the defined and registered request category # handlers. The key is the request category and the value is the respective @@ -79,9 +86,6 @@ self.__editorConfigRequestHandler.handleRequest, ) - self.__address = ("", port) - self.__useIPv6 = useIPv6 - def getSelector(self): """ Public method to get a reference to the selector object. @@ -185,6 +189,16 @@ if self.isSocketClosed(sock): return None + if self.__clientId and sock == self.__connection: + msgClientIdBytes = self.__receiveBytes(len(self.__clientId), sock) + try: + msgClientId = str(msgClientIdBytes, encoding="utf-8") + except UnicodeDecodeError: + msgClientId = str(bytes(msgClientIdBytes)) + if msgClientId != self.__clientId: + print(f"Received illegal client ID '{msgClientId}'.") # noqa: M801 + return {} + header = self.__receiveBytes(struct.calcsize(b"!II"), sock) if not header: return {} @@ -326,7 +340,7 @@ @param sock reference to the listening socket @type socket.socket """ - connection, address = sock.accept() # Should be ready to read + connection, address = sock.accept() # Should be ready to read. if self.__connection is None: print(f"'eric-ide' connection from {address[0]}, port {address[1]}") # noqa: M801
--- a/src/eric7/RemoteServerInterface/EricServerConnectionDialog.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerConnectionDialog.py Sun Nov 03 12:34:02 2024 +0100 @@ -98,9 +98,9 @@ """ Public method to get the entered data. - @return tuple containing the entered host name or IP address, the port number - and the timeout (in seconds) - @rtype tuple of (str, int, int) + @return tuple containing the entered host name or IP address, the port number, + the timeout in seconds and the client ID string + @rtype tuple of (str, int, int, str) """ port = self.portSpinBox.value() if port == self.portSpinBox.minimum(): @@ -110,15 +110,15 @@ if timeout == self.timeoutSpinBox.minimum(): timeout = None - return self.hostnameEdit.text(), port, timeout + return self.hostnameEdit.text(), port, timeout, self.clientIdEdit.text() def getProfileData(self): """ Public method to get the entered data for connection profile mode. @return tuple containing the profile name, host name or IP address, - the port number and the timeout (in seconds) - @rtype tuple of (str, str, int, int) + the port number, the timeout in seconds and the client ID string + @rtype tuple of (str, str, int, int, str) """ port = self.portSpinBox.value() if port == self.portSpinBox.minimum(): @@ -128,9 +128,15 @@ if timeout == self.timeoutSpinBox.minimum(): timeout = 0 - return self.nameEdit.text(), self.hostnameEdit.text(), port, timeout + return ( + self.nameEdit.text(), + self.hostnameEdit.text(), + port, + timeout, + self.clientIdEdit.text(), + ) - def setProfileData(self, name, hostname, port, timeout): + def setProfileData(self, name, hostname, port, timeout, clientId=""): """ Public method to set the connection profile data to be edited. @@ -142,6 +148,8 @@ @type int @param timeout timeout value in seconds @type int + @param clientId client ID string (defaults to "") + @type str (optional) """ # adjust some values if not bool(port): @@ -155,3 +163,4 @@ self.hostnameEdit.setText(hostname) self.portSpinBox.setValue(port) self.timeoutSpinBox.setValue(timeout) + self.clientIdEdit.setText(clientId)
--- a/src/eric7/RemoteServerInterface/EricServerConnectionDialog.ui Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerConnectionDialog.ui Sun Nov 03 12:34:02 2024 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>169</height> + <height>200</height> </rect> </property> <property name="windowTitle"> @@ -125,7 +125,24 @@ </property> </widget> </item> - <item row="4" column="0" colspan="3"> + <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Client ID:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QLineEdit" name="clientIdEdit"> + <property name="toolTip"> + <string>Enter the client ID string expected by the eric-ide server</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="0" colspan="3"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -142,6 +159,7 @@ <tabstop>hostnameEdit</tabstop> <tabstop>portSpinBox</tabstop> <tabstop>timeoutSpinBox</tabstop> + <tabstop>clientIdEdit</tabstop> </tabstops> <resources/> <connections>
--- a/src/eric7/RemoteServerInterface/EricServerInterface.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerInterface.py Sun Nov 03 12:34:02 2024 +0100 @@ -102,6 +102,7 @@ # no specific service interfaces have been created yet self.__connection = None + self.__clientId = b"" # prepended to each messge for validity checking self.__callbacks = {} # callback references indexed by UUID self.__messageQueue = collections.deque() self.__connected = False @@ -170,7 +171,7 @@ ## Methods for handling the server connection. ####################################################################### - def connectToServer(self, host, port=None, timeout=None): + def connectToServer(self, host, port=None, timeout=None, clientId=""): """ Public method to connect to the given host and port. @@ -181,6 +182,9 @@ @param timeout timeout im seconds for the connection attempt (defaults to None) @type int (optional) + @param clientId string prepended to each message for validity checking + (defaults to "") + @type str (optional) @return flag indicating success @rtype bool """ @@ -215,6 +219,8 @@ self.__connection = None return False + self.__clientId = clientId.encode("utf-8") + self.__connection.readyRead.connect(self.__receiveJson) self.__connection.disconnected.connect(self.__handleDisconnect) @@ -243,6 +249,8 @@ self.__connection = None self.__callbacks.clear() + self.__clientId = b"" + def isServerConnected(self): """ Public method to check, if a connection to an eric-ide server has been @@ -267,6 +275,7 @@ self.connectionStateChanged.emit(False) self.__connection = None self.__callbacks.clear() + self.__clientId = b"" def getHost(self): """ @@ -457,6 +466,8 @@ if self.__connection is not None: data = jsonString.encode("utf8", "backslashreplace") header = struct.pack(b"!II", len(data), zlib.adler32(data) & 0xFFFFFFFF) + if self.__clientId: + self.__connection.write(self.__clientId) self.__connection.write(header) self.__connection.write(data) if flush: @@ -672,11 +683,11 @@ self.stopServerAct.setEnabled(False) self.serverVersionsAct.setEnabled(False) - def initMenu(self): + def initMenus(self): """ - Public slot to initialize the eric-ide server menu. + Public slot to initialize the eric-ide server menus. - @return the menu generated + @return reference to the main eric-ide server menu @rtype QMenu """ self.__serverProfilesMenu = QMenu(self.tr("Connect to")) @@ -757,14 +768,18 @@ """ Private slot to prepare the eric server profiles menu. """ - profiles = Preferences.getEricServer("ConnectionProfiles") + serverProfiles = Preferences.getEricServer("ConnectionProfiles") self.__serverProfilesMenu.clear() if not self.isServerConnected(): - for profile in sorted(profiles): - act = self.__serverProfilesMenu.addAction(profile) - act.setData(profiles[profile]) + for serverProfile in sorted(serverProfiles): + act = self.__serverProfilesMenu.addAction(serverProfile) + data = serverProfiles[serverProfile] + if len(data) == 3: + # profile generated before eric-ide 24.12 + data.append("") + act.setData(data) self.__serverProfilesMenu.addSeparator() self.__serverProfilesMenu.addAction( @@ -818,8 +833,10 @@ dlg = EricServerConnectionDialog(parent=self.__ui) if dlg.exec() == QDialog.DialogCode.Accepted: - hostname, port, timeout = dlg.getData() - self.connectToServer(hostname, port=port, timeout=timeout) + hostname, port, timeout, clientId = dlg.getData() + self.connectToServer( + hostname, port=port, timeout=timeout, clientId=clientId + ) @pyqtSlot() def __shutdownServer(self): @@ -849,8 +866,10 @@ data = act.data() if data is not None: # handle the connection - hostname, port, timeout = data - self.connectToServer(hostname, port=port, timeout=timeout) + hostname, port, timeout, clientId = data + self.connectToServer( + hostname, port=port, timeout=timeout, clientId=clientId + ) @pyqtSlot() def __manageServerProfiles(self):
--- a/src/eric7/RemoteServerInterface/EricServerProfilesDialog.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerProfilesDialog.py Sun Nov 03 12:34:02 2024 +0100 @@ -23,11 +23,11 @@ Class implementing a dialog to manage server connection profiles. """ - def __init__(self, profiles, parent=None): + def __init__(self, connectionProfiles, parent=None): """ Constructor - @param profiles dictionary containing the server connection profiles + @param connectionProfiles dictionary containing the server connection profiles @type dict @param parent reference to the parent widget (defaults to None) @type QWidget (optional) @@ -35,7 +35,15 @@ super().__init__(parent) self.setupUi(self) - self.__profiles = copy.deepcopy(profiles) + self.__connectionProfiles = copy.deepcopy(connectionProfiles) + # adapt connection profiles generated by eric-ide < 24.12 + for ( + connectionProfile, + connectionProfileData, + ) in self.__connectionProfiles.items(): + if len(connectionProfileData) < 4: + self.__connectionProfiles[connectionProfile].append("") + self.__populateProfilesList() self.on_connectionsList_itemSelectionChanged() @@ -46,9 +54,11 @@ """ self.connectionsList.clear() - for profile in self.__profiles: - itm = QListWidgetItem(profile, self.connectionsList) - itm.setData(Qt.ItemDataRole.UserRole, self.__profiles[profile]) + for connectionProfile in self.__connectionProfiles: + itm = QListWidgetItem(connectionProfile, self.connectionsList) + itm.setData( + Qt.ItemDataRole.UserRole, self.__connectionProfiles[connectionProfile] + ) def __getProfilesList(self): """ @@ -145,6 +155,10 @@ for row in range(self.connectionsList.count()): itm = self.connectionsList.item(row) - profiles[itm.text()] = itm.data(Qt.ItemDataRole.UserRole) + profileData = itm.data(Qt.ItemDataRole.UserRole) + if not profileData[3]: + # make it backward compatible (eric-ide < 24.12) + profileData = profileData[:3] + profiles[itm.text()] = profileData return profiles
--- a/src/eric7/RemoteServerInterface/Ui_EricServerConnectionDialog.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/Ui_EricServerConnectionDialog.py Sun Nov 03 12:34:02 2024 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/RemoteServerInterface/EricServerConnectionDialog.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.7.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -12,7 +12,7 @@ class Ui_EricServerConnectionDialog(object): def setupUi(self, EricServerConnectionDialog): EricServerConnectionDialog.setObjectName("EricServerConnectionDialog") - EricServerConnectionDialog.resize(400, 169) + EricServerConnectionDialog.resize(400, 200) EricServerConnectionDialog.setSizeGripEnabled(True) self.gridLayout = QtWidgets.QGridLayout(EricServerConnectionDialog) self.gridLayout.setObjectName("gridLayout") @@ -53,11 +53,18 @@ self.timeoutSpinBox.setMaximum(60) self.timeoutSpinBox.setObjectName("timeoutSpinBox") self.gridLayout.addWidget(self.timeoutSpinBox, 3, 1, 1, 1) + self.label_4 = QtWidgets.QLabel(parent=EricServerConnectionDialog) + self.label_4.setObjectName("label_4") + self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1) + self.clientIdEdit = QtWidgets.QLineEdit(parent=EricServerConnectionDialog) + self.clientIdEdit.setClearButtonEnabled(True) + self.clientIdEdit.setObjectName("clientIdEdit") + self.gridLayout.addWidget(self.clientIdEdit, 4, 1, 1, 2) self.buttonBox = QtWidgets.QDialogButtonBox(parent=EricServerConnectionDialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) self.buttonBox.setObjectName("buttonBox") - self.gridLayout.addWidget(self.buttonBox, 4, 0, 1, 3) + self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 3) self.retranslateUi(EricServerConnectionDialog) self.buttonBox.accepted.connect(EricServerConnectionDialog.accept) # type: ignore @@ -66,6 +73,7 @@ EricServerConnectionDialog.setTabOrder(self.nameEdit, self.hostnameEdit) EricServerConnectionDialog.setTabOrder(self.hostnameEdit, self.portSpinBox) EricServerConnectionDialog.setTabOrder(self.portSpinBox, self.timeoutSpinBox) + EricServerConnectionDialog.setTabOrder(self.timeoutSpinBox, self.clientIdEdit) def retranslateUi(self, EricServerConnectionDialog): _translate = QtCore.QCoreApplication.translate @@ -80,3 +88,5 @@ self.label_3.setText(_translate("EricServerConnectionDialog", "Timeout:")) self.timeoutSpinBox.setSpecialValueText(_translate("EricServerConnectionDialog", "default")) self.timeoutSpinBox.setSuffix(_translate("EricServerConnectionDialog", " s")) + self.label_4.setText(_translate("EricServerConnectionDialog", "Client ID:")) + self.clientIdEdit.setToolTip(_translate("EricServerConnectionDialog", "Enter the client ID string expected by the eric-ide server"))
--- a/src/eric7/UI/UserInterface.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/UI/UserInterface.py Sun Nov 03 12:34:02 2024 +0100 @@ -3855,7 +3855,7 @@ ## Remote Server menu ############################################################## - self.__menus["server"] = self.__ericServerInterface.initMenu() + self.__menus["server"] = self.__ericServerInterface.initMenus() ############################################################## ## Sessions menu
--- a/src/eric7/eric7_server.py Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/eric7_server.py Sun Nov 03 12:34:02 2024 +0100 @@ -62,6 +62,13 @@ version="%(prog)s {0}".format(Version), help="Show version information and exit.", ) + parser.add_argument( + "client_id", + nargs="?", + default="", + help="ID string to check, if received messages have been sent by a" + " valid eric IDE (default empty)", + ) return parser @@ -73,7 +80,14 @@ parser = createArgumentParser() args = parser.parse_args() - server = EricServer(port=args.port, useIPv6=args.with_ipv6) + if not args.client_id: + print( + "You should consider to add a client ID string in order to allow\n" + "the eric-ide server to check, if received messages have been sent\n" + "by a valid eric IDE.\n" + ) + + server = EricServer(port=args.port, useIPv6=args.with_ipv6, clientId=args.client_id) ok = server.run() sys.exit(0 if ok else 1)
--- a/src/eric7/i18n/eric7_cs.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_cs.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19683,6 +19683,16 @@ <source> s</source> <translation type="unfinished" /> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19930,43 +19940,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19975,7 +19985,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19984,129 +19994,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">Připojeno</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">Spojuji...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">Odpojeno</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">Zastavit server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20206,22 +20216,22 @@ <translation type="unfinished">Reset</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52516,18 +52526,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_de.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_de.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19675,6 +19675,16 @@ <source> s</source> <translation> s</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0"/> + <source>Client ID:</source> + <translation>Client ID:</translation> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0"/> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation>Gib die vom eric-ide-Server erwartete Client-ID-Zeichenkette ein</translation> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19922,43 +19932,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208"/> <source>Connect to eric-ide Server</source> <translation>Verbindungsaufbau zu eric-ide Server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209"/> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation><p>Die Verbindung zum eric-ide Server {0}:{1} konnte nicht aufgebaut werden.</p><p>Ursache: {2}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387"/> <source>JSON Protocol Error</source> <translation>JSON Protokollfehler</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388"/> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>Die vom eric-ide Server empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.</p><p>Fehler: {0}</p><p>Daten:<br/>{1}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521"/> <source>{0}Version Numbers</source> <translation>{0}Versionsnummern</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522"/> <source>{0} - </source> <translation>{0} - </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547"/> <source>eric-ide Server Versions</source> <translation>eric-ide Server Versionen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566"/> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19971,7 +19981,7 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573"/> <source>eric-ide Server Data Error Error: {0} Data: @@ -19984,130 +19994,130 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580"/> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation>eric-ide Server Nicht unterstützte Kategorie Fehler: Der server empfing die nicht unterstützte Kategorie '{0}'.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597"/> <source>Connect</source> <translation>Verbinden</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599"/> <source>Connect...</source> <translation>Verbinden...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600"/> <source>Meta+Shift+C</source> <translation>Meta+Shift+C</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606"/> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation>Zeigt einen Dialog zum Verbinden mit einem 'eric-ide' Server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609"/> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation><b>Verbinden...</b><p>Dies öffnet einen Dialog zur Eingabe der Parameter zur Verbindung mit einem entfernten 'eric-ide' Server.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619"/> <source>Disconnect</source> <translation>Trennen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622"/> <source>Meta+Shift+D</source> <translation>Meta+Shift+D</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628"/> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation>Die aktuelle Verbindung zum 'eric-ide' Server trennen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631"/> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation><b>Trennen</b><p>Dies trennt die aktuelle Verbindung zum 'eric-ide' Server.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641"/> <source>Stop Server</source> <translation>Server stoppen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644"/> <source>Meta+Shift+S</source> <translation>Meta+Shift+S</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650"/> <source>Stop the currently connected 'eric-ide' server</source> <translation>Stoppt den aktuell verbundenen 'eric-ide' Server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642"/> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation><b>Server stoppen</b><p>Dies stoppt den aktuell verbundenen 'eric-ide' Server.</p></translation> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651"/> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation><b>Server stoppen</b><p>Dies stoppt den aktuell verbundenen 'eric-ide' Server.</p></translation> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662"/> <source>Show Server Versions</source> <translation>Zeige Server Versionen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671"/> <source>Show the eric-ide server versions</source> <translation>Zeigt die eric-ide Server Versionen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674"/> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation><b>Zeige Server Versionen</b><p>Dies öffnet einen Dialog zur Anzeige der Versionen des eric-ide Servers.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693"/> <source>Connect to</source> <translation>Verbinden zu</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725"/> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697"/> <source>eric-ide Server</source> <translation>eric-ide Server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786"/> <source>Manage Server Connections</source> <translation>Serververbindungen verwalten</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812"/> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation><p>Der eric-ide Server <b>{0}:{1}</b> wurde erfolgreich verbunden.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823"/> <source>Disconnect from eric-ide Server</source> <translation>Verbindung zum eric-ide Server trennen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824"/> <source>The eric-ide server was disconnected.</source> <translation>Die Verbindung zum eric-ide Server wurde getrennt.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832"/> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849"/> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation><p>Soll der aktuell verbundene eric-ide Server <b>{0}</b> wirkl gestoppt werden? Es sind keine weiteren Verbindungen bis zu einem Neustart des Servers möglich.</p></translation> </message> @@ -20203,22 +20213,22 @@ <translation>Zurücksetzen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114"/> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124"/> <source>Remove Selected Entries</source> <translation>Gewählte Einträge entfernen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115"/> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125"/> <source>Do you really want to remove the selected entries from the list?</source> <translation>Sollen die ausgewählten Einträge wirklich aus dieser Liste entfernt werden?</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129"/> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139"/> <source>Reset Changes</source> <translation>Änderungen zurücksetzen</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130"/> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140"/> <source>Do you really want to reset all changes performed up to this point?</source> <translation>Sollen wirklich alle bisher durchgeführten Änderungen verworfen werden?</translation> </message> @@ -52593,18 +52603,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369"/> + <location filename="../MicroPython/Devices/__init__.py" line="365"/> <source>Generic MicroPython Board</source> <translation>Generisches MicroPython Board</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416"/> + <location filename="../MicroPython/Devices/__init__.py" line="412"/> <source>RP2040/RP2350 based</source> <translation>RP2040/RP2350 basiert</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579"/> - <location filename="../MicroPython/Devices/__init__.py" line="568"/> + <location filename="../MicroPython/Devices/__init__.py" line="571"/> + <location filename="../MicroPython/Devices/__init__.py" line="560"/> <source>Unknown Device</source> <translation>Unbekanntes Gerät</translation> </message>
--- a/src/eric7/i18n/eric7_empty.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_empty.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19568,6 +19568,16 @@ <source> s</source> <translation type="unfinished" /> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19815,43 +19825,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19860,7 +19870,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19869,129 +19879,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20087,22 +20097,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52344,18 +52354,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_en.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_en.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19584,6 +19584,16 @@ <source> s</source> <translation type="unfinished" /> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19831,43 +19841,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19876,7 +19886,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19885,129 +19895,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20103,22 +20113,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52387,18 +52397,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_es.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_es.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19681,6 +19681,16 @@ <source> s</source> <translation> s</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19928,43 +19938,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation>Conectar al Servidor de eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation><p>La conexión al servidor de eric-ide {0}:{1} no se ha podido establecer.</p><p>Razón: {2}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation>Error de Protocolo JSON</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>La respuesta recibida desde el servidor remoto no se ha podido decodificar. Por favor, informar de este problema junto con los datos recibidos en la dirección de email de errores de eric.</p><p>Error: {0}</p><p>Datos:<br/>{1}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation>{0}Números de Versión</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation>{0} - </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation>Versiones de Servidor de eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19977,7 +19987,7 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19990,130 +20000,130 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation>Categoria no Soportada de Servidor de eric-ide Error: El servidor ha recibido una categoría de solicitud no soportada '{0}'.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation>Conectar</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation>Conectar...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation>Meta+Shift+C</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation>Mostrar un diálogo de conexión a un servidor de 'eric-ide'</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation><b>Conectar...</b><p>Esto abre un diálogo para introducir parámetros de conexión a un servidor remoto de 'eric-ide'.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation>Desconectar</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation>Meta+Shift+D</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation>Desconectar del servidor de 'eric-ide' actualmente conectado</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation><b>Desconectar</b><p>Esto desconecta del servidor de 'eric-ide' actualmente conectado.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation>Detener servidor</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation>Meta+Shift+S</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation>Detener el servidor de 'eric-ide' actualmente conectado</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation><b>Detener</b><p>Esto detiene el servidor de 'eric-ide' actualmente conectado.</p></translation> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation><b>Detener</b><p>Esto detiene el servidor de 'eric-ide' actualmente conectado.</p></translation> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation>Mostrar Versiones del Servidor</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation>Mostrar las versiones de Servidor de eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation><b>Mostrar Versiones de Servidor</b><p>Esto abre un diálogo para mostrar las versiones de servidor de eric-ide.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation>Conectar a</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation>Servidor de eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation>Gestionar Conexiones de Servidor</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation><p>El servidor de ide server en <b>{0}:{1}</b> se ha conectado con éxito.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation>Desconectar del Servidor de eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation>El servidor de eric-ide se ha desconectado.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation><p>¿Desea realmente detener le servidor de eric-ide actualmente conectado<b>{0}</b>? No serán posibles más conexiones sin reiniciar el servidor.</p></translation> </message> @@ -20209,22 +20219,22 @@ <translation>Restablecer</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation>Eliminar Entradas Seleccionadas</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation>¿Realmente desea eliminar las entradas seleccionadas de la lista?</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation>Restablecer Cambios</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation>¿Realmente desea restablecer todos los cambios llevados a cabo hasta el momento?</translation> </message> @@ -52597,18 +52607,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation>Placa Genérica MicroPython</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation>Basada en RP2040/RP2350</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation>Dispositivo Desconocido</translation> </message>
--- a/src/eric7/i18n/eric7_fr.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19712,6 +19712,16 @@ <source> s</source> <translation type="unfinished"> s</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19959,43 +19969,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -20004,7 +20014,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -20013,129 +20023,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">Brancher</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">Connection...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">Couper</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">Arrêter serveur</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20235,22 +20245,22 @@ <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52563,18 +52573,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_it.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_it.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19703,6 +19703,16 @@ <source> s</source> <translation type="unfinished"> s</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19950,43 +19960,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19995,7 +20005,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -20004,129 +20014,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">Connetti</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">Connetti...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">Disconnetti</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">Ferma Server</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20226,22 +20236,22 @@ <translation type="unfinished">Resetta</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52544,18 +52554,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_pt.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_pt.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19707,6 +19707,16 @@ <source> s</source> <translation type="unfinished"> s</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19954,43 +19964,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19999,7 +20009,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -20008,129 +20018,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">Conetar</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">Conetar...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">Desconetar</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">Parar Servidor</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20226,22 +20236,22 @@ <translation type="unfinished">Reinicializar</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52550,18 +52560,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_ru.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_ru.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19718,6 +19718,16 @@ <source> s</source> <translation> сек</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19965,43 +19975,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation>Соединение с сервером eric-idle</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation><p>Не удалось установить соединение с сервером eric-ide {0}:{1}.</p><p>Причина: {2}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation>Ошибка протокола JSON</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>Не удалось расшифровать ответ, полученный от удаленного сервера. Пожалуйста, сообщите об этой проблеме с полученными данными на адрес электронной почты eric bugs.</p><p>Ошибка: {0}</p><p>Данные:<br/>{1}</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation>{0}Номера версий</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation>{0} - </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation>Версии сервера eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -20014,7 +20024,7 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -20027,130 +20037,130 @@ </translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation>Неподдерживаемая категория серверов eric-ide Ошибка: сервер получил неподдерживаемую категорию запроса '{0}'.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation>Соединиться</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation>Установить соединение...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation>Meta+Shift+C</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation>Отображение диалогового окна соединения с сервером eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation><b>Соединение...</b><p>Отображение диалогового окна ввода параметров подключения к удаленному серверу eric-ide.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation>Разорвать соединение</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation>Meta+Shift+D</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation>Разорвать соединение с текущим сервером eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation><b>Разорвать соединение</b><p>Разорвать соединение с текущим сервером eric-ide.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation>Остановить сервер</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation>Meta+Shift+S</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation>Остановить подключенный в данный момент сервер 'eric-ide'</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation><b>Остановить сервер</b><p>Будет остановлен подключенный в данный момент сервер 'eric-ide'.</p></translation> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation><b>Остановить сервер</b><p>Будет остановлен подключенный в данный момент сервер 'eric-ide'.</p></translation> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation>Показать версии сервера</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation>Показать версии сервера eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation><b>Показать версии сервера</b><p>Открытие диалогового окна отображения версий сервера eric-ide.< / p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation>Установить соединение с</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation>Сервер eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation>Управление соединениями с сервером</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation><p>Сервер eric-ide по адресу <b>{0}:{1}</b> был успешно подключен.</p></translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation>Отключиться от сервера eric-ide</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation>Соединение с сервером eric-ide было разорвано.</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation><p>Вы действительно хотите остановить подключенный в данный момент сервер eric-ide <b>{0}</b>? Дальнейшие подключения будут невозможны без перезапуска сервера.</p></translation> </message> @@ -20246,22 +20256,22 @@ <translation>Сброс</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation>Удалить выбранные записи</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation>Вы действительно хотите удалить выбранные записи из списка?</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation>Сбросить изменения</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation>Вы действительно хотите отменить все изменения, внесенные до этого момента?</translation> </message> @@ -52665,18 +52675,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation>Универсальная плата MicroPython</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation>на базе RP2040/RP2350</translation> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation>Неизвестное устройство</translation> </message>
--- a/src/eric7/i18n/eric7_tr.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_tr.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19674,6 +19674,16 @@ <source> s</source> <translation type="unfinished" /> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19921,43 +19931,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19966,7 +19976,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19975,129 +19985,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">Bağlantı</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">Bağlanıyor...</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">Bağlantı kesildi</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">Sunucuyu durdur</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20197,22 +20207,22 @@ <translation type="unfinished">Başadön</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52497,18 +52507,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_zh_CN.ts Sat Nov 02 19:28:14 2024 +0100 +++ b/src/eric7/i18n/eric7_zh_CN.ts Sun Nov 03 12:34:02 2024 +0100 @@ -19684,6 +19684,16 @@ <source> s</source> <translation type="unfinished"> 秒</translation> </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Client ID:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerConnectionDialog.ui" line="0" /> + <source>Enter the client ID string expected by the eric-ide server</source> + <translation type="unfinished" /> + </message> </context> <context> <name>EricServerDebuggerInterface</name> @@ -19931,43 +19941,43 @@ <context> <name>EricServerInterface</name> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="796" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="204" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="811" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="208" /> <source>Connect to eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="205" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="209" /> <source><p>The connection to the eric-ide server {0}:{1} could not be established.</p><p>Reason: {2}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="378" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="387" /> <source>JSON Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="379" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="388" /> <source><p>The response received from the remote server could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="510" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="521" /> <source>{0}Version Numbers</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="511" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="522" /> <source>{0} - </source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="536" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="547" /> <source>eric-ide Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="555" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="566" /> <source>eric-ide Server Checksum Error Error: {0} Data: @@ -19976,7 +19986,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="562" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="573" /> <source>eric-ide Server Data Error Error: {0} Data: @@ -19985,129 +19995,129 @@ <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="569" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="580" /> <source>eric-ide Server Unsupported Category Error: The server received the unsupported request category '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="586" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="597" /> <source>Connect</source> <translation type="unfinished">连接</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="588" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="599" /> <source>Connect...</source> <translation type="unfinished">连接…</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="589" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="600" /> <source>Meta+Shift+C</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="595" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="606" /> <source>Show a dialog to connect to an 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="598" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="609" /> <source><b>Connect...</b><p>This opens a dialog to enter the connection parameters to connect to a remote 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="610" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="608" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="621" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="619" /> <source>Disconnect</source> <translation type="unfinished">断开连接</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="611" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="622" /> <source>Meta+Shift+D</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="617" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="628" /> <source>Disconnect from the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="620" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="631" /> <source><b>Disconnect</b><p>This disconnects from the currently connected 'eric-ide' server.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="831" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="632" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="630" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="848" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="643" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="641" /> <source>Stop Server</source> <translation type="unfinished">停止服务器</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="633" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="644" /> <source>Meta+Shift+S</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="639" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="650" /> <source>Stop the currently connected 'eric-ide' server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="642" /> - <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../RemoteServerInterface/EricServerInterface.py" line="653" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="651" /> + <source><b>Stop Server</b><p>This stops the currently connected 'eric-ide server.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="664" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="662" /> <source>Show Server Versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="660" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="671" /> <source>Show the eric-ide server versions</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="663" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="674" /> <source><b>Show Server Versions</b><p>This opens a dialog to show the eric-ide server versions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="682" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="693" /> <source>Connect to</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="727" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="725" /> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="686" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="738" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="736" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="697" /> <source>eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="771" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="786" /> <source>Manage Server Connections</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="797" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="812" /> <source><p>The eric-ide server at <b>{0}:{1}</b> was connected successfully.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="808" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="823" /> <source>Disconnect from eric-ide Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="809" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="824" /> <source>The eric-ide server was disconnected.</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerInterface.py" line="832" /> + <location filename="../RemoteServerInterface/EricServerInterface.py" line="849" /> <source><p>Do you really want to stop the currently connected eric-ide server <b>{0}</b>? No further connections will be possible without restarting the server.</p></source> <translation type="unfinished" /> </message> @@ -20207,22 +20217,22 @@ <translation type="unfinished">重置</translation> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="114" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="124" /> <source>Remove Selected Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="115" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="125" /> <source>Do you really want to remove the selected entries from the list?</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="129" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="139" /> <source>Reset Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="130" /> + <location filename="../RemoteServerInterface/EricServerProfilesDialog.py" line="140" /> <source>Do you really want to reset all changes performed up to this point?</source> <translation type="unfinished" /> </message> @@ -52491,18 +52501,18 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/Devices/__init__.py" line="369" /> + <location filename="../MicroPython/Devices/__init__.py" line="365" /> <source>Generic MicroPython Board</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="416" /> + <location filename="../MicroPython/Devices/__init__.py" line="412" /> <source>RP2040/RP2350 based</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/__init__.py" line="579" /> - <location filename="../MicroPython/Devices/__init__.py" line="568" /> + <location filename="../MicroPython/Devices/__init__.py" line="571" /> + <location filename="../MicroPython/Devices/__init__.py" line="560" /> <source>Unknown Device</source> <translation type="unfinished" /> </message>