Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun Mar 18 17:46:54 2012 +0100
+++ b/APIs/Python3/eric5.api	Sun Mar 18 19:10:59 2012 +0100
@@ -1810,6 +1810,11 @@
 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.IExplorerImporter.IExplorerImporter.importedBookmarks?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.open?4()
+eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.setPath?4(path)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(id="", parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(id)
 eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.importedBookmarks?4()
 eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.open?4()
 eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.setPath?4(path)

--- a/APIs/Python3/eric5.bas	Sun Mar 18 17:46:54 2012 +0100
+++ b/APIs/Python3/eric5.bas	Sun Mar 18 19:10:59 2012 +0100
@@ -58,7 +58,7 @@
 ChangeBookmarkCommand QUndoCommand
 ChatWidget QWidget Ui_ChatWidget
 ChromeImporter BookmarksImporter
-Class ClbrBase
+Class ClbrBaseClasses.Class VisibilityMixin
 ClassItem UMLItem
 ClassScope Scope
 ClbrBase _ClbrBase
@@ -308,6 +308,7 @@
 HistoryMostVisitedMenuModel QSortFilterProxyModel
 HistoryTreeModel QAbstractProxyModel
 HtmlImporter BookmarksImporter
+IExplorerImporter BookmarksImporter
 IconEditCommand QUndoCommand
 IconEditorGrid QWidget
 IconEditorPalette QWidget

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Mar 18 17:46:54 2012 +0100
+++ b/Documentation/Help/source.qhp	Sun Mar 18 19:10:59 2012 +0100
@@ -205,6 +205,7 @@
                 <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html" />
                 <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html" />
                 <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html" />
+                <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html" />
                 <section title="eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.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" />
@@ -5749,6 +5750,12 @@
       <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="IExplorerImporter" id="IExplorerImporter" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter" />
+      <keyword name="IExplorerImporter (Constructor)" id="IExplorerImporter (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.__init__" />
+      <keyword name="IExplorerImporter (Module)" id="IExplorerImporter (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html" />
+      <keyword name="IExplorerImporter.importedBookmarks" id="IExplorerImporter.importedBookmarks" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.importedBookmarks" />
+      <keyword name="IExplorerImporter.open" id="IExplorerImporter.open" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.open" />
+      <keyword name="IExplorerImporter.setPath" id="IExplorerImporter.setPath" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.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" />
@@ -11330,6 +11337,7 @@
       <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html#getImporterInfo" />
       <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html#getImporterInfo" />
       <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#getImporterInfo" />
+      <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#getImporterInfo" />
       <keyword name="getImporterInfo" id="getImporterInfo" ref="eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.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" />
@@ -11886,6 +11894,7 @@
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html</file>
+      <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html</file>
       <file>eric5.Helpviewer.Bookmarks.BookmarksImporters.__init__.html</file>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html	Sun Mar 18 19:10:59 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.IExplorerImporter</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.IExplorerImporter</h1>
+<p>
+Module implementing an importer for Internet Explorer bookmarks.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#IExplorerImporter">IExplorerImporter</a></td>
+<td>Class implementing the Chrome 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 source id.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="IExplorerImporter" ID="IExplorerImporter"></a>
+<h2>IExplorerImporter</h2>
+<p>
+    Class implementing the Chrome 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="#IExplorerImporter.__init__">IExplorerImporter</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#IExplorerImporter.importedBookmarks">importedBookmarks</a></td>
+<td>Public method to get the imported bookmarks.</td>
+</tr><tr>
+<td><a href="#IExplorerImporter.open">open</a></td>
+<td>Public method to open the bookmarks file.</td>
+</tr><tr>
+<td><a href="#IExplorerImporter.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="IExplorerImporter.__init__" ID="IExplorerImporter.__init__"></a>
+<h4>IExplorerImporter (Constructor)</h4>
+<b>IExplorerImporter</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="IExplorerImporter.importedBookmarks" ID="IExplorerImporter.importedBookmarks"></a>
+<h4>IExplorerImporter.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="IExplorerImporter.open" ID="IExplorerImporter.open"></a>
+<h4>IExplorerImporter.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="IExplorerImporter.setPath" ID="IExplorerImporter.setPath"></a>
+<h4>IExplorerImporter.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 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

--- a/Documentation/Source/index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html	Sun Mar 18 17:46:54 2012 +0100
+++ b/Documentation/Source/index-eric5.Helpviewer.Bookmarks.BookmarksImporters.html	Sun Mar 18 19:10:59 2012 +0100
@@ -41,6 +41,9 @@
 <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.IExplorerImporter.html">IExplorerImporter</a></td>
+<td>Module implementing an importer for Internet Explorer bookmarks.</td>
+</tr><tr>
 <td><a href="eric5.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html">OperaImporter</a></td>
 <td>Module implementing an importer for Opera bookmarks.</td>
 </tr><tr>

--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sun Mar 18 17:46:54 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py	Sun Mar 18 19:10:59 2012 +0100
@@ -16,6 +16,8 @@
 
 from . import BookmarksImporters
 
+import Utilities
+
 
 class BookmarksImportDialog(QDialog, Ui_BookmarksImportDialog):
     """
@@ -90,7 +92,7 @@
                 self.__sourceFile)
         
         if path:
-            self.fileEdit.setText(path)
+            self.fileEdit.setText(Utilities.toNativeSeparators(path))
     
     @pyqtSlot()
     def on_nextButton_clicked(self):

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py	Sun Mar 18 19:10:59 2012 +0100
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing an importer for Internet Explorer bookmarks.
+"""
+
+import os
+
+from PyQt4.QtCore import QCoreApplication, QDate, Qt
+
+from ..BookmarkNode import BookmarkNode
+
+from .BookmarksImporter import BookmarksImporter
+
+import UI.PixmapCache
+import Globals
+
+
+def getImporterInfo(id):
+    """
+    Module function to get information for the given 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 == "ie":
+        if Globals.isWindowsPlatform():
+            standardDir = os.path.expandvars(
+                "%USERPROFILE%\\Favorites")
+        else:
+            standardDir = ""
+        return (
+            UI.PixmapCache.getPixmap("internet_explorer.png"),
+            "Internet Explorer",
+            "",
+            QCoreApplication.translate("IExplorerImporter",
+                """Internet Explorer stores its bookmarks in the <b>Favorites</b> """
+                """folder This folder is usually located in"""),
+            QCoreApplication.translate("IExplorerImporter",
+                """Please choose the folder to begin importing bookmarks."""),
+            standardDir,
+        )
+    else:
+        raise ValueError("Unsupported browser ID given ({0}).".format(id))
+
+
+class IExplorerImporter(BookmarksImporter):
+    """
+    Class implementing the Chrome 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("Folder '{0}' does not exist.")\
+                .format(self.__fileName)
+            return False
+        if not os.path.isdir(self.__fileName):
+            self._error = True
+            self._errorString = self.trUtf8("'{0}' is not a folder.")\
+                .format(self.__fileName)
+        return True
+    
+    def importedBookmarks(self):
+        """
+        Public method to get the imported bookmarks.
+        
+        @return imported bookmarks (BookmarkNode)
+        """
+        folders = {}
+        
+        importRootNode = BookmarkNode(BookmarkNode.Folder)
+        folders[self.__fileName] = importRootNode
+        
+        for dir, subdirs, files in os.walk(self.__fileName):
+            for subdir in subdirs:
+                path = os.path.join(dir, subdir)
+                if dir in folders:
+                    folder = BookmarkNode(BookmarkNode.Folder, folders[dir])
+                else:
+                    folder = BookmarkNode(BookmarkNode.Folder, importRootNode)
+                folder.title = subdir.replace("&", "&&")
+                folders[path] = folder
+            
+            for file in files:
+                name, ext = os.path.splitext(file)
+                if ext.lower() == ".url":
+                    path = os.path.join(dir, file)
+                    try:
+                        f = open(path, "r")
+                        contents = f.read()
+                        f.close()
+                    except IOError:
+                        continue
+                    url = ""
+                    for line in contents.splitlines():
+                        if line.startswith("URL="):
+                            url = line.replace("URL=", "")
+                            break
+                    if url:
+                        if dir in folders:
+                            bookmark = BookmarkNode(BookmarkNode.Bookmark, folders[dir])
+                        else:
+                            bookmark = BookmarkNode(BookmarkNode.Bookmark, importRootNode)
+                        bookmark.url = url
+                        bookmark.title = name.replace("&", "&&")
+        
+        if self._id == "ie":
+            importRootNode.title = self.trUtf8("Internet Explorer Import")
+        else:
+            importRootNode.title = self.trUtf8("Imported {0}")\
+                .format(QDate.currentDate().toString(Qt.SystemLocaleShortDate))
+        return importRootNode

--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 17:46:54 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py	Sun Mar 18 19:10:59 2012 +0100
@@ -32,6 +32,9 @@
             (UI.PixmapCache.getIcon("chromium.png"), "Chromium", "chromium"))
     importers.append(
         (UI.PixmapCache.getIcon("opera.png"), "Opera", "opera"))
+    if Globals.isWindowsPlatform():
+        importers.append(
+            (UI.PixmapCache.getIcon("internet_explorer.png"), "Internet Explorer", "ie"))
     importers.append(
         (UI.PixmapCache.getIcon("xbel.png"),
          QCoreApplication.translate("BookmarksImporters", "XBEL File"),
@@ -68,6 +71,9 @@
     elif id == "firefox":
         from . import FirefoxImporter
         return FirefoxImporter.getImporterInfo(id)
+    elif id == "ie":
+        from . import IExplorerImporter
+        return IExplorerImporter.getImporterInfo(id)
     else:
         raise ValueError("Invalid importer ID given ({0}).".format(id))
 
@@ -94,5 +100,8 @@
     elif id == "firefox":
         from . import FirefoxImporter
         return FirefoxImporter.FirefoxImporter(id, parent)
+    elif id == "ie":
+        from . import IExplorerImporter
+        return IExplorerImporter.IExplorerImporter(id, parent)
     else:
         raise ValueError("No importer for ID {0}.".format(id))

--- a/eric5.e4p	Sun Mar 18 17:46:54 2012 +0100
+++ b/eric5.e4p	Sun Mar 18 19:10:59 2012 +0100
@@ -994,6 +994,7 @@
     <Source>Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py</Source>
+    <Source>Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>

--- a/i18n/eric5_cs.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_cs.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1559,27 +1559,27 @@
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,12 +1597,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22577,6 +22577,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importováno {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

Binary file i18n/eric5_de.qm has changed

--- a/i18n/eric5_de.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_de.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1548,27 +1548,27 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation>Wähle Verzeichnis ...</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation>Wähle Datei ...</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation>Abschließen</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation>Fehler beim Importieren von Lesezeichen</translation>
     </message>
@@ -1586,12 +1586,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation>XBEL Datei</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation>HTML Datei</translation>
     </message>
@@ -22048,6 +22048,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation>Internet Explorer speichert die Lesezeichen in dem Verzeichnis &lt;b&gt;Favorites&lt;/b&gt;. Dieses Verzeichnis befindet sich gewöhnlich in</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation>Bitte wähle das Verzeichnis, um den Import von Lesezeichen zu starten.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation>Verzeichnis &apos;{0}&apos; existiert nicht.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation>&apos;{0}&apos; ist kein Verzeichnis.</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation>Internet Explorer Import</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation>Importiert {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_en.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_en.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1521,27 +1521,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1559,12 +1559,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21904,6 +21904,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_es.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_es.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1557,27 +1557,27 @@
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1595,12 +1595,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22444,6 +22444,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importado {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_fr.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_fr.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1740,27 +1740,27 @@
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished">Installer</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1778,12 +1778,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23606,6 +23606,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_it.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_it.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1559,27 +1559,27 @@
         <translation type="unfinished">Cancella</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,12 +1597,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22342,6 +22342,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Importato {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_ru.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_ru.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1556,27 +1556,27 @@
         <translation type="unfinished">Отмена</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1594,12 +1594,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22455,6 +22455,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">Импортировано {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_tr.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_tr.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1557,27 +1557,27 @@
         <translation type="unfinished">Vazgeç</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1595,12 +1595,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22508,6 +22508,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished">İçe Aktarılmış {0}</translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>

--- a/i18n/eric5_zh_CN.GB2312.ts	Sun Mar 18 17:46:54 2012 +0100
+++ b/i18n/eric5_zh_CN.GB2312.ts	Sun Mar 18 19:10:59 2012 +0100
@@ -1733,27 +1733,27 @@
         <translation type="unfinished">取消</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="80"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="82"/>
         <source>Choose Directory ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="86"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="88"/>
         <source>Choose File ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="110"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="112"/>
         <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"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="118"/>
         <source>Finish</source>
         <translation type="unfinished">完成</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImportDialog.py" line="133"/>
         <source>Error importing bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1771,12 +1771,12 @@
 <context>
     <name>BookmarksImporters</name>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="35"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="38"/>
         <source>XBEL File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="39"/>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/>
         <source>HTML File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23566,6 +23566,39 @@
     </message>
 </context>
 <context>
+    <name>IExplorerImporter</name>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Internet Explorer stores its bookmarks in the &lt;b&gt;Favorites&lt;/b&gt; folder This folder is usually located in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="36"/>
+        <source>Please choose the folder to begin importing bookmarks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="82"/>
+        <source>Folder &apos;{0}&apos; does not exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="87"/>
+        <source>&apos;{0}&apos; is not a folder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="136"/>
+        <source>Internet Explorer Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py" line="138"/>
+        <source>Imported {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IconEditorGrid</name>
     <message>
         <location filename="IconEditor/IconEditorGrid.py" line="193"/>