Mercurial Repositories > eric / file diff

--- a/eric6/i18n/eric6_ru.ts	Tue May 12 17:32:16 2020 +0200
+++ b/eric6/i18n/eric6_ru.ts	Fri May 15 18:33:53 2020 +0200
@@ -2926,15 +2926,20 @@
         <translation>Файлы прошивки CircuitPython (*.uf2);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/>
+        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/>
         <source>Select Path to Device</source>
         <translation>Выберите путь к устройству</translation>
     </message>
     <message>
-        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="96"/>
+        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/>
         <source>&lt;p&gt;The device volume &lt;b&gt;{0}&lt;/b&gt; could not be found. Is the device in &apos;bootloader&apos; mode and mounted?&lt;/p&gt; &lt;p&gt;Alternatively select the &quot;Manual Select&quot; entry and enter the path to the device below.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удается найти том устройства &lt;b&gt;{0}&lt;/b&gt;. Находится ли устройство в режиме &apos;bootloader&apos; и подмонтировано ли?&lt;/p&gt;&lt;p&gt;В качестве альтернативы, выберите пункт &quot;Manual Select&quot; и ниже введите путь к устройству.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="52"/>
+        <source>Manual Select</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearPrivateDataDialog</name>
@@ -17053,17 +17058,17 @@
         <translation>Введите путь к файлу прошивки</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="66"/>
+        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="71"/>
         <source>Firmware Files (*.img);;All Files (*)</source>
         <translation>Файлы прошивки (*.img);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="72"/>
+        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="77"/>
         <source>Backup Firmware</source>
         <translation>Резервное копирование прошивки</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="76"/>
+        <location filename="../MicroPython/EspBackupRestoreFirmwareDialog.py" line="82"/>
         <source>Restore Firmware</source>
         <translation>Восстановить прошивку</translation>
     </message>
@@ -17081,12 +17086,12 @@
         <translation>Очистить Flash-память</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="211"/>
+        <location filename="../MicroPython/EspDevices.py" line="217"/>
         <source>Flash MicroPython Firmware</source>
         <translation>Прошивка Flash MicroPython</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="236"/>
+        <location filename="../MicroPython/EspDevices.py" line="248"/>
         <source>Flash Additional Firmware</source>
         <translation>Дополнительная прошивка Flash</translation>
     </message>
@@ -17111,7 +17116,7 @@
         <translation>Неподдерживаемый тип чипа &apos;{0}&apos;.</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="297"/>
+        <location filename="../MicroPython/EspDevices.py" line="309"/>
         <source>&apos;esptool write_flash&apos; Output</source>
         <translation>Вывод команды &apos;esptool write_flash&apos;</translation>
     </message>
@@ -17121,47 +17126,47 @@
         <translation>Сбросить устройство</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="263"/>
+        <location filename="../MicroPython/EspDevices.py" line="275"/>
         <source>Backup Firmware</source>
         <translation>Резервное копирование прошивки</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="297"/>
+        <location filename="../MicroPython/EspDevices.py" line="309"/>
         <source>Restore Firmware</source>
         <translation>Восстановить прошивку</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="315"/>
+        <location filename="../MicroPython/EspDevices.py" line="327"/>
         <source>Show Chip ID</source>
         <translation>Показать ID чипа</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="332"/>
+        <location filename="../MicroPython/EspDevices.py" line="344"/>
         <source>Show Flash ID</source>
         <translation>Показать ID Flash</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="349"/>
+        <location filename="../MicroPython/EspDevices.py" line="361"/>
         <source>Show MAC Address</source>
         <translation>Показать MAC-адрес</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="263"/>
+        <location filename="../MicroPython/EspDevices.py" line="275"/>
         <source>&apos;esptool read_flash&apos; Output</source>
         <translation>Вывод команды &apos;esptool read_flash&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="315"/>
+        <location filename="../MicroPython/EspDevices.py" line="327"/>
         <source>&apos;esptool chip_id&apos; Output</source>
         <translation>Вывод команды &apos;esptool chip_id&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="332"/>
+        <location filename="../MicroPython/EspDevices.py" line="344"/>
         <source>&apos;esptool flash_id&apos; Output</source>
         <translation>Вывод команды &apos;esptool flash_id&apos;</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspDevices.py" line="349"/>
+        <location filename="../MicroPython/EspDevices.py" line="361"/>
         <source>&apos;esptool read_mac&apos; Output</source>
         <translation>Вывод команды &apos;esptool read_mac&apos;</translation>
     </message>
@@ -17194,20 +17199,35 @@
         <translation>Введите путь к файлу прошивки</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="72"/>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="96"/>
         <source>Address:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="79"/>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="103"/>
         <source>Enter the flash addres in the hexadecimal form</source>
         <translation>Введите адрес flash-памяти в шестнадцатеричной форме</translation>
     </message>
     <message>
-        <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="43"/>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.py" line="51"/>
         <source>Firmware Files (*.bin);;All Files (*)</source>
         <translation>Файлы прошивки (* .bin);;Все файлы (*)</translation>
     </message>
+    <message>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="75"/>
+        <source>Flash Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="82"/>
+        <source>Select the flash mode</source>
+        <translation type="unfinished">Выберите режим прошивки</translation>
+    </message>
+    <message>
+        <location filename="../MicroPython/EspFirmwareSelectionDialog.ui" line="89"/>
+        <source>Leave empty to use the default mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExceptionLogger</name>