Mercurial Repositories > eric / changeset
changeset
Fixed a few bugs in the web browser.
Fri, 02 Apr 2010 17:12:47 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 02 Apr 2010 17:12:47 +0000
- changeset 168
- 3383117f894b
- parent 167
- 7508e44f4853
- child 169
- a03768260179
Fixed a few bugs in the web browser.
--- a/APIs/Python3/eric5.api Fri Apr 02 13:57:06 2010 +0000 +++ b/APIs/Python3/eric5.api Fri Apr 02 17:12:47 2010 +0000 @@ -2112,7 +2112,7 @@ eric5.Helpviewer.Network.NetworkReply.NetworkReply.abort?4() eric5.Helpviewer.Network.NetworkReply.NetworkReply.bytesAvailable?4() eric5.Helpviewer.Network.NetworkReply.NetworkReply.readData?4(maxlen) -eric5.Helpviewer.Network.NetworkReply.NetworkReply?1(request, fileData, mimeType) +eric5.Helpviewer.Network.NetworkReply.NetworkReply?1(request, fileData, mimeType, parent = None) eric5.Helpviewer.Network.PyrcAccessHandler.PyrcAccessHandler.createRequest?4(op, request, outgoingData = None) eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler.createRequest?4(op, request, outgoingData = None) eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler?1(engine, parent = None)
--- a/Cooperation/CooperationClient.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Cooperation/CooperationClient.py Fri Apr 02 17:12:47 2010 +0000 @@ -151,8 +151,6 @@ if connection.isValid(): connection.abort() - - connection.deleteLater() def disconnectConnections(self): """
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Fri Apr 02 13:57:06 2010 +0000 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Fri Apr 02 17:12:47 2010 +0000 @@ -69,7 +69,7 @@ </table> <a NAME="NetworkReply.__init__" ID="NetworkReply.__init__"></a> <h4>NetworkReply (Constructor)</h4> -<b>NetworkReply</b>(<i>request, fileData, mimeType</i>) +<b>NetworkReply</b>(<i>request, fileData, mimeType, parent = None</i>) <p> Constructor </p><dl> @@ -82,6 +82,9 @@ </dd><dt><i>mimeType</i></dt> <dd> for the reply (string) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent object (QObject) </dd> </dl><a NAME="NetworkReply.abort" ID="NetworkReply.abort"></a> <h4>NetworkReply.abort</h4>
--- a/E5Network/E5NetworkMonitor.py Fri Apr 02 13:57:06 2010 +0000 +++ b/E5Network/E5NetworkMonitor.py Fri Apr 02 17:12:47 2010 +0000 @@ -129,7 +129,6 @@ @param evt reference to the close event object (QCloseEvent) """ - self.deleteLater() self.__class__._monitor = None QDialog.closeEvent(self, evt) @@ -381,4 +380,4 @@ self.beginRemoveRows(parent, row, lastRow) del self.requests[row:lastRow + 1] self.endRemoveRows() - return True \ No newline at end of file + return True
--- a/Helpviewer/AdBlock/AdBlockManager.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/AdBlock/AdBlockManager.py Fri Apr 02 17:12:47 2010 +0000 @@ -159,8 +159,6 @@ try: self.__subscriptions.remove(subscription) rulesFileName = subscription.rulesFileName() - if subscription.parent() == self: - subscription.deleteLater() QFile.remove(rulesFileName) self.emit(SIGNAL("rulesChanged()")) except ValueError:
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Fri Apr 02 17:12:47 2010 +0000 @@ -254,7 +254,7 @@ response = reply.readAll() redirect = reply.attribute(QNetworkRequest.RedirectionTargetAttribute) or QUrl() reply.close() - reply.deleteLater() + self.__downloading = None if reply.error() != QNetworkReply.NoError: QMessageBox.warning(None,
--- a/Helpviewer/DownloadDialog.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/DownloadDialog.py Fri Apr 02 17:12:47 2010 +0000 @@ -41,6 +41,9 @@ self.setupUi(self) self.setAttribute(Qt.WA_DeleteOnClose) + self.__windowTitleTemplate = self.trUtf8("Eric5 Download {0}") + self.setWindowTitle(self.__windowTitleTemplate.format("")) + self.__tryAgainButton = \ self.buttonBox.addButton(self.trUtf8("Try Again"), QDialogButtonBox.ActionRole) @@ -122,7 +125,13 @@ """<p>What do you want to do?</p>""").format(baseName), QMessageBox.StandardButtons(\ QMessageBox.Open | \ - QMessageBox.Save)) + QMessageBox.Save | \ + QMessageBox.Cancel)) + if res == QMessageBox.Cancel: + self.__stop() + self.close() + return + self.__autoOpen = res == QMessageBox.Open fileName = QDesktopServices.storageLocation(QDesktopServices.TempLocation) + \ '/' + baseName @@ -232,8 +241,6 @@ else: nam = QNetworkAccessManager() reply = nam.get(QNetworkRequest(self.__url)) - if self.__reply: - self.__reply.deleteLater() if self.__output.exists(): self.__output.remove() self.__reply = reply @@ -288,7 +295,6 @@ locationHeader = self.__reply.header(QNetworkRequest.LocationHeader) if locationHeader.isValid(): self.__url = locationHeader - self.__reply.deleteLater() self.__reply = Helpviewer.HelpWindow.HelpWindow.networkAccessManager().get( QNetworkRequest(self.__url)) self.__initialize() @@ -304,9 +310,12 @@ if total == -1: self.progressBar.setValue(0) self.progressBar.setMaximum(0) + self.setWindowTitle(self.__windowTitleTemplate.format("")) else: self.progressBar.setValue(received) self.progressBar.setMaximum(total) + pc = "{0}%".format(received * 100 // total) + self.setWindowTitle(self.__windowTitleTemplate.format(pc)) self.__updateInfoLabel() def __updateInfoLabel(self):
--- a/Helpviewer/HelpBrowserWV.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/HelpBrowserWV.py Fri Apr 02 17:12:47 2010 +0000 @@ -915,7 +915,6 @@ if dlg in self.__downloadWindows: self.disconnect(dlg, SIGNAL("done()"), self.__downloadDone) self.__downloadWindows.remove(dlg) - dlg.deleteLater() def __downloadRequested(self, request): """
--- a/Helpviewer/HelpDocsInstaller.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/HelpDocsInstaller.py Fri Apr 02 17:12:47 2010 +0000 @@ -123,8 +123,8 @@ if not engine.registerDocumentation(fi.absoluteFilePath()): self.emit(SIGNAL("errorMessage(const QString&)"), - self.trUtf8("""The file <b>{0}</b> could not be registered.""" - """<br/>Reason: {1}""")\ + self.trUtf8("""<p>The file <b>{0}</b> could not be registered.""" + """<br/>Reason: {1}</p>""")\ .format(fi.absoluteFilePath, engine.error()) ) return False @@ -180,8 +180,8 @@ if not engine.registerDocumentation(fi.absoluteFilePath()): self.emit(SIGNAL("errorMessage(const QString&)"), - self.trUtf8("""The file <b>{0}</b> could not be registered.""" - """<br/>Reason: {1}""")\ + self.trUtf8("""<p>The file <b>{0}</b> could not be registered.""" + """<br/>Reason: {1}</p>""")\ .format(fi.absoluteFilePath, engine.error()) ) return False @@ -191,4 +191,4 @@ fi.absoluteFilePath()) return True - return False \ No newline at end of file + return False
--- a/Helpviewer/History/HistoryManager.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/History/HistoryManager.py Fri Apr 02 17:12:47 2010 +0000 @@ -336,8 +336,8 @@ if not historyFile.open(QIODevice.ReadOnly): QMessageBox.warning(None, self.trUtf8("Loading History"), - self.trUtf8("""Unable to open history file <b>{0}</b>.<br/>""" - """Reason: {1}""")\ + self.trUtf8("""<p>Unable to open history file <b>{0}</b>.<br/>""" + """Reason: {1}</p>""")\ .format(historyFile.fileName, historyFile.errorString())) return @@ -412,8 +412,8 @@ if not opened: QMessageBox.warning(None, self.trUtf8("Saving History"), - self.trUtf8("""Unable to open history file <b>{0}</b>.<br/>""" - """Reason: {1}""")\ + self.trUtf8("""<p>Unable to open history file <b>{0}</b>.<br/>""" + """Reason: {1}</p>""")\ .format(f.fileName(), f.errorString())) return @@ -432,14 +432,14 @@ if historyFile.exists() and not historyFile.remove(): QMessageBox.warning(None, self.trUtf8("Saving History"), - self.trUtf8("""Error removing old history file <b>{0}</b>.""" - """<br/>Reason: {1}""")\ + self.trUtf8("""<p>Error removing old history file <b>{0}</b>.""" + """<br/>Reason: {1}</p>""")\ .format(historyFile.fileName(), historyFile.errorString())) if not f.copy(historyFile.fileName()): QMessageBox.warning(None, self.trUtf8("Saving History"), - self.trUtf8("""Error moving new history file over old one """ - """(<b>{0}</b>).<br/>Reason: {1}""")\ + self.trUtf8("""<p>Error moving new history file over old one """ + """(<b>{0}</b>).<br/>Reason: {1}</p>""")\ .format(historyFile.fileName(), tempFile.errorString())) try:
--- a/Helpviewer/Network/AboutAccessHandler.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/Network/AboutAccessHandler.py Fri Apr 02 17:12:47 2010 +0000 @@ -25,4 +25,4 @@ (QIODevice) @return reference to the created reply object (QNetworkReply) """ - return NetworkProtocolUnknownErrorReply("about") + return NetworkProtocolUnknownErrorReply("about", self.parent())
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Fri Apr 02 17:12:47 2010 +0000 @@ -21,7 +21,7 @@ @param protocol protocol name (string) @param parent reference to the parent object (QObject) """ - QNetworkReply.__init__(self) + QNetworkReply.__init__(self, parent) self.setError(QNetworkReply.ProtocolUnknownError, self.trUtf8("Protocol '{0}' not supported.").format(protocol)) QTimer.singleShot(0, self.__fireSignals)
--- a/Helpviewer/Network/NetworkReply.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/Network/NetworkReply.py Fri Apr 02 17:12:47 2010 +0000 @@ -14,15 +14,16 @@ """ Class implementing a QNetworkReply subclass for special data. """ - def __init__(self, request, fileData, mimeType): + def __init__(self, request, fileData, mimeType, parent = None): """ Constructor @param request reference to the request object (QNetworkRequest) @param fileData reference to the data buffer (QByteArray) @param mimeType for the reply (string) + @param parent reference to the parent object (QObject) """ - QNetworkReply.__init__(self) + QNetworkReply.__init__(self, parent) self.__data = fileData
--- a/Helpviewer/Network/PyrcAccessHandler.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/Network/PyrcAccessHandler.py Fri Apr 02 17:12:47 2010 +0000 @@ -40,6 +40,6 @@ if pixmap.save(imageBuffer, "PNG"): html = html.replace("IMAGE_BINARY_DATA_HERE", bytes(imageBuffer.buffer().toBase64()).decode()) - return NetworkReply(request, QByteArray(html), "text/html") + return NetworkReply(request, QByteArray(html), "text/html", self.parent()) - return NetworkProtocolUnknownErrorReply("pyrc") + return NetworkProtocolUnknownErrorReply("pyrc", self.parent())
--- a/Helpviewer/Network/QtHelpAccessHandler.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/Network/QtHelpAccessHandler.py Fri Apr 02 17:12:47 2010 +0000 @@ -47,4 +47,4 @@ mimeType = "text/javascript" else: mimeType = "text/html" - return NetworkReply(request, self.__engine.fileData(url), mimeType) + return NetworkReply(request, self.__engine.fileData(url), mimeType, self.parent())
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Apr 02 17:12:47 2010 +0000 @@ -54,6 +54,7 @@ self._suggestionsParameters = [] # list of two tuples self._imageUrl = "" self.__image = QImage() + self.__imageReply = None self.__iconMoved = False self.__searchMethod = "get" self.__suggestionsMethod = "get" @@ -303,22 +304,22 @@ if self.__networkAccessManager is None or not self._imageUrl: return - reply = self.__networkAccessManager.get( + self.__imageReply = self.__networkAccessManager.get( QNetworkRequest(QUrl.fromEncoded(self._imageUrl))) - self.connect(reply, SIGNAL("finished()"), self.__imageObtained) + self.connect(self.__imageReply, SIGNAL("finished()"), self.__imageObtained) def __imageObtained(self): """ Private slot to receive the image of the engine. """ reply = self.sender() - if reply is None: + if reply is None or reply != self.__imageReply: return response = reply.readAll() reply.close() - reply.deleteLater() + self.__imageReply = None if response.isEmpty(): return
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Fri Apr 02 13:57:06 2010 +0000 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Fri Apr 02 17:12:47 2010 +0000 @@ -42,6 +42,7 @@ parent = e5App() QObject.__init__(self, parent) + self.__replies = [] self.__engines = {} self.__keywords = {} self.__current = "" @@ -171,6 +172,7 @@ reply = HelpWindow.networkAccessManager().get(QNetworkRequest(url)) self.connect(reply, SIGNAL("finished()"), self.__engineFromUrlAvailable) reply.setParent(self) + self.__replies.append(reply) return True @@ -381,8 +383,9 @@ res = QMessageBox.question(None, "", - self.trUtf8("""Do you want to add the following engine to your list of""" - """ search engines?<br/><br/>Name: {0}<br/>Searches on: {1}""")\ + self.trUtf8("""<p>Do you want to add the following engine to your list of""" + """ search engines?<br/><br/>Name: {0}<br/>""" + """Searches on: {1}</p>""")\ .format(engine.name(), host), QMessageBox.StandardButtons(\ QMessageBox.No | \ @@ -400,14 +403,16 @@ if reply.error() != QNetworkReply.NoError: reply.close() - reply.deleteLater() + if reply in self.__replies: + self.__replies.remove(reply) return reader = OpenSearchReader() engine = reader.read(reply) reply.close() - reply.deleteLater() + if reply in self.__replies: + self.__replies.remove(reply) if not engine.isValid(): return
--- a/changelog Fri Apr 02 13:57:06 2010 +0000 +++ b/changelog Fri Apr 02 17:12:47 2010 +0000 @@ -1,5 +1,8 @@ Change Log ---------- +Version 5.0-snapshot-2010mmdd: +- bug fixes + Version 5.0-snapshot-20100401: - bug fixes - added installation of a .desktop file for Linux systems
--- a/i18n/eric5_cs.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_cs.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3386,7 +3386,7 @@ <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5599,17 +5599,17 @@ <translation>Po ukončení ponechat otevřený</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Zkusit znova</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Stop</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> @@ -5649,7 +5649,7 @@ <translation type="obsolete">%1 z %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> @@ -5664,22 +5664,22 @@ <translation type="obsolete">%1 z %2 - zastaveno</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>bajtů</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation>Stahování</translation> </message> @@ -5694,55 +5694,60 @@ <translation type="unfinished">Eric4 Download {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6153,42 +6158,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> <source>Method</source> <translation type="unfinished">Metoda</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <source>Address</source> + <translation type="unfinished">Adresa</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> - <translation type="unfinished">Adresa</translation> + <source>Response</source> + <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> - <translation type="unfinished"></translation> + <source>Length</source> + <translation type="unfinished">Délka</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> - <translation type="unfinished">Délka</translation> + <source>Content Type</source> + <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished">Neznámý</translation> </message> @@ -12095,7 +12100,7 @@ </message> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14223,17 +14228,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19184,8 +19189,8 @@ <translation type="obsolete">Chcete přidat následující enginy do vašeho seznamu vyhledávacích enginů?<br/><br/>Jméno: %1<br/>Hledá v: %2</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_de.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_de.ts Fri Apr 02 17:12:47 2010 +0000 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1550,7 +1549,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> <message> @@ -1601,7 +1600,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -3206,7 +3205,7 @@ <translation>unbekannt</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation>Ungültige Adresse: {0}:{1} @@ -5295,82 +5294,82 @@ <translation>Offen lassen nach Fertigstellung</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Nochmals versuchen</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Anhalten</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Datei speichern</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation>Download abgebrochen: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation>Fehler beim Öffnen der zu speichernden Datei: {0}</translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation>Fehler beim Öffnen der zu speichernden Datei: {0}</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation>Fehler beim Speichern: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation>Netzwerkfehler: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> - <translation>{0} von {1} ({2}/s) {3}</translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> - <source>?</source> - <translation>?</translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation>{0} von {1} ({2}/s) {3}</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> + <source>?</source> + <translation>?</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation>{0} heruntergeladen</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation>{0} von {1} - Angehalten</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>Bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation>Download</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation><p>Sie sind dabei, die Datei <b>{0}</b> herunterzuladen.</p><p>Was wollen sie tun?</p></translation> </message> @@ -5380,15 +5379,20 @@ <translation>Eric5 Download</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> + <location filename="Helpviewer/DownloadDialog.py" line="341"/> <source>- {0}:{1:02} minutes remaining</source> <translation>- {0}:{1:02} Minuten verbleiben</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> <source>- {0} seconds remaining</source> <translation>- {0} Sekunden verbleiben</translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation>Eric5 Download {0}</translation> + </message> </context> <context> <name>E5GraphicsView</name> @@ -5515,42 +5519,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> <source>Method</source> <translation>Methode</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> - <translation>Adresse</translation> + <source>Response</source> + <translation>Antwort</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> - <translation>Antwort</translation> + <source>Length</source> + <translation>Länge</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> - <translation>Länge</translation> + <source>Content Type</source> + <translation>Inhaltstyp</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation>Inhaltstyp</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation>Redirect: {0}</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation>Unbekannt</translation> </message> @@ -11037,7 +11041,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="568"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -11213,8 +11217,8 @@ <name>HelpDocsInstaller</name> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> - <translation>Die Datei <b>{0}</b> konnte nicht registriert werden.<br/>Ursache: {1}</translation> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> + <translation><p>Die Datei <b>{0}</b> konnte nicht registriert werden.<br/>Ursache: {1}</p></translation> </message> </context> <context> @@ -13260,24 +13264,24 @@ <translation>Chronik laden</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> - <translation>Die Chronikdatei <b>{0}</b> konnte nicht geöffnet werden.<br/>Ursache: {1}</translation> - </message> - <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> <source>Saving History</source> <translation>Chronik speichern</translation> </message> <message> + <location filename="Helpviewer/History/HistoryManager.py" line="413"/> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> + <translation><p>Die Chronikdatei <b>{0}</b> konnte nicht geöffnet werden.<br/>Ursache: {1}</p></translation> + </message> + <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> - <translation>Fehler beim Löschen der alten Chronikdatei <b>{0}</b>.<br/>Ursache: {1}</translation> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> + <translation><p>Fehler beim Löschen der alten Chronikdatei <b>{0}</b>.<br/>Ursache: {1}</p></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> - <translation>Fehler beim Kopieren der neuen Chronikdatei über die alte (<b>{0}</b>).<br/>Ursache: {1}</translation> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> + <translation><p>Fehler beim Kopieren der neuen Chronikdatei über die alte (<b>{0}</b>).<br/>Ursache: {1}</p></translation> </message> </context> <context> @@ -17870,9 +17874,9 @@ <context> <name>OpenSearchManager</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> - <translation>Soll die folgende Suchmaschine zur Liste der Suchmaschinen hinzugefügt werden?<br/><br/>Name: {0}<br/>Sucht bei: {1}</translation> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> + <translation><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></translation> </message> </context> <context>
--- a/i18n/eric5_es.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_es.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3198,7 +3198,7 @@ <translation type="unfinished">desconocido</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5284,42 +5284,42 @@ <translation>Mantener abierto al terminar</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Intentar de nuevo</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Parar</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation>Descargando</translation> </message> @@ -5329,55 +5329,60 @@ <translation>Descarga de Eric5</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation><p>Está a punto de descargar el archivo <b>{0}</b>.</p><p>¿Qué desea hacer?</p></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation>Descarga cancelada: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation>Error al abrir el fichero a guardar: {0}</translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation>Error al abrir el fichero a guardar: {0}</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation>Error al guardar: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation>Error de Red: {0}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation>-{0}:{1:02} minutos restantes</translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation>- {0} seconds restantes</translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> - <translation>{0} de {1} ({2}/segundo) {3}</translation> + <source>- {0}:{1:02} minutes remaining</source> + <translation>-{0}:{1:02} minutos restantes</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> + <translation>- {0} seconds restantes</translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation>{0} de {1} ({2}/segundo) {3}</translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation>{0} descargado</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation>{0} de {1} - Parado</translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E5GraphicsView</name> @@ -5503,42 +5508,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> <source>Method</source> <translation>Método</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> - <translation>Dirección</translation> + <source>Response</source> + <translation>Respuesta</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> - <translation>Respuesta</translation> + <source>Length</source> + <translation>Longitud</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> - <translation>Longitud</translation> + <source>Content Type</source> + <translation>Tipo de Contenido</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation>Tipo de Contenido</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation>Información</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation>Redirigir: {0}</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation>Desconocido</translation> </message> @@ -11205,7 +11210,12 @@ <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> - <translation>El archivo <b>{0}</b> no ha podido ser registrado.<br/>Causa: {1}</translation> + <translation type="obsolete">El archivo <b>{0}</b> no ha podido ser registrado.<br/>Causa: {1}</translation> + </message> + <message> + <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -13278,17 +13288,32 @@ <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> - <translation>No se ha podido abrir el archivo de historial <b>{0}</b>.<br/>Razón: {1}</translation> + <translation type="obsolete">No se ha podido abrir el archivo de historial <b>{0}</b>.<br/>Razón: {1}</translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> - <translation>Error al eliminar el antiguo archivo de historial <b>{0}</b>.<br/>Razón: {1}</translation> + <translation type="obsolete">Error al eliminar el antiguo archivo de historial <b>{0}</b>.<br/>Razón: {1}</translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> - <translation>Error al copiar el nuevo archivo de historial sobre el antiguo (<b>{0}</b>).<br/>Razón: {1}</translation> + <translation type="obsolete">Error al copiar el nuevo archivo de historial sobre el antiguo (<b>{0}</b>).<br/>Razón: {1}</translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryManager.py" line="413"/> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryManager.py" line="433"/> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/History/HistoryManager.py" line="439"/> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -17883,7 +17908,12 @@ <message> <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> - <translation>¿Desea añadir el siguiente motor a la lista de motores de búsqueda?<br/><br/>Nombre: {0}<br/>Busca en: {1}</translation> + <translation type="obsolete">¿Desea añadir el siguiente motor a la lista de motores de búsqueda?<br/><br/>Nombre: {0}<br/>Busca en: {1}</translation> + </message> + <message> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> + <translation type="unfinished"></translation> </message> </context> <context>
--- a/i18n/eric5_fr.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_fr.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3437,7 +3437,7 @@ <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5719,17 +5719,17 @@ <translation>Laisser ouvert après le téléchargement</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Essayer à nouveau</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Stop</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Enregistrer le fichier</translation> </message> @@ -5769,7 +5769,7 @@ <translation type="obsolete">%1 sur %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> @@ -5784,22 +5784,22 @@ <translation type="obsolete">%1 sur %2 - Stoppé</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>octets</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5809,55 +5809,60 @@ <translation type="unfinished">Téléchargement Eric4 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6203,42 +6208,42 @@ <context> <name>E5RequestModel</name> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> + <source>Method</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="222"/> - <source>Method</source> + <source>Address</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> + <source>Response</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> + <source>Length</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> + <source>Content Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished">Inconnu</translation> </message> @@ -12231,7 +12236,7 @@ <name>HelpDocsInstaller</name> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14582,17 +14587,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19523,8 +19528,8 @@ <context> <name>OpenSearchManager</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_it.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_it.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3392,7 +3392,7 @@ <translation type="unfinished">sconosciuto</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5611,17 +5611,17 @@ <translation>Tieni aperto quando termina</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Ritenta</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Ferma</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Salva file</translation> </message> @@ -5661,7 +5661,7 @@ <translation type="obsolete">%1 of %2 (%3/sec) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> @@ -5676,22 +5676,22 @@ <translation type="obsolete">%1 di %2 - Fermati</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>bytes</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation>Scaricamento</translation> </message> @@ -5706,55 +5706,60 @@ <translation type="unfinished">Download Eric4 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6171,42 +6176,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> <source>Method</source> <translation type="unfinished">Metodo</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <source>Address</source> + <translation type="unfinished">Indirizzo</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> - <translation type="unfinished">Indirizzo</translation> + <source>Response</source> + <translation type="unfinished">Risposta</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> - <translation type="unfinished">Risposta</translation> + <source>Length</source> + <translation type="unfinished">Lunghezza</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> - <translation type="unfinished">Lunghezza</translation> + <source>Content Type</source> + <translation type="unfinished">Content Type</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished">Content Type</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished">Sconosciuto</translation> </message> @@ -12134,7 +12139,7 @@ </message> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14262,17 +14267,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19243,8 +19248,8 @@ <translation type="obsolete">Vuoi aggiungere il seguente motore di ricerca alla tua lista ?<br/><br/>Nome: %1<br/>Cerca su: %2</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_ru.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_ru.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3398,7 +3398,7 @@ <translation type="unfinished">неизвестный</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5641,17 +5641,17 @@ <translation>Сохранить открытым по окончании</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Повторить</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Стоп</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> @@ -5691,7 +5691,7 @@ <translation type="obsolete">%1 из %2 (%3/сек) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation></translation> </message> @@ -5706,22 +5706,22 @@ <translation type="obsolete">%1 из %2 - остановлено</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>байты</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation>Скачивание</translation> </message> @@ -5736,55 +5736,60 @@ <translation type="unfinished">Скачивание Eric4 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6213,42 +6218,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> <source>Method</source> <translation type="unfinished">Метод</translation> </message> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="222"/> + <source>Address</source> + <translation type="unfinished">Адрес</translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> - <translation type="unfinished">Адрес</translation> + <source>Response</source> + <translation type="unfinished">Ответ</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> - <translation type="unfinished">Ответ</translation> + <source>Length</source> + <translation type="unfinished">Размер</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> - <translation type="unfinished">Размер</translation> + <source>Content Type</source> + <translation type="unfinished">Тип содержимого</translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished">Тип содержимого</translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">Информация</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> @@ -12175,7 +12180,7 @@ </message> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14310,17 +14315,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19305,8 +19310,8 @@ <translation type="obsolete">Добавить поисковик? <br/><br/> %1<br/>Ищет на: %2</translation> </message> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_tr.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_tr.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3427,7 +3427,7 @@ <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5679,17 +5679,17 @@ <translation>bitince korumayı aç</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>Tekrar Dene</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>Dur</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>Dosyayı Kaydet</translation> </message> @@ -5729,7 +5729,7 @@ <translation type="obsolete">%1 of %2 (%3/sn) %4</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> @@ -5744,22 +5744,22 @@ <translation type="obsolete">%1 of %2 - Durdu</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>bitler</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>kB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>MB</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5769,55 +5769,60 @@ <translation type="unfinished">Eric4 İndirme {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6167,42 +6172,42 @@ <context> <name>E5RequestModel</name> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> + <source>Method</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="222"/> - <source>Method</source> + <source>Address</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> + <source>Response</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> + <source>Length</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> + <source>Content Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">Bilgi</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished">Bilinmeyen</translation> </message> @@ -12163,7 +12168,7 @@ <name>HelpDocsInstaller</name> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14514,17 +14519,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19459,8 +19464,8 @@ <context> <name>OpenSearchManager</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Apr 02 13:57:06 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Apr 02 17:12:47 2010 +0000 @@ -3429,7 +3429,7 @@ <translation type="unfinished">未知</translation> </message> <message> - <location filename="Cooperation/CooperationClient.py" line="273"/> + <location filename="Cooperation/CooperationClient.py" line="271"/> <source>Illegal address: {0}:{1} </source> <translation type="unfinished"></translation> @@ -5713,17 +5713,17 @@ <translation>结束时不关闭</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="45"/> + <location filename="Helpviewer/DownloadDialog.py" line="48"/> <source>Try Again</source> <translation>再试</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="48"/> + <location filename="Helpviewer/DownloadDialog.py" line="51"/> <source>Stop</source> <translation>中止</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="131"/> + <location filename="Helpviewer/DownloadDialog.py" line="140"/> <source>Save File</source> <translation>保存文件</translation> </message> @@ -5763,7 +5763,7 @@ <translation type="obsolete">%2 (%3/秒) %4 的 %1</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="342"/> + <location filename="Helpviewer/DownloadDialog.py" line="351"/> <source>?</source> <translation>?</translation> </message> @@ -5778,22 +5778,22 @@ <translation type="obsolete">%2 的 %1 - 已中止</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="367"/> + <location filename="Helpviewer/DownloadDialog.py" line="376"/> <source>bytes</source> <translation>字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="370"/> + <location filename="Helpviewer/DownloadDialog.py" line="379"/> <source>kB</source> <translation>千字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="373"/> + <location filename="Helpviewer/DownloadDialog.py" line="382"/> <source>MB</source> <translation>兆字节</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source>Downloading</source> <translation type="unfinished"></translation> </message> @@ -5803,55 +5803,60 @@ <translation type="unfinished">Eric4 下载 {5 ?}</translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="119"/> + <location filename="Helpviewer/DownloadDialog.py" line="122"/> <source><p>You are about to download the file <b>{0}</b>.</p><p>What do you want to do?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="141"/> + <location filename="Helpviewer/DownloadDialog.py" line="150"/> <source>Download canceled: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="254"/> - <source>Error opening save file: {0}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="261"/> + <source>Error opening save file: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="268"/> <source>Error saving: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="278"/> + <location filename="Helpviewer/DownloadDialog.py" line="285"/> <source>Network Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="332"/> - <source>- {0}:{1:02} minutes remaining</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/DownloadDialog.py" line="339"/> - <source>- {0} seconds remaining</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/DownloadDialog.py" line="341"/> - <source>{0} of {1} ({2}/sec) {3}</source> + <source>- {0}:{1:02} minutes remaining</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="348"/> + <source>- {0} seconds remaining</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/DownloadDialog.py" line="350"/> + <source>{0} of {1} ({2}/sec) {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="359"/> <source>{0} downloaded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/DownloadDialog.py" line="353"/> + <location filename="Helpviewer/DownloadDialog.py" line="362"/> <source>{0} of {1} - Stopped</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/DownloadDialog.py" line="44"/> + <source>Eric5 Download {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>E4GraphicsView</name> @@ -6175,42 +6180,42 @@ <context> <name>E5RequestModel</name> <message> + <location filename="E5Network/E5NetworkMonitor.py" line="221"/> + <source>Method</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="E5Network/E5NetworkMonitor.py" line="222"/> - <source>Method</source> + <source>Address</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="223"/> - <source>Address</source> + <source>Response</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="224"/> - <source>Response</source> + <source>Length</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="225"/> - <source>Length</source> + <source>Content Type</source> <translation type="unfinished"></translation> </message> <message> <location filename="E5Network/E5NetworkMonitor.py" line="226"/> - <source>Content Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="E5Network/E5NetworkMonitor.py" line="227"/> <source>Info</source> <translation type="unfinished">信息</translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="297"/> + <location filename="E5Network/E5NetworkMonitor.py" line="296"/> <source>Redirect: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="E5Network/E5NetworkMonitor.py" line="330"/> + <location filename="E5Network/E5NetworkMonitor.py" line="329"/> <source>Unknown</source> <translation type="unfinished">未知</translation> </message> @@ -12198,7 +12203,7 @@ <name>HelpDocsInstaller</name> <message> <location filename="Helpviewer/HelpDocsInstaller.py" line="182"/> - <source>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</source> + <source><p>The file <b>{0}</b> could not be registered.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -14554,17 +14559,17 @@ </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="413"/> - <source>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="433"/> - <source>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</source> + <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/History/HistoryManager.py" line="439"/> - <source>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</source> + <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> </context> @@ -19501,8 +19506,8 @@ <context> <name>OpenSearchManager</name> <message> - <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="382"/> - <source>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</source> + <location filename="Helpviewer/OpenSearch/OpenSearchManager.py" line="384"/> + <source><p>Do you want to add the following engine to your list of search engines?<br/><br/>Name: {0}<br/>Searches on: {1}</p></source> <translation type="unfinished"></translation> </message> </context>
