Skip to content

Commit 24d36fd

Browse files
committed
Merge remote-tracking branch 'eff/master' into vijayp.add-persistent-user-rules
Conflicts: chromium/background.js
2 parents ee74c9f + 781c86a commit 24d36fd

File tree

568 files changed

+10389
-1954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

568 files changed

+10389
-1954
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pkg/crx
55
pkg/*.crx
66
pkg/*.xpi
77
src/chrome/content/rules/default.rulesets
8+
src/defaults/rulesets.sqlite
89
*.swp
910
tokenkeys.py*
1011
.idea

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Important directories you might want to know about
2323
Installing Dependencies in Debian or Ubuntu
2424
-------------------------------------------
2525

26-
sudo apt-get install python-lxml python-libxml2 libxml2-utils zip
26+
sudo apt-get install python-lxml python-libxml2 libxml2-utils sqlite3 zip
2727

2828
Installing Dependencies in Mac OS X
2929
-----------------------------------

chromium/_locales/sv/messages.json

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"about_title": {
3+
"message": "Om HTTPS Everywhere"
4+
},
5+
"about_ext_name": {
6+
"message": "HTTPS Everywhere"
7+
},
8+
"about_ext_description": {
9+
"message": "Kryptera webben! Använd HTTPS automatiskt på många sidor."
10+
},
11+
"about_version": {
12+
"message": "Version"
13+
},
14+
"about_created_by": {
15+
"message": "Skapat av"
16+
},
17+
"about_librarians": {
18+
"message": "Regelförfattare"
19+
},
20+
"about_thanks": {
21+
"message": "Tack till"
22+
},
23+
"about_contribute": {
24+
"message": "Om du gillar HTTPS Everywhere, kanske du kan tänka dig"
25+
},
26+
"about_donate_tor": {
27+
"message": "Donera till Tor"
28+
},
29+
"about_tor_lang_code": {
30+
"message": "en"
31+
},
32+
"about_donate_eff": {
33+
"message": "Donera till EFF"
34+
},
35+
"menu_about": {
36+
"message": "Om HTTPS Everywhere"
37+
},
38+
"menu_observatory": {
39+
"message": "SSL observerings inställningar"
40+
},
41+
"menu_globalEnable": {
42+
"message": "Aktivera HTTPS Everywhere"
43+
},
44+
"menu_globalDisable": {
45+
"message": "Inaktivera HTTPS Everywhere"
46+
},
47+
"prefs_title": {
48+
"message": "HTTPS Everywhere inställningar"
49+
},
50+
"prefs_enable_all": {
51+
"message": "Aktivera alla"
52+
},
53+
"prefs_disable_all": {
54+
"message": "Inaktivera alla"
55+
},
56+
"prefs_reset_defaults": {
57+
"message": "Återställ till standardvärden"
58+
},
59+
"prefs_search": {
60+
"message": "Sök"
61+
},
62+
"prefs_site": {
63+
"message": "Sida"
64+
},
65+
"prefs_notes": {
66+
"message": "Kommentarer"
67+
},
68+
"prefs_list_caption": {
69+
"message": "Vilka HTTPS omdirigerings regler skall gälla?"
70+
},
71+
"prefs_enabled": {
72+
"message": "Aktiverad"
73+
},
74+
"prefs_ruleset_howto": {
75+
"message": "Du kan lära dig att skriva egna regler (för att lägga till stöd för andra sidor)"
76+
},
77+
"prefs_here_link": {
78+
"message": "här"
79+
},
80+
"prefs_toggle": {
81+
"message": "Växla"
82+
},
83+
"prefs_reset_default": {
84+
"message": "Återställ till standardvärden"
85+
},
86+
"prefs_view_xml_source": {
87+
"message": "Visa XML källa"
88+
},
89+
"source_downloading": {
90+
"message": "Laddar ner"
91+
},
92+
"source_filename": {
93+
"message": "Filnamn"
94+
},
95+
"source_unable_to_download": {
96+
"message": "Kan inte ladda ner."
97+
},
98+
"chrome_stable_rules": {
99+
"message": "Stabila regler"
100+
},
101+
"chrome_stable_rules_description": {
102+
"message": "Tvinga <a href=\"https://sv.wikipedia.org/wiki/Transport_Layer_Security\" title=\"Wikipedia artikel om kryptering\" target=\"_blank\" tabindex=\"-1\">krypterade</a> uppkoppligar till dessa webbsidor:"
103+
},
104+
"chrome_experimental_rules": {
105+
"message": "Experimentella regler"
106+
},
107+
"chrome_experimental_rules_description": {
108+
"message": "Kan orsaka varningar eller fel. Inaktiverad som standard."
109+
},
110+
"chrome_what_is_this": {
111+
"message": "Vad är detta?"
112+
},
113+
"chrome_what_is_this_title": {
114+
"message": "HTTPS Everywhere websida"
115+
}
116+
}
117+

0 commit comments

Comments
 (0)