eric: changeset 1713:56fdde8a2441

--- a/APIs/Python3/eric5.api	Sat Mar 17 13:03:30 2012 +0100
+++ b/APIs/Python3/eric5.api	Sun Mar 18 10:07:28 2012 +0100
@@ -1780,6 +1780,34 @@
 eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.openUrl?7
 eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.reject?4()
 eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog?1(parent=None, manager=None)
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.SourcesListIdRole?7
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.getImportedBookmarks?4()
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.on_cancelButton_clicked?4()
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.on_chooseButton_clicked?4()
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.on_fileEdit_textChanged?4(txt)
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.on_nextButton_clicked?4()
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog.on_sourcesList_itemSelectionChanged?4()
+eric5.Helpviewer.Bookmarks.BookmarksImportDialog.BookmarksImportDialog?1(parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.error?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.errorString?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.importedBookmarks?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.open?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.setPath?4(path)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(id="", parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.importedBookmarks?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.open?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.setPath?4(path)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(id="", parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.extract_js?7
+eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(id)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.importedBookmarks?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.open?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.setPath?4(path)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(id="", parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(id)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.getImporter?4(id, parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.getImporterInfo?4(id)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.getImporters?4()
 eric5.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKBAR?7
 eric5.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKMENU?7
 eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.addBookmark?4(parent, node, row=-1)
@@ -1820,7 +1848,6 @@
 eric5.Helpviewer.Bookmarks.BookmarksManager.StartMenu?7
 eric5.Helpviewer.Bookmarks.BookmarksManager.StartRoot?7
 eric5.Helpviewer.Bookmarks.BookmarksManager.StartToolBar?7
-eric5.Helpviewer.Bookmarks.BookmarksManager.extract_js?7
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.createBaseMenu?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.newUrl?7
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.openAll?4()
--- a/APIs/Python3/eric5.bas	Sat Mar 17 13:03:30 2012 +0100
+++ b/APIs/Python3/eric5.bas	Sun Mar 18 10:07:28 2012 +0100
@@ -34,6 +34,8 @@
 BookmarkedFilesDialog QDialog Ui_BookmarkedFilesDialog
 Bookmarks HgExtension
 BookmarksDialog QDialog Ui_BookmarksDialog
+BookmarksImportDialog QDialog Ui_BookmarksImportDialog
+BookmarksImporter QObject
 BookmarksManager QObject
 BookmarksMenu E5ModelMenu
 BookmarksMenuBarMenu BookmarksMenu
@@ -303,6 +305,7 @@
 HistoryMostVisitedMenu E5ModelMenu
 HistoryMostVisitedMenuModel QSortFilterProxyModel
 HistoryTreeModel QAbstractProxyModel
+HtmlImporter BookmarksImporter
 IconEditCommand QUndoCommand
 IconEditorGrid QWidget
 IconEditorPalette QWidget
@@ -663,6 +666,7 @@
 WidgetView QWidget
 XMLStreamReaderBase QXmlStreamReader
 XMLStreamWriterBase QXmlStreamWriter
+XbelImporter BookmarksImporter
 XbelReader QXmlStreamReader
 XbelWriter QXmlStreamWriter
 XmlEntityResolver QXmlStreamEntityResolver
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Mar 17 13:03:30 2012 +0100
+++ b/Documentation/Help/source.qhp	Sun Mar 18 10:07:28 2012 +0100
@@ -200,9 +200,16 @@
               <section title="eric5.Helpviewer.AdBlock.AdBlockSubscription" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html" />
             </section>
             <section title="eric5.Helpviewer.Bookmarks" ref="index-eric5.Helpviewer.Bookmarks.html">
+              <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters" ref="index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html">
+                <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html" />
+                <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html" />
+                <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html" />
+                <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html" />
+              </section>
               <section title="eric5.Helpviewer.Bookmarks.AddBookmarkDialog" ref="eric5.Helpviewer.Bookmarks.AddBookmarkDialog.html" />
               <section title="eric5.Helpviewer.Bookmarks.BookmarkNode" ref="eric5.Helpviewer.Bookmarks.BookmarkNode.html" />
               <section title="eric5.Helpviewer.Bookmarks.BookmarksDialog" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html" />
+              <section title="eric5.Helpviewer.Bookmarks.BookmarksImportDialog" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html" />
               <section title="eric5.Helpviewer.Bookmarks.BookmarksManager" ref="eric5.Helpviewer.Bookmarks.BookmarksManager.html" />
               <section title="eric5.Helpviewer.Bookmarks.BookmarksMenu" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html" />
               <section title="eric5.Helpviewer.Bookmarks.BookmarksModel" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html" />
@@ -1361,6 +1368,25 @@
       <keyword name="BookmarksDialog.closeEvent" id="BookmarksDialog.closeEvent" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.closeEvent" />
       <keyword name="BookmarksDialog.reject" id="BookmarksDialog.reject" ref="eric5.Helpviewer.Bookmarks.BookmarksDialog.html#BookmarksDialog.reject" />
       <keyword name="BookmarksExtension (Package)" id="BookmarksExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.html" />
+      <keyword name="BookmarksImportDialog" id="BookmarksImportDialog" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog" />
+      <keyword name="BookmarksImportDialog (Constructor)" id="BookmarksImportDialog (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.__init__" />
+      <keyword name="BookmarksImportDialog (Module)" id="BookmarksImportDialog (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html" />
+      <keyword name="BookmarksImportDialog.__enableNextButton" id="BookmarksImportDialog.__enableNextButton" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.__enableNextButton" />
+      <keyword name="BookmarksImportDialog.getImportedBookmarks" id="BookmarksImportDialog.getImportedBookmarks" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.getImportedBookmarks" />
+      <keyword name="BookmarksImportDialog.on_cancelButton_clicked" id="BookmarksImportDialog.on_cancelButton_clicked" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.on_cancelButton_clicked" />
+      <keyword name="BookmarksImportDialog.on_chooseButton_clicked" id="BookmarksImportDialog.on_chooseButton_clicked" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.on_chooseButton_clicked" />
+      <keyword name="BookmarksImportDialog.on_fileEdit_textChanged" id="BookmarksImportDialog.on_fileEdit_textChanged" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.on_fileEdit_textChanged" />
+      <keyword name="BookmarksImportDialog.on_nextButton_clicked" id="BookmarksImportDialog.on_nextButton_clicked" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.on_nextButton_clicked" />
+      <keyword name="BookmarksImportDialog.on_sourcesList_itemSelectionChanged" id="BookmarksImportDialog.on_sourcesList_itemSelectionChanged" ref="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html#BookmarksImportDialog.on_sourcesList_itemSelectionChanged" />
+      <keyword name="BookmarksImporter" id="BookmarksImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter" />
+      <keyword name="BookmarksImporter (Constructor)" id="BookmarksImporter (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.__init__" />
+      <keyword name="BookmarksImporter (Module)" id="BookmarksImporter (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html" />
+      <keyword name="BookmarksImporter.error" id="BookmarksImporter.error" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.error" />
+      <keyword name="BookmarksImporter.errorString" id="BookmarksImporter.errorString" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.errorString" />
+      <keyword name="BookmarksImporter.importedBookmarks" id="BookmarksImporter.importedBookmarks" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.importedBookmarks" />
+      <keyword name="BookmarksImporter.open" id="BookmarksImporter.open" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.open" />
+      <keyword name="BookmarksImporter.setPath" id="BookmarksImporter.setPath" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html#BookmarksImporter.setPath" />
+      <keyword name="BookmarksImporters (Package)" id="BookmarksImporters (Package)" ref="index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html" />
       <keyword name="BookmarksManager" id="BookmarksManager" ref="eric5.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager" />
       <keyword name="BookmarksManager (Constructor)" id="BookmarksManager (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager.__init__" />
       <keyword name="BookmarksManager (Module)" id="BookmarksManager (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksManager.html" />
@@ -5699,6 +5725,12 @@
       <keyword name="HistoryTreeModel.removeRows" id="HistoryTreeModel.removeRows" ref="eric5.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.removeRows" />
       <keyword name="HistoryTreeModel.rowCount" id="HistoryTreeModel.rowCount" ref="eric5.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.rowCount" />
       <keyword name="HistoryTreeModel.setSourceModel" id="HistoryTreeModel.setSourceModel" ref="eric5.Helpviewer.History.HistoryTreeModel.html#HistoryTreeModel.setSourceModel" />
+      <keyword name="HtmlImporter" id="HtmlImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter" />
+      <keyword name="HtmlImporter (Constructor)" id="HtmlImporter (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.__init__" />
+      <keyword name="HtmlImporter (Module)" id="HtmlImporter (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html" />
+      <keyword name="HtmlImporter.importedBookmarks" id="HtmlImporter.importedBookmarks" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.importedBookmarks" />
+      <keyword name="HtmlImporter.open" id="HtmlImporter.open" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.open" />
+      <keyword name="HtmlImporter.setPath" id="HtmlImporter.setPath" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.setPath" />
       <keyword name="IconEditCommand" id="IconEditCommand" ref="eric5.IconEditor.IconEditorGrid.html#IconEditCommand" />
       <keyword name="IconEditCommand (Constructor)" id="IconEditCommand (Constructor)" ref="eric5.IconEditor.IconEditorGrid.html#IconEditCommand.__init__" />
       <keyword name="IconEditCommand.redo" id="IconEditCommand.redo" ref="eric5.IconEditor.IconEditorGrid.html#IconEditCommand.redo" />
@@ -10979,6 +11011,12 @@
       <keyword name="XMLStreamWriterBase._write_unimplemented" id="XMLStreamWriterBase._write_unimplemented" ref="eric5.E5XML.XMLStreamWriterBase.html#XMLStreamWriterBase._write_unimplemented" />
       <keyword name="XMLStreamWriterBase.writeBasics" id="XMLStreamWriterBase.writeBasics" ref="eric5.E5XML.XMLStreamWriterBase.html#XMLStreamWriterBase.writeBasics" />
       <keyword name="XMLStreamWriterBase.writeXML" id="XMLStreamWriterBase.writeXML" ref="eric5.E5XML.XMLStreamWriterBase.html#XMLStreamWriterBase.writeXML" />
+      <keyword name="XbelImporter" id="XbelImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#XbelImporter" />
+      <keyword name="XbelImporter (Constructor)" id="XbelImporter (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#XbelImporter.__init__" />
+      <keyword name="XbelImporter (Module)" id="XbelImporter (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html" />
+      <keyword name="XbelImporter.importedBookmarks" id="XbelImporter.importedBookmarks" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#XbelImporter.importedBookmarks" />
+      <keyword name="XbelImporter.open" id="XbelImporter.open" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#XbelImporter.open" />
+      <keyword name="XbelImporter.setPath" id="XbelImporter.setPath" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#XbelImporter.setPath" />
       <keyword name="XbelReader" id="XbelReader" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader" />
       <keyword name="XbelReader (Constructor)" id="XbelReader (Constructor)" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__init__" />
       <keyword name="XbelReader (Module)" id="XbelReader (Module)" ref="eric5.Helpviewer.Bookmarks.XbelReader.html" />
@@ -11264,6 +11302,11 @@
       <keyword name="getIcon" id="getIcon" ref="eric5.UI.PixmapCache.html#getIcon" />
       <keyword name="getIconEditor" id="getIconEditor" ref="eric5.Preferences.__init__.html#getIconEditor" />
       <keyword name="getIcons" id="getIcons" ref="eric5.Preferences.__init__.html#getIcons" />
+      <keyword name="getImporter" id="getImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html#getImporter" />
+      <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#getImporterInfo" />
+      <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html#getImporterInfo" />
+      <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html#getImporterInfo" />
+      <keyword name="getImporters" id="getImporters" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html#getImporters" />
       <keyword name="getLexer" id="getLexer" ref="eric5.QScintilla.Lexers.__init__.html#getLexer" />
       <keyword name="getMessage" id="getMessage" ref="eric5.Plugins.CheckerPlugins.Pep8.pep8.html#getMessage" />
       <keyword name="getMultiProject" id="getMultiProject" ref="eric5.Preferences.__init__.html#getMultiProject" />
@@ -11811,6 +11854,11 @@
       <file>eric5.Helpviewer.Bookmarks.AddBookmarkDialog.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarkNode.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksDialog.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksManager.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksMenu.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksModel.html</file>
@@ -12382,6 +12430,7 @@
       <file>index-eric5.Globals.html</file>
       <file>index-eric5.Graphics.html</file>
       <file>index-eric5.Helpviewer.AdBlock.html</file>
+      <file>index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html</file>
       <file>index-eric5.Helpviewer.Bookmarks.html</file>
       <file>index-eric5.Helpviewer.CookieJar.html</file>
       <file>index-eric5.Helpviewer.Download.html</file>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImportDialog</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImportDialog</h1>
+<p>
+Module implementing a dialog for importing bookmarks from other sources.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#BookmarksImportDialog">BookmarksImportDialog</a></td>
+<td>Class implementing a dialog for importing bookmarks from other sources.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="BookmarksImportDialog" ID="BookmarksImportDialog"></a>
+<h2>BookmarksImportDialog</h2>
+<p>
+    Class implementing a dialog for importing bookmarks from other sources.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_BookmarksImportDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>SourcesListIdRole</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#BookmarksImportDialog.__init__">BookmarksImportDialog</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.__enableNextButton">__enableNextButton</a></td>
+<td>Private slot to set the enabled state of the next button.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.getImportedBookmarks">getImportedBookmarks</a></td>
+<td>Public method to get the imported bookmarks.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.on_cancelButton_clicked">on_cancelButton_clicked</a></td>
+<td>Slot documentation goes here.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.on_chooseButton_clicked">on_chooseButton_clicked</a></td>
+<td>Private slot to choose the bookmarks file or directory.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.on_fileEdit_textChanged">on_fileEdit_textChanged</a></td>
+<td>Private slot handling changes of the file to import bookmarks from.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.on_nextButton_clicked">on_nextButton_clicked</a></td>
+<td>Private slot to switch to the next page.</td>
+</tr><tr>
+<td><a href="#BookmarksImportDialog.on_sourcesList_itemSelectionChanged">on_sourcesList_itemSelectionChanged</a></td>
+<td>Private slot to handle changes of the selection of the import source.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="BookmarksImportDialog.__init__" ID="BookmarksImportDialog.__init__"></a>
+<h4>BookmarksImportDialog (Constructor)</h4>
+<b>BookmarksImportDialog</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+reference to the parent widget (QWidget)
+</dd>
+</dl><a NAME="BookmarksImportDialog.__enableNextButton" ID="BookmarksImportDialog.__enableNextButton"></a>
+<h4>BookmarksImportDialog.__enableNextButton</h4>
+<b>__enableNextButton</b>(<i></i>)
+<p>
+        Private slot to set the enabled state of the next button.
+</p><a NAME="BookmarksImportDialog.getImportedBookmarks" ID="BookmarksImportDialog.getImportedBookmarks"></a>
+<h4>BookmarksImportDialog.getImportedBookmarks</h4>
+<b>getImportedBookmarks</b>(<i></i>)
+<p>
+        Public method to get the imported bookmarks.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+top level bookmark (BookmarkNode)
+</dd>
+</dl><a NAME="BookmarksImportDialog.on_cancelButton_clicked" ID="BookmarksImportDialog.on_cancelButton_clicked"></a>
+<h4>BookmarksImportDialog.on_cancelButton_clicked</h4>
+<b>on_cancelButton_clicked</b>(<i></i>)
+<p>
+        Slot documentation goes here.
+</p><a NAME="BookmarksImportDialog.on_chooseButton_clicked" ID="BookmarksImportDialog.on_chooseButton_clicked"></a>
+<h4>BookmarksImportDialog.on_chooseButton_clicked</h4>
+<b>on_chooseButton_clicked</b>(<i></i>)
+<p>
+        Private slot to choose the bookmarks file or directory.
+</p><a NAME="BookmarksImportDialog.on_fileEdit_textChanged" ID="BookmarksImportDialog.on_fileEdit_textChanged"></a>
+<h4>BookmarksImportDialog.on_fileEdit_textChanged</h4>
+<b>on_fileEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot handling changes of the file to import bookmarks from.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+text of the line edit (string)
+</dd>
+</dl><a NAME="BookmarksImportDialog.on_nextButton_clicked" ID="BookmarksImportDialog.on_nextButton_clicked"></a>
+<h4>BookmarksImportDialog.on_nextButton_clicked</h4>
+<b>on_nextButton_clicked</b>(<i></i>)
+<p>
+        Private slot to switch to the next page.
+</p><a NAME="BookmarksImportDialog.on_sourcesList_itemSelectionChanged" ID="BookmarksImportDialog.on_sourcesList_itemSelectionChanged"></a>
+<h4>BookmarksImportDialog.on_sourcesList_itemSelectionChanged</h4>
+<b>on_sourcesList_itemSelectionChanged</b>(<i></i>)
+<p>
+        Private slot to handle changes of the selection of the import source.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter</h1>
+<p>
+Module implementing a base class for the bookmarks importers.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#BookmarksImporter">BookmarksImporter</a></td>
+<td>Class implementing the base class for the bookmarks importers.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="BookmarksImporter" ID="BookmarksImporter"></a>
+<h2>BookmarksImporter</h2>
+<p>
+    Class implementing the base class for the bookmarks importers.
+</p>
+<h3>Derived from</h3>
+QObject
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#BookmarksImporter.__init__">BookmarksImporter</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#BookmarksImporter.error">error</a></td>
+<td>Public method to check for an error.</td>
+</tr><tr>
+<td><a href="#BookmarksImporter.errorString">errorString</a></td>
+<td>Public method to get the error description.</td>
+</tr><tr>
+<td><a href="#BookmarksImporter.importedBookmarks">importedBookmarks</a></td>
+<td>Public method to get the imported bookmarks.</td>
+</tr><tr>
+<td><a href="#BookmarksImporter.open">open</a></td>
+<td>Public method to open the bookmarks file.</td>
+</tr><tr>
+<td><a href="#BookmarksImporter.setPath">setPath</a></td>
+<td>Public method to set the path of the bookmarks file or directory.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="BookmarksImporter.__init__" ID="BookmarksImporter.__init__"></a>
+<h4>BookmarksImporter (Constructor)</h4>
+<b>BookmarksImporter</b>(<i>id="", parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+source ID (string)
+</dd><dt><i>parent</i></dt>
+<dd>
+reference to the parent object (QObject)
+</dd>
+</dl><a NAME="BookmarksImporter.error" ID="BookmarksImporter.error"></a>
+<h4>BookmarksImporter.error</h4>
+<b>error</b>(<i></i>)
+<p>
+        Public method to check for an error.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating an error (boolean)
+</dd>
+</dl><a NAME="BookmarksImporter.errorString" ID="BookmarksImporter.errorString"></a>
+<h4>BookmarksImporter.errorString</h4>
+<b>errorString</b>(<i></i>)
+<p>
+        Public method to get the error description.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+error description (string)
+</dd>
+</dl><a NAME="BookmarksImporter.importedBookmarks" ID="BookmarksImporter.importedBookmarks"></a>
+<h4>BookmarksImporter.importedBookmarks</h4>
+<b>importedBookmarks</b>(<i></i>)
+<p>
+        Public method to get the imported bookmarks.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+imported bookmarks (BookmarkNode)
+</dd>
+</dl><a NAME="BookmarksImporter.open" ID="BookmarksImporter.open"></a>
+<h4>BookmarksImporter.open</h4>
+<b>open</b>(<i></i>)
+<p>
+        Public method to open the bookmarks file.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
+</dl><a NAME="BookmarksImporter.setPath" ID="BookmarksImporter.setPath"></a>
+<h4>BookmarksImporter.setPath</h4>
+<b>setPath</b>(<i>path</i>)
+<p>
+        Public method to set the path of the bookmarks file or directory.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+bookmarks file or directory (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter</h1>
+<p>
+Module implementing an importer for HTML bookmark files.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>extract_js</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#HtmlImporter">HtmlImporter</a></td>
+<td>Class implementing the HTML bookmarks importer.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#getImporterInfo">getImporterInfo</a></td>
+<td>Module function to get information for the given HTML source id.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="HtmlImporter" ID="HtmlImporter"></a>
+<h2>HtmlImporter</h2>
+<p>
+    Class implementing the HTML bookmarks importer.
+</p>
+<h3>Derived from</h3>
+BookmarksImporter
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#HtmlImporter.__init__">HtmlImporter</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#HtmlImporter.importedBookmarks">importedBookmarks</a></td>
+<td>Public method to get the imported bookmarks.</td>
+</tr><tr>
+<td><a href="#HtmlImporter.open">open</a></td>
+<td>Public method to open the bookmarks file.</td>
+</tr><tr>
+<td><a href="#HtmlImporter.setPath">setPath</a></td>
+<td>Public method to set the path of the bookmarks file or directory.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="HtmlImporter.__init__" ID="HtmlImporter.__init__"></a>
+<h4>HtmlImporter (Constructor)</h4>
+<b>HtmlImporter</b>(<i>id="", parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+source ID (string)
+</dd><dt><i>parent</i></dt>
+<dd>
+reference to the parent object (QObject)
+</dd>
+</dl><a NAME="HtmlImporter.importedBookmarks" ID="HtmlImporter.importedBookmarks"></a>
+<h4>HtmlImporter.importedBookmarks</h4>
+<b>importedBookmarks</b>(<i></i>)
+<p>
+        Public method to get the imported bookmarks.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+imported bookmarks (BookmarkNode)
+</dd>
+</dl><a NAME="HtmlImporter.open" ID="HtmlImporter.open"></a>
+<h4>HtmlImporter.open</h4>
+<b>open</b>(<i></i>)
+<p>
+        Public method to open the bookmarks file.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
+</dl><a NAME="HtmlImporter.setPath" ID="HtmlImporter.setPath"></a>
+<h4>HtmlImporter.setPath</h4>
+<b>setPath</b>(<i>path</i>)
+<p>
+        Public method to set the path of the bookmarks file or directory.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+bookmarks file or directory (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getImporterInfo" ID="getImporterInfo"></a>
+<h2>getImporterInfo</h2>
+<b>getImporterInfo</b>(<i>id</i>)
+<p>
+    Module function to get information for the given HTML source id.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter</h1>
+<p>
+Module implementing an importer for XBEL files.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#XbelImporter">XbelImporter</a></td>
+<td>Class implementing the XBEL bookmarks importer.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#getImporterInfo">getImporterInfo</a></td>
+<td>Module function to get information for the given XBEL source id.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="XbelImporter" ID="XbelImporter"></a>
+<h2>XbelImporter</h2>
+<p>
+    Class implementing the XBEL bookmarks importer.
+</p>
+<h3>Derived from</h3>
+BookmarksImporter
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#XbelImporter.__init__">XbelImporter</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#XbelImporter.importedBookmarks">importedBookmarks</a></td>
+<td>Public method to get the imported bookmarks.</td>
+</tr><tr>
+<td><a href="#XbelImporter.open">open</a></td>
+<td>Public method to open the bookmarks file.</td>
+</tr><tr>
+<td><a href="#XbelImporter.setPath">setPath</a></td>
+<td>Public method to set the path of the bookmarks file or directory.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="XbelImporter.__init__" ID="XbelImporter.__init__"></a>
+<h4>XbelImporter (Constructor)</h4>
+<b>XbelImporter</b>(<i>id="", parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+source ID (string)
+</dd><dt><i>parent</i></dt>
+<dd>
+reference to the parent object (QObject)
+</dd>
+</dl><a NAME="XbelImporter.importedBookmarks" ID="XbelImporter.importedBookmarks"></a>
+<h4>XbelImporter.importedBookmarks</h4>
+<b>importedBookmarks</b>(<i></i>)
+<p>
+        Public method to get the imported bookmarks.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+imported bookmarks (BookmarkNode)
+</dd>
+</dl><a NAME="XbelImporter.open" ID="XbelImporter.open"></a>
+<h4>XbelImporter.open</h4>
+<b>open</b>(<i></i>)
+<p>
+        Public method to open the bookmarks file.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
+</dl><a NAME="XbelImporter.setPath" ID="XbelImporter.setPath"></a>
+<h4>XbelImporter.setPath</h4>
+<b>setPath</b>(<i>path</i>)
+<p>
+        Public method to set the path of the bookmarks file or directory.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+bookmarks file or directory (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getImporterInfo" ID="getImporterInfo"></a>
+<h2>getImporterInfo</h2>
+<b>getImporterInfo</b>(<i>id</i>)
+<p>
+    Module function to get information for the given XBEL source id.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__</h1>
+<p>
+Package implementing bookmarks importers for various sources.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#getImporter">getImporter</a></td>
+<td>Module function to get an importer for the given source id.</td>
+</tr><tr>
+<td><a href="#getImporterInfo">getImporterInfo</a></td>
+<td>Module function to get information for the given source id.</td>
+</tr><tr>
+<td><a href="#getImporters">getImporters</a></td>
+<td>Module function to get a list of supported importers.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="getImporter" ID="getImporter"></a>
+<h2>getImporter</h2>
+<b>getImporter</b>(<i>id, parent=None</i>)
+<p>
+    Module function to get an importer for the given source id.
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+source id to get an importer for (string)
+</dd><dt><i>parent</i></dt>
+<dd>
+reference to the parent object (QObject)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+bookmarks importer (BookmarksImporter)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getImporterInfo" ID="getImporterInfo"></a>
+<h2>getImporterInfo</h2>
+<b>getImporterInfo</b>(<i>id</i>)
+<p>
+    Module function to get information for the given source id.
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+source id to get info for (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getImporters" ID="getImporters"></a>
+<h2>getImporters</h2>
+<b>getImporters</b>(<i></i>)
+<p>
+    Module function to get a list of supported importers.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list of tuples with an icon (QIcon), readable name (string) and
+        internal name (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksManager.html	Sat Mar 17 13:03:30 2012 +0100
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksManager.html	Sun Mar 18 10:07:28 2012 +0100
@@ -26,7 +26,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>BOOKMARKBAR</td></tr><tr><td>BOOKMARKMENU</td></tr><tr><td>StartMenu</td></tr><tr><td>StartRoot</td></tr><tr><td>StartToolBar</td></tr><tr><td>extract_js</td></tr>
+<tr><td>BOOKMARKBAR</td></tr><tr><td>BOOKMARKMENU</td></tr><tr><td>StartMenu</td></tr><tr><td>StartRoot</td></tr><tr><td>StartToolBar</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
@@ -81,7 +81,10 @@
 </table>
 <h3>Class Methods</h3>
 <table>
-<tr><td>None</td></tr>
+<tr>
+<td><a href="#BookmarksManager.getFileName">getFileName</a></td>
+<td>Public method to get the file name of the bookmark file.</td>
+</tr>
 </table>
 <h3>Methods</h3>
 <table>
@@ -125,9 +128,6 @@
 <td><a href="#BookmarksManager.exportBookmarks">exportBookmarks</a></td>
 <td>Public method to export the bookmarks.</td>
 </tr><tr>
-<td><a href="#BookmarksManager.getFileName">getFileName</a></td>
-<td>Public method to get the file name of the bookmark file.</td>
-</tr><tr>
 <td><a href="#BookmarksManager.iconChanged">iconChanged</a></td>
 <td>Public slot to update the icon image for an URL.</td>
 </tr><tr>
@@ -166,7 +166,17 @@
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="BookmarksManager.__init__" ID="BookmarksManager.__init__"></a>
+<a NAME="BookmarksManager.getFileName" ID="BookmarksManager.getFileName"></a>
+<h4>BookmarksManager.getFileName (class method)</h4>
+<b>getFileName</b>(<i></i>)
+<p>
+        Public method to get the file name of the bookmark file.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+name of the bookmark file (string)
+</dd>
+</dl><a NAME="BookmarksManager.__init__" ID="BookmarksManager.__init__"></a>
 <h4>BookmarksManager (Constructor)</h4>
 <b>BookmarksManager</b>(<i>parent=None</i>)
 <p>
@@ -311,17 +321,7 @@
 <b>exportBookmarks</b>(<i></i>)
 <p>
         Public method to export the bookmarks.
-</p><a NAME="BookmarksManager.getFileName" ID="BookmarksManager.getFileName"></a>
-<h4>BookmarksManager.getFileName</h4>
-<b>getFileName</b>(<i></i>)
-<p>
-        Public method to get the file name of the bookmark file.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-name of the bookmark file (string)
-</dd>
-</dl><a NAME="BookmarksManager.iconChanged" ID="BookmarksManager.iconChanged"></a>
+</p><a NAME="BookmarksManager.iconChanged" ID="BookmarksManager.iconChanged"></a>
 <h4>BookmarksManager.iconChanged</h4>
 <b>iconChanged</b>(<i>url</i>)
 <p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Helpviewer.Bookmarks.BookmarksImporters</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<h1>eric5.Helpviewer.Bookmarks.BookmarksImporters</h1>
+<p>
+Package implementing bookmarks importers for various sources.
+</p>
+
+
+<h3>Modules</h3>
+<table>
+<tr>
+<td><a href="eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html">BookmarksImporter</a></td>
+<td>Module implementing a base class for the bookmarks importers.</td>
+</tr><tr>
+<td><a href="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html">HtmlImporter</a></td>
+<td>Module implementing an importer for HTML bookmark files.</td>
+</tr><tr>
+<td><a href="eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html">XbelImporter</a></td>
+<td>Module implementing an importer for XBEL files.</td>
+</tr><tr>
+<td><a href="eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html">BookmarksImporters</a></td>
+<td>Package implementing bookmarks importers for various sources.</td>
+</tr>
+</table>
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/index-eric5.Helpviewer.Bookmarks.html	Sat Mar 17 13:03:30 2012 +0100
+++ b/Documentation/Source/index-eric5.Helpviewer.Bookmarks.html	Sun Mar 18 10:07:28 2012 +0100
@@ -25,6 +25,13 @@
 Package implementing the bookmarks system.
 </p>

+<h3>Packages</h3>
+<table>
+<tr>
+<td><a href="index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html">BookmarksImporters</a></td>
+<td>Package implementing bookmarks importers for various sources.</td>
+</tr>
+</table>

 <h3>Modules</h3>
 <table>
@@ -38,6 +45,9 @@
 <td><a href="eric5.Helpviewer.Bookmarks.BookmarksDialog.html">BookmarksDialog</a></td>
 <td>Module implementing a dialog to manage bookmarks.</td>
 </tr><tr>
+<td><a href="eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html">BookmarksImportDialog</a></td>
+<td>Module implementing a dialog for importing bookmarks from other sources.</td>
+</tr><tr>
 <td><a href="eric5.Helpviewer.Bookmarks.BookmarksManager.html">BookmarksManager</a></td>
 <td>Module implementing the bookmarks manager.</td>
 </tr><tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog for importing bookmarks from other sources.
+"""
+
+from PyQt4.QtCore import pyqtSlot, Qt, QSize
+from PyQt4.QtGui import QDialog, QListWidgetItem, QFileDialog
+
+from E5Gui import E5FileDialog, E5MessageBox
+
+from .Ui_BookmarksImportDialog import Ui_BookmarksImportDialog
+
+from . import BookmarksImporters
+
+
+class BookmarksImportDialog(QDialog, Ui_BookmarksImportDialog):
+    """
+    Class implementing a dialog for importing bookmarks from other sources.
+    """
+    SourcesListIdRole = Qt.UserRole
+
+    def __init__(self, parent=None):
+        """
+        Constructor
+
+        @param parent reference to the parent widget (QWidget)
+        """
+        super().__init__(parent)
+        self.setupUi(self)
+
+        self.sourcesList.setIconSize(QSize(48, 48))
+        for icon, displayText, idText in BookmarksImporters.getImporters():
+            itm = QListWidgetItem(icon, displayText, self.sourcesList)
+            itm.setData(self.SourcesListIdRole, idText)
+
+        self.__currentPage = 0
+        self.__selectedSource = ""
+        self.__topLevelBookmarkNode = None
+        self.__sourceFile = ""
+        self.__sourceDir = ""
+
+        self.pagesWidget.setCurrentIndex(self.__currentPage)
+        self.__enableNextButton()
+
+    def __enableNextButton(self):
+        """
+        Private slot to set the enabled state of the next button.
+        """
+        if self.__currentPage == 0:
+            self.nextButton.setEnabled(len(self.sourcesList.selectedItems()) == 1)
+        elif self.__currentPage == 1:
+            self.nextButton.setEnabled(self.fileEdit.text() != "")
+
+    @pyqtSlot()
+    def on_sourcesList_itemSelectionChanged(self):
+        """
+        Private slot to handle changes of the selection of the import source.
+        """
+        self.__enableNextButton()
+
+    @pyqtSlot(str)
+    def on_fileEdit_textChanged(self, txt):
+        """
+        Private slot handling changes of the file to import bookmarks from.
+
+        @param txt text of the line edit (string)
+        """
+        self.__enableNextButton()
+
+    @pyqtSlot()
+    def on_chooseButton_clicked(self):
+        """
+        Private slot to choose the bookmarks file or directory.
+        """
+        if self.__selectedSource == "ie":
+            path = E5FileDialog.getExistingDirectory(
+                self,
+                self.trUtf8("Choose Directory ..."),
+                self.__sourceDir,
+                QFileDialog.Options(QFileDialog.Option(0)))
+        else:
+            path = E5FileDialog.getOpenFileName(
+                self,
+                self.trUtf8("Choose File ..."),
+                self.__sourceDir,
+                self.__sourceFile)
+
+        if path:
+            self.fileEdit.setText(path)
+
+    @pyqtSlot()
+    def on_nextButton_clicked(self):
+        """
+        Private slot to switch to the next page.
+        """
+        if self.sourcesList.currentItem() is None:
+            return
+
+        if self.__currentPage == 0:
+            self.__selectedSource = self.sourcesList.currentItem().data(
+                self.SourcesListIdRole)
+            pixmap, sourceName, self.__sourceFile, info, prompt, self.__sourceDir = \
+                BookmarksImporters.getImporterInfo(self.__selectedSource)
+
+            self.iconLabel.setPixmap(pixmap)
+            self.importingFromLabel.setText(
+                self.trUtf8("<b>Importing from {0}</b>").format(sourceName))
+            self.fileLabel1.setText(info)
+            self.fileLabel2.setText(prompt)
+            self.standardDirLabel.setText("<i>{0}</i>".format(self.__sourceDir))
+
+            self.nextButton.setText(self.trUtf8("Finish"))
+
+            self.__currentPage += 1
+            self.pagesWidget.setCurrentIndex(self.__currentPage)
+            self.__enableNextButton()
+
+        elif self.__currentPage == 1:
+            if self.fileEdit.text() == "":
+                return
+
+            importer = BookmarksImporters.getImporter(self.__selectedSource)
+            importer.setPath(self.fileEdit.text())
+            if importer.open():
+                self.__topLevelBookmarkNode = importer.importedBookmarks()
+            if importer.error():
+                E5MessageBox.critical(self,
+                    self.trUtf8("Error importing bookmarks"),
+                    importer.errorString())
+                return
+
+            self.accept()
+
+    @pyqtSlot()
+    def on_cancelButton_clicked(self):
+        """
+        Slot documentation goes here.
+        """
+        self.reject()
+
+    def getImportedBookmarks(self):
+        """
+        Public method to get the imported bookmarks.
+
+        @return top level bookmark (BookmarkNode)
+        """
+        return self.__topLevelBookmarkNode
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImportDialog.ui	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BookmarksImportDialog</class>
+ <widget class="QDialog" name="BookmarksImportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>550</width>
+    <height>350</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>550</width>
+    <height>350</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Import Bookmarks</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QStackedWidget" name="pagesWidget">
+     <widget class="QWidget" name="sourcePage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Choose source from which you want to import bookmarks:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="sourcesList">
+         <property name="toolTip">
+          <string>Choose the source to import from</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="filePage">
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="iconLabel">
+         <property name="minimumSize">
+          <size>
+           <width>48</width>
+           <height>48</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>48</width>
+           <height>48</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2">
+        <widget class="QLabel" name="importingFromLabel"/>
+       </item>
+       <item row="1" column="2">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>44</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" colspan="3">
+        <widget class="QLabel" name="fileLabel1">
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="3">
+        <widget class="QLabel" name="standardDirLabel">
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="3">
+        <widget class="QLabel" name="fileLabel2"/>
+       </item>
+       <item row="5" column="1" colspan="2">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>44</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="6" column="0" colspan="3">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLineEdit" name="fileEdit">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>Shows the name of the bookmarks file or directory</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="chooseButton">
+           <property name="text">
+            <string notr="true">...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="1">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>44</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="nextButton">
+       <property name="text">
+        <string>Next &gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>sourcesList</tabstop>
+  <tabstop>nextButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+  <tabstop>fileEdit</tabstop>
+  <tabstop>chooseButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a base class for the bookmarks importers.
+"""
+
+from PyQt4.QtCore import QObject
+
+class BookmarksImporter(QObject):
+    """
+    Class implementing the base class for the bookmarks importers.
+    """
+    def __init__(self, id="", parent=None):
+        """
+        Constructor
+
+        @param id source ID (string)
+        @param parent reference to the parent object (QObject)
+        """
+        super().__init__(parent)
+
+        self._path = ""
+        self._file = ""
+        self._error = False
+        self._errorString = ""
+        self._id = id
+
+    def setPath(self, path):
+        """
+        Public method to set the path of the bookmarks file or directory.
+
+        @param path bookmarks file or directory (string)
+        """
+        raise NotImplementedError
+
+    def open(self):
+        """
+        Public method to open the bookmarks file.
+
+        @return flag indicating success (boolean)
+        """
+        raise NotImplementedError
+
+    def importedBookmarks(self):
+        """
+        Public method to get the imported bookmarks.
+
+        @return imported bookmarks (BookmarkNode)
+        """
+        raise NotImplementedError
+
+    def error(self):
+        """
+        Public method to check for an error.
+
+        @return flag indicating an error (boolean)
+        """
+        return self._error
+
+    def errorString(self):
+        """
+        Public method to get the error description.
+
+        @return error description (string)
+        """
+        return self._errorString
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing an importer for HTML bookmark files.
+"""
+
+import os
+import tempfile
+
+from PyQt4.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt
+from PyQt4.QtWebKit import QWebPage
+
+from ..BookmarkNode import BookmarkNode
+from ..XbelReader import XbelReader
+
+from .BookmarksImporter import BookmarksImporter
+
+import UI.PixmapCache
+
+##########################################################################################
+
+extract_js = r"""
+function walk() {
+    var parent = arguments[0];
+    var indent = arguments[1];
+
+    var result = "";
+    var children = parent.childNodes;
+    var folderName = "";
+    var folded = "";
+    for (var i = 0; i < children.length; i++) {
+        var object = children.item(i);
+        if (object.nodeName == "HR") {
+            result += indent + "<separator/>\n";
+        }
+        if (object.nodeName == "H3") {
+            folderName = object.innerHTML;
+            folded = object.folded;
+            if (object.folded == undefined)
+                folded = "false";
+            else
+                folded = "true";
+        }
+        if (object.nodeName == "A") {
+            result += indent + "<bookmark href=\"" + encodeURI(object.href).replace(/&/g, '&amp;') + "\">\n";
+            result += indent + indent + "<title>" + object.innerHTML + "</title>\n";
+            result += indent + "</bookmark>\n";
+        }
+
+        var currentIndent = indent;
+        if (object.nodeName == "DL" && folderName != "") {
+            result += indent + "<folder folded=\"" + folded + "\">\n";
+            indent += "    ";
+            result += indent + "<title>" + folderName + "</title>\n";
+        }
+        result += walk(object, indent);
+        if (object.nodeName == "DL" && folderName != "") {
+            result += currentIndent + "</folder>\n";
+        }
+    }
+    return result;
+}
+
+var xbel = walk(document, "    ");
+
+if (xbel != "") {
+    xbel = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE xbel>\n<xbel version=\"1.0\">\n" + xbel + "</xbel>\n";
+}
+
+xbel;
+"""
+
+##########################################################################################
+
+
+def getImporterInfo(id):
+    """
+    Module function to get information for the given HTML source id.
+
+    @return tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+    """
+    if id == "html":
+        return (
+            UI.PixmapCache.getPixmap("html.png"),
+            "HTML Netscape Bookmarks",
+            QCoreApplication.translate("HtmlImporter",
+                "HTML Netscape Bookmarks") + " (*.htm *.html)",
+            QCoreApplication.translate("HtmlImporter",
+                """You can import bookmarks from any browser that supports HTML """
+                """exporting. This file has usually the extension .htm or .html.""" ),
+            QCoreApplication.translate("HtmlImporter",
+                """Please choose the file to begin importing bookmarks."""),
+            "",
+        )
+    else:
+        raise ValueError("Unsupported browser ID given ({0}).".format(id))
+
+
+class HtmlImporter(BookmarksImporter):
+    """
+    Class implementing the HTML bookmarks importer.
+    """
+    def __init__(self, id="", parent=None):
+        """
+        Constructor
+
+        @param id source ID (string)
+        @param parent reference to the parent object (QObject)
+        """
+        super().__init__(id, parent)
+
+        self.__fileName = ""
+        self.__inFile = None
+
+    def setPath(self, path):
+        """
+        Public method to set the path of the bookmarks file or directory.
+
+        @param path bookmarks file or directory (string)
+        """
+        self.__fileName = path
+
+    def open(self):
+        """
+        Public method to open the bookmarks file.
+
+        @return flag indicating success (boolean)
+        """
+        if not os.path.exists(self.__fileName):
+            self._error = True
+            self._errorString = self.trUtf8("File '{0}' does not exist.")\
+                .format(self.__fileName)
+            return False
+        return True
+
+    def importedBookmarks(self):
+        """
+        Public method to get the imported bookmarks.
+
+        @return imported bookmarks (BookmarkNode)
+        """
+        try:
+            f = open(self.__fileName, "r")
+            contents = f.read()
+            f.close()
+        except IOError as err:
+            self._error = True
+            self._errorString = self.trUtf8("File '{0}' cannot be read.\nReason: {1}")\
+                .format(self.__fileName, str(err))
+            return None
+
+        reader = XbelReader()
+        webpage = QWebPage()
+        webpage.mainFrame().setHtml(contents)
+        result = webpage.mainFrame().evaluateJavaScript(extract_js)
+
+        fd, name = tempfile.mkstemp(text=True)
+        f = os.fdopen(fd, "w")
+        f.write(result)
+        f.close()
+        importRootNode = reader.read(name)
+        os.remove(name)
+
+        if reader.error() != QXmlStreamReader.NoError:
+            self._error = True
+            self._errorString = self.trUtf8(
+                """Error when importing bookmarks on line {0}, column {1}:\n{2}""")\
+                .format(reader.lineNumber(),
+                        reader.columnNumber(),
+                        reader.errorString())
+            return None
+
+        importRootNode.setType(BookmarkNode.Folder)
+        if self._id == "html":
+            importRootNode.title = self.trUtf8("HTML Import")
+        else:
+            importRootNode.title = self.trUtf8("Imported {0}")\
+                .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate))
+        return importRootNode
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing an importer for XBEL files.
+"""
+
+import os
+
+from PyQt4.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt
+
+from ..BookmarksManager import BookmarksManager
+from ..BookmarkNode import BookmarkNode
+from ..XbelReader import XbelReader
+
+from .BookmarksImporter import BookmarksImporter
+
+import UI.PixmapCache
+
+
+def getImporterInfo(id):
+    """
+    Module function to get information for the given XBEL source id.
+
+    @return tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+    """
+    if id == "e5browser":
+        bookmarksFile = BookmarksManager.getFileName()
+        return (
+            UI.PixmapCache.getPixmap("ericWeb48.png"),
+            "eric5 Web Browser",
+            os.path.basename(bookmarksFile),
+            QCoreApplication.translate("XbelImporter",
+                """eric5 Web Browser stores its bookmarks in the <b>{0}</b> XML file. """
+                """This file is usually located in"""
+            ).format(os.path.basename(bookmarksFile)),
+            QCoreApplication.translate("XbelImporter",
+                """Please choose the file to begin importing bookmarks."""),
+            os.path.dirname(bookmarksFile),
+        )
+    elif id == "xbel":
+        return (
+            UI.PixmapCache.getPixmap("xbel.png"),
+            "XBEL Bookmarks",
+            QCoreApplication.translate("XbelImporter", "XBEL Bookmarks") + \
+                " (*.xbel *.xml)",
+            QCoreApplication.translate("XbelImporter",
+                """You can import bookmarks from any browser that supports XBEL """
+                """exporting. This file has usually the extension .xbel or .xml.""" ),
+            QCoreApplication.translate("XbelImporter",
+                """Please choose the file to begin importing bookmarks."""),
+            "",
+        )
+    else:
+        raise ValueError("Unsupported browser ID given ({0}).".format(id))
+
+
+class XbelImporter(BookmarksImporter):
+    """
+    Class implementing the XBEL bookmarks importer.
+    """
+    def __init__(self, id="", parent=None):
+        """
+        Constructor
+
+        @param id source ID (string)
+        @param parent reference to the parent object (QObject)
+        """
+        super().__init__(id, parent)
+
+        self.__fileName = ""
+
+    def setPath(self, path):
+        """
+        Public method to set the path of the bookmarks file or directory.
+
+        @param path bookmarks file or directory (string)
+        """
+        self.__fileName = path
+
+    def open(self):
+        """
+        Public method to open the bookmarks file.
+
+        @return flag indicating success (boolean)
+        """
+        if not os.path.exists(self.__fileName):
+            self._error = True
+            self._errorString = self.trUtf8("File '{0}' does not exist.")\
+                .format(self.__fileName)
+            return False
+        return True
+
+    def importedBookmarks(self):
+        """
+        Public method to get the imported bookmarks.
+
+        @return imported bookmarks (BookmarkNode)
+        """
+        reader = XbelReader()
+        importRootNode = reader.read(self.__fileName)
+
+        if reader.error() != QXmlStreamReader.NoError:
+            self._error = True
+            self._errorString = self.trUtf8(
+                """Error when importing bookmarks on line {0}, column [1}:\n{2}""")\
+                .format(reader.lineNumber(),
+                        reader.columnNumber(),
+                        reader.errorString())
+            return None
+
+        importRootNode.setType(BookmarkNode.Folder)
+        if self._id == "e5browser":
+            importRootNode.title = self.trUtf8("eric5 Web Browser Import")
+        elif self._id == "xbel":
+            importRootNode.title = self.trUtf8("XBEL Import")
+        else:
+            importRootNode.title = self.trUtf8("Imported {0}")\
+                .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate))
+        return importRootNode
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 10:07:28 2012 +0100
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Package implementing bookmarks importers for various sources.
+"""
+
+from PyQt4.QtCore import QCoreApplication
+
+import UI.PixmapCache
+
+
+def getImporters():
+    """
+    Module function to get a list of supported importers.
+
+    @return list of tuples with an icon (QIcon), readable name (string) and
+        internal name (string)
+    """
+    return [
+        (UI.PixmapCache.getIcon("ericWeb48.png"),
+         "eric5 Web Browser",
+         "e5browser"),
+        (UI.PixmapCache.getIcon("xbel.png"),
+         QCoreApplication.translate("BookmarksImporters", "XBEL File"),
+         "xbel"),
+        (UI.PixmapCache.getIcon("html.png"),
+         QCoreApplication.translate("BookmarksImporters", "HTML File"),
+         "html"),
+    ]
+
+
+def getImporterInfo(id):
+    """
+    Module function to get information for the given source id.
+
+    @param id source id to get info for (string)
+    @return tuple with an icon (QPixmap), readable name (string), name of
+        the default bookmarks file (string), an info text (string),
+        a prompt (string) and the default directory of the bookmarks file (string)
+    """
+    if id in ["e5browser", "xbel"]:
+        from . import XbelImporter
+        return XbelImporter.getImporterInfo(id)
+    elif id == "html":
+        from . import HtmlImporter
+        return HtmlImporter.getImporterInfo(id)
+
+def getImporter(id, parent=None):
+    """
+    Module function to get an importer for the given source id.
+
+    @param id source id to get an importer for (string)
+    @param parent reference to the parent object (QObject)
+    @return bookmarks importer (BookmarksImporter)
+    """
+    if id in ["e5browser", "xbel"]:
+        from . import XbelImporter
+        return XbelImporter.XbelImporter(id, parent)
+    elif id == "html":
+        from . import HtmlImporter
+        return HtmlImporter.HtmlImporter(id, parent)
+    else:
+        raise ValueError("No importer for ID {0}.".format(id))
--- a/Helpviewer/Bookmarks/BookmarksManager.py	Sat Mar 17 13:03:30 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksManager.py	Sun Mar 18 10:07:28 2012 +0100
@@ -11,8 +11,7 @@

 from PyQt4.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, QByteArray, \
     QBuffer, QIODevice, QXmlStreamReader, QDate, QFileInfo, QUrl
-from PyQt4.QtGui import QUndoStack, QUndoCommand, QApplication
-from PyQt4.QtWebKit import QWebPage
+from PyQt4.QtGui import QUndoStack, QUndoCommand, QApplication, QDialog

 from E5Gui import E5MessageBox, E5FileDialog

@@ -21,6 +20,7 @@
 from .DefaultBookmarks import DefaultBookmarks
 from .XbelReader import XbelReader
 from .XbelWriter import XbelWriter
+from .BookmarksImportDialog import BookmarksImportDialog

 from Utilities.AutoSaver import AutoSaver
 import Utilities
@@ -33,61 +33,6 @@
 StartMenu = 1
 StartToolBar = 2

-##########################################################################################
-
-extract_js = r"""
-function walk() {
-    var parent = arguments[0];
-    var indent = arguments[1];
-
-    var result = "";
-    var children = parent.childNodes;
-    var folderName = "";
-    var folded = "";
-    for (var i = 0; i < children.length; i++) {
-        var object = children.item(i);
-        if (object.nodeName == "HR") {
-            result += indent + "<separator/>\n";
-        }
-        if (object.nodeName == "H3") {
-            folderName = object.innerHTML;
-            folded = object.folded;
-            if (object.folded == undefined)
-                folded = "false";
-            else
-                folded = "true";
-        }
-        if (object.nodeName == "A") {
-            result += indent + "<bookmark href=\"" + encodeURI(object.href).replace(/&/g, '&amp;') + "\">\n";
-            result += indent + indent + "<title>" + object.innerHTML + "</title>\n";
-            result += indent + "</bookmark>\n";
-        }
-
-        var currentIndent = indent;
-        if (object.nodeName == "DL" && folderName != "") {
-            result += indent + "<folder folded=\"" + folded + "\">\n";
-            indent += "    ";
-            result += indent + "<title>" + folderName + "</title>\n";
-        }
-        result += walk(object, indent);
-        if (object.nodeName == "DL" && folderName != "") {
-            result += currentIndent + "</folder>\n";
-        }
-    }
-    return result;
-}
-
-var xbel = walk(document, "    ");
-
-if (xbel != "") {
-    xbel = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE xbel>\n<xbel version=\"1.0\">\n" + xbel + "</xbel>\n";
-}
-
-xbel;
-"""
-
-##########################################################################################
-

 class BookmarksManager(QObject):
     """
@@ -132,7 +77,8 @@
         self.__bookmarksModel = None
         self.__commands = QUndoStack()

-    def getFileName(self):
+    @classmethod
+    def getFileName(cls):
         """
         Public method to get the file name of the bookmark file.

@@ -359,54 +305,11 @@
         """
         Public method to import bookmarks.
         """
-        supportedFormats = [
-            self.trUtf8("XBEL bookmarks") + " (*.xbel *.xml)",
-            self.trUtf8("HTML Netscape bookmarks") + " (*.html *.htm)"
-        ]
-
-        fileName = E5FileDialog.getOpenFileName(
-            None,
-            self.trUtf8("Import Bookmarks"),
-            "",
-            ";;".join(supportedFormats))
-        if not fileName:
-            return
-
-        reader = XbelReader()
-        importRootNode = None
-        if fileName.endswith(".html"):
-            inFile = QFile(fileName)
-            inFile.open(QIODevice.ReadOnly)
-            if inFile.openMode == QIODevice.NotOpen:
-                E5MessageBox.warning(None,
-                    self.trUtf8("Import Bookmarks"),
-                    self.trUtf8("""Error opening bookmarks file <b>{0}</b>.""")\
-                        .format(fileName))
-                return
-
-            webpage = QWebPage()
-            webpage.mainFrame().setHtml(inFile.readAll())
-            result = webpage.mainFrame().evaluateJavaScript(extract_js)
-            buffer_ = QBuffer(result)
-            buffer_.open(QIODevice.ReadOnly)
-            importRootNode = reader.read(buffer_)
-        else:
-            importRootNode = reader.read(fileName)
-
-        if reader.error() != QXmlStreamReader.NoError:
-            E5MessageBox.warning(None,
-                self.trUtf8("Import Bookmarks"),
-                self.trUtf8("""Error when importing bookmarks on"""
-                            """ line {0}, column [1}:\n{2}""")\
-                    .format(reader.lineNumber(),
-                            reader.columnNumber(),
-                            reader.errorString()))
-            return
-
-        importRootNode.setType(BookmarkNode.Folder)
-        importRootNode.title = self.trUtf8("Imported {0}")\
-            .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate))
-        self.addBookmark(self.menu(), importRootNode)
+        dlg = BookmarksImportDialog()
+        if dlg.exec_() == QDialog.Accepted:
+            importRootNode = dlg.getImportedBookmarks()
+            if importRootNode is not None:
+                self.addBookmark(self.menu(), importRootNode)

     def exportBookmarks(self):
         """
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Sat Mar 17 13:03:30 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Sun Mar 18 10:07:28 2012 +0100
@@ -219,7 +219,10 @@

         # initial actions
         for act in self.__initialActions:
-            self.addAction(act)
+            if act == "--SEPARATOR--":
+                self.addSeparator()
+            else:
+                self.addAction(act)
         if len(self.__initialActions) != 0:
             self.addSeparator()
--- a/Helpviewer/HelpWindow.py	Sat Mar 17 13:03:30 2012 +0100
+++ b/Helpviewer/HelpWindow.py	Sun Mar 18 10:07:28 2012 +0100
@@ -1291,9 +1291,6 @@
         menu.addAction(self.saveAsAct)
         menu.addAction(self.savePageScreenAct)
         menu.addSeparator()
-        menu.addAction(self.importBookmarksAct)
-        menu.addAction(self.exportBookmarksAct)
-        menu.addSeparator()
         menu.addAction(self.printPreviewAct)
         menu.addAction(self.printAct)
         menu.addAction(self.printPdfAct)
@@ -1359,6 +1356,9 @@
         bookmarksActions.append(self.bookmarksAddAct)
         bookmarksActions.append(self.bookmarksAllTabsAct)
         bookmarksActions.append(self.bookmarksAddFolderAct)
+        bookmarksActions.append("--SEPARATOR--")
+        bookmarksActions.append(self.importBookmarksAct)
+        bookmarksActions.append(self.exportBookmarksAct)
         self.bookmarksMenu.setInitialActions(bookmarksActions)

         menu = mb.addMenu(self.trUtf8('&Settings'))
--- a/changelog	Sat Mar 17 13:03:30 2012 +0100
+++ b/changelog	Sun Mar 18 10:07:28 2012 +0100
@@ -35,6 +35,7 @@
      ten pages by pressing Meta+1 to Meta+0
   -- added a history sub-menu showing the most visited sites
   -- added the capability to restore closed tabs
+  -- added a bookmarks importer to get them directly from other browsers files
 - Third Party packages
   -- updated to Pygments 1.5
--- a/eric5.e4p	Sat Mar 17 13:03:30 2012 +0100
+++ b/eric5.e4p	Sun Mar 18 10:07:28 2012 +0100
@@ -986,6 +986,11 @@
     <Source>ThirdParty/Pygments/pygments/lexers/_scilab_builtins.py</Source>
     <Source>ThirdParty/Pygments/pygments/lexers/shell.py</Source>
     <Source>ThirdParty/Pygments/pygments/styles/rrt.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImportDialog.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImporters/__init__.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>
@@ -1270,6 +1275,7 @@
     <Form>Helpviewer/UrlBar/BookmarkActionSelectionDialog.ui</Form>
     <Form>Helpviewer/Sync/SyncEncryptionPage.ui</Form>
     <Form>Helpviewer/Sync/SyncDirectorySettingsPage.ui</Form>
+    <Form>Helpviewer/Bookmarks/BookmarksImportDialog.ui</Form>
   </Forms>
   <Translations>
     <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_cs.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1532,6 +1532,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished">Importovat záložky</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Další</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Zrušit</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Další &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1544,108 +1620,108 @@
         <translation>Menu záložek</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Nahrání záložek</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Panel nástrojů záložek</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Ukládání záložek</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
         <source>XBEL bookmarks</source>
-        <translation>XBEL záložky</translation>
+        <translation type="obsolete">XBEL záložky</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
         <source>HTML Netscape bookmarks</source>
-        <translation>HTML Netscape záložky</translation>
+        <translation type="obsolete">HTML Netscape záložky</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Import Bookmarks</source>
-        <translation>Importovat záložky</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <translation type="obsolete">Importovat záložky</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Export záložek</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Exportování záložek</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Odebrat záložku</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Vložit záložku</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>Změnit název</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Změnit adresu</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Chyba při ukládání záložek do &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
         <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Chyba při otevírání souboru záložek &lt;b&gt;{0}&lt;/b&gt;.</translation>
+        <translation type="obsolete">Chyba při otevírání souboru záložek &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Error when importing bookmarks on line {0}, column [1}:
 {2}</source>
-        <translation>Chyba při importu záložek na řádce {0}, sloupci {1}:{2}</translation>
+        <translation type="obsolete">Chyba při importu záložek na řádce {0}, sloupci {1}:{2}</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
         <source>Imported {0}</source>
-        <translation>Importováno {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <translation type="obsolete">Importováno {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Chyba při exportu záložek &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Konvertováno {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>XBEL záložky (*.xbel);;XBEL záložky (*.xml)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Chyba při načítání záložek na řádce {0}, sloupci {1}:
@@ -1678,17 +1754,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished">Otevřít vše v tabech</translation>
     </message>
@@ -15235,27 +15311,27 @@
         <translation>S&amp;oubor</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edit</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>Poh&amp;led</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Jít</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>H&amp;istorie</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Záložky</translation>
     </message>
@@ -16324,7 +16400,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22378,6 +22454,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importováno {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -36047,17 +36168,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40233,7 +40354,7 @@
 &lt;p&gt;Zobrazuje případná chybová hlášení ze subversion příkazu proplist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Chyba v procesu generování</translation>
     </message>
@@ -40248,7 +40369,7 @@
         <translation>Chyby</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
@@ -52553,6 +52674,55 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{2}</source>
+        <translation type="unfinished">Chyba při importu záložek na řádce {0}, sloupci {1}:{2}</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">Importováno {0}</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_de.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_de.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de">
+<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1526,6 +1525,77 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation>Lesezeichen importieren</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation>Wähle die Quelle aus, von der Lesezeichen importiert werden sollen:</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation>Wähle die zu importierende Quelle aus</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation>Wähle Verzeichnis ...</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation>Wähle Datei ...</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Imprtiere von {0}&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation>Abschließen</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation>Fehler beim Importieren von Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation>Zeigt den Namen der Lesezeichendatei oder -verzeichnisses an</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation>Weiter &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation>XBEL Datei</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation>HTML Datei</translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1538,109 +1608,77 @@
         <translation>Lesezeichenmenü</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Lesezeichen laden</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Lesezeichenleiste</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Lesezeichen speichern</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Fehler beim Speichern der Lesezeichen in &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
-        <source>XBEL bookmarks</source>
-        <translation>XBEL Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
-        <source>HTML Netscape bookmarks</source>
-        <translation>HTML Netscape Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Import Bookmarks</source>
-        <translation>Lesezeichen importieren</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
-        <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Fehler beim Öffnen der Lesezeichendatei &lt;b&gt;{0}&lt;/b&gt;.</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
-        <source>Imported {0}</source>
-        <translation>Importiert {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Lesezeichen exportieren</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Lesezeichen exportieren</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Fehler beim Exportieren der Lesezeichen in &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Umgewandelt {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Lesezeichen löschen</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Lesezeichen einfügen</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>Namensänderung</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Adressenänderung</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Error when importing bookmarks on line {0}, column [1}:
-{2}</source>
-        <translation>Fehler beim Importieren der Lesezeichen in Zeile {0}, Spalte {1}:
-{2}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>XBEL Lesezeichen (*.xbel);;XBEL Lesezeichen (*.xml)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Fehler beim Laden der Lesezeichen in Zeile {0}, Spalte {1}:
@@ -1661,8 +1699,8 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/>
-        <source>Open in New &amp;Tab	Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
+        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="148"/>
@@ -1673,17 +1711,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation>Stadard Startseite</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation>Schnellwahl</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation>Alle in Tabs öffnen</translation>
     </message>
@@ -1898,7 +1936,7 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/>
-        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
         <translation>In neuem &amp;Register öffnen\tStrg+LMK</translation>
     </message>
 </context>
@@ -13135,7 +13173,7 @@
     </message>
     <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="899"/>
-        <source>Open Link in New Tab	Ctrl+LMB</source>
+        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
         <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation>
     </message>
     <message>
@@ -14726,12 +14764,12 @@
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Gehe zu</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Lesezeichen</translation>
     </message>
@@ -14781,12 +14819,12 @@
         <translation>&lt;b&gt;Kopieren&lt;/b&gt;&lt;p&gt;Kopiert den ausgewählten Text in die Zwischenablage.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
@@ -14821,7 +14859,7 @@
         <translation>&lt;b&gt;Verkleinern&lt;/b&gt;&lt;p&gt;Den angezeigten Text verkleinern.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>&amp;Chronik</translation>
     </message>
@@ -15928,7 +15966,7 @@
         <translation>&lt;b&gt;Sind sie sicher, dass sie privates Browsen einschalten möchten?&lt;/b&gt;&lt;p&gt;Wenn das private Browsen eingeschaltet ist, werden keine Web Seiten mehr zur Chronik hinzugefügt und Suchanfragen, Web Site Icons und Cookies werden nicht mehr gespeichert. HTML5 Offline Speicher wird deaktiviert. Bis das Fenster geschlossen wird, können sie jedoch weiterhin die Zurück und Vorwärts Knöpfe nutzen, um zu besuchten Web Seiten zurückzukehren.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation>Zeichenkodierung</translation>
     </message>
@@ -21882,6 +21920,53 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation>HTML Netscape Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation>Bitte wähle die Datei, um den Import von Lesezeichen zu starten.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation>Datei &apos;{0}&apos; existiert nicht.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation>Datei &apos;{0}&apos; kann nicht gelesen werden.
+Ursache: {1}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation>Fehler beim Importieren der Lesezeichen in Zeile {0}, Spalte {1}:
+{2}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation>HTML Import</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation>Importiert {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation>Es können Lesezeichen von jedem Browser, der den HTML Export unterstützt, importiert werden. Diese Datei hat üblicherweise die Endung .htm oder .html.</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -35154,17 +35239,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation>Fehler beim Laden</translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation>Speichere Schnellwahl Daten</translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Schnellwahl Daten konnten nicht in die Datei &lt;b&gt;{0}&lt;/b&gt; gespeichert werden&lt;/p&gt;</translation>
     </message>
@@ -39351,7 +39436,7 @@
 &lt;p&gt;Dies zeigt mögliche Fehlermeldungen des subversion proplist Befehls.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
@@ -39361,7 +39446,7 @@
         <translation>Keine</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
@@ -51415,6 +51500,56 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation>Der eric5 Web Browser speichert seine Lesezeichen in der XML-Datei &lt;b&gt;{0}&lt;/b&gt;. Diese Datei befindet sich gewöhnlich in</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation>Bitte wähle die Datei, um den Import von Lesezeichen zu starten.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <source>XBEL Bookmarks</source>
+        <translation>XBEL Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation>Datei &apos;{0}&apos; existiert nicht.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/>
+        <source>Error when importing bookmarks on line {0}, column [1}:
+{2}</source>
+        <translation>Fehler beim Importieren der Lesezeichen in Zeile {0}, Spalte {1}:
+{2}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/>
+        <source>eric5 Web Browser Import</source>
+        <translation>eric5 Web Browser Import</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/>
+        <source>XBEL Import</source>
+        <translation>XBEL Import</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/>
+        <source>Imported {0}</source>
+        <translation>Importiert {0}</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>
+        <translation>Es können Lesezeichen von jedem Browser, der den XBEL Export unterstützt, importiert werden. Diese Datei hat üblicherweise die Endung .xbel oder .xml.</translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_en.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_en.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1499,6 +1499,77 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1511,109 +1582,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <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="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
-        <source>XBEL bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
-        <source>HTML Netscape bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Import Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
-        <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Error when importing bookmarks on line {0}, column [1}:
-{2}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
-        <source>Imported {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <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="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1644,17 +1684,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15708,32 +15748,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21741,6 +21781,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -34835,17 +34920,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38967,12 +39052,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50960,6 +51045,55 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_es.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_es.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1530,6 +1530,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished">Importar Marcadores</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Siguiente</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancelar</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Siguiente &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1542,109 +1618,109 @@
         <translation>Menú de Marcadores</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Cargando Marcadores</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Marcadores de Barra de Herramientas</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Guardando Marcadores</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
         <source>XBEL bookmarks</source>
-        <translation>Marcadores XBEL</translation>
+        <translation type="obsolete">Marcadores XBEL</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
         <source>HTML Netscape bookmarks</source>
-        <translation>Marcadores HTML Netscape</translation>
+        <translation type="obsolete">Marcadores HTML Netscape</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Import Bookmarks</source>
-        <translation>Importar Marcadores</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <translation type="obsolete">Importar Marcadores</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Exportar Marcadores</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Exportando Marcadores</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Borrar Marcador</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Insertar Marcador</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>Cambiar Nombre</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Cambiar Dirección</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Error al guardar marcadores a &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
         <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Error al abrir archivo de marcadores &lt;b&gt;{0}&lt;/b&gt;.</translation>
+        <translation type="obsolete">Error al abrir archivo de marcadores &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Error when importing bookmarks on line {0}, column [1}:
 {2}</source>
-        <translation>Error al importar marcadores en línea {0}, columna {1}:
+        <translation type="obsolete">Error al importar marcadores en línea {0}, columna {1}:
 {2}</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
         <source>Imported {0}</source>
-        <translation>Importado {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <translation type="obsolete">Importado {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Error al exportar marcadores a &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Convertido {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>Marcadores XBEL (*.xbel);;Marcadores XBEL(*.xml)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Error al cargar marcadores en línea {0}, columna {1}:
@@ -1677,17 +1753,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation>Página de Inicio por Defecto</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation>Marcación rápida</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation>Abrir todo en Pestañas</translation>
     </message>
@@ -15302,27 +15378,27 @@
         <translation>&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edición</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Ir</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historial</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Marcadores</translation>
     </message>
@@ -16154,7 +16230,7 @@
         <translation>&lt;b&gt;¿Está seguro de que desea activar la navegación privada?&lt;/b&gt;&lt;p&gt;Cuando la navegación privada ha sido activada, las páginas web no se añaden al historial, las búsquedas no se añaden a la lista de búsquedas recientes, y los iconos de website y las cookies no son almacenados. El almacenamiento offline de HTML5 tambien es desactivado. Hasta que la ventana sea cerrada, todavía se pueden utilizar los botones de Atrás y Adelante para retornar a las páginas web que hayan sido navegadas.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation>Codificación de Texto</translation>
     </message>
@@ -22245,6 +22321,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importado {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -35701,17 +35822,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation>No se ha podido cargar</translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39983,7 +40104,7 @@
 &lt;p&gt;Muestra los posibles mensajes de error del comando subversion proplist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
@@ -39998,7 +40119,7 @@
         <translation>Errores</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
@@ -52221,6 +52342,56 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{2}</source>
+        <translation type="unfinished">Error al importar marcadores en línea {0}, columna {1}:
+{2}</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">Importado {0}</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_fr.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_fr.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1713,6 +1713,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Suivant</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished">Installer</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Suivant &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1725,108 +1801,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
-        <source>XBEL bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
-        <source>HTML Netscape bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Import Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
-        <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Error when importing bookmarks on line {0}, column [1}:
-{2}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
-        <source>Imported {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <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="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation type="unfinished"></translation>
@@ -1858,17 +1903,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16286,27 +16331,27 @@
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edition</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>A&amp;ller</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>&amp;Historique</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Signets</translation>
     </message>
@@ -17438,7 +17483,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23438,6 +23483,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -38612,17 +38702,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43262,7 +43352,7 @@
 &lt;p&gt;Affiche les erreurs possibles de la commande &quot;proplist&quot; de Subversion&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Erreur du processus</translation>
     </message>
@@ -43282,7 +43372,7 @@
         <translation>Erreurs</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -56435,6 +56525,55 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_it.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_it.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1532,6 +1532,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished">Importa Segnalibri</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Successivo</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Cancella</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Successivo&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1544,109 +1620,109 @@
         <translation>Menu dei segnalibri</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Caricamento dei segnalibri</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Toolbar segnalibri</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Salvataggio segnalibri</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
         <source>XBEL bookmarks</source>
-        <translation>Segnalibri XBEL</translation>
+        <translation type="obsolete">Segnalibri XBEL</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
         <source>HTML Netscape bookmarks</source>
-        <translation>Segnalibri HTML Netscape</translation>
+        <translation type="obsolete">Segnalibri HTML Netscape</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Import Bookmarks</source>
-        <translation>Importa Segnalibri</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <translation type="obsolete">Importa Segnalibri</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Esporta segnalibri</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Esportazione Segnalibri</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Rimuovi segnalibro</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Inserisci segnalibro</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>Cambia Nome</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Cambia Indirizzo</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Errore nel salvataggio dei segnalibri su &lt;b&gt;({0})&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
         <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Errore nell&apos;apertura del file segnalibri &lt;b&gt;{0}&lt;/b&gt;.</translation>
+        <translation type="obsolete">Errore nell&apos;apertura del file segnalibri &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Error when importing bookmarks on line {0}, column [1}:
 {2}</source>
-        <translation>Errore nell&apos;importazione dei segnalibri alla riga {0}, colonna {1}:
+        <translation type="obsolete">Errore nell&apos;importazione dei segnalibri alla riga {0}, colonna {1}:
 {2}</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
         <source>Imported {0}</source>
-        <translation>Importato {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <translation type="obsolete">Importato {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Errore nell&apos;esportazione dei segnalibri su &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Convertito {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>Bookmark XBEL (*.xbel);;Bookmark XBEL (*.xml)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Errore nell&apos;importazione dei segnalibri alla riga {0}, colonna {1}:
@@ -1679,17 +1755,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished">Apri in tutte le linguette</translation>
     </message>
@@ -15008,27 +15084,27 @@
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edita</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Vai</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>Cronolog&amp;ia</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>Segnali&amp;bri</translation>
     </message>
@@ -16090,7 +16166,7 @@
         <translation>&lt;b&gt;Sei sicuro di voler attivare la navigazione riservata?&lt;/b&gt;&lt;p&gt;Quando la navigazione riservata è attivata, le pagine web non sono aggiunte alla cronologia, le ricerche non sono aggiunte alla lista delle ultime ricerche e le icone dei siti e i cookie non sono salvati, l&apos;offline storage di HTML5 viene disattivato. Fino alla chiusura della finestra, puoi premere sui pulsanti Precedente e Successivo per tornare alle pagine web che hai visitato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation>Codifica testo</translation>
     </message>
@@ -22143,6 +22219,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importato {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -35549,17 +35670,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39830,7 +39951,7 @@
 &lt;p&gt;Mostra i possibile messaggi di errore del comando subversion proplist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Errore Generazione Processo</translation>
     </message>
@@ -39845,7 +39966,7 @@
         <translation>Errori</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Il processo {0}  non può essere avviato. Assicurarsi che sia nel path.</translation>
     </message>
@@ -52047,6 +52168,56 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{2}</source>
+        <translation type="unfinished">Errore nell&apos;importazione dei segnalibri alla riga {0}, colonna {1}:
+{2}</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">Importato {0}</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_ru.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_ru.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1529,6 +1529,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished">Импортировать закладки</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Далее</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Далее &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1541,99 +1617,99 @@
         <translation>Выбор закладок</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Добавление закладок</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Ошибка при добавлении закладок в строке {0}, позиция {1}:
 {2}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Коллекция закладок</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Сохранение закладок</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Ошибка при сохранении закладок в файл &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
         <source>XBEL bookmarks</source>
-        <translation>XBEL закладки</translation>
+        <translation type="obsolete">XBEL закладки</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
         <source>HTML Netscape bookmarks</source>
-        <translation>HTML Netscape закладки</translation>
+        <translation type="obsolete">HTML Netscape закладки</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Import Bookmarks</source>
-        <translation>Импортировать закладки</translation>
+        <translation type="obsolete">Импортировать закладки</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
         <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Ошибка чтения файла закладок &lt;b&gt;{0}&lt;/b&gt;.</translation>
+        <translation type="obsolete">Ошибка чтения файла закладок &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
         <source>Imported {0}</source>
-        <translation>Импортировано {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <translation type="obsolete">Импортировано {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Экспортировать закладки</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Экспорт закладок</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Ошибка при сохранении закладок в файл &lt;b&gt;{0}&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Сконвертировано {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Удалить закладку</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Вставить закладку</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>Изменить имя</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Изменить адрес</translation>
     </message>
@@ -1641,11 +1717,11 @@
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Error when importing bookmarks on line {0}, column [1}:
 {2}</source>
-        <translation>Ошибка при импорте закладок в строке {0}, позиция {1}:
+        <translation type="obsolete">Ошибка при импорте закладок в строке {0}, позиция {1}:
 {2}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>XBEL закладки (*.xbel);;XBEL закладки (*.xml)</translation>
     </message>
@@ -1676,17 +1752,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished">Открыть всё в закладках</translation>
     </message>
@@ -15089,27 +15165,27 @@
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Перейти</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>И&amp;стория</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Закладки</translation>
     </message>
@@ -16197,7 +16273,7 @@
         <translation>&lt;b&gt;Подтвердите включение закрытого режима.&lt;/b&gt;&lt;p&gt;В закрытом режиме посещённые WEB страницы не сохраняются в истории, поиски не сохраняються в списке последних поисков, иконки сайтов и cookies так же не сохраняются. HTML5 автономное хранилище будет выключено. Пока текущее окно не закрыто, переход вперёд и назад на просмотренные уже страницы всё же будет работать.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation>Кодировка текста</translation>
     </message>
@@ -22256,6 +22332,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Импортировано {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -35694,17 +35815,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39978,7 +40099,7 @@
 &lt;p&gt;Показывает возможные ошибки команды subversion proplist.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>Ошибка процесса генерации</translation>
     </message>
@@ -39988,7 +40109,7 @@
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Не могу запустить процесс &apos;{0}&apos;. Убедитесь, что он находится в пути поиска.</translation>
     </message>
@@ -52292,6 +52413,56 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{2}</source>
+        <translation type="unfinished">Ошибка при импорте закладок в строке {0}, позиция {1}:
+{2}</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">Импортировано {0}</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_tr.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_tr.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1530,6 +1530,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished">Yerimlerini İçeaktar</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">Sonraki</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Vazgeç</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">Sonraki &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1542,111 +1618,111 @@
         <translation>Yerimleri Menüsü</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation>Yerimleri Yükleniyor</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation>Yerimlerini yüklerken {0} satır, {1} sütunda hata var:
 {2}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation>Yerimleri Araççubuğu</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation>Yerimleri Kaydediliyor</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Yer imlerinin &lt;b&gt;{0}&lt;/b&gt;ne kaydederken hata oldu.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
         <source>XBEL bookmarks</source>
-        <translation>XBEL yerimleri</translation>
+        <translation type="obsolete">XBEL yerimleri</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
         <source>HTML Netscape bookmarks</source>
-        <translation>HTML Netscape yerimleri</translation>
+        <translation type="obsolete">HTML Netscape yerimleri</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Import Bookmarks</source>
-        <translation>Yerimlerini İçeaktar</translation>
+        <translation type="obsolete">Yerimlerini İçeaktar</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
         <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation>Yerimi dosyası &lt;b&gt;{0}&lt;/b&gt; yi açarken hata oldu.</translation>
+        <translation type="obsolete">Yerimi dosyası &lt;b&gt;{0}&lt;/b&gt; yi açarken hata oldu.</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
         <source>Error when importing bookmarks on line {0}, column [1}:
 {2}</source>
-        <translation>Yerimlerini içe aktarırken {0} satır, {1} sütunda hata var:
+        <translation type="obsolete">Yerimlerini içe aktarırken {0} satır, {1} sütunda hata var:
 {2}</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
         <source>Imported {0}</source>
-        <translation>İçe Aktarılmış {0}</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <translation type="obsolete">İçe Aktarılmış {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation>Yerimlerini Dışaaktar</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source>
         <translation>XBEL yerimleri (*.xbel);;XBEL yerimleri (*.xml)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation>Yerimleri Dışaaktarılıyor</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation>Yerimlerini {0} ye dışa aktarırken hata oldu.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation>Çevrilmiş {0}</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation>Yerimini kaldır</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation>Yerimi Araya gir</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation>İsim Değişikliği</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation>Adres Değişikliği</translation>
     </message>
@@ -1677,17 +1753,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished">Hepsini Sekmelerde Aç</translation>
     </message>
@@ -16105,27 +16181,27 @@
         <translation>&amp;Dosya</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>Düz&amp;en</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>&amp;Görünüm</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>&amp;Git</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>Geçmi&amp;ş</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Yerimleri</translation>
     </message>
@@ -16360,7 +16436,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22309,6 +22385,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">İçe Aktarılmış {0}</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -35848,17 +35969,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40022,12 +40143,12 @@
 &lt;p&gt;Bu altsürüm özelliklistesi komut hatalarını olası mesajlarını gösterir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>İşlem Üretecinde Hata</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation>
     </message>
@@ -52292,6 +52413,56 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{2}</source>
+        <translation type="unfinished">Yerimlerini içe aktarırken {0} satır, {1} sütunda hata var:
+{2}</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">İçe Aktarılmış {0}</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
--- a/i18n/eric5_zh_CN.GB2312.ts	Sat Mar 17 13:03:30 2012 +0100
+++ b/i18n/eric5_zh_CN.GB2312.ts	Sun Mar 18 10:07:28 2012 +0100
@@ -1706,6 +1706,82 @@
     </message>
 </context>
 <context>
+    <name>BookmarksImportDialog</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="20"/>
+        <source>Import Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/>
+        <source>Choose source from which you want to import bookmarks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/>
+        <source>Choose the source to import from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next</source>
+        <translation type="obsolete">下一个</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <source>Choose Directory ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <source>Choose File ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <source>&lt;b&gt;Importing from {0}&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="116"/>
+        <source>Finish</source>
+        <translation type="unfinished">完成</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <source>Error importing bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/>
+        <source>Shows the name of the bookmarks file or directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/>
+        <source>Next &gt;</source>
+        <translation type="unfinished">下一步 &gt;</translation>
+    </message>
+</context>
+<context>
+    <name>BookmarksImporters</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="26"/>
+        <source>XBEL File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="29"/>
+        <source>HTML File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BookmarksManager</name>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/>
@@ -1718,108 +1794,77 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Loading Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="201"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/>
         <source>Toolbar Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="207"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Saving Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="363"/>
-        <source>XBEL bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="364"/>
-        <source>HTML Netscape bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Import Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/>
         <source>Export Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Exporting Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="566"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/>
         <source>Remove Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="606"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/>
         <source>Insert Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="645"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/>
         <source>Name Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="648"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/>
         <source>Address Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="250"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/>
         <source>Error saving bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="381"/>
-        <source>Error opening bookmarks file &lt;b&gt;{0}&lt;/b&gt;.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="397"/>
-        <source>Error when importing bookmarks on line {0}, column [1}:
-{2}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="407"/>
-        <source>Imported {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="431"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/>
         <source>Error exporting bookmarks to &lt;b&gt;{0}&lt;/b&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="446"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/>
         <source>Converted {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="415"/>
+        <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="189"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/>
         <source>Error when loading bookmarks on line {0}, column {1}:
 {2}</source>
         <translation type="unfinished"></translation>
@@ -1851,17 +1896,17 @@
 <context>
     <name>BookmarksMenuBarMenu</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="254"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
         <source>Default Home Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="257"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="260"/>
         <source>Speed Dial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="261"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="264"/>
         <source>Open all in Tabs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16617,27 +16662,27 @@
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1308"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1305"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1316"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1313"/>
         <source>&amp;View</source>
         <translation>视图(&amp;V)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1332"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1329"/>
         <source>&amp;Go</source>
         <translation>跳转(&amp;G)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1345"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1342"/>
         <source>H&amp;istory</source>
         <translation>历史(&amp;i)</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1352"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1349"/>
         <source>&amp;Bookmarks</source>
         <translation>书签(&amp;B)</translation>
     </message>
@@ -17399,7 +17444,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpWindow.py" line="1327"/>
+        <location filename="Helpviewer/HelpWindow.py" line="1324"/>
         <source>Text Encoding</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23398,6 +23443,51 @@
     </message>
 </context>
 <context>
+    <name>HtmlImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>HTML Netscape Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>Please choose the file to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="136"/>
+        <source>File &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="153"/>
+        <source>File &apos;{0}&apos; cannot be read.
+Reason: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="171"/>
+        <source>Error when importing bookmarks on line {0}, column {1}:
+{2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="180"/>
+        <source>HTML Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="182"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py" line="88"/>
+        <source>You can import bookmarks from any browser that supports HTML exporting. This file has usually the extension .htm or .html.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>
@@ -38576,17 +38666,17 @@
 <context>
     <name>SpeedDial</name>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="363"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="366"/>
         <source>Unable to load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>Saving Speed Dial data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="198"/>
+        <location filename="Helpviewer/SpeedDial/SpeedDial.py" line="201"/>
         <source>&lt;p&gt;Speed Dial data could not be saved to &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43236,7 +43326,7 @@
 &lt;p&gt;显示版本控制属性列表命令可能的错误消息。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>Process Generation Error</source>
         <translation>进程生成错误</translation>
     </message>
@@ -43251,7 +43341,7 @@
         <translation>无</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="120"/>
+        <location filename="Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="123"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -56396,6 +56486,55 @@
     </message>
 </context>
 <context>
+    <name>XbelImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="33"/>
+        <source>eric5 Web Browser stores its bookmarks in the &lt;b&gt;{0}&lt;/b&gt; XML file. This file is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/>
+        <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"/>
+        <source>XBEL Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/>
+        <source>File &apos;{0}&apos; 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}:
+{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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>XbelReader</name>
     <message>
         <location filename="Helpviewer/Bookmarks/XbelReader.py" line="71"/>
Binary file icons/default/chrome.png has changed
Binary file icons/default/chromium.png has changed
Binary file icons/default/firefox.png has changed
Binary file icons/default/html.png has changed
Binary file icons/default/internet_explorer.png has changed
Binary file icons/default/opera.png has changed
Binary file icons/default/safari.png has changed
Binary file icons/default/xbel.png has changed
APIs/Python3/eric5.api		file \| annotate \| diff \| comparison \| revisions
APIs/Python3/eric5.bas		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImportDialog.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksManager.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric5.Helpviewer.Bookmarks.html		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImportDialog.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImportDialog.ui		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksImporters/__init__.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksManager.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/Bookmarks/BookmarksMenu.py		file \| annotate \| diff \| comparison \| revisions
Helpviewer/HelpWindow.py		file \| annotate \| diff \| comparison \| revisions
changelog		file \| annotate \| diff \| comparison \| revisions
eric5.e4p		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_cs.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_de.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_en.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_es.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_fr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_it.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_ru.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_tr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric5_zh_CN.GB2312.ts		file \| annotate \| diff \| comparison \| revisions
icons/default/chrome.png		file \| annotate \| diff \| comparison \| revisions
icons/default/chromium.png		file \| annotate \| diff \| comparison \| revisions
icons/default/firefox.png		file \| annotate \| diff \| comparison \| revisions
icons/default/html.png		file \| annotate \| diff \| comparison \| revisions
icons/default/internet_explorer.png		file \| annotate \| diff \| comparison \| revisions
icons/default/opera.png		file \| annotate \| diff \| comparison \| revisions
icons/default/safari.png		file \| annotate \| diff \| comparison \| revisions
icons/default/xbel.png		file \| annotate \| diff \| comparison \| revisions