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

Commit e8e6b68

Browse files
gorhillgorhill
committed
added "breakage" level
1 parent d0ac227 commit e8e6b68

File tree

6 files changed

+151
-91
lines changed

6 files changed

+151
-91
lines changed

‎_locales/de/messages.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -659,33 +659,45 @@
659659
"message": "Block nothing / report everything",
660660
"description": "English: Block nothing / report everything"
661661
},
662-
"setupVeryHighSecurity" : {
663-
"message": "Security: very high",
664-
"description": "English: Security: very high"
662+
"setupSecurity" : {
663+
"message": "Security:",
664+
"description": "English: Security:"
665665
},
666-
"setupHighSecurity" : {
667-
"message": "Security: high",
668-
"description": "Security: high"
666+
"setupBreakage" : {
667+
"message": "Breakage:",
668+
"description": "English: Breakage:"
669669
},
670-
"setupMediumHighSecurity" : {
671-
"message": "Security: medium high",
672-
"description": "English: Security: medium high"
670+
"setupVeryHigh" : {
671+
"message": "very high",
672+
"description": "English: very high"
673673
},
674-
"setupMediumSecurity" : {
675-
"message": "Security: medium",
676-
"description": "English: Security: medium"
674+
"setupHigh" : {
675+
"message": "high",
676+
"description": "English: high"
677677
},
678-
"setupMediumLowSecurity" : {
679-
"message": "Security: medium low",
680-
"description": "English: Security: medium low"
678+
"setupMediumHigh" : {
679+
"message": "medium high",
680+
"description": "English: medium high"
681681
},
682-
"setupLowSecurity" : {
683-
"message": "Security: low",
684-
"description": "English: Security: low"
682+
"setupMedium" : {
683+
"message": "medium",
684+
"description": "English: medium"
685685
},
686-
"setupNoSecurity" : {
687-
"message": "Security: none",
688-
"description": "English: Security: none"
686+
"setupMediumLow" : {
687+
"message": "medium low",
688+
"description": "English: medium low"
689+
},
690+
"setupLow" : {
691+
"message": "low",
692+
"description": "English: low"
693+
},
694+
"setupVeryLow" : {
695+
"message": "very low",
696+
"description": "English: very low"
697+
},
698+
"setupNone" : {
699+
"message": "none",
700+
"description": "English: none"
689701
},
690702
"setupRestoreConfirm" : {
691703
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",

‎_locales/en/messages.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -659,33 +659,45 @@
659659
"message": "Block nothing / report everything",
660660
"description": "English: Block nothing / report everything"
661661
},
662-
"setupVeryHighSecurity" : {
663-
"message": "Security: very high",
664-
"description": "English: Security: very high"
662+
"setupSecurity" : {
663+
"message": "Security:",
664+
"description": "English: Security:"
665665
},
666-
"setupHighSecurity" : {
667-
"message": "Security: high",
668-
"description": "Security: high"
666+
"setupBreakage" : {
667+
"message": "Breakage:",
668+
"description": "English: Breakage:"
669669
},
670-
"setupMediumHighSecurity" : {
671-
"message": "Security: medium high",
672-
"description": "English: Security: medium high"
670+
"setupVeryHigh" : {
671+
"message": "very high",
672+
"description": "English: very high"
673673
},
674-
"setupMediumSecurity" : {
675-
"message": "Security: medium",
676-
"description": "English: Security: medium"
674+
"setupHigh" : {
675+
"message": "high",
676+
"description": "English: high"
677677
},
678-
"setupMediumLowSecurity" : {
679-
"message": "Security: medium low",
680-
"description": "English: Security: medium low"
678+
"setupMediumHigh" : {
679+
"message": "medium high",
680+
"description": "English: medium high"
681681
},
682-
"setupLowSecurity" : {
683-
"message": "Security: low",
684-
"description": "English: Security: low"
682+
"setupMedium" : {
683+
"message": "medium",
684+
"description": "English: medium"
685685
},
686-
"setupNoSecurity" : {
687-
"message": "Security: none",
688-
"description": "English: Security: none"
686+
"setupMediumLow" : {
687+
"message": "medium low",
688+
"description": "English: medium low"
689+
},
690+
"setupLow" : {
691+
"message": "low",
692+
"description": "English: low"
693+
},
694+
"setupVeryLow" : {
695+
"message": "very low",
696+
"description": "English: very low"
697+
},
698+
"setupNone" : {
699+
"message": "none",
700+
"description": "English: none"
689701
},
690702
"setupRestoreConfirm" : {
691703
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",

‎_locales/fr/messages.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -659,33 +659,45 @@
659659
"message": "Block nothing / report everything",
660660
"description": "English: Block nothing / report everything"
661661
},
662-
"setupVeryHighSecurity" : {
663-
"message": "Security: very high",
664-
"description": "English: Security: very high"
662+
"setupSecurity" : {
663+
"message": "Security:",
664+
"description": "English: Security:"
665665
},
666-
"setupHighSecurity" : {
667-
"message": "Security: high",
668-
"description": "Security: high"
666+
"setupBreakage" : {
667+
"message": "Breakage:",
668+
"description": "English: Breakage:"
669669
},
670-
"setupMediumHighSecurity" : {
671-
"message": "Security: medium high",
672-
"description": "English: Security: medium high"
670+
"setupVeryHigh" : {
671+
"message": "very high",
672+
"description": "English: very high"
673673
},
674-
"setupMediumSecurity" : {
675-
"message": "Security: medium",
676-
"description": "English: Security: medium"
674+
"setupHigh" : {
675+
"message": "high",
676+
"description": "English: high"
677677
},
678-
"setupMediumLowSecurity" : {
679-
"message": "Security: medium low",
680-
"description": "English: Security: medium low"
678+
"setupMediumHigh" : {
679+
"message": "medium high",
680+
"description": "English: medium high"
681681
},
682-
"setupLowSecurity" : {
683-
"message": "Security: low",
684-
"description": "English: Security: low"
682+
"setupMedium" : {
683+
"message": "medium",
684+
"description": "English: medium"
685685
},
686-
"setupNoSecurity" : {
687-
"message": "Security: none",
688-
"description": "English: Security: none"
686+
"setupMediumLow" : {
687+
"message": "medium low",
688+
"description": "English: medium low"
689+
},
690+
"setupLow" : {
691+
"message": "low",
692+
"description": "English: low"
693+
},
694+
"setupVeryLow" : {
695+
"message": "very low",
696+
"description": "English: very low"
697+
},
698+
"setupNone" : {
699+
"message": "none",
700+
"description": "English: none"
689701
},
690702
"setupRestoreConfirm" : {
691703
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",

‎_locales/ru/messages.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -659,33 +659,45 @@
659659
"message": "Block nothing / report everything",
660660
"description": "English: Block nothing / report everything"
661661
},
662-
"setupVeryHighSecurity" : {
663-
"message": "Security: very high",
664-
"description": "English: Security: very high"
662+
"setupSecurity" : {
663+
"message": "Security:",
664+
"description": "English: Security:"
665665
},
666-
"setupHighSecurity" : {
667-
"message": "Security: high",
668-
"description": "Security: high"
666+
"setupBreakage" : {
667+
"message": "Breakage:",
668+
"description": "English: Breakage:"
669669
},
670-
"setupMediumHighSecurity" : {
671-
"message": "Security: medium high",
672-
"description": "English: Security: medium high"
670+
"setupVeryHigh" : {
671+
"message": "very high",
672+
"description": "English: very high"
673673
},
674-
"setupMediumSecurity" : {
675-
"message": "Security: medium",
676-
"description": "English: Security: medium"
674+
"setupHigh" : {
675+
"message": "high",
676+
"description": "English: high"
677677
},
678-
"setupMediumLowSecurity" : {
679-
"message": "Security: medium low",
680-
"description": "English: Security: medium low"
678+
"setupMediumHigh" : {
679+
"message": "medium high",
680+
"description": "English: medium high"
681681
},
682-
"setupLowSecurity" : {
683-
"message": "Security: low",
684-
"description": "English: Security: low"
682+
"setupMedium" : {
683+
"message": "medium",
684+
"description": "English: medium"
685685
},
686-
"setupNoSecurity" : {
687-
"message": "Security: none",
688-
"description": "English: Security: none"
686+
"setupMediumLow" : {
687+
"message": "medium low",
688+
"description": "English: medium low"
689+
},
690+
"setupLow" : {
691+
"message": "low",
692+
"description": "English: low"
693+
},
694+
"setupVeryLow" : {
695+
"message": "very low",
696+
"description": "English: very low"
697+
},
698+
"setupNone" : {
699+
"message": "none",
700+
"description": "English: none"
689701
},
690702
"setupRestoreConfirm" : {
691703
"message": "All your settings and rules will be overwritten\nand HTTP Switchboard will restart.\n\nOverwrite all existing data?",

‎manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "__MSG_extName__",
44
"short_name": "HTTPSB",
5-
"version": "0.9.4.4",
5+
"version": "0.9.5.0",
66
"description": "__MSG_extShortDesc__",
77
"icons": {
88
"16": "icon_16.png",

‎setup.html‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,42 +31,54 @@
3131

3232
<div class="setup">
3333
<h4 data-i18n="setupBlockAllAllowExceptionally"></h4>
34-
<p data-i18n="setupVeryHighSecurity"></p>
34+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupVeryHigh"></span>
35+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
36+
</p>
3537
<img src="doc/img/httpsb-block-all-allow-exceptionally.png" />
3638
<input type="hidden" value="/assets/httpsb/setup/httpsb-factory-setup.txt" />
3739
</div>
3840

3941
<div class="setup">
4042
<h4 data-i18n="setupAllowAllBlockExceptionally"></h4>
41-
<p data-i18n="setupMediumSecurity"></p>
43+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupMedium"></span>
44+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupMediumLow"></span>
45+
</p>
4246
<img src="doc/img/httpsb-allow-all-block-exceptionally.png" />
4347
<input type="hidden" value="/assets/httpsb/setup/httpsb-allow-all-block-exceptionally-setup.txt" />
4448
</div>
4549

4650
<div class="setup">
4751
<h4 data-i18n="setupAdBlocker"></h4>
48-
<p data-i18n="setupLowSecurity"></p>
52+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupLow"></span>
53+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupLow"></span>
54+
</p>
4955
<img src="doc/img/httpsb-as-abp.png" />
5056
<input type="hidden" value="/assets/httpsb/setup/httpsb-just-block-ads-setup.txt" />
5157
</div>
5258

5359
<div class="setup">
5460
<h4 data-i18n="setupNoScript">NoScript-like</h4>
55-
<p data-i18n="setupHighSecurity"></p>
61+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupHigh"></span>
62+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
63+
</p>
5664
<img src="doc/img/httpsb-as-noscript.png" />
5765
<input type="hidden" value="/assets/httpsb/setup/httpsb-noscript-like-setup.txt" />
5866
</div>
5967

6068
<div class="setup">
6169
<h4 data-i18n="setupRequestPolicy"></h4>
62-
<p data-i18n="setupMediumHighSecurity"></p>
70+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupMediumHigh"></span>
71+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupHigh"></span>
72+
</p>
6373
<img src="doc/img/httpsb-as-requestpolicy.png" />
6474
<input type="hidden" value="/assets/httpsb/setup/httpsb-requestpolicy-like-setup.txt" />
6575
</div>
6676

6777
<div class="setup">
6878
<h4 data-i18n="setupBlockNothingReportAll"></h4>
69-
<p data-i18n="setupNoSecurity"></p>
79+
<p><span data-i18n="setupSecurity"></span> <span data-i18n="setupNone"></span>
80+
<br><span data-i18n="setupBreakage"></span> <span data-i18n="setupNone"></span>
81+
</p>
7082
<img src="doc/img/httpsb-allow-all-disclose-all.png" />
7183
<input type="hidden" value="/assets/httpsb/setup/httpsb-block-nothing-report-everything-setup.txt" />
7284
</div>

0 commit comments

Comments
 (0)