Sat, 06 May 2023 16:22:17 +0200
Merged with branch 'eric7' to get all the latest updates.
--- a/src/eric7/MicroPython/Devices/DeviceBase.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/Devices/DeviceBase.py Sat May 06 16:22:17 2023 +0200 @@ -1088,6 +1088,12 @@ except ImportError: pass + try: + import time + res['epoch_year'] = time.gmtime(0)[0] + except AttributeError: + res['epoch_year'] = 2000 + return res print(get_device_data())
--- a/src/eric7/MicroPython/Devices/EspDevices.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/Devices/EspDevices.py Sat May 06 16:22:17 2023 +0200 @@ -1180,7 +1180,6 @@ 'mac': ubinascii.hexlify(ble.config('mac')[1], ':').decode(), 'addr_type': ble.config('mac')[0], 'name': ble.config('gap_name'), - 'rxbuf': ble.config('rxbuf'), 'mtu': ble.config('mtu'), } @@ -1207,9 +1206,6 @@ self.tr("Public") if bleStatus == 0 else self.tr("Random"), ) ) - status.append( - (self.tr("Rx-Buffer"), self.tr("{0} Bytes").format(bleStatus["rxbuf"])) - ) status.append((self.tr("MTU"), self.tr("{0} Bytes").format(bleStatus["mtu"]))) return status
--- a/src/eric7/MicroPython/MicroPythonFileManager.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/MicroPythonFileManager.py Sat May 06 16:22:17 2023 +0200 @@ -108,14 +108,16 @@ """ try: filesList = self.__device.lls(dirname, showHidden=showHidden) + adjustEpoch = ( + not self.__device.hasCircuitPython() + and self.__device.getDeviceData(key="epoch_year") == 2000 + ) result = [ ( decoratedName(name, mode), mode2string(mode), str(size), - mtime2string( - mtime, adjustEpoch=not self.__device.hasCircuitPython() - ), + mtime2string(mtime, adjustEpoch=adjustEpoch), ) for name, (mode, size, mtime) in filesList ]
--- a/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py Sat May 06 16:22:17 2023 +0200 @@ -199,17 +199,19 @@ return (b"", b"Could not switch to paste mode. Is the device switched on?") # send commands - commandBytes = commands.encode("utf-8") - self.__socket.writeTextMessage(commandBytes) - ok = self.__socket.readUntil(commandBytes) - if ok != commandBytes: - self.__blockReadyRead = False - return ( - b"", - "Expected '{0}', got '{1}', followed by '{2}'".format( - commandBytes, ok, self.__socket.readAll() - ).encode("utf-8"), - ) + for command in commands.splitlines(keepends=True): + # send the data as single lines + commandBytes = command.encode("utf-8") + self.__socket.writeTextMessage(commandBytes) + ok = self.__socket.readUntil(commandBytes) + if ok != commandBytes: + self.__blockReadyRead = False + return ( + b"", + "Expected '{0}', got '{1}', followed by '{2}'".format( + commandBytes, ok, self.__socket.readAll() + ).encode("utf-8"), + ) # switch off paste mode causing the commands to be executed self.__pasteOff()
--- a/src/eric7/MicroPython/MicroPythonWebreplUrlAddEditDialog.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/MicroPythonWebreplUrlAddEditDialog.py Sat May 06 16:22:17 2023 +0200 @@ -75,7 +75,7 @@ self.portEdit.setText(port) self.passwordEdit.setText(password) - typeIndex = self.deviceTypeComboBox.findData(params["device_type"]) + typeIndex = self.deviceTypeComboBox.findData(params[3]) self.deviceTypeComboBox.setCurrentIndex(typeIndex) @pyqtSlot()
--- a/src/eric7/MicroPython/MicroPythonWebreplUrlsConfigDialog.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/MicroPython/MicroPythonWebreplUrlsConfigDialog.py Sat May 06 16:22:17 2023 +0200 @@ -109,7 +109,12 @@ itm = self.webreplUrlsList.selectedItems()[0] dlg = MicroPythonWebreplUrlAddEditDialog( self.__definedNames(), - connectionParams=(itm.text(0), itm.text(1), itm.text(2)), + connectionParams=( + itm.text(0), + itm.text(1), + itm.text(2), + itm.data(0, Qt.ItemDataRole.UserRole), + ), parent=self, ) if dlg.exec() == QDialog.DialogCode.Accepted:
--- a/src/eric7/Testing/TestResultsTree.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/Testing/TestResultsTree.py Sat May 06 16:22:17 2023 +0200 @@ -84,6 +84,7 @@ } self.__testResults = [] + self.__testResultsById = {} def index(self, row, column, parent=QModelIndex()): """ @@ -250,6 +251,7 @@ """ self.beginResetModel() self.__testResults.clear() + self.__testResultsById.clear() self.endResetModel() self.summary.emit("") @@ -307,6 +309,9 @@ """ self.beginResetModel() self.__testResults = copy.deepcopy(testResults) + self.__testResultsById.clear() + for testResult in testResults: + self.__testResultsById[testResult.id] = testResult self.endResetModel() self.summary.emit(self.__summary()) @@ -323,6 +328,8 @@ lastRow = firstRow + len(testResults) - 1 self.beginInsertRows(QModelIndex(), firstRow, lastRow) self.__testResults.extend(testResults) + for testResult in testResults: + self.__testResultsById[testResult.id] = testResult self.endInsertRows() self.summary.emit(self.__summary()) @@ -340,17 +347,18 @@ testResultsToBeAdded = [] for testResult in testResults: - for index, currentResult in enumerate(self.__testResults): - if currentResult.id == testResult.id: - self.__testResults[index] = testResult - if minIndex is None: - minIndex = index - maxIndex = index - else: - minIndex = min(minIndex, index) - maxIndex = max(maxIndex, index) + if testResult.id in self.__testResultsById: + result = self.__testResultsById[testResult.id] + index = self.__testResults.index(result) + self.__testResults[index] = testResult + self.__testResultsById[testResult.id] = testResult + if minIndex is None: + minIndex = index + maxIndex = index + else: + minIndex = min(minIndex, index) + maxIndex = max(maxIndex, index) - break else: # Test result with given id was not found. # Just add it to the list (could be a sub test) @@ -474,7 +482,6 @@ """ super().rowsInserted(parent, startRow, endRow) - self.resizeColumns() self.spanFirstColumn(startRow, endRow) def dataChanged(self, topLeft, bottomRight, roles=[]): @@ -490,7 +497,6 @@ """ super().dataChanged(topLeft, bottomRight, roles) - self.resizeColumns() while topLeft.parent().isValid(): topLeft = topLeft.parent() while bottomRight.parent().isValid():
--- a/src/eric7/Testing/TestingWidget.py Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/Testing/TestingWidget.py Sat May 06 16:22:17 2023 +0200 @@ -549,7 +549,7 @@ @pyqtSlot() def __updateProgress(self): """ - Private slot update the progress indicators. + Private slot to update the progress indicators. """ self.progressCounterRunCount.setText(str(self.__runCount)) self.progressCounterRemCount.setText(str(self.__totalCount - self.__runCount)) @@ -596,6 +596,8 @@ self.progressGroupBox.hide() + self.__resultsTree.resizeColumns() + self.__updateButtonBoxButtons() self.testRunStopped.emit() @@ -931,6 +933,7 @@ for id, name, desc in testNames ] self.__resultsModel.addTestResults(testResults) + self.__resultsTree.resizeColumns() self.__totalCount += len(testResults) self.__updateProgress() @@ -969,6 +972,7 @@ if testResults: self.__resultsModel.addTestResults(testResults) + self.__resultsTree.resizeColumns() @pyqtSlot(tuple) def __testStarted(self, test):
--- a/src/eric7/i18n/eric7_cs.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_cs.ts Sat May 06 16:22:17 2023 +0200 @@ -1840,27 +1840,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">Ano</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">Ne</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">ano</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">ne</translation> </message> @@ -20607,8 +20607,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20619,7 +20619,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20670,8 +20670,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20742,63 +20742,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">Aktivní</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">Jméno</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">Jméno</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50029,50 +50023,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -51074,22 +51068,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_de.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_de.ts Sat May 06 16:22:17 2023 +0200 @@ -1783,27 +1783,27 @@ <translation>Es wurde ein Fehler ohne nähere Angaben entdeckt.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation>Befehl wird nicht unterstützt.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation>Ja</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation>Nein</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation>ja</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation>nein</translation> </message> @@ -20533,8 +20533,8 @@ <translation>Zeige MicroPython Versionen</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation>Flash löschen</translation> @@ -20545,7 +20545,7 @@ <translation>MicroPython Firmware flashen</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation>Zusätzliche Firmware flashen</translation> @@ -20596,8 +20596,8 @@ <translation>Ausgabe von 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation>Ausgabe von 'esptool write_flash'</translation> @@ -20668,63 +20668,57 @@ <translation>unbekannt ({0})</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation>Aktiv</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation>Name</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation>Name</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation>MAC-Addresse</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation>Adresstyp</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation>Öffentlich</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation>Adresstyp</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation>Öffentlich</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation>Zufällig</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation>Empfangspuffer</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation>{0} Bytes</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation>MTU</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation>{0} Bytes</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation>Soll der Flashspeicher des ausgewählten Gerätes wirklich gelöscht werden?</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation>Ausgabe von 'esptool erase_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation>µPy/CPy Firmware flashen</translation> </message> @@ -49909,50 +49903,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation>Der angegebene Name '{0}' ist kein Verzeichnis oder existiert nicht.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation>{1}Synchronisiere <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation>{1}Synchronisierung von <b>{0}</b> ist abgeschlossen.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation>{1}Füge <b>{0}</b> hinzu...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation>Die Quelle <b>{0}</b> ist ein Verzeichnis und das Ziel <b>{1}</b> ist eine Datei. Ignoriere sie.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation>Die Quelle <b>{0}</b> ist eine Datei und das Ziel <b>{1}</b> ist ein Verzeichnis. Ignoriere sie.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation>Aktualisiere <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation>{1}Entferne <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation>{1}Aktualisiere <b>{0}</b>...</translation> </message> @@ -50954,22 +50948,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation>Ausgewählte WebREPL URLs löschen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation>Sollen die ausgewählten WebREPL URLs wirklich gelöscht werden?</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation>Alle WebREPL URLs löschen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation>Sollen wirklich alle WebREPL URLs gelöscht werden?</translation> </message>
--- a/src/eric7/i18n/eric7_empty.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_empty.ts Sat May 06 16:22:17 2023 +0200 @@ -1766,27 +1766,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished" /> </message> @@ -20412,8 +20412,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20424,7 +20424,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20475,8 +20475,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20547,63 +20547,57 @@ <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> + <source>Active</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> - <source>Active</source> + <source>Name</source> <translation type="unfinished" /> </message> <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -49671,50 +49665,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -50716,22 +50710,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_en.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_en.ts Sat May 06 16:22:17 2023 +0200 @@ -1766,27 +1766,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished" /> </message> @@ -20428,8 +20428,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20440,7 +20440,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20491,8 +20491,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20563,63 +20563,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation>Name</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation>Name</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -49713,50 +49707,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -50758,22 +50752,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_es.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_es.ts Sat May 06 16:22:17 2023 +0200 @@ -1780,27 +1780,27 @@ <translation>Detectado un error sin indicaciones.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation>Operación no soportada.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation>Si</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation>No</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation>si</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation>no</translation> </message> @@ -20538,8 +20538,8 @@ <translation>Mostrar Versiones de MicroPython</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation>Borrar Flash</translation> @@ -20550,7 +20550,7 @@ <translation>Flash MicroPython Firmware</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation>Flash Additional Firmware</translation> @@ -20601,8 +20601,8 @@ <translation>Salida de 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation>Salida de 'esptool write_flash'</translation> @@ -20673,66 +20673,64 @@ <translation>desconocido ({0})</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation>Activo</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation>Nombre</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation>Dirección MAC</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation>Tipo de Dirección</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation>Pública</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation>Tipo de Dirección</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation>Pública</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation>Aleatoria</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation>Rx-Buffer</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation>{0} Bytes</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation>MTU</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation>{0} Bytes</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation>¿Borrar el flash del dispositivo seleccionado?</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation>Salida de 'esptool erase_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation>Flash Firmware µPy/CPy</translation> </message> + <message> + <source>Rx-Buffer</source> + <translation type="vanished">Rx-Buffer</translation> + </message> </context> <context> <name>EspFirmwareSelectionDialog</name> @@ -49913,50 +49911,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation>El nombre proporcionado '{0}' no es un directorio o no existe.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation>{1}Sincronizando <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation>{1}Sincronización terminada <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation>{1}Añadiendo <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation>El origen <b>{0}</b> es un directorio y el destino <b>{1}</b> es un archivo. Ignorado.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation>El origen <b>{0}</b> es un archivo y el destino <b>{1}</b> es un directorio. Ignorado.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation>Actualizando <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation>{1}Eliminando <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation>{1}Actualizando <b>{0}</b>...</translation> </message> @@ -50966,22 +50964,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_fr.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_fr.ts Sat May 06 16:22:17 2023 +0200 @@ -1871,27 +1871,27 @@ <translation type="unfinished">Supprimer une erreur sans indications.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">Oui</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">Non</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">oui</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">non</translation> </message> @@ -20695,8 +20695,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20707,7 +20707,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20758,8 +20758,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20830,63 +20830,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">Actif</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">Nom</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">Nom</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50223,50 +50217,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation>Le nom fourni '{0}' n'est pas un répertoire ou n'existe pas.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation>{1}Synchronisation en cours <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation>{1}Synchronisation terminée <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation>{1}Ajout en cours <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation>La source <b>{0}</b> est un répertoire et la destination <b>{1}</b> est un fichier. Passer.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation>La source <b>{0}</b> est un fichier et la destination <b>{1}</b> est un répertoire. Passer.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation>Mise à jour en cours <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation>{1}Suppression en cours <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation>{1}Mise à jour en cours <b>{0}</b>...</translation> </message> @@ -51268,22 +51262,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_it.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_it.ts Sat May 06 16:22:17 2023 +0200 @@ -1844,27 +1844,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">Si</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">No</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">si</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">no</translation> </message> @@ -20665,8 +20665,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20677,7 +20677,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20728,8 +20728,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20800,63 +20800,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">Attivo</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">Nome</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50150,50 +50144,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -51195,22 +51189,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_pt.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_pt.ts Sat May 06 16:22:17 2023 +0200 @@ -1854,27 +1854,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">Sim</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">Não</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">sim</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">não</translation> </message> @@ -20683,8 +20683,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20695,7 +20695,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20746,8 +20746,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20818,63 +20818,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">Ativo</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">Nome</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">Nome</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Public</source> <translation type="unfinished">Público</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>MTU</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>{0} Bytes</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <source>MTU</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50144,50 +50138,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -51189,22 +51183,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_ru.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_ru.ts Sat May 06 16:22:17 2023 +0200 @@ -1780,27 +1780,27 @@ <translation>Обнаружена неиндексированная ошибка.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation>Операция не поддерживается.</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation>Да</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation>Нет</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation>да</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation>нет</translation> </message> @@ -20576,8 +20576,8 @@ <translation>Показать версии MicroPython</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation>Очистить Flash-память</translation> @@ -20588,7 +20588,7 @@ <translation>Прошить микрокод MicroPython</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation>Прошить дополнительный микрокод</translation> @@ -20639,8 +20639,8 @@ <translation>Вывод команды 'esptool read_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation>Вывод команды 'esptool write_flash'</translation> @@ -20711,66 +20711,64 @@ <translation>неизвестная ({0})</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation>Активно</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation>Имя</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation>MAC-адрес</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation>Тип адреса</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation>Публичный</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation>Тип адреса</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation>Публичный</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation>Случайный</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation>Rx-буфер</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation>{0} байт</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation>MTU</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation>{0} байт</translation> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation>Действительно ли flash-память выбранного устройства должна быть очищена?</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation>Вывод команды 'esptool erase_flash'</translation> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation>Прошить микропрограмму µPy/CPy</translation> </message> + <message> + <source>Rx-Buffer</source> + <translation type="vanished">Rx-буфер</translation> + </message> </context> <context> <name>EspFirmwareSelectionDialog</name> @@ -49981,50 +49979,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation>Заданное имя '{0}' не является директорией или не существует.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation>{1}Синхронизация <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation>{1}Выполнена синхронизация <b>{0}</b>.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation>{1}Добавление <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation>Источник <b>{0}</b> является директорией, а назначение <b>{1}</b> является файлом. Игнорировать.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation>Источник <b>{0}</b> является файлом, а назначение <b>{1}</b> является директорией. Игнорировать.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation>Обновление <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation>{1}Удаление <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation>{1}Обновление <b>{0}</b>...</translation> </message> @@ -51034,22 +51032,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_tr.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_tr.ts Sat May 06 16:22:17 2023 +0200 @@ -1841,27 +1841,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">Evet</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">Hayır</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">evet</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">no</translation> </message> @@ -20600,8 +20600,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20612,7 +20612,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20663,8 +20663,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20735,63 +20735,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">Aktif</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">Adı</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">Adı</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50016,50 +50010,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -51061,22 +51055,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_zh_CN.ts Thu May 04 17:57:23 2023 +0200 +++ b/src/eric7/i18n/eric7_zh_CN.ts Sat May 06 16:22:17 2023 +0200 @@ -1869,27 +1869,27 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1473" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1479" /> <source>Operation not supported.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>Yes</source> <translation type="unfinished">是</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1781" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1787" /> <source>No</source> <translation type="unfinished">否</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>yes</source> <translation type="unfinished">是</translation> </message> <message> - <location filename="../MicroPython/Devices/DeviceBase.py" line="1783" /> + <location filename="../MicroPython/Devices/DeviceBase.py" line="1789" /> <source>no</source> <translation type="unfinished">否</translation> </message> @@ -20676,8 +20676,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1498" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1482" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1494" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1478" /> <location filename="../MicroPython/Devices/EspDevices.py" line="196" /> <source>Erase Flash</source> <translation type="unfinished" /> @@ -20688,7 +20688,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1583" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1579" /> <location filename="../MicroPython/Devices/EspDevices.py" line="203" /> <source>Flash Additional Firmware</source> <translation type="unfinished" /> @@ -20739,8 +20739,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1582" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1541" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1578" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1537" /> <location filename="../MicroPython/Devices/EspDevices.py" line="363" /> <source>'esptool write_flash' Output</source> <translation type="unfinished" /> @@ -20811,63 +20811,57 @@ <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1200" /> <source>Active</source> <translation type="unfinished">活动的</translation> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1201" /> + <source>Name</source> + <translation type="unfinished">名称</translation> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1202" /> - <source>Name</source> - <translation type="unfinished">名称</translation> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1203" /> <source>MAC-Address</source> <translation type="unfinished" /> </message> <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1205" /> + <source>Address Type</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> + <source>Public</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../MicroPython/Devices/EspDevices.py" line="1206" /> - <source>Address Type</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> - <source>Public</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1207" /> <source>Random</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>Rx-Buffer</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> - <location filename="../MicroPython/Devices/EspDevices.py" line="1211" /> - <source>{0} Bytes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1213" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> <source>MTU</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1483" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1209" /> + <source>{0} Bytes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../MicroPython/Devices/EspDevices.py" line="1479" /> <source>Shall the flash of the selected device really be erased?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1497" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1493" /> <source>'esptool erase_flash' Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/Devices/EspDevices.py" line="1542" /> + <location filename="../MicroPython/Devices/EspDevices.py" line="1538" /> <source>Flash µPy/CPy Firmware</source> <translation type="unfinished" /> </message> @@ -50122,50 +50116,50 @@ <context> <name>MicroPythonFileManager</name> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="291" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="293" /> <source>The given name '{0}' is not a directory or does not exist.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="298" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="300" /> <source>{1}Synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="301" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="303" /> <source>{1}Done synchronizing <b>{0}</b>.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="429" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="349" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="431" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="351" /> <source>{1}Adding <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="491" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="398" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="493" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="400" /> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="500" /> - <location filename="../MicroPython/MicroPythonFileManager.py" line="407" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="502" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="409" /> <source>Source <b>{0}</b> is a file and destination <b>{1}</b> is a directory. Ignoring it.</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="416" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="418" /> <source>Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="457" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="459" /> <source>{1}Removing <b>{0}</b>...</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="509" /> + <location filename="../MicroPython/MicroPythonFileManager.py" line="511" /> <source>{1}Updating <b>{0}</b>...</source> <translation type="unfinished" /> </message> @@ -51167,22 +51161,22 @@ <context> <name>MicroPythonWebreplUrlsConfigDialog</name> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="133" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="138" /> <source>Remove Selected WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="134" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="139" /> <source>Shall the selected WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="150" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="155" /> <source>Remove All WebREPL URLs</source> <translation type="unfinished" /> </message> <message> - <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="151" /> + <location filename="../MicroPython/MicroPythonWebreplUrlsConfigDialog.py" line="156" /> <source>Shall all WebREPL URLs really be removed?</source> <translation type="unfinished" /> </message>