Sun, 06 May 2012 19:08:47 +0200
Made the AdBlock update period configurable between 1 and 14 days.
--- a/APIs/Python3/eric5.api Sun May 06 18:10:24 2012 +0200 +++ b/APIs/Python3/eric5.api Sun May 06 19:08:47 2012 +0200 @@ -1684,6 +1684,7 @@ eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, rule, parent=None) eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(rule="") eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.model?4() +eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value) eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.setCurrentIndex?4(index) eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog?1(parent=None) eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.addSubscription?4(subscription) @@ -1732,6 +1733,7 @@ eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.allow?4(urlString) eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.block?4(urlString) eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.changed?7 +eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.checkForUpdate?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.isEnabled?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.lastUpdate?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.location?4()
--- a/Documentation/Help/source.qhp Sun May 06 18:10:24 2012 +0200 +++ b/Documentation/Help/source.qhp Sun May 06 19:08:47 2012 +0200 @@ -1033,6 +1033,7 @@ <keyword name="AdBlockDialog.__updateSubscription" id="AdBlockDialog.__updateSubscription" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.__updateSubscription" /> <keyword name="AdBlockDialog.addCustomRule" id="AdBlockDialog.addCustomRule" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.addCustomRule" /> <keyword name="AdBlockDialog.model" id="AdBlockDialog.model" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.model" /> + <keyword name="AdBlockDialog.on_updateSpinBox_valueChanged" id="AdBlockDialog.on_updateSpinBox_valueChanged" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.on_updateSpinBox_valueChanged" /> <keyword name="AdBlockDialog.setCurrentIndex" id="AdBlockDialog.setCurrentIndex" ref="eric5.Helpviewer.AdBlock.AdBlockDialog.html#AdBlockDialog.setCurrentIndex" /> <keyword name="AdBlockManager" id="AdBlockManager" ref="eric5.Helpviewer.AdBlock.AdBlockManager.html#AdBlockManager" /> <keyword name="AdBlockManager (Constructor)" id="AdBlockManager (Constructor)" ref="eric5.Helpviewer.AdBlock.AdBlockManager.html#AdBlockManager.__init__" /> @@ -1101,6 +1102,7 @@ <keyword name="AdBlockSubscription.allRules" id="AdBlockSubscription.allRules" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.allRules" /> <keyword name="AdBlockSubscription.allow" id="AdBlockSubscription.allow" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.allow" /> <keyword name="AdBlockSubscription.block" id="AdBlockSubscription.block" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.block" /> + <keyword name="AdBlockSubscription.checkForUpdate" id="AdBlockSubscription.checkForUpdate" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.checkForUpdate" /> <keyword name="AdBlockSubscription.isEnabled" id="AdBlockSubscription.isEnabled" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.isEnabled" /> <keyword name="AdBlockSubscription.lastUpdate" id="AdBlockSubscription.lastUpdate" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.lastUpdate" /> <keyword name="AdBlockSubscription.location" id="AdBlockSubscription.location" ref="eric5.Helpviewer.AdBlock.AdBlockSubscription.html#AdBlockSubscription.location" />
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html Sun May 06 18:10:24 2012 +0200 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html Sun May 06 19:08:47 2012 +0200 @@ -82,6 +82,9 @@ <td><a href="#AdBlockDialog.model">model</a></td> <td>Public method to return a reference to the subscriptions tree model.</td> </tr><tr> +<td><a href="#AdBlockDialog.on_updateSpinBox_valueChanged">on_updateSpinBox_valueChanged</a></td> +<td>Private slot to handle changes of the update period.</td> +</tr><tr> <td><a href="#AdBlockDialog.setCurrentIndex">setCurrentIndex</a></td> <td>Private slot to set the current index of the subscriptions tree.</td> </tr> @@ -135,7 +138,17 @@ <b>model</b>(<i></i>) <p> Public method to return a reference to the subscriptions tree model. -</p><a NAME="AdBlockDialog.setCurrentIndex" ID="AdBlockDialog.setCurrentIndex"></a> +</p><a NAME="AdBlockDialog.on_updateSpinBox_valueChanged" ID="AdBlockDialog.on_updateSpinBox_valueChanged"></a> +<h4>AdBlockDialog.on_updateSpinBox_valueChanged</h4> +<b>on_updateSpinBox_valueChanged</b>(<i>value</i>) +<p> + Private slot to handle changes of the update period. +</p><dl> +<dt><i>value</i></dt> +<dd> +update period (integer) +</dd> +</dl><a NAME="AdBlockDialog.setCurrentIndex" ID="AdBlockDialog.setCurrentIndex"></a> <h4>AdBlockDialog.setCurrentIndex</h4> <b>setCurrentIndex</b>(<i>index</i>) <p>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html Sun May 06 18:10:24 2012 +0200 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html Sun May 06 19:08:47 2012 +0200 @@ -94,6 +94,9 @@ <td><a href="#AdBlockSubscription.block">block</a></td> <td>Public method to check, if the given URL should be blocked.</td> </tr><tr> +<td><a href="#AdBlockSubscription.checkForUpdate">checkForUpdate</a></td> +<td>Public method to check for an update.</td> +</tr><tr> <td><a href="#AdBlockSubscription.isEnabled">isEnabled</a></td> <td>Public method to check, if the subscription is enabled.</td> </tr><tr> @@ -222,7 +225,12 @@ <dd> reference to the rule object or None (AdBlockRule) </dd> -</dl><a NAME="AdBlockSubscription.isEnabled" ID="AdBlockSubscription.isEnabled"></a> +</dl><a NAME="AdBlockSubscription.checkForUpdate" ID="AdBlockSubscription.checkForUpdate"></a> +<h4>AdBlockSubscription.checkForUpdate</h4> +<b>checkForUpdate</b>(<i></i>) +<p> + Public method to check for an update. +</p><a NAME="AdBlockSubscription.isEnabled" ID="AdBlockSubscription.isEnabled"></a> <h4>AdBlockSubscription.isEnabled</h4> <b>isEnabled</b>(<i></i>) <p>
--- a/Helpviewer/AdBlock/AdBlockDialog.py Sun May 06 18:10:24 2012 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Sun May 06 19:08:47 2012 +0200 @@ -7,7 +7,7 @@ Module implementing the AdBlock configuration dialog. """ -from PyQt4.QtCore import QUrl +from PyQt4.QtCore import pyqtSlot, QUrl from PyQt4.QtGui import QDialog, QMenu, QToolButton, QApplication, QDesktopServices from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel @@ -20,6 +20,7 @@ from .AdBlockRule import AdBlockRule import UI.PixmapCache +import Preferences class AdBlockDialog(QDialog, Ui_AdBlockDialog): @@ -36,6 +37,8 @@ self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus48.png")) + self.updateSpinBox.setValue(Preferences.getHelp("AdBlockUpdatePeriod")) + self.__adBlockModel = AdBlockModel(self) self.__proxyModel = E5TreeSortFilterProxyModel(self) self.__proxyModel.setSourceModel(self.__adBlockModel) @@ -155,3 +158,17 @@ subscription = self.__adBlockModel.subscription(idx) manager = Helpviewer.HelpWindow.HelpWindow.adblockManager() manager.removeSubscription(subscription) + + @pyqtSlot(int) + def on_updateSpinBox_valueChanged(self, value): + """ + Private slot to handle changes of the update period. + + @param value update period (integer) + """ + if value != Preferences.getHelp("AdBlockUpdatePeriod"): + Preferences.setHelp("AdBlockUpdatePeriod", value) + + manager = Helpviewer.HelpWindow.HelpWindow.adblockManager() + for subscription in manager.subscriptions(): + subscription.checkForUpdate()
--- a/Helpviewer/AdBlock/AdBlockDialog.ui Sun May 06 18:10:24 2012 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.ui Sun May 06 19:08:47 2012 +0200 @@ -103,7 +103,7 @@ </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QToolButton" name="actionButton"> <property name="text"> @@ -124,6 +124,35 @@ </property> </spacer> </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Update Period (days):</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="updateSpinBox"> + <property name="toolTip"> + <string>Enter the update period (1 to 14 days)</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="suffix"> + <string/> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>14</number> + </property> + <property name="value"> + <number>7</number> + </property> + </widget> + </item> </layout> </item> </layout> @@ -154,6 +183,7 @@ <tabstop>clearButton</tabstop> <tabstop>subscriptionsTree</tabstop> <tabstop>actionButton</tabstop> + <tabstop>updateSpinBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/>
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun May 06 18:10:24 2012 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sun May 06 19:08:47 2012 +0200 @@ -20,6 +20,7 @@ import Helpviewer.HelpWindow import Utilities +import Preferences class AdBlockSubscription(QObject): @@ -228,8 +229,15 @@ self.__populateCache() self.changed.emit() + self.checkForUpdate() + + def checkForUpdate(self): + """ + Public method to check for an update. + """ if not self.__lastUpdate.isValid() or \ - self.__lastUpdate.addDays(7) < QDateTime.currentDateTime(): + self.__lastUpdate.addDays(Preferences.getHelp("AdBlockUpdatePeriod")) < \ + QDateTime.currentDateTime(): self.updateNow() def updateNow(self):
--- a/Preferences/__init__.py Sun May 06 18:10:24 2012 +0200 +++ b/Preferences/__init__.py Sun May 06 19:08:47 2012 +0200 @@ -637,6 +637,7 @@ "DefaultScheme": "file://", "AdBlockEnabled": False, "AdBlockSubscriptions": [], + "AdBlockUpdatePeriod": 7, "OfflineStorageDatabaseQuota": 50, # 50 MB "UserAgent": "", "ShowPreview": True, @@ -2033,7 +2034,7 @@ elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies", "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota", - "CachePolicy", "DownloadManagerRemovePolicy", + "CachePolicy", "DownloadManagerRemovePolicy", "AdBlockUpdatePeriod", "SearchLanguage", "SyncType", "SyncFtpPort", "SyncFtpIdleTimeout", "SyncEncryptionKeyLength"]: return int(prefClass.settings.value("Help/" + key,
--- a/changelog Sun May 06 18:10:24 2012 +0200 +++ b/changelog Sun May 06 19:08:47 2012 +0200 @@ -14,6 +14,7 @@ - Web Browser -- extended the "Clear Private Data" dialog to clear flash cookies and to select a browsing history period to clear + -- made the AdBlock update period configurable between 1 and 14 days Version 5.3-snapshot-20120430: - bug fixes
--- a/i18n/eric5_cs.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_cs.ts Sun May 06 19:08:47 2012 +0200 @@ -120,27 +120,27 @@ <translation>Akce</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Přidat vlastní pravidlo</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Další informace o pravidlech psaní...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Aktualizovat odběr</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Procházet odběry...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Odebrat odběr</translation> </message> @@ -149,6 +149,16 @@ <source>Enter search term for subscriptions and rules</source> <translation>Zadejte výraz pro vyhledání odběrů a pravidel</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -169,42 +179,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Nahrát odebíraná pravidla</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Stažení odebíraných pravidel</translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Stažení odebíraných pravidel</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>Odebíraná pravidla jsou prázdná.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Ukládání odebíraných pravidel</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Nelze otevřít adblock soubor '{0}' pro čtení.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>Adblock soubor '{0}' nezačíná s [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation><p>Pravidla pro předplatné nelze stáhnout.</p><p>Chyba: {0}</p></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Nelze otevřít adblock soubor '{0}' pro zápis.</translation> </message> @@ -29485,27 +29495,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_de.ts Sun May 06 19:08:47 2012 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -112,27 +113,27 @@ <translation>Aktionen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Spezifische Regel hinzufügen</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Mehr über das Schreiben von Regeln lernen...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Abonnement aktualisieren</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Abonnements anschauen...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Abonnement löschen</translation> </message> @@ -141,6 +142,16 @@ <source>Enter search term for subscriptions and rules</source> <translation>Gib den Suchtext für Abonnements und Regeln ein</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation>Aktualisierungsperiode (Tage):</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation>Gib die Aktualisierungsperiode ein (1 bis 14 Tage)</translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -161,42 +172,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Abonnementregeln laden</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Adblock Datei '{0}' konnte nicht zum Lesen geöffnet werden.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>Adblock Datei '{0}' startet nicht mit [Adblock.</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Lade Abonnementregeln herunter</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> + <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> + <translation><p>Abonnementregeln konnten nicht heruntergeladen werden.</p><p>Fehler: {0}</p></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Lade Abonnementregeln herunter</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> - <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> - <translation><p>Abonnementregeln konnten nicht heruntergeladen werden.</p><p>Fehler: {0}</p></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>Habe leere Abonnementregeln erhalten.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Adblock Datei '{0}' konnte nicht zum Schreiben geöffnet werden.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Speichern der Abonnementregeln</translation> </message> @@ -1762,8 +1773,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="147"/> @@ -2004,7 +2015,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> <message> @@ -13369,7 +13380,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="910"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -28580,27 +28591,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation>Wähle den Python2 Interpreter</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation> </message>
--- a/i18n/eric5_en.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_en.ts Sun May 06 19:08:47 2012 +0200 @@ -117,30 +117,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -161,42 +171,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> + <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> - <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> @@ -28419,27 +28429,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_es.ts Sun May 06 19:08:47 2012 +0200 @@ -112,27 +112,27 @@ <translation>Acciones</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Añadir Regla Personalizada</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Aprender más acerca de escribir reglas...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Actualizar Suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Navegar Suscripciones...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Eliminar Suscripción</translation> </message> @@ -141,6 +141,16 @@ <source>Enter search term for subscriptions and rules</source> <translation>Introduzca el término de búsqueda para suscripciones y reglas</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -161,42 +171,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Cargar reglas de la suscripción</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Descargando reglas de la suscripción</translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Descargando reglas de la suscripción</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>El conjunto de reglas de suscripción está vacío.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Guardando reglas de la suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>No ha sido posible abrir el archivo de AdBlock '{0}' en modo lectura.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>El archivo de AdBlock '{0}' no comienza con [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation><p>Las reglas de la subscrición no han podido ser descargadas.</p><p>Error: {0}</p></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>No ha sido posible abrir el archivo de AdBlock '{0}' en modo escritura.</translation> </message> @@ -28594,27 +28604,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation>Seleccionar Intérprete de Python2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation>Seleccionar el intérprete de Python2 a utilizar:</translation> </message>
--- a/i18n/eric5_fr.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_fr.ts Sun May 06 19:08:47 2012 +0200 @@ -160,27 +160,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation type="unfinished"></translation> </message> @@ -189,6 +189,16 @@ <source>Enter search term for subscriptions and rules</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -209,42 +219,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> @@ -31016,27 +31026,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_it.ts Sun May 06 19:08:47 2012 +0200 @@ -125,30 +125,40 @@ <translation>Azioni</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Aggiungi regola personalizzata</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Documentazione aggiuntiva sulla scrittura delle regole...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Aggiorna sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Naviga sottoscrizioni...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Rimuovi sottoscrizione</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -169,42 +179,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Carica regole di sottoscrizione</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Scarica regole di sottoscrizione</translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Scarica regole di sottoscrizione</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>Ricevuto regole di sottoscrizione vuote.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Salvataggio regole di sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Non posso aprire il file adblock '{0}' in lettura.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>Il file adblock '{0}' non inizia con [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation><p>Le regole di sottoscrizione non possono essere scaricate.</p><p>Errore {0}</p></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Non posso aprire il file adblock '{0}' in scrittura.</translation> </message> @@ -29089,27 +29099,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_ru.ts Sun May 06 19:08:47 2012 +0200 @@ -125,30 +125,40 @@ <translation>Действия</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Добавить пользовательское правило</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Узнать больше о написании правил...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Обновить подписку</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Просмотреть подписки...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Удалить подписку</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -169,42 +179,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Загрузить правила подписки</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Невозможно открыть adblock файл '{0}' для чтения.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>Adblock файл '{0}' начинается не с '[Adblock'.</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Загрузка правил подписки</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> + <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> + <translation><p>Не могу загрузить правила подписки.</p><p>Ошибка: {0}</p></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Загрузка правил подписки</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> - <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> - <translation><p>Не могу загрузить правила подписки.</p><p>Ошибка: {0}</p></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>Правила подписки пусты.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Невозможно открыть adblock файл '{0}' для записи.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Сохранение правил подписки</translation> </message> @@ -29224,27 +29234,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_tr.ts Sun May 06 19:08:47 2012 +0200 @@ -125,30 +125,40 @@ <translation>İşlemler</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation>Özel Kural Ekle</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation>Yazım kuralları hakkında daha fazla bilgi...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation>Üyeliği Güncelle</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation>Üyeliğe Gözat...</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation>Üyeliği İpta Et</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -169,42 +179,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation>Üyelik kuralları yükleniyor</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>'{0}' dosyasına okuma blokesini kaldır.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation>Block'{0}' dosyası [Adblock ile başlamıyor.</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation>Üyelik kuralları indiriliyor</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> + <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> + <translation><p>Üyelik kuralları indirilemiyor.</p><p>Hatar: {0}</p></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation>Üyelik kuralları indiriliyor</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> - <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> - <translation><p>Üyelik kuralları indirilemiyor.</p><p>Hatar: {0}</p></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation>Boş üyelik kuralları alındı.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>'{0}' dosyasına yazma blokesini kaldır.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation>Üyelik kurallarını kaydediliyor</translation> </message> @@ -29384,27 +29394,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun May 06 18:10:24 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun May 06 19:08:47 2012 +0200 @@ -160,27 +160,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="83"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="86"/> <source>Add Custom Rule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="85"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="88"/> <source>Learn more about writing rules...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="92"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="95"/> <source>Update Subscription</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="96"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="99"/> <source>Browse Subscriptions...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="100"/> + <location filename="Helpviewer/AdBlock/AdBlockDialog.py" line="103"/> <source>Remove Subscription</source> <translation type="unfinished"></translation> </message> @@ -189,6 +189,16 @@ <source>Enter search term for subscriptions and rules</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="130"/> + <source>Update Period (days):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="137"/> + <source>Enter the update period (1 to 14 days)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockManager</name> @@ -209,42 +219,42 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="303"/> + <source>Downloading subscription rules</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="295"/> - <source>Downloading subscription rules</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="287"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="207"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="208"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="215"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="216"/> <source>Adblock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="270"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="278"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="316"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> @@ -30977,27 +30987,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="1001"/> + <location filename="Preferences/__init__.py" line="1002"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1028"/> + <location filename="Preferences/__init__.py" line="1029"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1121"/> + <location filename="Preferences/__init__.py" line="1122"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>