diff -r ae9232bf4854 -r 1193fc2bf192 src/eric7/i18n/eric7_en.ts --- a/src/eric7/i18n/eric7_en.ts Wed Nov 09 15:18:07 2022 +0100 +++ b/src/eric7/i18n/eric7_en.ts Fri Nov 11 15:30:47 2022 +0100 @@ -2584,17 +2584,17 @@ <context> <name>BookmarksImportDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="103" /> + <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="104" /> <source><b>Importing from {0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="109" /> + <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="110" /> <source>Finish</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="136" /> + <location filename="../WebBrowser/Bookmarks/BookmarksImportDialog.py" line="141" /> <source>Error importing bookmarks</source> <translation type="unfinished" /> </message> @@ -2632,12 +2632,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 type="unfinished" /> </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 type="unfinished" /> </message> @@ -3724,39 +3724,69 @@ <translation type="unfinished" /> </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 type="unfinished" /> </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 <b>Bookmarks</b> text file. This file is usually located in</source> <translation type="unfinished" /> </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 <b>Bookmarks</b> 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 <b>bookmarks.json</b> 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 <b>Bookmarks</b> 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 <b>Bookmarks</b> 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 <b>Bookmarks</b> 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 type="unfinished" /> </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 type="unfinished" /> </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 type="unfinished" /> </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 type="unfinished" /> </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 type="unfinished" /> </message> @@ -52139,7 +52169,7 @@ <name>OperaImporter</name> <message> <location filename="../WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py" line="44" /> - <source>Opera stores its bookmarks in the <b>bookmarks.adr</b> text file. This file is usually located in</source> + <source>Opera (Legacy) stores its bookmarks in the <b>bookmarks.adr</b> text file. This file is usually located in</source> <translation type="unfinished" /> </message> <message> @@ -79586,12 +79616,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Testing/TestResultsTree.py" line="391" /> + <location filename="../Testing/TestResultsTree.py" line="392" /> <source>No results to show</source> <translation type="unfinished" /> </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>Collected %n test</numerusform> @@ -79599,7 +79629,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 test)/subtest total, {0} failed, {1} passed, {2} skipped, {3} pending</numerusform> @@ -79610,29 +79640,29 @@ <context> <name>TestResultsTreeView</name> <message> - <location filename="../Testing/TestResultsTree.py" line="590" /> + <location filename="../Testing/TestResultsTree.py" line="591" /> <source>Collapse</source> <translation type="unfinished" /> </message> <message> - <location filename="../Testing/TestResultsTree.py" line="592" /> + <location filename="../Testing/TestResultsTree.py" line="593" /> <source>Expand</source> <translation type="unfinished" /> </message> <message> - <location filename="../Testing/TestResultsTree.py" line="597" /> + <location filename="../Testing/TestResultsTree.py" line="598" /> <source>Show Source</source> <translation type="unfinished" /> </message> <message> - <location filename="../Testing/TestResultsTree.py" line="615" /> - <location filename="../Testing/TestResultsTree.py" line="602" /> - <source>Collapse All</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Testing/TestResultsTree.py" line="616" /> <location filename="../Testing/TestResultsTree.py" line="603" /> + <source>Collapse All</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Testing/TestResultsTree.py" line="617" /> + <location filename="../Testing/TestResultsTree.py" line="604" /> <source>Expand All</source> <translation type="unfinished" /> </message>