diff -r 9355815a4403 -r 66b9dc45f2bd i18n/eric5_en.ts --- a/i18n/eric5_en.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_en.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1559,12 +1559,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1572,91 +1572,91 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> - <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -51249,44 +51249,54 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/> - <source>Error when importing bookmarks on line {0}, column [1}: + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> + <source>eric5 Web Browser Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> + <source>XBEL Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> + <source>Imported {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> + <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> - <source>eric5 Web Browser Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> - <source>XBEL Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> - <source>Imported {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> - <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> <translation type="unfinished"></translation> </message> </context> @@ -51298,7 +51308,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation type="unfinished"></translation> </message>