Skip to content

Commit 52045c4

Browse files
nullishzeronullishzero
committed
Merge branch 'master' into issue9535
2 parents 3831b93 + 6ecdb50 commit 52045c4

33 files changed

+207
-180
lines changed

‎src/Changelog‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
4.0development.11 (2013-08-30)
2+
* Notify users who have been accidentally updated from stable to dev
3+
https://trac.torproject.org/projects/tor/ticket/9600
4+
* Added and updated numerous rules, including Craigslist
5+
* Fixes toolbar button size
6+
https://trac.torproject.org/projects/tor/ticket/9511
7+
* Declare loop variables with var to avoid global memory leaks
8+
* Updated localizations
9+
10+
3.4.1
11+
* Fix typo resulting in variable leak in get_prefs(), thanks to Jérémy
12+
Bobbio
13+
14+
3.4
15+
* Do not upgrade stable users to the development branch!
16+
* The previous release moved extension code from the development branch into
17+
the stable branch, and changed many stable rules
18+
19+
chrome-2013.8.17
20+
* Urgent bugfix release for
21+
https://trac.torproject.org/projects/tor/ticket/9507
22+
- release from the stable / 3.0 branch, not master
23+
- don't ship the development ruleset library, it's not ready for prime
24+
time yet
25+
- avoid performance hits from repeatedly re-testing rulesets
26+
- other possible weirdness
27+
128
chrome-2013-8.16
229
* Includes all fixes from 3.3, 3.3.1, and 4.0development.10
330
* This will be the first Chromium release where the bulk of the rules that

‎src/chrome/content/rules/Cengage.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
-->
44
<ruleset name="Cengage (partial)" platform="mixedcontent">
55

6-
<target host="calendarwiz.com"/>
7-
<target host="*.calendarwiz.com"/>
86
<target host="serviceplus.cengage.com"/>
97
<target host="cengagebrain.com"/>
108
<target host="*.cengagebrain.com"/>
@@ -20,13 +18,10 @@
2018
<target host="ordercourses.com"/>
2119
<target host="www.ordercourses.com"/>
2220

23-
<securecookie host="^(.*\.)?(calendarwiz|ed2go|ordercourses).com$" name=".*"/>
21+
<securecookie host="^(.*\.)?(ed2go|ordercourses).com$" name=".*"/>
2422
<securecookie host="^serviceplus\.cengage\.com$" name=".*"/>
2523
<securecookie host="^(.*\.)?cengagebrain\.co(m|\.uk)$" name=".*"/>
2624

27-
<rule from="^http://(www\.)?calendarwiz\.com/"
28-
to="https://$1calendarwiz.com/"/>
29-
3025
<rule from="^http://serviceplus\.cengage\.com/"
3126
to="https://serviceplus.cengage.com/"/>
3227

‎src/chrome/locale/ar/https-everywhere.dtd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<!ENTITY https-everywhere.source.unable_to_download "تعذّر تنزيل المصدر.">
3636

3737
<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
38-
<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
39-
<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
40-
<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
41-
<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
42-
<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
38+
<!ENTITY https-everywhere.popup.paragraph1 "عذراً. انت كنت تستخدم اصدار مستقر من HTTPS Everywhere، ولكن تم تحديث اصدارك إلي الاصدار التجريبي عن طريق الخطء.">
39+
<!ENTITY https-everywhere.popup.paragraph2 "هل ترغب في العودة للاصدار المستقر؟">
40+
<!ENTITY https-everywhere.popup.paragraph3 "كنا نحب لو واصلت استخدام الاصدار التجريبي من HTTPS Everywhere لان ذلك يساعدنا علي جعل البرنامج أفضل! قد تجد في الاصدار التجريبي بعض الأخطاء التي يمكنك ان تبلغ عنها بمراسلة https-everywhere@eff.org. نآسف على الإزعاج و شكراً لأستخدامك HTTPS Everywhere.">
41+
<!ENTITY https-everywhere.popup.keep "ابقني علي الاصدار التجريبي">
42+
<!ENTITY https-everywhere.popup.revert "حمل الاصدار المستقر الاخير">

‎src/chrome/locale/ar/https-everywhere.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ https-everywhere.menu.enableDisable = فعل / اوقف القوانين
44
https-everywhere.menu.noRules = (هذه الصفحة لا تحتوي على قوانين)
55
https-everywhere.menu.unknownRules = (قواين هذه الصفحة غير معروفة)
66
https-everywhere.toolbar.hint = HTTPS Everywhere مفعل الان. يمكنك تفعيله او تعطيله علي حسب الموقع الذي تزور عن طريق الضغط علي الرمز في شريطة العناوين.
7-
https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
7+
https-everywhere.migration.notification0 = من أجل أن تنفيذ اصلاح مهم، هذا التحديث يعيد قوانين HTTPS Everywhere إلى حالتها الإفتراضية.

‎src/chrome/locale/da/https-everywhere.dtd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<!ENTITY https-everywhere.source.filename "Filnavn">
3535
<!ENTITY https-everywhere.source.unable_to_download "Kan ikke hente kilde">
3636

37-
<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
38-
<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
39-
<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
40-
<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
41-
<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
42-
<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
37+
<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 meddelelse">
38+
<!ENTITY https-everywhere.popup.paragraph1 "Ups. Du anvendte den stabile version af HTTPS Everywhere, men vi har ved et uheld måske opdateret til udvikler-versionen ved den sidste opdatering.">
39+
<!ENTITY https-everywhere.popup.paragraph2 "Vil du skifte tilbage til den stabile version?">
40+
<!ENTITY https-everywhere.popup.paragraph3 "Vi ville sætte pris på at du fortsatte med at anvende vores udvikler-version, og derved hjalp os med at gøre HTTPS Everywhere bedre! Der er optræder måske fejl her og der, som du kan rapportere på https-everywhere@eff.org, på engelsk. Vi beklager besværet. Tak fordi du anvender HTTPS Everywhere.">
41+
<!ENTITY https-everywhere.popup.keep "Behold udvikler-versionen">
42+
<!ENTITY https-everywhere.popup.revert "Hent den seneste stabile version">

‎src/chrome/locale/da/https-everywhere.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ https-everywhere.menu.globalDisable = Deaktivér HTTPS Overalt
33
https-everywhere.menu.enableDisable = Aktivér / Deaktivér regler
44
https-everywhere.menu.noRules = (Der er ikke opsat regler for denne side)
55
https-everywhere.menu.unknownRules = (Regler for denne side ukendt)
6-
https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
7-
https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
6+
https-everywhere.toolbar.hint = HTTPS Everywhere er nu aktiv. De kan tænde den ved et side-ved-side basis ved at klikke på ikonet i adresse baren.
7+
https-everywhere.migration.notification0 = For at rette en vigtig fejl, nulstiller denne opdatering dine HTTPS Everywhere indstillinger til deres oprindelige værdier.

‎src/chrome/locale/de/https-everywhere.dtd‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!ENTITY https-everywhere.prefs.site "Seite">
2424
<!ENTITY https-everywhere.prefs.notes "Notizen">
2525
<!ENTITY https-everywhere.prefs.list_caption "Welche HTTPS-Weiterleitung soll gewählt werden?">
26-
<!ENTITY https-everywhere.prefs.enabled "Aktivieren">
26+
<!ENTITY https-everywhere.prefs.enabled "Gestartet">
2727
<!ENTITY https-everywhere.prefs.ruleset_howto "Lerne, deine eigene Regelliste zu schreiben (Füge Regeln für andere Web-Seiten hinzu)">
2828
<!ENTITY https-everywhere.prefs.here_link "Hier">
2929
<!ENTITY https-everywhere.prefs.toggle "Toggle">
@@ -34,9 +34,9 @@
3434
<!ENTITY https-everywhere.source.filename "Dateiname">
3535
<!ENTITY https-everywhere.source.unable_to_download "Quelle konnte nicht heruntergeladen werden.">
3636

37-
<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
38-
<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
39-
<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
40-
<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
41-
<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
42-
<!ENTITY https-everywhere.popup.revert "Download the latest stable version">
37+
<!ENTITY https-everywhere.popup.title "Nachricht von HTTPS Everywhere 4.0development.11">
38+
<!ENTITY https-everywhere.popup.paragraph1 "Oops. Du hattest die stabile Version von HTTPS Everywhere benutzt, aber wir haben dich möglicherweise in unserem letztdem Update auf eine Entwickler-Version geupgraded.">
39+
<!ENTITY https-everywhere.popup.paragraph2 "Möchtest du zurück zur stabilen Version?">
40+
<!ENTITY https-everywhere.popup.paragraph3 "Wir würden uns freuen, wenn du weiterhin die Entwickler-Version benutzen würdest, um uns zu helfen HTTPS Everywhere zu verbessern! Es könnte sein, dass du hier und da einige Fehler findest, welche du an https-everywhere@eff.org melden kannst. Entschuldige die Unannehmlichkeit und danke, dass du HTTPS Everywhere benutzt.">
41+
<!ENTITY https-everywhere.popup.keep "Entwickler-Version beibehalten.">
42+
<!ENTITY https-everywhere.popup.revert "Die letzte stabile Version herunterladen">

‎src/chrome/locale/de/https-everywhere.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ https-everywhere.menu.enableDisable = Regeln Aktivieren / Deaktivieren
44
https-everywhere.menu.noRules = (Keine Regeln für diese Seite)
55
https-everywhere.menu.unknownRules = (Regeln für diese Seite unbekannt)
66
https-everywhere.toolbar.hint = HTTPS Everywhere ist nun aktiv. Sie können es für bestimmte Seiten ein- oder ausschalten, indem Sie auf das Icon in der Adresszeile klicken.
7-
https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
7+
https-everywhere.migration.notification0 = Um einen wichtigen Fix zu implementieren, wird dieses Update deine HTTPS Everywhere Regel-Einstellungen zurücksetzen.

‎src/chrome/locale/de/ssl-observatory.dtd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ to turn it on?">-->
2929
<!ENTITY ssl-observatory.prefs.alt_roots_tooltip
3030
"Es ist sicher (und eine gute Idee), diese Option zu aktivieren, es sei denn, Sie benutzen ein aufdringliches Firmennetzwerk, oder Kaspersky Antiviren-Software, die Sie beim Browsen mittels eines TLS Proxyservers und einer privaten Zertifizierungsstelle überwacht. Wenn diese Option in einem solchen Netzwerk verwendet wird, könnte Sie Hinweise (in Form der dadurch erstellten eindeutigen Zertifikate) auf die durch diesen Proxyserver besuchten https:// Domains hinterlassen.">
3131

32-
<!ENTITY ssl-observatory.prefs.anonymous "Überprüfe Zertifikate, die Tor für Anonymität benutzt">
32+
<!ENTITY ssl-observatory.prefs.anonymous "Überprüfe Zertifikate mit Tor, um Anonymität zu bewahren">
3333
<!ENTITY ssl-observatory.prefs.anonymous_unavailable
34-
"Üerprüfte Zertifikate, die Tor für Anonymität benutzt (benötigt Torbutton)">
34+
"Überprüfte Zertifikate mit Tor, um Anonymität zu bewahren (benötigt Torbutton)">
3535
<!ENTITY ssl-observatory.prefs.anonymous_tooltip
3636
"Diese Option macht die Installation von Tor und Torbutton erforderlich">
3737

‎src/chrome/locale/el/https-everywhere.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ https-everywhere.menu.globalDisable = Απενεργοποίηση του HTTPS
33
https-everywhere.menu.enableDisable = Ενεργοποίηση / Απενεργοποίηση των κανόνων
44
https-everywhere.menu.noRules = (Δεν υπάρχουν κανόνες για αυτή την σελίδα)
55
https-everywhere.menu.unknownRules = (Κανόνες για αυτή τη σελίδα: Άγνωστοι)
6-
https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar.
7-
https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values.
6+
https-everywhere.toolbar.hint = Το HTTPS Everywhere ειναι τωρα ενεργοποιημενο. Μπορείτε να το αλλάξετε με βάση την τοποθεσία ανά τοποθεσία, κάνοντας κλικ στο εικονίδιο στη γραμμή διευθύνσεων.
7+
https-everywhere.migration.notification0 = Αυτή η ενημέρωση επαναφέρει τις ρυθμίσεις κανόνων του HTTPS Everywhere στις προεπιλεγμένες τιμές, με σκοπό να εφαρμοστεί μια κρίσιμη διόρθωση.

0 commit comments

Comments
 (0)