Skip to content
This repository was archived by the owner on Nov 15, 2017. It is now read-only.

Commit 8157450

Browse files
gorhillgorhill
committed
this addresses #271, probably needs polishing
1 parent e308d39 commit 8157450

21 files changed

+498
-42
lines changed

‎_locales/de/messages.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@
577577
"message": "Restore from file...",
578578
"description": "English: Restore all..."
579579
},
580+
"aboutUserDataResetButton" : {
581+
"message": "Start from scratch...",
582+
"description": "English: Start from scratch..."
583+
},
580584
"aboutUserDataRestoreConfirm" : {
581585
"message": "All your settings and rules will be overwritten\nusing data backed up on {{time}},\nand HTTP Switchboard will restart.\n\nOverwrite all existing data using backed up data?",
582586
"description": "Message asking user to confirm restore"
@@ -627,6 +631,68 @@
627631
},
628632

629633

634+
"setupPagePrompt" : {
635+
"message": "<p><b>HTTP Switchboard</b> is highly configurable: it can be set anywhere between &ldquo;blocking everything&rdquo; and &ldquo;block nothing&rdquo;. <p>The higher the security, the more likely web pages will be &ldquo;broken&rdquo;, i.e. will not render and/or behave as intended. Thus, higher security also means more intervention required from the user in order to &ldquo;unbreak&rdquo; those web pages which a user trust. <p>Here you can pick a profile which best matches how you plan to use <b>HTTP Switchboard</b>",
636+
"description": "Appears at the top of the setup page"
637+
},
638+
"setupBlockAllAllowExceptionally" : {
639+
"message": "Block all / allow exceptionally",
640+
"description": "English: Block all / allow exceptionally"
641+
},
642+
"setupAllowAllBlockExceptionally" : {
643+
"message": "Allow all / block exceptionally",
644+
"description": "English: Allow all / block exceptionally"
645+
},
646+
"setupAdBlocker" : {
647+
"message": "Ad blocker-like",
648+
"description": "English: Ad blocker-like"
649+
},
650+
"setupNoScript" : {
651+
"message": "NoScript-like",
652+
"description": "English: NoScript-like"
653+
},
654+
"setupRequestPolicy" : {
655+
"message": "RequestPolicy-like",
656+
"description": "English: RequestPolicy-like"
657+
},
658+
"setupBlockNothingReportAll" : {
659+
"message": "Block nothing / report everything",
660+
"description": "English: Block nothing / report everything"
661+
},
662+
"setupVeryHighSecurity" : {
663+
"message": "Security: very high",
664+
"description": "English: Security: very high"
665+
},
666+
"setupHighSecurity" : {
667+
"message": "Security: high",
668+
"description": "Security: high"
669+
},
670+
"setupMediumHighSecurity" : {
671+
"message": "Security: medium high",
672+
"description": "English: Security: medium high"
673+
},
674+
"setupMediumSecurity" : {
675+
"message": "Security: medium",
676+
"description": "English: Security: medium"
677+
},
678+
"setupMediumLowSecurity" : {
679+
"message": "Security: medium low",
680+
"description": "English: Security: medium low"
681+
},
682+
"setupLowSecurity" : {
683+
"message": "Security: low",
684+
"description": "English: Security: low"
685+
},
686+
"setupNoSecurity" : {
687+
"message": "Security: none",
688+
"description": "English: Security: none"
689+
},
690+
"setupRestoreConfirm" : {
691+
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",
692+
"description": "English: All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?"
693+
},
694+
695+
630696
"dummy": {
631697
"message": "This entry must be the last one",
632698
"description": "so we dont need to deal with comma for last entry"

‎_locales/en/messages.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@
577577
"message": "Restore from file...",
578578
"description": "English: Restore all..."
579579
},
580+
"aboutUserDataResetButton" : {
581+
"message": "Start from scratch...",
582+
"description": "English: Start from scratch..."
583+
},
580584
"aboutUserDataRestoreConfirm" : {
581585
"message": "All your settings and rules will be overwritten\nusing data backed up on {{time}},\nand HTTP Switchboard will restart.\n\nOverwrite all existing data using backed up data?",
582586
"description": "Message asking user to confirm restore"
@@ -627,6 +631,68 @@
627631
},
628632

629633

634+
"setupPagePrompt" : {
635+
"message": "<p><b>HTTP Switchboard</b> is highly configurable: it can be set anywhere between &ldquo;blocking everything&rdquo; and &ldquo;block nothing&rdquo;. <p>The higher the security, the more likely web pages will be &ldquo;broken&rdquo;, i.e. will not render and/or behave as intended. Thus, higher security also means more intervention required from the user in order to &ldquo;unbreak&rdquo; those web pages which a user trust. <p>Here you can pick a profile which best matches how you plan to use <b>HTTP Switchboard</b>",
636+
"description": "Appears at the top of the setup page"
637+
},
638+
"setupBlockAllAllowExceptionally" : {
639+
"message": "Block all / allow exceptionally",
640+
"description": "English: Block all / allow exceptionally"
641+
},
642+
"setupAllowAllBlockExceptionally" : {
643+
"message": "Allow all / block exceptionally",
644+
"description": "English: Allow all / block exceptionally"
645+
},
646+
"setupAdBlocker" : {
647+
"message": "Ad blocker-like",
648+
"description": "English: Ad blocker-like"
649+
},
650+
"setupNoScript" : {
651+
"message": "NoScript-like",
652+
"description": "English: NoScript-like"
653+
},
654+
"setupRequestPolicy" : {
655+
"message": "RequestPolicy-like",
656+
"description": "English: RequestPolicy-like"
657+
},
658+
"setupBlockNothingReportAll" : {
659+
"message": "Block nothing / report everything",
660+
"description": "English: Block nothing / report everything"
661+
},
662+
"setupVeryHighSecurity" : {
663+
"message": "Security: very high",
664+
"description": "English: Security: very high"
665+
},
666+
"setupHighSecurity" : {
667+
"message": "Security: high",
668+
"description": "Security: high"
669+
},
670+
"setupMediumHighSecurity" : {
671+
"message": "Security: medium high",
672+
"description": "English: Security: medium high"
673+
},
674+
"setupMediumSecurity" : {
675+
"message": "Security: medium",
676+
"description": "English: Security: medium"
677+
},
678+
"setupMediumLowSecurity" : {
679+
"message": "Security: medium low",
680+
"description": "English: Security: medium low"
681+
},
682+
"setupLowSecurity" : {
683+
"message": "Security: low",
684+
"description": "English: Security: low"
685+
},
686+
"setupNoSecurity" : {
687+
"message": "Security: none",
688+
"description": "English: Security: none"
689+
},
690+
"setupRestoreConfirm" : {
691+
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",
692+
"description": "English: All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?"
693+
},
694+
695+
630696
"dummy": {
631697
"message": "This entry must be the last one",
632698
"description": "so we dont need to deal with comma for last entry"

‎_locales/fr/messages.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@
577577
"message": "Importer depuis un fichier...",
578578
"description": "English: Restore from file..."
579579
},
580+
"aboutUserDataResetButton" : {
581+
"message": "Repartir à zéro...",
582+
"description": "English: Start from scratch..."
583+
},
580584
"aboutUserDataRestoreConfirm" : {
581585
"message": "Vos paramètres et vos règles seront remplacés\npar les données sauvegardées le {{time}},\net puis HTTP Switchboard redémarrera.\n\nProcéder à l'importation ?",
582586
"description": "Message asking user to confirm restore"
@@ -627,6 +631,68 @@
627631
},
628632

629633

634+
"setupPagePrompt" : {
635+
"message": "<p><b>HTTP Switchboard</b> is highly configurable: it can be set anywhere between &ldquo;blocking everything&rdquo; and &ldquo;block nothing&rdquo;. <p>The higher the security, the more likely web pages will be &ldquo;broken&rdquo;, i.e. will not render and/or behave as intended. Thus, higher security also means more intervention required from the user in order to &ldquo;unbreak&rdquo; those web pages which a user trust. <p>Here you can pick a profile which best matches how you plan to use <b>HTTP Switchboard</b>",
636+
"description": "Appears at the top of the setup page"
637+
},
638+
"setupBlockAllAllowExceptionally" : {
639+
"message": "Block all / allow exceptionally",
640+
"description": "English: Block all / allow exceptionally"
641+
},
642+
"setupAllowAllBlockExceptionally" : {
643+
"message": "Allow all / block exceptionally",
644+
"description": "English: Allow all / block exceptionally"
645+
},
646+
"setupAdBlocker" : {
647+
"message": "Ad blocker-like",
648+
"description": "English: Ad blocker-like"
649+
},
650+
"setupNoScript" : {
651+
"message": "NoScript-like",
652+
"description": "English: NoScript-like"
653+
},
654+
"setupRequestPolicy" : {
655+
"message": "RequestPolicy-like",
656+
"description": "English: RequestPolicy-like"
657+
},
658+
"setupBlockNothingReportAll" : {
659+
"message": "Block nothing / report everything",
660+
"description": "English: Block nothing / report everything"
661+
},
662+
"setupVeryHighSecurity" : {
663+
"message": "Security: very high",
664+
"description": "English: Security: very high"
665+
},
666+
"setupHighSecurity" : {
667+
"message": "Security: high",
668+
"description": "Security: high"
669+
},
670+
"setupMediumHighSecurity" : {
671+
"message": "Security: medium high",
672+
"description": "English: Security: medium high"
673+
},
674+
"setupMediumSecurity" : {
675+
"message": "Security: medium",
676+
"description": "English: Security: medium"
677+
},
678+
"setupMediumLowSecurity" : {
679+
"message": "Security: medium low",
680+
"description": "English: Security: medium low"
681+
},
682+
"setupLowSecurity" : {
683+
"message": "Security: low",
684+
"description": "English: Security: low"
685+
},
686+
"setupNoSecurity" : {
687+
"message": "Security: none",
688+
"description": "English: Security: none"
689+
},
690+
"setupRestoreConfirm" : {
691+
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",
692+
"description": "English: All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?"
693+
},
694+
695+
630696
"dummy": {
631697
"message": "This entry must be the last one",
632698
"description": "so we dont need to deal with comma for last entry"

‎_locales/ru/messages.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@
577577
"message": "Восстановить из файла...",
578578
"description": "English: Restore all..."
579579
},
580+
"aboutUserDataResetButton" : {
581+
"message": "Start from scratch...",
582+
"description": "English: Start from scratch..."
583+
},
580584
"aboutUserDataRestoreConfirm" : {
581585
"message": "Все ваши настройки и правила будет перезаписаны\nданными от {{time}},\nи HTTP Switchboard перезапустится.\n\nПерезаписать все существующие данные резервной копией?",
582586
"description": "Message asking user to confirm restore"
@@ -627,6 +631,68 @@
627631
},
628632

629633

634+
"setupPagePrompt" : {
635+
"message": "<p><b>HTTP Switchboard</b> is highly configurable: it can be set anywhere between &ldquo;blocking everything&rdquo; and &ldquo;block nothing&rdquo;. <p>The higher the security, the more likely web pages will be &ldquo;broken&rdquo;, i.e. will not render and/or behave as intended. Thus, higher security also means more intervention required from the user in order to &ldquo;unbreak&rdquo; those web pages which a user trust. <p>Here you can pick a profile which best matches how you plan to use <b>HTTP Switchboard</b>",
636+
"description": "Appears at the top of the setup page"
637+
},
638+
"setupBlockAllAllowExceptionally" : {
639+
"message": "Block all / allow exceptionally",
640+
"description": "English: Block all / allow exceptionally"
641+
},
642+
"setupAllowAllBlockExceptionally" : {
643+
"message": "Allow all / block exceptionally",
644+
"description": "English: Allow all / block exceptionally"
645+
},
646+
"setupAdBlocker" : {
647+
"message": "Ad blocker-like",
648+
"description": "English: Ad blocker-like"
649+
},
650+
"setupNoScript" : {
651+
"message": "NoScript-like",
652+
"description": "English: NoScript-like"
653+
},
654+
"setupRequestPolicy" : {
655+
"message": "RequestPolicy-like",
656+
"description": "English: RequestPolicy-like"
657+
},
658+
"setupBlockNothingReportAll" : {
659+
"message": "Block nothing / report everything",
660+
"description": "English: Block nothing / report everything"
661+
},
662+
"setupVeryHighSecurity" : {
663+
"message": "Security: very high",
664+
"description": "English: Security: very high"
665+
},
666+
"setupHighSecurity" : {
667+
"message": "Security: high",
668+
"description": "Security: high"
669+
},
670+
"setupMediumHighSecurity" : {
671+
"message": "Security: medium high",
672+
"description": "English: Security: medium high"
673+
},
674+
"setupMediumSecurity" : {
675+
"message": "Security: medium",
676+
"description": "English: Security: medium"
677+
},
678+
"setupMediumLowSecurity" : {
679+
"message": "Security: medium low",
680+
"description": "English: Security: medium low"
681+
},
682+
"setupLowSecurity" : {
683+
"message": "Security: low",
684+
"description": "English: Security: low"
685+
},
686+
"setupNoSecurity" : {
687+
"message": "Security: none",
688+
"description": "English: Security: none"
689+
},
690+
"setupRestoreConfirm" : {
691+
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",
692+
"description": "English: All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?"
693+
},
694+
695+
630696
"dummy": {
631697
"message": "Эта запись должна быть последней",
632698
"description": "so we dont need to deal with comma for last entry"

‎about.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ <h2>HTTP Switchboard version <span id="aboutVersion"></span></h2>
6464

6565
<h2 data-i18n="aboutUserDataHeader"></h2>
6666
<div>
67-
<button type="button" id="backupUserDataButton" data-i18n="aboutUserDataBackupButton"></button>
67+
<p><button type="button" id="backupUserDataButton" data-i18n="aboutUserDataBackupButton"></button>
6868
<button type="button" id="restoreUserDataButton" data-i18n="aboutUserDataRestoreButton"></button>
69+
<p> ... or ...
70+
<p><button type="button" id="resetUserDataButton" data-i18n="aboutUserDataResetButton"></button>
6971
</div>
7072

7173
<h2 data-i18n="aboutExtensionDataHeader"></h2>

‎assets/httpsb/setup/httpsb-allow-all-block-exceptionally-setup.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"timeStamp":1400764298819,"version":"0.9.4.4","userSettings":{"autoCreateScope":"","autoWhitelistPageDomain":false,"clearBrowserCache":true,"clearBrowserCacheAfter":60,"deleteCookies":false,"deleteLocalStorage":false,"deleteUnusedSessionCookies":false,"deleteUnusedSessionCookiesAfter":60,"deleteUnusedTemporaryScopes":false,"deleteUnusedTemporaryScopesAfter":30,"displayTextSize":"13px","maxLoggedRequests":50,"parseAllABPFilters":true,"parseAllABPHideFilters":false,"popupCollapseDomains":true,"popupCollapseSpecificDomains":{},"popupHideBlacklisted":true,"processBehindTheSceneRequests":false,"processReferer":false,"smartAutoReload":"all","spoofUserAgent":false,"spoofUserAgentEvery":5,"spoofUserAgentWith":"Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.154 Safari/537.36\nMozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.152 Safari/537.36\nMozilla/5.0 (Windows NT 6.1; WOW64; rv:28.0) Gecko/20100101 Firefox/28.0\nMozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36\nMozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.116 Safari/537.36\n","statsFilters":{},"strictBlocking":true,"subframeFgColor":"rgb(204,0,0)"},"scopes":"{\"scopes\":[{\"scopeKey\":\"chromium-behind-the-scene\",\"scopeStr\":\"{\\\"whiteStr\\\":\\\"*|*\\\\nmain_frame|*\\\",\\\"blackStr\\\":\\\"*|*\\\",\\\"grayStr\\\":\\\"\\\",\\\"mtxFiltering\\\":false,\\\"abpFiltering\\\":false}\"},{\"scopeKey\":\"*\",\"scopeStr\":\"{\\\"whiteStr\\\":\\\"*|*\\\\nmain_frame|*\\\",\\\"blackStr\\\":\\\"*|*\\\",\\\"grayStr\\\":\\\"\\\",\\\"mtxFiltering\\\":true,\\\"abpFiltering\\\":true}\"}]}","remoteBlacklists":{"assets/httpsb/blacklist.txt":{"entryCount":46,"entryUsedCount":41,"off":false},"assets/thirdparties/adblock-chinalist.googlecode.com/svn/trunk/adblock.txt":{"off":true},"assets/thirdparties/adblock-czechoslovaklist.googlecode.com/svn/filters.txt":{"off":true},"assets/thirdparties/download.wiltteri.net/wiltteri.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt":{"entryCount":454,"entryUsedCount":394,"off":false},"assets/thirdparties/easylist-downloads.adblockplus.org/easylistdutch.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/easylistgermany.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/easylistitaly.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt":{"entryCount":1305,"entryUsedCount":0,"off":false},"assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-annoyance.txt":{"off":true},"assets/thirdparties/easylist-downloads.adblockplus.org/liste_fr.txt":{"off":true},"assets/thirdparties/hosts-file.net/ad-servers":{"entryCount":19553,"entryUsedCount":16728,"off":false},"assets/thirdparties/hosts-file.net/hosts.txt":{"off":true},"assets/thirdparties/indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt":{"off":true},"assets/thirdparties/liste-ar-adblock.googlecode.com/hg/Liste_AR.txt":{"off":true},"assets/thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt":{"entryCount":2180,"entryUsedCount":2170,"off":false},"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains":{"entryCount":19474,"entryUsedCount":16888,"off":false},"assets/thirdparties/pgl.yoyo.org/as/serverlist":{"entryCount":2492,"entryUsedCount":2492,"off":false},"assets/thirdparties/raw.github.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt":{"off":true},"assets/thirdparties/someonewhocares.org/hosts/hosts":{"entryCount":10163,"entryUsedCount":9604,"off":false},"assets/thirdparties/stanev.org/abp/adblock_bg.txt":{"off":true},"assets/thirdparties/winhelp2002.mvps.org/hosts.txt":{"entryCount":13649,"entryUsedCount":11431,"off":false},"assets/thirdparties/www.fanboy.co.nz/enhancedstats.txt":{"off":true},"assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt":{"entryCount":1435,"entryUsedCount":1435,"off":false},"assets/user/ubiquitous-blacklisted-hosts.txt":{"entryCount":0,"entryUsedCount":0,"off":false}},"ubiquitousBlacklist":"","ubiquitousWhitelist":"s.ytimg.com"}

0 commit comments

Comments
 (0)