Mercurial Repositories > eric / changeset
changeset
Added support for variable AdBlock update periods (given in subscription) to the web browser.
Mon, 13 Aug 2012 20:01:04 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 13 Aug 2012 20:01:04 +0200
- changeset 2005
- 6867cf32df67
- parent 2001
- 92a4e822aefe
- child 2006
- 1056be73e934
Added support for variable AdBlock update periods (given in subscription) to the web browser.
--- a/Helpviewer/AdBlock/AdBlockDialog.ui Sun Aug 12 13:43:15 2012 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.ui Mon Aug 13 20:01:04 2012 +0200 @@ -98,7 +98,7 @@ <item> <widget class="QLabel" name="label"> <property name="text"> - <string>Update Period (days):</string> + <string>Default Update Period (days):</string> </property> </widget> </item>
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Aug 12 13:43:15 2012 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Mon Aug 13 20:01:04 2012 +0200 @@ -62,6 +62,8 @@ self.__requiresLocation = "" self.__requiresTitle = "" + self.__updatePeriod = 0 # update period in hours, 0 = use default + self.__rules = [] # list containing all AdBlock rules self.__networkExceptionRules = [] @@ -73,6 +75,10 @@ self.__checksumRe = re.compile(r"""^\s*!\s*checksum[\s\-:]+([\w\+\/=]+).*\n""", re.IGNORECASE | re.MULTILINE) + self.__expiresRe = re.compile( + r"""(?:expires:|expires after)\s*(\d+)\s*(hour|h)?""", + re.IGNORECASE) + self.__parseUrl(url) @@ -263,6 +269,15 @@ while not textStream.atEnd(): line = textStream.readLine() self.__rules.append(AdBlockRule(line, self)) + expires = self.__expiresRe.search(line) + if expires: + period, kind = expires.groups() + if kind: + # hours + self.__updatePeriod = int(period) + else: + # days + self.__updatePeriod = int(period) * 24 self.__populateCache() self.changed.emit() elif not fileName.endswith("_custom"): @@ -274,8 +289,12 @@ """ Public method to check for an update. """ + if self.__updatePeriod: + updatePeriod = self.__updatePeriod + else: + updatePeriod = Preferences.getHelp("AdBlockUpdatePeriod") * 24 if not self.__lastUpdate.isValid() or \ - self.__lastUpdate.addDays(Preferences.getHelp("AdBlockUpdatePeriod")) < \ + self.__lastUpdate.addSecs(updatePeriod * 3600) < \ QDateTime.currentDateTime(): self.updateNow()
--- a/Preferences/__init__.py Sun Aug 12 13:43:15 2012 +0200 +++ b/Preferences/__init__.py Mon Aug 13 20:01:04 2012 +0200 @@ -639,7 +639,7 @@ "DefaultScheme": "file://", "AdBlockEnabled": False, "AdBlockSubscriptions": [], - "AdBlockUpdatePeriod": 7, + "AdBlockUpdatePeriod": 1, "AdBlockExceptions": [], "OfflineStorageDatabaseQuota": 50, # 50 MB "UserAgent": "",
--- a/changelog Sun Aug 12 13:43:15 2012 +0200 +++ b/changelog Mon Aug 13 20:01:04 2012 +0200 @@ -26,6 +26,7 @@ -- added support for dependent AdBlock subscriptions -- added support for AdBlock exceptions -- added support for AdBlock checksum checking when downloading a subscription + -- added support for variable AdBlock update periods (given in subscription) Version 5.3-snapshot-20120624: - bug fixes
--- a/i18n/eric5_cs.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_cs.ts Mon Aug 13 20:01:04 2012 +0200 @@ -150,11 +150,6 @@ <translation>Zadejte výraz pro vyhledání odběrů a pravidel</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -199,6 +194,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -320,27 +320,27 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Nahrát odebíraná pravidla</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Stažení odebíraných pravidel</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation>Odebíraná pravidla jsou prázdná.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Ukládání odebíraných pravidel</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Nelze otevřít adblock soubor '{0}' pro čtení.</translation> </message> @@ -350,22 +350,22 @@ <translation type="obsolete">Adblock soubor '{0}' nezačíná s [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Nelze otevřít adblock soubor '{0}' pro zápis.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -46461,12 +46461,12 @@ <translation>&Změnit šířky sloupců</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Aktivovat filtr úloh</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Filtr úloh nemá žádný aktivní. Chcete konfigurovat nastavení filtru?</translation> </message> @@ -46476,12 +46476,12 @@ <translation>Znovu vygene&rovat úlohy projektu</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Extrahovat úlohy projektu...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Přerušit</translation> </message> @@ -46496,7 +46496,7 @@ <translation>Konfigurovat...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Extrahování úloh projektu....{0}</translation> @@ -46507,12 +46507,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_de.ts Mon Aug 13 20:01:04 2012 +0200 @@ -132,11 +132,6 @@ <translation>Gib den Suchtext für Abonnements und Regeln ein</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation>Aktualisierungsperiode (Tage):</translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation>Gib die Aktualisierungsperiode ein (1 bis 14 Tage)</translation> @@ -181,6 +176,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation><p>Soll das Abonnement <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation>Standardaktualisierungsperiode (Tage):</translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -289,47 +289,47 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Abonnementregeln laden</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <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="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Lade Abonnementregeln herunter</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation>Habe leere Abonnementregeln erhalten.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Speichern der Abonnementregeln</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <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="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation><p>AdBlock Abonnement <b>{0}</b> hat eine falsche Prüfsumme.<br/>Gefunden: {1}<br/>Berechnet: {2}<br/>Trotzdem verwenden?</p></translation> </message> @@ -45071,12 +45071,12 @@ <translation>Spaltenbreite an&passen</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Aufgabenfilter aktivieren</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Der Aufgabenfilter hat keinen aktiven Filter. Soll die Filterkonfiguration erstellt werden?</translation> </message> @@ -45086,17 +45086,17 @@ <translation>Projektaufgaben &regenerieren</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Extrahiere Projektaufgaben...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Abbrechen</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Extrahiere Projektaufgaben... @@ -45118,12 +45118,12 @@ <translation>Scanoptionen &konfigurieren</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation>Scanfiltermuster</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen:</translation> </message>
--- a/i18n/eric5_en.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_en.ts Mon Aug 13 20:01:04 2012 +0200 @@ -132,11 +132,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -181,6 +176,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -289,47 +289,47 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -44657,27 +44657,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation type="unfinished"></translation> @@ -44688,12 +44688,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_es.ts Mon Aug 13 20:01:04 2012 +0200 @@ -144,7 +144,7 @@ <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> <source>Update Period (days):</source> - <translation>Periodo de Actualización (días):</translation> + <translation type="obsolete">Periodo de Actualización (días):</translation> </message> <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> @@ -191,6 +191,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation><p>¿Desea realmente eliminar la suscripción <b>{0}</b> ?</p></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -312,27 +317,27 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Cargar reglas de la suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Descargando reglas de la suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Guardando reglas de la suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <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> @@ -342,22 +347,22 @@ <translation type="obsolete">El archivo de AdBlock '{0}' no comienza con [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <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> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -45244,22 +45249,22 @@ <translation>Cambiar &tamaño de las columnas</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Activar filtro de tareas</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>El filtro de tareas no tiene ningún filtro activo. ¿Desea configurar las propiedades del filtro?</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Extrayendo tareas del proyecto...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Abortar</translation> </message> @@ -45274,7 +45279,7 @@ <translation>Configurar...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Extrayendo tareas del proyecto... @@ -45286,12 +45291,12 @@ <translation>&Configurar opciones de análisis</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation>Patrones de filtro de análisis</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation>Introducir patrones de nombre de archivo para los archivos a ser excluidos separados por una coma:</translation> </message>
--- a/i18n/eric5_fr.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_fr.ts Mon Aug 13 20:01:04 2012 +0200 @@ -185,11 +185,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -234,6 +229,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -342,47 +342,47 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -49516,12 +49516,12 @@ <translation>Ajuster la largeur des &colonnes</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Activer le filtre de tâches</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Le filtre de tâches n'a aucun filtre actif. Voulez-vous configurer les paramètres de filtre ?</translation> </message> @@ -49531,12 +49531,12 @@ <translation>&Regénérer les tâches de projet</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Extraction des tâches de projet...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Abandon</translation> </message> @@ -49558,7 +49558,7 @@ <translation>Configuration...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation type="unfinished"></translation> @@ -49569,12 +49569,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_it.ts Mon Aug 13 20:01:04 2012 +0200 @@ -150,11 +150,6 @@ <translation>Rimuovi sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -199,6 +194,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -320,27 +320,27 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Carica regole di sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Scarica regole di sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation>Ricevuto regole di sottoscrizione vuote.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Salvataggio regole di sottoscrizione</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Non posso aprire il file adblock '{0}' in lettura.</translation> </message> @@ -350,22 +350,22 @@ <translation type="obsolete">Il file adblock '{0}' non inizia con [Adblock.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Non posso aprire il file adblock '{0}' in scrittura.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -46140,12 +46140,12 @@ <translation>Ridimen&siona colonne</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Attiva i filtri sui task</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Il filtro sui task non ha nessun filtro attivo. Vuoi configurare i filtri ?</translation> </message> @@ -46155,12 +46155,12 @@ <translation>&Rigenera task del progetto</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Estrazione dei task del progetto...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Termina</translation> </message> @@ -46175,7 +46175,7 @@ <translation>Configura...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Estrazione dei task del progetto... @@ -46192,12 +46192,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_ru.ts Mon Aug 13 20:01:04 2012 +0200 @@ -150,11 +150,6 @@ <translation>Удалить подписку</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -199,6 +194,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -320,12 +320,12 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Загрузить правила подписки</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>Невозможно открыть adblock файл '{0}' для чтения.</translation> </message> @@ -335,37 +335,37 @@ <translation type="obsolete">Adblock файл '{0}' начинается не с '[Adblock'.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Загрузка правил подписки</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation>Правила подписки пусты.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>Невозможно открыть adblock файл '{0}' для записи.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Сохранение правил подписки</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -46242,12 +46242,12 @@ <translation>Изменить размер &колонок</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Включить фильтр задач</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Фильтр задач не содержит ни одного активного фильтра. Настроить фильтры?</translation> </message> @@ -46257,17 +46257,17 @@ <translation>&Перегенерировать задачи проекта</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Извлечение задач проекта...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Отмена</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Извлечение задач проекта... @@ -46289,12 +46289,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_tr.ts Mon Aug 13 20:01:04 2012 +0200 @@ -150,11 +150,6 @@ <translation>Üyeliği İpta Et</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -199,6 +194,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -320,12 +320,12 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation>Üyelik kuralları yükleniyor</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation>'{0}' dosyasına okuma blokesini kaldır.</translation> </message> @@ -335,37 +335,37 @@ <translation type="obsolete">Block'{0}' dosyası [Adblock ile başlamıyor.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation>Üyelik kuralları indiriliyor</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation>Boş üyelik kuralları alındı.</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation>Üyelik kurallarını kaydediliyor</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -46032,27 +46032,27 @@ <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>Görev süzgeçini etkinleştir</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Görev süzgeçlerinin etkin olan hiç süzgeçi yok. Bu süzgeçlerin ayarlarını yapmak ister misiniz?</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>Proje görevleri çıkarılıyor...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>Vazgeç</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation>Proje görevleri çıkarılıyor... @@ -46064,12 +46064,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun Aug 12 13:43:15 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon Aug 13 20:01:04 2012 +0200 @@ -185,11 +185,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> - <source>Update Period (days):</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="108"/> <source>Enter the update period (1 to 14 days)</source> <translation type="unfinished"></translation> @@ -234,6 +229,11 @@ <source><p>Do you really want to remove subscription <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockDialog.ui" line="101"/> + <source>Default Update Period (days):</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockExceptionsDialog</name> @@ -342,47 +342,47 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>Load subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source>Downloading subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="343"/> <source>Got empty subscription rules.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Saving subscription rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="250"/> <source>Unable to open adblock file '{0}' for reading.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="333"/> <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="402"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="421"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="258"/> <source>AdBlock file '{0}' does not start with [Adblock.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="401"/> <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> <translation type="unfinished"></translation> </message> @@ -49506,22 +49506,22 @@ <translation>配置……</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>Activate task filter</source> <translation>激活任务过滤器</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="452"/> + <location filename="Tasks/TaskViewer.py" line="456"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>任务过滤器不包含任务激活过滤器。要配置过滤器设置吗？</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Extracting project tasks...</source> <translation>提取项目任务……</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="514"/> + <location filename="Tasks/TaskViewer.py" line="518"/> <source>Abort</source> <translation>终止</translation> </message> @@ -49533,7 +49533,7 @@ %1</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="520"/> + <location filename="Tasks/TaskViewer.py" line="524"/> <source>Extracting project tasks... {0}</source> <translation type="unfinished"></translation> @@ -49544,12 +49544,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="481"/> + <location filename="Tasks/TaskViewer.py" line="485"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message>
