Sun, 06 May 2012 18:10:24 +0200
Extended the "Clear Private Data" dialog of the web browser to clear flash cookies and to select a browsing history period to clear.
--- a/APIs/Python3/eric5.api Sun May 06 16:01:03 2012 +0200 +++ b/APIs/Python3/eric5.api Sun May 06 18:10:24 2012 +0200 @@ -2326,7 +2326,7 @@ eric5.Helpviewer.History.HistoryManager.HistoryManager._addHistoryEntry?5(itm) eric5.Helpviewer.History.HistoryManager.HistoryManager._removeHistoryEntry?5(itm) eric5.Helpviewer.History.HistoryManager.HistoryManager.addHistoryEntry?4(url) -eric5.Helpviewer.History.HistoryManager.HistoryManager.clear?4() +eric5.Helpviewer.History.HistoryManager.HistoryManager.clear?4(period=0) eric5.Helpviewer.History.HistoryManager.HistoryManager.close?4() eric5.Helpviewer.History.HistoryManager.HistoryManager.daysToExpire?4() eric5.Helpviewer.History.HistoryManager.HistoryManager.entryAdded?7
--- a/Documentation/Source/eric5.Helpviewer.HelpClearPrivateDataDialog.html Sun May 06 16:01:03 2012 +0200 +++ b/Documentation/Source/eric5.Helpviewer.HelpClearPrivateDataDialog.html Sun May 06 18:10:24 2012 +0200 @@ -87,9 +87,10 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple of flags indicating which data to clear (browsing history, +tuple with flags indicating which data to clear (browsing history, search history, favicons, disk cache, cookies, passwords, web - databases, downloads) (list of boolean) + databases, downloads, flash) and the selected history period in milliseconds + (tuple of booleans and integer) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryManager.html Sun May 06 16:01:03 2012 +0200 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryManager.html Sun May 06 18:10:24 2012 +0200 @@ -317,10 +317,15 @@ </dd> </dl><a NAME="HistoryManager.clear" ID="HistoryManager.clear"></a> <h4>HistoryManager.clear</h4> -<b>clear</b>(<i></i>) +<b>clear</b>(<i>period=0</i>) <p> Public slot to clear the complete history. -</p><a NAME="HistoryManager.close" ID="HistoryManager.close"></a> +</p><dl> +<dt><i>period</i></dt> +<dd> +history period in milliseconds to be cleared (integer) +</dd> +</dl><a NAME="HistoryManager.close" ID="HistoryManager.close"></a> <h4>HistoryManager.close</h4> <b>close</b>(<i></i>) <p>
--- a/Helpviewer/HelpClearPrivateDataDialog.py Sun May 06 16:01:03 2012 +0200 +++ b/Helpviewer/HelpClearPrivateDataDialog.py Sun May 06 18:10:24 2012 +0200 @@ -29,10 +29,28 @@ """ Public method to get the data from the dialog. - @return tuple of flags indicating which data to clear (browsing history, + @return tuple with flags indicating which data to clear (browsing history, search history, favicons, disk cache, cookies, passwords, web - databases, downloads) (list of boolean) + databases, downloads, flash) and the selected history period in milliseconds + (tuple of booleans and integer) """ + index = self.historyCombo.currentIndex() + if index == 0: + # last hour + historyPeriod = 60 * 60 * 1000 + elif index == 1: + # last day + historyPeriod = 24 * 60 * 60 * 1000 + elif index == 2: + # last week + historyPeriod = 7 * 24 * 60 * 60 * 1000 + elif index == 3: + # last four weeks + historyPeriod = 4 * 7 * 24 * 60 * 60 * 1000 + elif index == 4: + # clear all + historyPeriod = 0 + return (self.historyCheckBox.isChecked(), self.searchCheckBox.isChecked(), self.iconsCheckBox.isChecked(), @@ -40,4 +58,6 @@ self.cookiesCheckBox.isChecked(), self.passwordsCheckBox.isChecked(), self.databasesCheckBox.isChecked(), - self.downloadsCheckBox.isChecked()) + self.downloadsCheckBox.isChecked(), + self.flashCookiesCheckBox.isChecked(), + historyPeriod)
--- a/Helpviewer/HelpClearPrivateDataDialog.ui Sun May 06 16:01:03 2012 +0200 +++ b/Helpviewer/HelpClearPrivateDataDialog.ui Sun May 06 18:10:24 2012 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>305</width> - <height>221</height> + <height>289</height> </rect> </property> <property name="windowTitle"> @@ -31,6 +31,61 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QComboBox" name="historyCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the history period to be deleted</string> + </property> + <item> + <property name="text"> + <string>Last Hour</string> + </property> + </item> + <item> + <property name="text"> + <string>Last Day</string> + </property> + </item> + <item> + <property name="text"> + <string>Last Week</string> + </property> + </item> + <item> + <property name="text"> + <string>Last 4 Weeks</string> + </property> + </item> + <item> + <property name="text"> + <string>Whole Period</string> + </property> + </item> + </widget> + </item> + </layout> + </item> + <item> <widget class="QCheckBox" name="searchCheckBox"> <property name="toolTip"> <string>Select to clear the search history</string> @@ -49,7 +104,7 @@ <string>Select to clear the download history</string> </property> <property name="text"> - <string>Download History</string> + <string>Download &History</string> </property> <property name="checked"> <bool>true</bool> @@ -119,6 +174,23 @@ </widget> </item> <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="flashCookiesCheckBox"> + <property name="toolTip"> + <string>Select to clear cookies set by the Adobe Flash Player</string> + </property> + <property name="text"> + <string>Cookies from Adobe &Flash Player</string> + </property> + </widget> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -132,6 +204,7 @@ </widget> <tabstops> <tabstop>historyCheckBox</tabstop> + <tabstop>historyCombo</tabstop> <tabstop>searchCheckBox</tabstop> <tabstop>downloadsCheckBox</tabstop> <tabstop>cookiesCheckBox</tabstop> @@ -139,6 +212,7 @@ <tabstop>iconsCheckBox</tabstop> <tabstop>passwordsCheckBox</tabstop> <tabstop>databasesCheckBox</tabstop> + <tabstop>flashCookiesCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> @@ -150,12 +224,12 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>248</x> - <y>254</y> + <x>257</x> + <y>243</y> </hint> <hint type="destinationlabel"> <x>157</x> - <y>274</y> + <y>252</y> </hint> </hints> </connection> @@ -166,12 +240,28 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>295</x> + <y>243</y> </hint> <hint type="destinationlabel"> <x>286</x> - <y>274</y> + <y>252</y> + </hint> + </hints> + </connection> + <connection> + <sender>historyCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>historyCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>65</x> + <y>19</y> + </hint> + <hint type="destinationlabel"> + <x>83</x> + <y>45</y> </hint> </hints> </connection>
--- a/Helpviewer/HelpWindow.py Sun May 06 16:01:03 2012 +0200 +++ b/Helpviewer/HelpWindow.py Sun May 06 18:10:24 2012 +0200 @@ -2542,10 +2542,10 @@ # browsing history, search history, favicons, disk cache, cookies, # passwords, web databases, downloads (history, searches, favicons, cache, cookies, - passwords, databases, downloads) = \ + passwords, databases, downloads, flashCookies, historyPeriod) = \ dlg.getData() if history: - self.historyManager().clear() + self.historyManager().clear(historyPeriod) if searches: self.searchEdit.clear() if downloads: @@ -2569,6 +2569,16 @@ for securityOrigin in QWebSecurityOrigin.allOrigins(): for database in securityOrigin.databases(): QWebDatabase.removeDatabase(database) + if flashCookies: + languages = Preferences.toList( + Preferences.Prefs.settings.value("Help/AcceptLanguages", + HelpLanguagesDialog.defaultAcceptLanguages())) + if languages: + language = languages[0] + langCode = language.split("[")[1][:2] + self.newTab("http://www.macromedia.com/support/documentation/" + "{0}/flashplayer/help/settings_manager07.html".format( + langCode)) def __showEnginesConfigurationDialog(self): """
--- a/Helpviewer/History/HistoryManager.py Sun May 06 16:01:03 2012 +0200 +++ b/Helpviewer/History/HistoryManager.py Sun May 06 18:10:24 2012 +0200 @@ -328,15 +328,24 @@ """ self.setDaysToExpire(Preferences.getHelp("HistoryLimit")) - def clear(self): + def clear(self, period=0): """ Public slot to clear the complete history. + + @param period history period in milliseconds to be cleared (integer) """ - self.__history = [] + if period == 0: + self.__history = [] + self.historyReset.emit() + else: + breakMS = QDateTime.currentMSecsSinceEpoch() - period + while self.__history and \ + QDateTime(self.__history[0].dateTime).toMSecsSinceEpoch() > breakMS: + itm = self.__history.pop(0) + self.entryRemoved.emit(itm) self.__lastSavedUrl = "" self.__saveTimer.changeOccurred() self.__saveTimer.saveIfNeccessary() - self.historyReset.emit() self.historyCleared.emit() def getFileName(self):
--- a/changelog Sun May 06 16:01:03 2012 +0200 +++ b/changelog Sun May 06 18:10:24 2012 +0200 @@ -11,6 +11,9 @@ -- added the capability to search in the output of the shell window - Terminal -- added the capability to search in the output of the terminal window +- Web Browser + -- extended the "Clear Private Data" dialog to clear flash cookies and + to select a browsing history period to clear Version 5.3-snapshot-20120430: - bug fixes
--- a/i18n/eric5_cs.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_cs.ts Sun May 06 18:10:24 2012 +0200 @@ -13967,73 +13967,113 @@ <translation>&Procházet historií</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Vybrat pro smazání historie hledání</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>Hi&storie hledání</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Smazat ikony webstran</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>&Ikony webstran</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Vybrat pro smazání cache disku</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>&Web strany v cache</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Vybrat pro smazání cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Vybrat pro vymazání uložených hesel</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>Uložit &hesla</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>Uložit &hesla</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> <translation type="unfinished"></translation> </message> </context> @@ -16614,37 +16654,37 @@ <translation type="obsolete">Výchozí</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -16704,12 +16744,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -22559,27 +22599,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Načíst historii</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Uložit historii</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Nelze otevřít soubor s historií <b>{0}</b>.<br/>Důvod: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Chyba při odebírání starého souboru historie <b>{0}</b>.<br/>Důvod: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation><p>Chyba při přesouvání nového souboru historie z původního (<b>{0}</b>).<br/>Důvod: {1}</p></translation> </message>
--- a/i18n/eric5_de.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_de.ts Sun May 06 18:10:24 2012 +0200 @@ -13676,74 +13676,114 @@ <translation>&Web-Chronik</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Auswählen, um die Such-Chronik zu löschen</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>&Such-Chronik</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Auswählen, um die Website Icons zu löschen</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>Website &Icons</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Auswählen, um den Offline-Speicher zu löschen</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>Ge&pufferte Web-Seiten</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Auswählen, um die Cookies zu löschen</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Auswählen, um die gespeicherten Passwörter zu löschen</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>Gespeicherte &Kennwörter</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation>Auswählen, um alle Webdatenbanken zu löschen</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation>Web&datenbanken</translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>Gespeicherte &Passwörter</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation>Auswählen, um alle Webdatenbanken zu löschen</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation>&Webdatenbanken</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation>Auswählen, um die Download-Chronik zu löschen</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> - <translation>Download Chronik</translation> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation>Wähle den zu löschenden Chronikzeitraum</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation>Letzte Stunde</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation>Letzter Tag</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation>Letzte Woche</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation>Letzte 4 Wochen</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation>Gesamter Zeitraum</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation>Auswählen, um durch den Adobe Flash Player gesetzte Cookies zu löschen</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation>Down&load Chronik</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> + <translation>Cookies des Adobe &Flash Player</translation> </message> </context> <context> @@ -16167,37 +16207,37 @@ <translation>Zeichenkodierung</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation>Sonstige</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation>Standardkodierung</translation> </message> @@ -16257,12 +16297,12 @@ <translation>Aktuelle Seite prüfen</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation>VirusTotal Prüfung</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>Die VirusTotal Prüfung konnte nicht beauftragt werden.<p> @@ -22018,27 +22058,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Chronik laden</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Chronik speichern</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Die Chronikdatei <b>{0}</b> konnte nicht geöffnet werden.<br/>Ursache: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Fehler beim Löschen der alten Chronikdatei <b>{0}</b>.<br/>Ursache: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation><p>Fehler beim Kopieren der neuen Chronikdatei über die alte (<b>{0}</b>).<br/>Ursache: {1}</p></translation> </message>
--- a/i18n/eric5_en.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_en.ts Sun May 06 18:10:24 2012 +0200 @@ -13589,73 +13589,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> <translation type="unfinished"></translation> </message> </context> @@ -16077,37 +16117,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -16167,12 +16207,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -21877,27 +21917,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -51903,9 +51943,6 @@ </message> </context> <context> - <name>ViewProfileDialog</name> -</context> -<context> <name>ViewProfileSidebarsDialog</name> <message> <location filename="Preferences/ViewProfileSidebarsDialog.ui" line="14"/>
--- a/i18n/eric5_es.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_es.ts Sun May 06 18:10:24 2012 +0200 @@ -13676,74 +13676,119 @@ <translation>&Historial de Navegación</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Seleccionar para limpiar el historial de búsquedas</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>&Historial de &Búsqueda</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Seleccionar para limpiar los iconos de website</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>&Iconos de Website</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Seleccionar para limpiar la caché de disco</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>Páginas &Web en caché</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Seleccionar para limpiar las cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Seleccionar para limpiar las contraseñas almacenadas</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>&Contraseñas almacenadas</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation>Seleccionar para borrar todas las bases de datos web</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation>Bases de &Datos Web</translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>&Contraseñas almacenadas</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation>Seleccionar para borrar todas las bases de datos web</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation>Bases de &Datos Web</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation>Seleccionar para limpiar el historial de descarga</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> <source>Download History</source> - <translation>Historial de Descarga</translation> + <translation type="obsolete">Historial de Descarga</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -16167,37 +16212,37 @@ <translation>Codificación de Texto</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation>Otro</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation>Codificación por Defecto</translation> </message> @@ -16257,12 +16302,12 @@ <translation>Analizar sitio actual</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation>Análisis con VirusTotal</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>El análisis con VirusTotal no se ha podido programar.<p> @@ -22020,27 +22065,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Cargando Historial</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Guardando Historial</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>No se ha podido abrir el archivo de historial <b>{0}</b>.<br/>Razón: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Error al eliminar el archivo de historial antiguo <b>{0}</b>.<br/>Razón: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation><p>Error al copiar el nuevo archivo de historial sobre el antiguo (<b>{0}</b>).<br/>Razón: {1}</p></translation> </message>
--- a/i18n/eric5_fr.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_fr.ts Sun May 06 18:10:24 2012 +0200 @@ -14843,73 +14843,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> <translation type="unfinished"></translation> </message> </context> @@ -17687,37 +17727,37 @@ <translation type="obsolete">Défaut</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation type="unfinished">Autre</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -17777,12 +17817,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -23579,27 +23619,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_it.ts Sun May 06 18:10:24 2012 +0200 @@ -13802,74 +13802,119 @@ <translation>Cronologia di &Navigazione</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Seleziona per eliminare la cronologia delle ricerche</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>Cronologia &Richerche</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Seleziona per eliminare le icone dei siti web</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>&Icone Siti Web</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Seleziona per eliminare la cache su disco</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>Pagine &Web in cache</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Seleziona per eliminare i cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Selezione per eliminare le password salvate</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>&Password salvate</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation>Seleziona per cancellare tutti i database web</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation>Web &Databases</translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>&Password salvate</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation>Seleziona per cancellare tutti i database web</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation>Web &Databases</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation>Seleziona per cancellare la cronologia di download</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> <source>Download History</source> - <translation>Cronologia Download</translation> + <translation type="obsolete">Cronologia Download</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -16380,37 +16425,37 @@ <translation type="obsolete">User Agent</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation>ISCII</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation>Altro</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation>Encoding di default</translation> </message> @@ -16470,12 +16515,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -22325,27 +22370,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Carica cronologia</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Salvataggio cronologia</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Apertura del file cronologia <b>{0}</b> non possibile.<br/>Motivo: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Errore nella rimozione del vecchio file cronologia <b>{0}</b>.<br/>Motivo: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation><p>Errore nello spostamento del nuovo file cronologia su quelle vecchio (<b>{0}</b>).<br/>Motivo: {1}</p></translation> </message>
--- a/i18n/eric5_ru.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_ru.ts Sun May 06 18:10:24 2012 +0200 @@ -13900,74 +13900,119 @@ <translation>&История просмотров</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Очистить историю поисков</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>История &поисков</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Очистить иконки WEB сайтов</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>Иконки &WEB сайтов</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Очистить кэш на диске</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>К&эшированные страницы</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Очистить cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Cookies</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Удалить сохранённые пароли</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>Сохранённые &пароли</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation>Удалить все Web базы данных</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation>Web &базы данных</translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>Сохранённые &пароли</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation>Удалить все Web базы данных</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation>Web &базы данных</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation>Очистить историю закачек</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> <source>Download History</source> - <translation>История закачек</translation> + <translation type="obsolete">История закачек</translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -16482,37 +16527,37 @@ <translation>Кодировка текста</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation>Юникод</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation>Другое</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation>Кодировка по умолчанию</translation> </message> @@ -16572,12 +16617,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -22437,27 +22482,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Загрузка истории</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Сохранение истории</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Невозможно открыть файл истории <b>{0}</b>.<br/>Причина: {1}</p></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation>Ошибка при удалении файла историии <b>{0}</b>.<br/>Причина: {1}</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation>Ошибка перезаписи файла истории (<b>{0}</b>).<br/>Причина: {1}</translation> </message>
--- a/i18n/eric5_tr.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_tr.ts Sun May 06 18:10:24 2012 +0200 @@ -13979,75 +13979,115 @@ <translation>Gözatıcı Ge&çmişi</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation>Arama geçmişini temizlemek için seçiniz</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation>Arama Geçmi&şi</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation>Çerezleri temizlemek için seçiniz</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation>&Çerezler</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation>Disk önbelleğini temizlemek için seçiniz</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation>&Wep sayfaları Önbelleği</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation>Websitesi ikonlarını temizlemek için seç</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation>Websitesi &İconları</translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation>Kaydedilmiş parolaları temizlemek için seçiniz</translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation>Kaydedilmiş &Parolalar</translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation>Kaydedilmiş &Parolalar</translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> <source>Select to delete all web databases</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> <source>Web &Databases</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpDocsInstaller</name> @@ -16650,37 +16690,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation>Evrensel kod</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation>Diğer</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation>Varsayılan Kodlama</translation> </message> @@ -16705,12 +16745,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -22491,27 +22531,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation>Geçmiş Yükleniyor</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation>Geçmiş Kaydediliyor</translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun May 06 16:01:03 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun May 06 18:10:24 2012 +0200 @@ -14800,73 +14800,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="36"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> <source>Select to clear the search history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="39"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="94"/> <source>&Search History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="88"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="143"/> <source>Select to clear the website icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="91"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="146"/> <source>Website &Icons</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="75"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="130"/> <source>Select to clear the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="78"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="133"/> <source>Cached &Web Pages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="62"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> <source>Select to clear the cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="65"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="120"/> <source>&Cookies</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="101"/> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="156"/> <source>Select to clear the saved passwords</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="159"/> + <source>Saved &Passwords</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="169"/> + <source>Select to delete all web databases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="172"/> + <source>Web &Databases</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="104"/> - <source>Saved &Passwords</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="114"/> - <source>Select to delete all web databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="117"/> - <source>Web &Databases</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="49"/> <source>Select to clear the download history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="52"/> - <source>Download History</source> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="57"/> + <source>Select the history period to be deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="61"/> + <source>Last Hour</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="66"/> + <source>Last Day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="71"/> + <source>Last Week</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="76"/> + <source>Last 4 Weeks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="81"/> + <source>Whole Period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="186"/> + <source>Select to clear cookies set by the Adobe Flash Player</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="107"/> + <source>Download &History</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpClearPrivateDataDialog.ui" line="189"/> + <source>Cookies from Adobe &Flash Player</source> <translation type="unfinished"></translation> </message> </context> @@ -17648,37 +17688,37 @@ <translation type="obsolete">默认</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2820"/> + <location filename="Helpviewer/HelpWindow.py" line="2830"/> <source>ISO</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2821"/> + <location filename="Helpviewer/HelpWindow.py" line="2831"/> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2822"/> + <location filename="Helpviewer/HelpWindow.py" line="2832"/> <source>ISCII</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2823"/> + <location filename="Helpviewer/HelpWindow.py" line="2833"/> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2824"/> + <location filename="Helpviewer/HelpWindow.py" line="2834"/> <source>Other</source> <translation type="unfinished">其它</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2825"/> + <location filename="Helpviewer/HelpWindow.py" line="2835"/> <source>IBM</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="2847"/> + <location filename="Helpviewer/HelpWindow.py" line="2857"/> <source>Default Encoding</source> <translation type="unfinished"></translation> </message> @@ -17738,12 +17778,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="3098"/> + <location filename="Helpviewer/HelpWindow.py" line="3108"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> @@ -23540,27 +23580,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="364"/> + <location filename="Helpviewer/History/HistoryManager.py" line="373"/> <source>Loading History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source>Saving History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="441"/> + <location filename="Helpviewer/History/HistoryManager.py" line="450"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="461"/> + <location filename="Helpviewer/History/HistoryManager.py" line="470"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/History/HistoryManager.py" line="467"/> + <location filename="Helpviewer/History/HistoryManager.py" line="476"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message>