diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp index 9f100c281..1e69a9756 100644 --- a/src/lib/cookies/cookiemanager.cpp +++ b/src/lib/cookies/cookiemanager.cpp @@ -71,7 +71,7 @@ CookieManager::CookieManager(QWidget* parent) ui->deleteCookiesOnClose->setEnabled(false); } ui->deleteCookiesOnClose->setChecked(settings.value("deleteCookiesOnClose", false).toBool()); - ui->matchExactly->setChecked(settings.value("allowCookiesFromVisitedDomainOnly", false).toBool()); + ui->filter3rdParty->setChecked(settings.value("allowCookiesFromVisitedDomainOnly", false).toBool()); ui->filterTracking->setChecked(settings.value("filterTrackingCookie", false).toBool()); settings.endGroup(); @@ -327,7 +327,7 @@ void CookieManager::closeEvent(QCloseEvent* e) settings.beginGroup("Cookie-Settings"); settings.setValue("allowCookies", ui->saveCookies->isChecked()); settings.setValue("deleteCookiesOnClose", ui->deleteCookiesOnClose->isChecked()); - settings.setValue("allowCookiesFromVisitedDomainOnly", ui->matchExactly->isChecked()); + settings.setValue("allowCookiesFromVisitedDomainOnly", ui->filter3rdParty->isChecked()); settings.setValue("filterTrackingCookie", ui->filterTracking->isChecked()); settings.setValue("whitelist", whitelist); settings.setValue("blacklist", blacklist); diff --git a/src/lib/cookies/cookiemanager.ui b/src/lib/cookies/cookiemanager.ui index 11dc72cf9..9861a600f 100644 --- a/src/lib/cookies/cookiemanager.ui +++ b/src/lib/cookies/cookiemanager.ui @@ -431,9 +431,9 @@ - + - Match domain exactly + Filter 3rd party cookies @@ -460,7 +460,7 @@ - <b>Warning:</b> Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first! + <b>Warning:</b> Filter 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first! true diff --git a/translations/empty.ts b/translations/empty.ts index 49b5d44cf..1e8a59619 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -116,7 +116,7 @@ AdBlockCustomList - + Custom Rules @@ -246,7 +246,7 @@ AdBlockManager - + EasyList @@ -264,7 +264,7 @@ AdBlockSubscription - + Cannot load subscription! @@ -323,12 +323,12 @@ AesInterface - + Warning! - + Data has been encrypted with a newer version of QupZilla. Please install latest version of QupZilla. @@ -337,33 +337,33 @@ Please install latest version of QupZilla. AutoFill - + Database (encrypted) - + Enter Master Password - + Permission is required, please enter Master Password: - - + + Warning! - + Entered password is wrong! - + This backend needs a master password to be set! QupZilla just switches to its default backend @@ -592,32 +592,32 @@ Please install latest version of QupZilla. Bookmarks - + Bookmarks Toolbar - + Bookmarks located in Bookmarks Toolbar - + Bookmarks Menu - + Bookmarks located in Bookmarks Menu - + Unsorted Bookmarks - + All other bookmarks @@ -908,39 +908,39 @@ Please install latest version of QupZilla. - + Open in new tab - + Open in new window - + Open in new private window - - + + New Bookmark - - + + New Folder - + New Separator - + Delete @@ -948,22 +948,22 @@ Please install latest version of QupZilla. BookmarksMenu - + &Bookmarks - + Bookmark &This Page - + Bookmark &All Tabs - + Organize &Bookmarks @@ -992,22 +992,22 @@ Please install latest version of QupZilla. BookmarksSidebar - + Open in new tab - + Open in new window - + Open in new private window - + Delete @@ -1015,22 +1015,22 @@ Please install latest version of QupZilla. BookmarksToolbar - + Open in new tab - + Open in new window - + Delete - + Show Only Icons @@ -1067,104 +1067,99 @@ Please install latest version of QupZilla. BrowserWindow - + QupZilla - - Private Browsing Enabled - - - - + IP Address of current page - + (Private Browsing) - + %1 - QupZilla - + &Menu Bar - + &Navigation Toolbar - + &Bookmarks Toolbar - + &Tabs on Top - + Other - + HTML files - + Image files - + Text files - + All files - + Open file... - + QupZilla %1 (%2) - + There are still %1 open tabs and your session won't be stored. Are you sure to close this window? - + Don't ask again - + There are still open tabs - + Close Tab @@ -1443,8 +1438,8 @@ Are you sure to close this window? - - + + Server: @@ -1470,12 +1465,12 @@ Are you sure to close this window? - + <cookie not selected> @@ -1486,7 +1481,7 @@ Are you sure to close this window? - + Remove cookies @@ -1549,7 +1544,7 @@ Are you sure to close this window? - Match domain exactly + Filter 3rd party cookies @@ -1559,51 +1554,51 @@ Are you sure to close this window? - <b>Warning:</b> Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first! + <b>Warning:</b> Filter 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first! - + Search - + Confirmation - + Are you sure to delete all cookies on your computer? - + Secure only - + All connections - + Session cookie - + Remove cookie - + Add to whitelist - + Add to blacklist @@ -1611,13 +1606,13 @@ Are you sure to close this window? DownloadFileHelper - - + + Save file as... - + NoNameDownload @@ -1625,34 +1620,34 @@ Are you sure to close this window? DownloadItem - + Remaining time unavailable - - + + Error: Cannot write to file! - - Done - %1 + + Done - %1 (%2) - - + + Cancelled - + few seconds - + %n seconds @@ -1660,7 +1655,7 @@ Are you sure to close this window? - + %n minutes @@ -1668,7 +1663,7 @@ Are you sure to close this window? - + %n hours @@ -1676,105 +1671,105 @@ Are you sure to close this window? - + Unknown speed - + kB/s - + MB/s - + GB/s - + Unknown size - + %2 - unknown size (%3) - + Remaining %1 - %2 of %3 (%4) - + Cancelled - %1 - + Delete file - + Do you want to also delete dowloaded file? - + Open File - + Open Folder - + Go to Download Page - + Copy Download Link - + Cancel downloading - + Remove From List - + Error - + Not found - + Sorry, the file %1 was not found! - - + + Error: @@ -2100,67 +2095,67 @@ Are you sure to close this window? History - - No Named Page + + Empty Page - + January - + February - + March - + April - + May - + June - + July - + August - + September - + October - + November - + December @@ -2196,59 +2191,59 @@ Are you sure to close this window? HistoryMenu - - - + + + Empty - + Restore All Closed Tabs - + Clear list - + Hi&story - + &Back - + &Forward - + &Home - + Show &All History - + Recently Visited - + Most Visited - + Closed Tabs @@ -2426,42 +2421,42 @@ Are you sure to close this window? LineEdit - + &Undo - + &Redo - + Cu&t - + &Copy - + &Paste - + Delete - + Clear All - + Select All @@ -2469,17 +2464,17 @@ Are you sure to close this window? LocationBar - + Enter URL address or search on %1 - + Paste And &Go - + .co.uk Append domain name on ALT + Enter = Should be different for every country @@ -2501,22 +2496,22 @@ Are you sure to close this window? MainApplication - + QupZilla is not currently your default browser. Would you like to make it your default browser? - + Always perform this check when starting QupZilla. - + Default Browser - + QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework. @@ -2524,252 +2519,252 @@ Are you sure to close this window? MainMenu - + &About QupZilla - + Pr&eferences - + Quit - + &File - + New Tab - + &New Window - + New &Private Window - + Open Location - + Open &File... - + Close Window - + &Save Page As... - + Save Page Screen - + Send Link... - + &Print... - + &Edit - + &Undo - + &Redo - + &Cut - + C&opy - + &Paste - + Select &All - + &Find - + &View - + Toolbars - + Sidebar - + Character &Encoding - + Sta&tus Bar - + &Stop - + &Reload - + Zoom &In - + Zoom &Out - + Reset - + &Caret Browsing - + &Page Source - + &FullScreen - + &Tools - + &Web Search - + Site &Info - + &Download Manager - + &Cookies Manager - + &AdBlock - + RSS &Reader - + Web In&spector - + Clear Recent &History - + &Help - + About &Qt - + Information about application - + Configuration Information - + Report &Issue - + Restore &Closed Tab @@ -2827,30 +2822,30 @@ Are you sure to close this window? - - - - + + + + Warning! - + You entered a wrong password! - + New/Confirm password fields do not match! - + Are you sure to clear master password and decrypt data? - + Some data has not been decrypted. The master password was not cleared! @@ -2858,140 +2853,140 @@ Are you sure to close this window? NavigationBar - - No Named Page - - - - + Back - + Forward - + Home - + New Tab - + Main Menu - + Exit Fullscreen - - + + Clear history + + + Empty Page + + NetworkManager - + SSL Certificate Error! - + The page you are trying to access has the following errors in the SSL certificate: - + <b>Organization: </b> - + <b>Domain Name: </b> - + <b>Expiration Date: </b> - + <b>Error: </b> - + Would you like to make an exception for this certificate? - + Authorisation required - - - + + + Username: - - - + + + Password: - + Save username and password on this site - + A username and password are being requested by %1. The site says: "%2" - + FTP authorisation required - + Login anonymously - + A username and password are being requested by %1:%2. - + Proxy authorisation required - + Remember username and password for this proxy. - + A username and password are being requested by proxy %1. @@ -3118,7 +3113,7 @@ Are you sure to close this window? PopupWebView - + Inspect Element @@ -3126,112 +3121,112 @@ Are you sure to close this window? PopupWindow - + File - + &Save Page As... - + Save Page Screen - + Send Link... - + &Print... - + Close - + Edit - + &Undo - + &Redo - + &Cut - + C&opy - + &Paste - + Select All - + Find - + View - + &Stop - + &Reload - + Zoom &In - + Zoom &Out - + Reset - + &Page Source - + %1 - QupZilla @@ -3311,7 +3306,7 @@ Are you sure to close this window? - + Note: You cannot delete active profile. @@ -3554,7 +3549,7 @@ Are you sure to close this window? - Closed tabs list instead of opened in tab bar + Show closed tabs button @@ -3674,10 +3669,10 @@ Are you sure to close this window? - - - - + + + + ... @@ -3775,524 +3770,524 @@ Are you sure to close this window? - + Local Storage - + Maximum - + 50 MB - + 1 - + Maximum pages in cache: - + Allow storing network cache on disk - + Store cache in: - + Allow saving history - + Delete history on close - + Allow local storage of HTML5 web content - + Delete locally stored HTML5 web content on close - + Delete now - + Proxy Configuration - + Proxy Auto-Config (.pac) file - + Reload - + <b>Exceptions</b> - + Don't use on: - + System proxy configuration - + Manual configuration - + HTTP - + SOCKS5 - - + + Port: - - + + Username: - - + + Password: - + Use different proxy for https connection - + Server: - + Use script for automatic configuration: - + Do not use proxy - + <b>Font Families</b> - + Standard - + Fixed - + Serif - + Sans Serif - + Cursive - + Fantasy - + <b>Font Sizes</b> - + Fixed Font Size - + Default Font Size - + Minimum Font Size - + Minimum Logical Font Size - + <b>Shortcuts</b> - + Switch to tabs with Alt + number of tab - + Load speed dials with Ctrl + number of speed dial - + Add .co.uk domain by pressing ALT key in address bar - + <b>Download Location</b> - + Ask everytime for download location - + Use defined location: - + <b>Download Options</b> - + Use native system file dialog (may or may not cause problems with downloading SSL secured content) - + Close download manager when downloading finishes - + <b>External download manager</b> - + Use external download manager - + Executable: - + Arguments: - + Leave blank if unsure - + <b>%d</b> will be replaced with URL to be downloaded - + <b>AutoFill options</b> - + Allow saving passwords from sites - + Send Referer header to servers - + <b>Cookies</b> - + Send Do Not Track header to servers - - + + <b>Other</b> - + Manage CA certificates - + Certificate Manager - + <b>SSL Certificates</b> - + <b>JavaScript</b> - + Manage JavaScript privacy options - + JavaScript options - + Cookies Manager - + Manage Cookies - + <b>HTML5 Permissions</b> - + Manage HTML5 permissions - + HTML5 Permissions - + <b>Notifications</b> - + Use OSD Notifications - + Use Native System Notifications (Linux only) - + Do not use Notifications - + Expiration timeout: - + seconds - + <b>Note: </b>You can change position of OSD Notification by dragging it on the screen. - + StyleSheet automatically loaded with all websites: - + Languages - + <b>Preferred language for web sites</b> - + <b>Change browser identification</b> - + User Agent Manager - + QupZilla - - + + Default - + Set as default - + OSD Notification - + Drag it on the screen to place it where you want. - + Choose download location... - + Choose stylesheet location... - + Deleted - + Choose executable location... - + Choose cache path... - + New Profile - + Enter the new profile's name: - - + + Error! - + This profile already exists! - + Cannot create profile directory! - + Confirmation - + Are you sure to permanently delete "%1" profile? This action cannot be undone! - + Select Color @@ -4300,13 +4295,13 @@ Are you sure to close this window? QObject - - Native System Notification + + Save file as... - - Save file as... + + Native System Notification @@ -4340,22 +4335,22 @@ Are you sure to close this window? - + Executable: - + Arguments: - + Cannot start external program - + Cannot start external program! %1 @@ -5203,7 +5198,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + Add Search Engine @@ -5226,27 +5221,27 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchEnginesManager - + Search Engine Added - + Search Engine "%1" has been successfully added. - + Search Engine is not valid! - + Error - + Error while adding Search Engine <br><b>Error Message: </b> %1 @@ -5254,7 +5249,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchToolBar - + No results found. @@ -5262,22 +5257,22 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SearchToolbar - + Search: - + Search... - + Highlight - + Case sensitive @@ -5300,176 +5295,176 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SiteInfo - + Site Info - + General - + Media - + Databases - + Security - - + + Size: - + Site address: - + Encoding: - + Meta tags of site: - + Tag - + Value - + <b>Security information</b> - + Details - + Image - + Image address - + <b>Preview</b> - + <b>Database details</b> - + Name: - + Path: - - - + + + <database not selected> - + <not set in certificate> - + No databases are used by this page. - + <b>Connection is Encrypted.</b> - + <b>Your connection to this page is secured with this certificate: </b> - + <b>Connection Not Encrypted.</b> - + <b>Your connection to this page is not secured!</b> - + Copy Image Location - + Copy Image Name - + Save Image to Disk - - + + Error! - + This preview is not available! - + Save image... - + Cannot write to file! - + Preview not available @@ -5477,43 +5472,43 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SiteInfoWidget - + More... - + Your connection to this site is <b>secured</b>. - + Your connection to this site is <b>unsecured</b>. - - + + This is your <b>%1</b> visit of this site. - + You have <b>never</b> visited this site before. - + first - + second - + third @@ -5521,153 +5516,153 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SourceViewer - + Source of - + File - + Load in page - + Save as... - + Close - + Edit - + Undo - + Redo - + Cut - + Copy - + Paste - + Select All - + Find - - + + Go to Line... - + View - + Reload - + Editable - + Word Wrap - + Source loaded in page - + Cannot load in page. Page has been closed. - + Save file... - + Error! - + Cannot write to file! - + Error writing to file - + Source successfully saved - + Source reloaded - + Cannot reload source. Page has been closed. - + Editable changed - + Word Wrap changed - + Enter line number @@ -5693,17 +5688,17 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Image files - + Select image... - + Unable to load @@ -5746,17 +5741,17 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + Choose dictionary path... - + Add new word... - + Add new word: @@ -5764,28 +5759,28 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Speller - + Check &Spelling - + Languages - - + + No suggestions - + Add to dictionary - + Settings @@ -5814,78 +5809,78 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla TabBar - + &New tab - + &Stop Tab - + &Reload Tab - + &Duplicate Tab - + D&etach Tab - + Un&pin Tab - + &Pin Tab - + Re&load All Tabs - + &Bookmark This Tab - - + + Bookmark &All Tabs - + Close Ot&her Tabs - + Cl&ose - + Reloa&d All Tabs - + Close Tabs - + Do you really want to close other tabs? @@ -5893,29 +5888,23 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla TabWidget - + New Tab - - - List of tabs - - - - - Loading... + + Closed tabs - - No Named Page + + List of tabs - - + + Currently you have %n opened tab(s) @@ -5923,43 +5912,31 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - - - - New tab + + Empty - + Restore All Closed Tabs - + Clear list - - Empty + + + New tab TabbedWebView - - Loading... - - - - - %1 - QupZilla - - - - + Inspect Element @@ -6081,185 +6058,176 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - WebInspectorDockWidget - - - - Web Inspector - - - WebPage - + QupZilla cannot handle <b>%1:</b> links. The requested link is <ul><li>%2</li></ul>Do you want QupZilla to try open this link in system application? - + Remember my choice for this protocol - + External Protocol Request - + To show this page, QupZilla must resend request which do it again (like searching on making an shopping, which has been already done.) - + Confirm form resubmission - + Select files to upload... - + Server refused the connection - + Server closed the connection - + Server not found - + Connection timed out - + Untrusted connection - + Temporary network failure - + Proxy connection refused - + Proxy server not found - + Proxy connection timed out - + Proxy authentication required - + Content not found - + Unknown network error - + AdBlocked Content - + Blocked by <i>%1</i> - + Content Access Denied - + Error code %1 - + Failed loading page - + QupZilla can't load page. - + QupZilla can't load page from %1. - + Check the address for typing errors such as <b>ww.</b>example.com instead of <b>www.</b>example.com - + If you are unable to load any pages, check your computer's network connection. - + If your computer or network is protected by a firewall or proxy, make sure that QupZilla is permitted to access the Web. - + Try Again - + JavaScript alert - + Prevent this page from creating additional dialogs - + Choose file... - + Cannot read data from <b>%1</b>. Upload was cancelled! - + Cannot read file! @@ -6267,351 +6235,364 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla WebSearchBar - + Manage Search Engines - + Add %1 ... - + Paste And &Search - + Show suggestions - + Search when engine changed + + WebTab + + + Loading... + + + + + %1 - QupZilla + + + WebView - - No Named Page + + Empty Page - + Create Search Engine - + Cut - + Copy - + Paste - + Select All - + Default - + Left to Right - + Right to Left - + Bold - + Italic - + Underline - - + + &Reload - + S&top - + Undo - + Redo - + Delete - + &Back - + &Forward - + This frame - + Show &only this frame - + Show this frame in new &tab - + Print frame - + Zoom &in - + &Zoom out - + Reset - + Show so&urce of frame - + Book&mark page - + &Save page as... - + &Copy page link - + Send page link... - + &Print page - + Select &all - + Validate page - + Translate page - + Show so&urce code - + Show info ab&out site - + &Add New Page - + &Configure Speed Dial - + Open link in new &tab - + Open link in new &window - + Open link in &private window - + B&ookmark link - + &Save link as... - + Send link... - + &Copy link address - + Show i&mage - + Copy im&age - + Copy image ad&dress - + &Save image as... - + Send image... - + Send text... - + Google Translate - + Dictionary - + Go to &web address - + Search "%1 .." with %2 - + Search with... - + &Play - + &Pause - + Un&mute - + &Mute - + &Copy Media Address - + &Send Media Address - + Save Media To &Disk @@ -6619,7 +6600,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla jsAlert - + Prevent this page from creating additional dialogs