Mercurial Repositories > eric / file diff

--- a/src/eric7/i18n/eric7_ru.ts	Wed Nov 09 15:18:07 2022 +0100
+++ b/src/eric7/i18n/eric7_ru.ts	Fri Nov 11 15:30:47 2022 +0100
@@ -2616,17 +2616,17 @@
   <context>
     <name>BookmarksImportDialog</name>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="103" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="104" />
       <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
       <translation>&lt;b&gt;Импорт из: {0}&lt;/b&gt;</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="109" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="110" />
       <source>Finish</source>
       <translation>Завершить</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="136" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="141" />
       <source>Error importing bookmarks</source>
       <translation>Ошибка импорта закладок</translation>
     </message>
@@ -2664,12 +2664,12 @@
   <context>
     <name>BookmarksImporters</name>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/__init__.py" line="45" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/__init__.py" line="33" />
       <source>XBEL File</source>
       <translation>XBEL файл</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/__init__.py" line="52" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/__init__.py" line="38" />
       <source>HTML File</source>
       <translation>HTML файл</translation>
     </message>
@@ -3768,40 +3768,70 @@
       <translation>Google Chrome хранит эти закладки в текстовом файле &lt;b&gt;Bookmarks&lt;/b&gt;. Этот файл обычно находится в</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="78" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="198" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="175" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="151" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="127" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="103" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="79" />
       <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="56" />
       <source>Please choose the file to begin importing bookmarks.</source>
       <translation>Пожалуйста выберите файл чтобы начать импортирование закладок.</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="73" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="74" />
       <source>Chromium stores its bookmarks in the &lt;b&gt;Bookmarks&lt;/b&gt; text file. This file is usually located in</source>
       <translation>Chromium хранит эти закладки в текстовом файле &lt;b&gt;Bookmarks&lt;/b&gt;. Этот файл обычно находится в</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="120" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="97" />
+      <source>Microsoft Edge stores its bookmarks in the &lt;b&gt;Bookmarks&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="121" />
+      <source>Falkon stores its bookmarks in the &lt;b&gt;bookmarks.json&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="145" />
+      <source>Opera stores its bookmarks in the &lt;b&gt;Bookmarks&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="169" />
+      <source>Vivaldi stores its bookmarks in the &lt;b&gt;Bookmarks&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="192" />
+      <source>This browser stores its bookmarks in the &lt;b&gt;Bookmarks&lt;/b&gt; text file. This file is usually located somewhere below</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="240" />
       <source>File '{0}' does not exist.</source>
       <translation>Файл '{0}' не существует.</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="139" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="259" />
       <source>File '{0}' cannot be read.
 Reason: {1}</source>
       <translation>Файл'{0}'невозможно прочитать.
 Причина: {1}</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="149" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="269" />
       <source>Google Chrome Import</source>
       <translation>Импорт из Google Chrome</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="151" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="271" />
       <source>Chromium Import</source>
       <translation>Импорт из Chromium</translation>
     </message>
     <message>
-      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="153" />
+      <location filename="../WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py" line="273" />
       <source>Imported {0}</source>
       <translation>Импортировано {0}</translation>
     </message>
@@ -52474,8 +52504,8 @@
     <name>OperaImporter</name>
     <message>
       <location filename="../WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py" line="44" />
-      <source>Opera stores its bookmarks in the &lt;b&gt;bookmarks.adr&lt;/b&gt; text file. This file is usually located in</source>
-      <translation>Закладки Оперы хранятся в текстовом файле &lt;b&gt;bookmarks.adr&lt;/b&gt;. Этот файл обычно находится в</translation>
+      <source>Opera (Legacy) stores its bookmarks in the &lt;b&gt;bookmarks.adr&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="unfinished" />
     </message>
     <message>
       <location filename="../WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py" line="49" />
@@ -52504,6 +52534,10 @@
       <source>Imported {0}</source>
       <translation>Импортировано {0}</translation>
     </message>
+    <message>
+      <source>Opera stores its bookmarks in the &lt;b&gt;bookmarks.adr&lt;/b&gt; text file. This file is usually located in</source>
+      <translation type="vanished">Закладки Оперы хранятся в текстовом файле &lt;b&gt;bookmarks.adr&lt;/b&gt;. Этот файл обычно находится в</translation>
+    </message>
   </context>
   <context>
     <name>PackageDiagramBuilder</name>
@@ -80280,12 +80314,12 @@
       <translation>Длительность [mсек]</translation>
     </message>
     <message>
-      <location filename="../Testing/TestResultsTree.py" line="391" />
+      <location filename="../Testing/TestResultsTree.py" line="392" />
       <source>No results to show</source>
       <translation>Нет результатов для отображения</translation>
     </message>
     <message numerus="yes">
-      <location filename="../Testing/TestResultsTree.py" line="402" />
+      <location filename="../Testing/TestResultsTree.py" line="403" />
       <source>Collected %n test(s)</source>
       <translation>
         <numerusform>Собран %n тест</numerusform>
@@ -80294,7 +80328,7 @@
       </translation>
     </message>
     <message numerus="yes">
-      <location filename="../Testing/TestResultsTree.py" line="404" />
+      <location filename="../Testing/TestResultsTree.py" line="405" />
       <source>%n test(s)/subtest(s) total, {0} failed, {1} passed, {2} skipped, {3} pending</source>
       <translation>
         <numerusform>Всего %n тест/субтест, {0} не пройдено, {1} пройдено, {2} пропущено, {3} ожидает</numerusform>
@@ -80306,29 +80340,29 @@
   <context>
     <name>TestResultsTreeView</name>
     <message>
-      <location filename="../Testing/TestResultsTree.py" line="590" />
+      <location filename="../Testing/TestResultsTree.py" line="591" />
       <source>Collapse</source>
       <translation>Свернуть</translation>
     </message>
     <message>
-      <location filename="../Testing/TestResultsTree.py" line="592" />
+      <location filename="../Testing/TestResultsTree.py" line="593" />
       <source>Expand</source>
       <translation>Развернуть</translation>
     </message>
     <message>
-      <location filename="../Testing/TestResultsTree.py" line="597" />
+      <location filename="../Testing/TestResultsTree.py" line="598" />
       <source>Show Source</source>
       <translation>Показать источник</translation>
     </message>
     <message>
-      <location filename="../Testing/TestResultsTree.py" line="615" />
-      <location filename="../Testing/TestResultsTree.py" line="602" />
-      <source>Collapse All</source>
-      <translation>Свернуть все</translation>
-    </message>
-    <message>
       <location filename="../Testing/TestResultsTree.py" line="616" />
       <location filename="../Testing/TestResultsTree.py" line="603" />
+      <source>Collapse All</source>
+      <translation>Свернуть все</translation>
+    </message>
+    <message>
+      <location filename="../Testing/TestResultsTree.py" line="617" />
+      <location filename="../Testing/TestResultsTree.py" line="604" />
       <source>Expand All</source>
       <translation>Развернуть все</translation>
     </message>