Sat, 24 Mar 2012 16:10:48 +0100
Added a bookmarks importer for Konqueror (Linux only) and an exporter to write Netscape bookmark files (HTML).
--- a/APIs/Python3/eric5.api Wed Mar 21 20:14:45 2012 +0100 +++ b/APIs/Python3/eric5.api Sat Mar 24 16:10:48 2012 +0100 @@ -1915,6 +1915,9 @@ eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar.openUrl?7 eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar?1(mainWindow, model, parent=None) eric5.Helpviewer.Bookmarks.DefaultBookmarks.DefaultBookmarks?7 +eric5.Helpviewer.Bookmarks.NsHtmlWriter.NsHtmlWriter.indentSize?7 +eric5.Helpviewer.Bookmarks.NsHtmlWriter.NsHtmlWriter.write?4(fileNameOrDevice, root) +eric5.Helpviewer.Bookmarks.NsHtmlWriter.NsHtmlWriter?1() eric5.Helpviewer.Bookmarks.XbelReader.XbelReader.read?4(fileNameOrDevice) eric5.Helpviewer.Bookmarks.XbelReader.XbelReader?1() eric5.Helpviewer.Bookmarks.XbelReader.XmlEntityResolver.resolveUndeclaredEntity?4(entity)
--- a/APIs/Python3/eric5.bas Wed Mar 21 20:14:45 2012 +0100 +++ b/APIs/Python3/eric5.bas Sat Mar 24 16:10:48 2012 +0100 @@ -392,6 +392,7 @@ NewDialogClassDialog QDialog Ui_NewDialogClassDialog NewPythonPackageDialog QDialog Ui_NewPythonPackageDialog NotBinaryPlistException Exception +NsHtmlWriter QObject NumbersWidget QWidget Ui_NumbersWidget OfflineStorageConfigDialog QDialog Ui_OfflineStorageConfigDialog OpenSearchDialog QDialog Ui_OpenSearchDialog
--- a/Documentation/Help/source.qhp Wed Mar 21 20:14:45 2012 +0100 +++ b/Documentation/Help/source.qhp Sat Mar 24 16:10:48 2012 +0100 @@ -220,6 +220,7 @@ <section title="eric5.Helpviewer.Bookmarks.BookmarksModel" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html" /> <section title="eric5.Helpviewer.Bookmarks.BookmarksToolBar" ref="eric5.Helpviewer.Bookmarks.BookmarksToolBar.html" /> <section title="eric5.Helpviewer.Bookmarks.DefaultBookmarks" ref="eric5.Helpviewer.Bookmarks.DefaultBookmarks.html" /> + <section title="eric5.Helpviewer.Bookmarks.NsHtmlWriter" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html" /> <section title="eric5.Helpviewer.Bookmarks.XbelReader" ref="eric5.Helpviewer.Bookmarks.XbelReader.html" /> <section title="eric5.Helpviewer.Bookmarks.XbelWriter" ref="eric5.Helpviewer.Bookmarks.XbelWriter.html" /> </section> @@ -6651,6 +6652,15 @@ <keyword name="NoneSplashScreen.finish" id="NoneSplashScreen.finish" ref="eric5.UI.SplashScreen.html#NoneSplashScreen.finish" /> <keyword name="NoneSplashScreen.showMessage" id="NoneSplashScreen.showMessage" ref="eric5.UI.SplashScreen.html#NoneSplashScreen.showMessage" /> <keyword name="NotBinaryPlistException" id="NotBinaryPlistException" ref="eric5.Utilities.binplistlib.html#NotBinaryPlistException" /> + <keyword name="NsHtmlWriter" id="NsHtmlWriter" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter" /> + <keyword name="NsHtmlWriter (Constructor)" id="NsHtmlWriter (Constructor)" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__init__" /> + <keyword name="NsHtmlWriter (Module)" id="NsHtmlWriter (Module)" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html" /> + <keyword name="NsHtmlWriter.__write" id="NsHtmlWriter.__write" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__write" /> + <keyword name="NsHtmlWriter.__writeBookmark" id="NsHtmlWriter.__writeBookmark" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__writeBookmark" /> + <keyword name="NsHtmlWriter.__writeFolder" id="NsHtmlWriter.__writeFolder" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__writeFolder" /> + <keyword name="NsHtmlWriter.__writeItem" id="NsHtmlWriter.__writeItem" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__writeItem" /> + <keyword name="NsHtmlWriter.__writeSeparator" id="NsHtmlWriter.__writeSeparator" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.__writeSeparator" /> + <keyword name="NsHtmlWriter.write" id="NsHtmlWriter.write" ref="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html#NsHtmlWriter.write" /> <keyword name="NumbersWidget" id="NumbersWidget" ref="eric5.UI.NumbersWidget.html#NumbersWidget" /> <keyword name="NumbersWidget (Constructor)" id="NumbersWidget (Constructor)" ref="eric5.UI.NumbersWidget.html#NumbersWidget.__init__" /> <keyword name="NumbersWidget (Module)" id="NumbersWidget (Module)" ref="eric5.UI.NumbersWidget.html" /> @@ -11118,6 +11128,7 @@ <keyword name="XbelReader.__readBookmarkNode" id="XbelReader.__readBookmarkNode" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readBookmarkNode" /> <keyword name="XbelReader.__readDescription" id="XbelReader.__readDescription" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readDescription" /> <keyword name="XbelReader.__readFolder" id="XbelReader.__readFolder" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readFolder" /> + <keyword name="XbelReader.__readInfo" id="XbelReader.__readInfo" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readInfo" /> <keyword name="XbelReader.__readSeparator" id="XbelReader.__readSeparator" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readSeparator" /> <keyword name="XbelReader.__readTitle" id="XbelReader.__readTitle" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readTitle" /> <keyword name="XbelReader.__readXBEL" id="XbelReader.__readXBEL" ref="eric5.Helpviewer.Bookmarks.XbelReader.html#XbelReader.__readXBEL" /> @@ -11975,6 +11986,7 @@ <file>eric5.Helpviewer.Bookmarks.BookmarksModel.html</file> <file>eric5.Helpviewer.Bookmarks.BookmarksToolBar.html</file> <file>eric5.Helpviewer.Bookmarks.DefaultBookmarks.html</file> + <file>eric5.Helpviewer.Bookmarks.NsHtmlWriter.html</file> <file>eric5.Helpviewer.Bookmarks.XbelReader.html</file> <file>eric5.Helpviewer.Bookmarks.XbelWriter.html</file> <file>eric5.Helpviewer.ClosedTabsManager.html</file>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.XbelReader.html Wed Mar 21 20:14:45 2012 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.XbelReader.html Sat Mar 24 16:10:48 2012 +0100 @@ -73,6 +73,9 @@ <td><a href="#XbelReader.__readFolder">__readFolder</a></td> <td>Private method to read and parse a folder subtree.</td> </tr><tr> +<td><a href="#XbelReader.__readInfo">__readInfo</a></td> +<td>Private method to read and parse an info subtree.</td> +</tr><tr> <td><a href="#XbelReader.__readSeparator">__readSeparator</a></td> <td>Private method to read a separator element.</td> </tr><tr> @@ -128,7 +131,12 @@ <dd> reference to the node to attach to (BookmarkNode) </dd> -</dl><a NAME="XbelReader.__readSeparator" ID="XbelReader.__readSeparator"></a> +</dl><a NAME="XbelReader.__readInfo" ID="XbelReader.__readInfo"></a> +<h4>XbelReader.__readInfo</h4> +<b>__readInfo</b>(<i></i>) +<p> + Private method to read and parse an info subtree. +</p><a NAME="XbelReader.__readSeparator" ID="XbelReader.__readSeparator"></a> <h4>XbelReader.__readSeparator</h4> <b>__readSeparator</b>(<i>node</i>) <p>
--- a/Documentation/Source/index-eric5.Helpviewer.Bookmarks.html Wed Mar 21 20:14:45 2012 +0100 +++ b/Documentation/Source/index-eric5.Helpviewer.Bookmarks.html Sat Mar 24 16:10:48 2012 +0100 @@ -63,6 +63,9 @@ <td><a href="eric5.Helpviewer.Bookmarks.DefaultBookmarks.html">DefaultBookmarks</a></td> <td>Module defining the default bookmarks.</td> </tr><tr> +<td><a href="eric5.Helpviewer.Bookmarks.NsHtmlWriter.html">NsHtmlWriter</a></td> +<td>Module implementing a class to write Netscape HTML bookmark files.</td> +</tr><tr> <td><a href="eric5.Helpviewer.Bookmarks.XbelReader.html">XbelReader</a></td> <td>Module implementing a class to read XBEL bookmark files.</td> </tr><tr>
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Wed Mar 21 20:14:45 2012 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Sat Mar 24 16:10:48 2012 +0100 @@ -42,6 +42,24 @@ """Please choose the file to begin importing bookmarks."""), os.path.dirname(bookmarksFile), ) + elif id == "konqueror": + if os.path.exists(os.path.expanduser("~/.kde4")): + standardDir = os.path.expanduser("~/.kde4/share/apps/konqueror") + elif os.path.exists(os.path.expanduser("~/.kde")): + standardDir = os.path.expanduser("~/.kde/share/apps/konqueror") + else: + standardDir = "" + return ( + UI.PixmapCache.getPixmap("konqueror.png"), + "Konqueror", + "bookmarks.xml", + QCoreApplication.translate("XbelImporter", + """Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML """ + """file. This file is usually located in"""), + QCoreApplication.translate("XbelImporter", + """Please choose the file to begin importing bookmarks."""), + standardDir, + ) elif id == "xbel": return ( UI.PixmapCache.getPixmap("xbel.png"), @@ -107,7 +125,7 @@ if reader.error() != QXmlStreamReader.NoError: self._error = True self._errorString = self.trUtf8( - """Error when importing bookmarks on line {0}, column [1}:\n{2}""")\ + """Error when importing bookmarks on line {0}, column {1}:\n{2}""")\ .format(reader.lineNumber(), reader.columnNumber(), reader.errorString()) @@ -116,6 +134,8 @@ importRootNode.setType(BookmarkNode.Folder) if self._id == "e5browser": importRootNode.title = self.trUtf8("eric5 Web Browser Import") + elif self._id == "konqueror": + importRootNode.title = self.trUtf8("Konqueror Import") elif self._id == "xbel": importRootNode.title = self.trUtf8("XBEL Import") else:
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Wed Mar 21 20:14:45 2012 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Sat Mar 24 16:10:48 2012 +0100 @@ -30,6 +30,8 @@ if Globals.isLinuxPlatform(): importers.append( (UI.PixmapCache.getIcon("chromium.png"), "Chromium", "chromium")) + importers.append( + (UI.PixmapCache.getIcon("konqueror.png"), "Konqueror", "konqueror")) importers.append( (UI.PixmapCache.getIcon("opera.png"), "Opera", "opera")) importers.append( @@ -46,7 +48,6 @@ QCoreApplication.translate("BookmarksImporters", "HTML File"), "html")) return importers - # TODO: importers for Safari def getImporterInfo(id): @@ -58,7 +59,7 @@ 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"]: + if id in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter return XbelImporter.getImporterInfo(id) elif id == "html": @@ -90,7 +91,7 @@ @param parent reference to the parent object (QObject) @return bookmarks importer (BookmarksImporter) """ - if id in ["e5browser", "xbel"]: + if id in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter return XbelImporter.XbelImporter(id, parent) elif id == "html":
--- a/Helpviewer/Bookmarks/BookmarksManager.py Wed Mar 21 20:14:45 2012 +0100 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sat Mar 24 16:10:48 2012 +0100 @@ -20,6 +20,7 @@ from .DefaultBookmarks import DefaultBookmarks from .XbelReader import XbelReader from .XbelWriter import XbelWriter +from .NsHtmlWriter import NsHtmlWriter from .BookmarksImportDialog import BookmarksImportDialog from Utilities.AutoSaver import AutoSaver @@ -319,7 +320,9 @@ None, self.trUtf8("Export Bookmarks"), "eric5_bookmarks.xbel", - self.trUtf8("XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)")) + self.trUtf8("XBEL bookmarks (*.xbel);;" + "XBEL bookmarks (*.xml);;" + "HTML Bookmarks (*.html)")) if not fileName: return @@ -329,7 +332,11 @@ if ex: fileName += ex - writer = XbelWriter() + ext = QFileInfo(fileName).suffix() + if ext == "html": + writer = NsHtmlWriter() + else: + writer = XbelWriter() if not writer.write(fileName, self.__bookmarkRootNode): E5MessageBox.critical(None, self.trUtf8("Exporting Bookmarks"),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Helpviewer/Bookmarks/NsHtmlWriter.py Sat Mar 24 16:10:48 2012 +0100 @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a class to write Netscape HTML bookmark files. +""" + +from PyQt4.QtCore import QObject, QIODevice, QFile + +from .BookmarkNode import BookmarkNode + +import Utilities + + +class NsHtmlWriter(QObject): + """ + Class implementing a writer object to generate Netscape HTML bookmark files. + """ + indentSize = 4 + + def __init__(self): + """ + Constructor + """ + super().__init__() + + def write(self, fileNameOrDevice, root): + """ + Public method to write an Netscape HTML bookmark file. + + @param fileNameOrDevice name of the file to write (string) + or device to write to (QIODevice) + @param root root node of the bookmark tree (BookmarkNode) + """ + if isinstance(fileNameOrDevice, QIODevice): + f = fileNameOrDevice + else: + f = QFile(fileNameOrDevice) + if root is None or not f.open(QFile.WriteOnly): + return False + + self.__dev = f + return self.__write(root) + + def __write(self, root): + """ + Private method to write an Netscape HTML bookmark file. + + @param root root node of the bookmark tree (BookmarkNode) + """ + self.__dev.write("<!DOCTYPE NETSCAPE-Bookmark-file-1>\n" + "<!-- This is an automatically generated file.\n" + " It will be read and overwritten.\n" + " DO NOT EDIT! -->\n" + "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\">\n" + "<TITLE>Bookmarks</TITLE>\n" + "<H1>Bookmarks</H1>\n" + "\n" + "<DL><p>\n") + if root.type() == BookmarkNode.Root: + for child in root.children(): + self.__writeItem(child, self.indentSize) + else: + self.__writeItem(root, self.indentSize) + self.__dev.write("</DL><p>\n") + return True + + def __writeItem(self, node, indent): + """ + Private method to write an entry for a node. + + @param node reference to the node to be written (BookmarkNode) + @param indent size of the indentation (integer) + """ + if node.type() == BookmarkNode.Folder: + self.__writeFolder(node, indent) + elif node.type() == BookmarkNode.Bookmark: + self.__writeBookmark(node, indent) + elif node.type() == BookmarkNode.Separator: + self.__writeSeparator(indent) + + def __writeSeparator(self, indent): + """ + Private method to write a separator. + + @param indent size of the indentation (integer) + """ + self.__dev.write(" " * indent) + self.__dev.write("<HR>\n") + + def __writeBookmark(self, node, indent): + """ + Private method to write a bookmark node. + + @param node reference to the node to be written (BookmarkNode) + @param indent size of the indentation (integer) + """ + self.__dev.write(" " * indent) + self.__dev.write("<DT><A HREF=\"{0}\">{1}</A>\n".format( + node.url, Utilities.html_uencode(node.title) + )) + + def __writeFolder(self, node, indent): + """ + Private method to write a bookmark node. + + @param node reference to the node to be written (BookmarkNode) + @param indent size of the indentation (integer) + """ + if node.expanded: + folded = "" + else: + folded = " FOLDED" + + self.__dev.write(" " * indent) + self.__dev.write("<DT><H3{0}>{1}</H3>\n".format( + folded, Utilities.html_uencode(node.title) + )) + + if node.desc: + self.__dev.write(" " * indent) + self.__dev.write("<DD>{0}\n".format("".join(node.desc.splitlines()))) + + self.__dev.write(" " * indent) + self.__dev.write("<DL><p>\n") + + for child in node.children(): + self.__writeItem(child, indent + self.indentSize) + + self.__dev.write(" " * indent) + self.__dev.write("</DL><p>\n")
--- a/Helpviewer/Bookmarks/XbelReader.py Wed Mar 21 20:14:45 2012 +0100 +++ b/Helpviewer/Bookmarks/XbelReader.py Sat Mar 24 16:10:48 2012 +0100 @@ -8,7 +8,7 @@ """ from PyQt4.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, QIODevice, \ - QFile, QCoreApplication + QFile, QCoreApplication, QXmlStreamNamespaceDeclaration from .BookmarkNode import BookmarkNode @@ -125,6 +125,8 @@ self.__readBookmarkNode(folder) elif self.name() == "separator": self.__readSeparator(folder) + elif self.name() == "info": + self.__readInfo() else: self.__skipUnknownElement() @@ -157,8 +159,18 @@ @param node reference to the bookmark node the separator belongs to (BookmarkNode) """ BookmarkNode(BookmarkNode.Separator, node) + # empty elements have a start and end element - self.readNext() + while not self.atEnd(): + self.readNext() + if self.isEndElement(): + break + + if self.isStartElement(): + if self.name() == "info": + self.__readInfo() + else: + self.__skipUnknownElement() def __readBookmarkNode(self, node): """ @@ -182,23 +194,24 @@ self.__readTitle(bookmark) elif self.name() == "desc": self.__readDescription(bookmark) + elif self.name() == "info": + self.__readInfo() else: self.__skipUnknownElement() if not bookmark.title: bookmark.title = QCoreApplication.translate("XbelReader", "Unknown title") + def __readInfo(self): + """ + Private method to read and parse an info subtree. + """ + self.addExtraNamespaceDeclaration( + QXmlStreamNamespaceDeclaration("bookmark", "http://www.python.org")) + self.skipCurrentElement() + def __skipUnknownElement(self): """ Private method to skip over all unknown elements. """ - if not self.isStartElement(): - return - - while not self.atEnd(): - self.readNext() - if self.isEndElement(): - break - - if self.isStartElement(): - self.__skipUnknownElement() + self.skipCurrentElement()
--- a/eric5.e4p Wed Mar 21 20:14:45 2012 +0100 +++ b/eric5.e4p Sat Mar 24 16:10:48 2012 +0100 @@ -998,6 +998,7 @@ <Source>Utilities/binplistlib.py</Source> <Source>Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py</Source> <Source>UI/ErrorLogDialog.py</Source> + <Source>Helpviewer/Bookmarks/NsHtmlWriter.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form>
--- a/i18n/eric5_cs.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_cs.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1597,12 +1597,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1610,32 +1610,32 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Panel záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Menu záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Nahrání záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Panel nástrojů záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Menu</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Ukládání záložek</translation> </message> @@ -1655,37 +1655,37 @@ <translation type="obsolete">Importovat záložky</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Export záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Exportování záložek</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Odebrat záložku</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Vložit záložku</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>Změnit název</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Změnit adresu</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Chyba při ukládání záložek do <b>{0}</b>.</translation> </message> @@ -1706,27 +1706,32 @@ <translation type="obsolete">Importováno {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Chyba při exportu záložek <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Konvertováno {0}</translation> </message> <message> <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="135"/> + <translation type="obsolete">XBEL záložky (*.xbel);;XBEL záložky (*.xml)</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <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}: {2}</translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -52903,17 +52908,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> @@ -52921,28 +52926,44 @@ <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"/> + <translation type="obsolete">Chyba při importu záložek na řádce {0}, sloupci {1}:{2}</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> <source>eric5 Web Browser Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> <source>XBEL Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> <source>Imported {0}</source> <translation type="unfinished">Importováno {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: +{2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>XbelReader</name> @@ -52952,7 +52973,7 @@ <translation>Soubor není XBEL verze 1.0 souboru.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Neznámý titulek</translation> </message>
--- a/i18n/eric5_de.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_de.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1585,12 +1585,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation>XBEL Datei</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation>HTML Datei</translation> </message> @@ -1598,92 +1598,92 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Lesezeichenleiste</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Lesezeichenmenü</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Lesezeichen laden</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Lesezeichenleiste</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Menü</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Lesezeichen speichern</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Fehler beim Speichern der Lesezeichen in <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Lesezeichen exportieren</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Lesezeichen exportieren</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Fehler beim Exportieren der Lesezeichen in <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Umgewandelt {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Lesezeichen einfügen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>Namensänderung</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Adressenänderung</translation> </message> <message> - <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="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation>Fehler beim Laden der Lesezeichen in Zeile {0}, Spalte {1}: {2}</translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation>XBEL Lesezeichen (*.xbel);;XBEL Lesezeichen (*.xml);;HTML Lesezeichen (*.html)</translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -51708,46 +51708,56 @@ <translation>Der eric5 Web Browser speichert seine Lesezeichen in der XML-Datei <b>{0}</b>. Diese Datei befindet sich gewöhnlich in</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation>Bitte wähle die Datei, um den Import von Lesezeichen zu starten.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation>XBEL Lesezeichen</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation>Datei '{0}' existiert nicht.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/> - <source>Error when importing bookmarks on line {0}, column [1}: + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> + <source>eric5 Web Browser Import</source> + <translation>eric5 Web Browser Import</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> + <source>XBEL Import</source> + <translation>XBEL Import</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> + <source>Imported {0}</source> + <translation>Importiert {0}</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> + <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <translation>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> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation>Konqueror speichert seine Lesezeichen in der XML-Datei <b>bookmarks.xml</b>. Diese Datei befindet sich gewöhnlich in</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: {2}</source> <translation>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> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation>Konqueror Import</translation> </message> </context> <context> @@ -51758,7 +51768,7 @@ <translation>Die Datei ist keine XBEL Version 1.0 Datei.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Unbekannter Titel</translation> </message>
--- a/i18n/eric5_en.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_en.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1559,12 +1559,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1572,91 +1572,91 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> - <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -51249,44 +51249,54 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/> - <source>Error when importing bookmarks on line {0}, column [1}: + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> + <source>eric5 Web Browser Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> + <source>XBEL Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> + <source>Imported {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> + <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> - <source>eric5 Web Browser Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> - <source>XBEL Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> - <source>Imported {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> - <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> <translation type="unfinished"></translation> </message> </context> @@ -51298,7 +51308,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_es.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1595,12 +1595,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1608,32 +1608,32 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Barra de Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Menú de Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Cargando Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Marcadores de Barra de Herramientas</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Menú</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Guardando Marcadores</translation> </message> @@ -1653,37 +1653,37 @@ <translation type="obsolete">Importar Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Exportar Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Exportando Marcadores</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Insertar Marcador</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>Cambiar Nombre</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Cambiar Dirección</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Error al guardar marcadores a <b>{0}</b>.</translation> </message> @@ -1705,27 +1705,32 @@ <translation type="obsolete">Importado {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Error al exportar marcadores a <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Convertido {0}</translation> </message> <message> <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="135"/> + <translation type="obsolete">Marcadores XBEL (*.xbel);;Marcadores XBEL(*.xml)</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation>Error al cargar marcadores en línea {0}, columna {1}: {2}</translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -52571,17 +52576,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> @@ -52589,29 +52594,45 @@ <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}: + <translation type="obsolete">Error al importar marcadores en línea {0}, columna {1}: {2}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> <source>eric5 Web Browser Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> <source>XBEL Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> <source>Imported {0}</source> <translation type="unfinished">Importado {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: +{2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>XbelReader</name> @@ -52621,7 +52642,7 @@ <translation>El archivo no es un archivo de XBEL versión 1.0.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Título desconocido</translation> </message>
--- a/i18n/eric5_fr.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_fr.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1778,12 +1778,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1791,91 +1791,91 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> - <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -56729,44 +56729,54 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/> - <source>Error when importing bookmarks on line {0}, column [1}: + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> + <source>eric5 Web Browser Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> + <source>XBEL Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> + <source>Imported {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> + <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> - <source>eric5 Web Browser Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> - <source>XBEL Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> - <source>Imported {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> - <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> <translation type="unfinished"></translation> </message> </context> @@ -56778,7 +56788,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_it.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1597,12 +1597,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1610,32 +1610,32 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Barra dei segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Menu dei segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Caricamento dei segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Toolbar segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Menu</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Salvataggio segnalibri</translation> </message> @@ -1655,37 +1655,37 @@ <translation type="obsolete">Importa Segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Esporta segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Esportazione Segnalibri</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Rimuovi segnalibro</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Inserisci segnalibro</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>Cambia Nome</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Cambia Indirizzo</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Errore nel salvataggio dei segnalibri su <b>({0})</b>.</translation> </message> @@ -1707,27 +1707,32 @@ <translation type="obsolete">Importato {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Errore nell'esportazione dei segnalibri su <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Convertito {0}</translation> </message> <message> <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="135"/> + <translation type="obsolete">Bookmark XBEL (*.xbel);;Bookmark XBEL (*.xml)</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation>Errore nell'importazione dei segnalibri alla riga {0}, colonna {1}: {2}</translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -52397,17 +52402,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> @@ -52415,29 +52420,45 @@ <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'importazione dei segnalibri alla riga {0}, colonna {1}: + <translation type="obsolete">Errore nell'importazione dei segnalibri alla riga {0}, colonna {1}: {2}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> <source>eric5 Web Browser Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> <source>XBEL Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> <source>Imported {0}</source> <translation type="unfinished">Importato {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: +{2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>XbelReader</name> @@ -52447,7 +52468,7 @@ <translation>Questo non è un file XBEL versione 1.0.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Titolo sconosciuto</translation> </message>
--- a/i18n/eric5_ru.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_ru.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1594,12 +1594,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1607,44 +1607,44 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Закладки</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Выбор закладок</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Добавление закладок</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation>Ошибка при добавлении закладок в строке {0}, позиция {1}: {2}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Коллекция закладок</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Меню</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Сохранение закладок</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Ошибка при сохранении закладок в файл <b>{0}</b>.</translation> </message> @@ -1674,42 +1674,42 @@ <translation type="obsolete">Импортировано {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Экспортировать закладки</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Экспорт закладок</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Ошибка при сохранении закладок в файл <b>{0}</b>.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Сконвертировано {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Вставить закладку</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>Изменить имя</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Изменить адрес</translation> </message> @@ -1723,7 +1723,12 @@ <message> <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source> - <translation>XBEL закладки (*.xbel);;XBEL закладки (*.xml)</translation> + <translation type="obsolete">XBEL закладки (*.xbel);;XBEL закладки (*.xml)</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -52642,17 +52647,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> @@ -52660,29 +52665,45 @@ <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}: + <translation type="obsolete">Ошибка при импорте закладок в строке {0}, позиция {1}: {2}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> <source>eric5 Web Browser Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> <source>XBEL Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> <source>Imported {0}</source> <translation type="unfinished">Импортировано {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: +{2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>XbelReader</name> @@ -52692,7 +52713,7 @@ <translation>Этот файл не соответствует XBEL 1.0.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Неизвестный файл</translation> </message>
--- a/i18n/eric5_tr.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_tr.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1595,12 +1595,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1608,44 +1608,44 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation>Yerimleri Çubuğu</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation>Yerimleri Menüsü</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation>Yerimleri Yükleniyor</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation>Yerimlerini yüklerken {0} satır, {1} sütunda hata var: {2}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation>Yerimleri Araççubuğu</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation>Menü</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation>Yerimleri Kaydediliyor</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation>Yer imlerinin <b>{0}</b>ne kaydederken hata oldu.</translation> </message> @@ -1682,50 +1682,55 @@ <translation type="obsolete">İçe Aktarılmış {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation>Yerimlerini Dışaaktar</translation> </message> <message> <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="334"/> + <translation type="obsolete">XBEL yerimleri (*.xbel);;XBEL yerimleri (*.xml)</translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation>Yerimleri Dışaaktarılıyor</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation>Yerimlerini {0} ye dışa aktarırken hata oldu.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation>Çevrilmiş {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation>Yerimini kaldır</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation>Yerimi Araya gir</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation>İsim Değişikliği</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation>Adres Değişikliği</translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -52642,17 +52647,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> @@ -52660,29 +52665,45 @@ <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: + <translation type="obsolete">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"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> <source>eric5 Web Browser Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> <source>XBEL Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> <source>Imported {0}</source> <translation type="unfinished">İçe Aktarılmış {0}</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: +{2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>XbelReader</name> @@ -52692,7 +52713,7 @@ <translation>Bu dosya bir XBEL sürüm1.0 dosyası değil.</translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation>Bilinmeyen başlık</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Mar 21 20:14:45 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Mar 24 16:10:48 2012 +0100 @@ -1771,12 +1771,12 @@ <context> <name>BookmarksImporters</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="40"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="42"/> <source>XBEL File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="44"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/__init__.py" line="46"/> <source>HTML File</source> <translation type="unfinished"></translation> </message> @@ -1784,91 +1784,91 @@ <context> <name>BookmarksManager</name> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="29"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> <source>Bookmarks Bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="30"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="31"/> <source>Bookmarks Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Loading Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="147"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="148"/> <source>Toolbar Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="153"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="154"/> <source>Menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Saving Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> <source>Export Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Exporting Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="469"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="476"/> <source>Remove Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="509"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="516"/> <source>Insert Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="548"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="555"/> <source>Name Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="551"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="558"/> <source>Address Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="196"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="197"/> <source>Error saving bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="334"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="341"/> <source>Error exporting bookmarks to <b>{0}</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="349"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="356"/> <source>Converted {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="318"/> - <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="135"/> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="136"/> <source>Error when loading bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksManager.py" line="319"/> + <source>XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml);;HTML Bookmarks (*.html)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarksMenu</name> @@ -56690,44 +56690,54 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>Please choose the file to begin importing bookmarks.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> <source>XBEL Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="93"/> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="111"/> <source>File '{0}' does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="109"/> - <source>Error when importing bookmarks on line {0}, column [1}: + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="136"/> + <source>eric5 Web Browser Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="140"/> + <source>XBEL Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="142"/> + <source>Imported {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="64"/> + <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="52"/> + <source>Konqueror stores its bookmarks in the <b>bookmarks.xml</b> XML file. This file is usually located in</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="127"/> + <source>Error when importing bookmarks on line {0}, column {1}: {2}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="118"/> - <source>eric5 Web Browser Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="120"/> - <source>XBEL Import</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="122"/> - <source>Imported {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="46"/> - <source>You can import bookmarks from any browser that supports XBEL exporting. This file has usually the extension .xbel or .xml.</source> + <location filename="Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py" line="138"/> + <source>Konqueror Import</source> <translation type="unfinished"></translation> </message> </context> @@ -56739,7 +56749,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Bookmarks/XbelReader.py" line="189"/> + <location filename="Helpviewer/Bookmarks/XbelReader.py" line="203"/> <source>Unknown title</source> <translation type="unfinished"></translation> </message>