tbb-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 20867 discussions
[tor-browser/tor-browser-78.15.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by richard＠torproject.org 22 Oct '21
by richard＠torproject.org 22 Oct '21
22 Oct '21
commit 9afd1f802d0854f118015a0510cc01f2177744a4
Author: Richard Pospesel <richard(a)torproject.org>
Date: Thu Oct 21 17:04:06 2021 +0200
fixup! Bug 10760: Integrate TorButton to TorBrowser core
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 1ecd3f264126..3bc2584d5c7f 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 1ecd3f2641264b1389c90af03c6310dbdb53e7e6
+Subproject commit 3bc2584d5c7ff4747195b194640b23abd0eba957
1
0
commit 3bc2584d5c7ff4747195b194640b23abd0eba957
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Oct 21 18:20:03 2021 +0000
Translations update (for YEC)
---
chrome/locale/ar/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/bn-BD/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ca/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/cs/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/da/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/de/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/el/aboutTor.dtd | 32 ++++++++++++++++++++++++++++++--
chrome/locale/es-AR/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/es-ES/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/eu/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/fa/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/fr/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ga-IE/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/he/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/hu/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/id/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/is/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/it/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ja/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ka/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ko/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/lt/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/mk/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ms/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/my/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/nb-NO/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/nl/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/pl/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/pt-BR/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ro/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/ru/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/sv-SE/aboutTor.dtd | 30 +++++++++++++++++++++++++++++-
chrome/locale/th/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/tr/aboutTor.dtd | 32 ++++++++++++++++++++++++++++++--
chrome/locale/vi/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/zh-CN/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
chrome/locale/zh-TW/aboutTor.dtd | 28 ++++++++++++++++++++++++++++
37 files changed, 1041 insertions(+), 5 deletions(-)
diff --git a/chrome/locale/ar/aboutTor.dtd b/chrome/locale/ar/aboutTor.dtd
index 00f2f913..60f87894 100644
--- a/chrome/locale/ar/aboutTor.dtd
+++ b/chrome/locale/ar/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor متاح مجاناً بفضل تبرعات من أشخاص مثلك">
<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "الخصوصية هي حق من حقوق الإنسان">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "سيتم مطابقة تبرعك بواسطة Friends of Tor ، حتى 150000 دولار.">
diff --git a/chrome/locale/bn-BD/aboutTor.dtd b/chrome/locale/bn-BD/aboutTor.dtd
index e52c4b7a..0808560c 100644
--- a/chrome/locale/bn-BD/aboutTor.dtd
+++ b/chrome/locale/bn-BD/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।">
<!ENTITY aboutTor.donationBanner.freeToUse "আপনার মতো মানুষদের দানের জন্যই Tor বিনামূল্যে ব্যবহার করা যায়">
<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! ">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "গোপনীয়তা একটি মানুষের অধিকার">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "তোমার অনুদানের সমান পরিমাণ অনুদান $১,৫০,০০০ পর্যন্ত দিলে টরের বন্ধুরা তার সমান অনুদান টরকে দিবে।">
diff --git a/chrome/locale/ca/aboutTor.dtd b/chrome/locale/ca/aboutTor.dtd
index 0741dd00..a566a3a9 100644
--- a/chrome/locale/ca/aboutTor.dtd
+++ b/chrome/locale/ca/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor és d'ús gratuït gràcies als donatius de persones com vós.">
<!ENTITY aboutTor.donationBanner.buttonA "Feu una donació">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "La privadesa és un dret humà">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/cs/aboutTor.dtd b/chrome/locale/cs/aboutTor.dtd
index 4a2a2e2b..2d5dd753 100644
--- a/chrome/locale/cs/aboutTor.dtd
+++ b/chrome/locale/cs/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor je zdarma k použití díky darům od lidí jako ty.">
<!ENTITY aboutTor.donationBanner.buttonA "Přispějte">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Soukromí je lidksé právo">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Váš dar bude dorovnán společností Friends of Tor, a to až do výše 150 000 $.">
diff --git a/chrome/locale/da/aboutTor.dtd b/chrome/locale/da/aboutTor.dtd
index 09c87f8c..62a0faa8 100644
--- a/chrome/locale/da/aboutTor.dtd
+++ b/chrome/locale/da/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis at bruge takke være donationer fra personer som dig.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nu">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privatliv er en menneskeret">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Din donation vil blive matchet af venner af Tor, op til $150.000.">
diff --git a/chrome/locale/de/aboutTor.dtd b/chrome/locale/de/aboutTor.dtd
index 65f3834a..05c71121 100644
--- a/chrome/locale/de/aboutTor.dtd
+++ b/chrome/locale/de/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor ist aufgrund von Spenden von Leuten wie dir frei nutzbar.">
<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Datenschutz ist ein Menschenrecht">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Deine Spende wird von Friends of Tor verdoppelt, bis zu 150.000 $.">
diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd
index 8d17ba12..a162ceaa 100644
--- a/chrome/locale/el/aboutTor.dtd
+++ b/chrome/locale/el/aboutTor.dtd
@@ -22,10 +22,38 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Εγχειρίδιο του Tor Browser">
-<!ENTITY aboutTor.tor_mission.label "Το πρότζεκτ του Tor είναι μία US 501(c)(3) μη κερδοσκοπική οργάνωση, που προωθεί τα ανθρώπινα δικαιώματα και τις ελευθερίες δημιουργώντας και παρέχοντας δωρεάν και ανοιχτά ανωνυμία πηγής και τεχνολογίας ιδιωτικότητας, υποστηρίζοντας την απεριόριστη παροχή και χρήση τους και επεκτείνοντας την επιστημονική και κοινή κατανόηση.">
+<!ENTITY aboutTor.tor_mission.label "Το Tor Project είναι ένας μη-κερδοσκοπικός οργανισμός US 501(c)(3), που προωθεί τα ανθρώπινα δικαιώματα και τις ελευθερίες δημιουργώντας και παρέχοντας τεχνολογίες ανωνυμίας και ιδιωτικότητας ελεύθερου και ανοιχτου λογισμικού, υποστηρίζοντας την απροόσκοπτη διαθεσιμότητα και χρήση τους, και προωθώντας την επιστημονική και κοινή κατανόησή τους.">
<!ENTITY aboutTor.getInvolved.label "Βοηθήστε κι εσείς »">
<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας.">
<!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor.">
-<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσάς.">
+<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι δωρεάν επειδή στηρίζεται σε δωρεές από άτομα σαν κι εσάς.">
<!ENTITY aboutTor.donationBanner.buttonA "Κάνε μια δωρεά τώρα">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Η ιδιωτικότητα είναι ανθρώπινο δικαίωμα ">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Η Friends of Tor θα δωρίσει το ίδιο ποσό με τη δωρεά σας, μέχρι $150.000.">
diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd
index 0c4ebb64..df88805e 100644
--- a/chrome/locale/es-AR/aboutTor.dtd
+++ b/chrome/locale/es-AR/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor puede ser usado libremente gracias a las donaciones de personas como vos.">
<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "La privacidad es un derecho humano">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Tu donación va a ser igualada por Amigos de Tor hasta USD 150.000">
diff --git a/chrome/locale/es-ES/aboutTor.dtd b/chrome/locale/es-ES/aboutTor.dtd
index 0671a826..491c547a 100644
--- a/chrome/locale/es-ES/aboutTor.dtd
+++ b/chrome/locale/es-ES/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Se puede usar Tor libremente por las donaciones de personas como tu.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora.">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "NO\nTOQUES\nMIS\nDATOS">
+<!ENTITY aboutTor.yec.motto "La privacidad es un derecho humano.">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Tu donación será igualada por Amigos de Tor hasta $150.000.">
diff --git a/chrome/locale/eu/aboutTor.dtd b/chrome/locale/eu/aboutTor.dtd
index b115af74..75ec4f0b 100644
--- a/chrome/locale/eu/aboutTor.dtd
+++ b/chrome/locale/eu/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you.">
<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privacy is a human right">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd
index 44e1efbc..c240de56 100644
--- a/chrome/locale/fa/aboutTor.dtd
+++ b/chrome/locale/fa/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "ثبتنام برای اخبار Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor برای استفاده رایگان است، این به خاطر حمایت افرادی مانند شماست.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون حمایت کنید">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "حریم خصوصی یک حق انسانی است">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/fr/aboutTor.dtd b/chrome/locale/fr/aboutTor.dtd
index 75b45004..cfda472c 100644
--- a/chrome/locale/fr/aboutTor.dtd
+++ b/chrome/locale/fr/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor peut être utilisé gratuitement grâce aux dons de personnes telles que vous.">
<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "La vie privée est un droit de la personne">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Votre don sera égalé par les Amis de Tor à concurrence de 150 000 $.">
diff --git a/chrome/locale/ga-IE/aboutTor.dtd b/chrome/locale/ga-IE/aboutTor.dtd
index 8f03245a..88365aed 100644
--- a/chrome/locale/ga-IE/aboutTor.dtd
+++ b/chrome/locale/ga-IE/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tá Tor saor in aisce a bhuí le bronntanais airgid ó dhaoine cosúil leatsa.">
<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Is buncheart daonna é an príobháideachas">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd
index 520d773b..c48ae2b7 100644
--- a/chrome/locale/he/aboutTor.dtd
+++ b/chrome/locale/he/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor חינמי לשימוש בגלל תרומות מאנשים כמוך.">
<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "פרטיות היא זכות אדם">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "תרומתך תוכפל על ידי החברים של Tor, עד סכום של $150,000">
diff --git a/chrome/locale/hu/aboutTor.dtd b/chrome/locale/hu/aboutTor.dtd
index 0ea02599..bfd3e056 100644
--- a/chrome/locale/hu/aboutTor.dtd
+++ b/chrome/locale/hu/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez.">
<!ENTITY aboutTor.donationBanner.freeToUse "A Tor ingyenes az Önhöz hasonló személyek támogatásai miatt.">
<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "A magánélet emberi jog">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "A támogatásoddal egyező összeget ad a Friends of Tor, 150 000 dollárig.">
diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd
index be1ecb07..18d9755a 100644
--- a/chrome/locale/id/aboutTor.dtd
+++ b/chrome/locale/id/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor bebas digunakan karena donasi dari orang-orang seperti Anda.">
<!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privasi adalah hak asasi manusia">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Donasi anda akan disesuaikan oleh "Friends of Tor", hingga $150,000.">
diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd
index 14bad9ac..84f950bc 100644
--- a/chrome/locale/is/aboutTor.dtd
+++ b/chrome/locale/is/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir.">
<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér.">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Friðhelgi persónuupplýsinga er mannréttindi">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Styrkur frá þér verður jafnaður upp af Friends of Tor, allt að $150,000.">
diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd
index 34fe8006..c3b5bdd3 100644
--- a/chrome/locale/it/aboutTor.dtd
+++ b/chrome/locale/it/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "L'utilizzo di Tor è gratuito grazie alle donazioni fatte da persone come te.">
<!ENTITY aboutTor.donationBanner.buttonA "Dona Adesso">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "La privacy è un diritto umano">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "La tua donazione sarà abbinata a "Amici di Tor", fino a $ 150.000.">
diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd
index 10eb73a1..f579c67b 100644
--- a/chrome/locale/ja/aboutTor.dtd
+++ b/chrome/locale/ja/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor は皆さんからの寄付に支えられています。">
<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "プライバシーは人権です">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/ka/aboutTor.dtd b/chrome/locale/ka/aboutTor.dtd
index 2bbdf85a..24a4d98d 100644
--- a/chrome/locale/ka/aboutTor.dtd
+++ b/chrome/locale/ka/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor უფასოა, თქვენნაირი ადამიანების შემოწირულობების დამსახურებით.">
<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "პირადულობა ადამიანის ძირითადი უფლებაა">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd
index 04e6de97..18bf3bfe 100644
--- a/chrome/locale/ko/aboutTor.dtd
+++ b/chrome/locale/ko/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor는 바로 당신과 같은 사람들의 기부 덕분에 자유롭게 사용할 수 있습니다.">
<!ENTITY aboutTor.donationBanner.buttonA "기부하기">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "프라이버시는 인권입니다">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/lt/aboutTor.dtd b/chrome/locale/lt/aboutTor.dtd
index 4b711723..c9702032 100644
--- a/chrome/locale/lt/aboutTor.dtd
+++ b/chrome/locale/lt/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Užsisakykite Tor naujienas.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor yra nemokamas naudoti dėl paaukojimų iš tokių žmonių kaip jūs.">
<!ENTITY aboutTor.donationBanner.buttonA "Paaukokite dabar">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privatumas yra žmogaus teisė">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd
index 5853c075..aee03654 100644
--- a/chrome/locale/mk/aboutTor.dtd
+++ b/chrome/locale/mk/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor е бесплатен за користење благодарение на донациите од луѓе како вас.">
<!ENTITY aboutTor.donationBanner.buttonA "Донирај сега">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Приватноста е човеково право">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/ms/aboutTor.dtd b/chrome/locale/ms/aboutTor.dtd
index b49406f7..231e59a1 100644
--- a/chrome/locale/ms/aboutTor.dtd
+++ b/chrome/locale/ms/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Daftar untuk dapatkan Berita Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor sepenuhnya percuma digunakan kerana adanya derma oleh individu seperti anda.">
<!ENTITY aboutTor.donationBanner.buttonA "Dermalah Sekarang">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privasi atau kesendirian ialah hak asasi manusia">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/my/aboutTor.dtd b/chrome/locale/my/aboutTor.dtd
index 06bc3410..d4be1cf6 100644
--- a/chrome/locale/my/aboutTor.dtd
+++ b/chrome/locale/my/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Tor News သတင်းများအတွက် အမည် စာရင်းသွင်းလိုက်ပါ။">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor သည် သင့်လို သုံးသူများမှ လှူဒါန်းငွေကြောင့် အခမဲ့သုံးနိုင်ပါသည်။">
<!ENTITY aboutTor.donationBanner.buttonA "အခုဘဲ လှူမယ်">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privacy is a human right">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/nb-NO/aboutTor.dtd b/chrome/locale/nb-NO/aboutTor.dtd
index 15c0c327..fb6544bf 100644
--- a/chrome/locale/nb-NO/aboutTor.dtd
+++ b/chrome/locale/nb-NO/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor er gratis å bruke, grunnet bidrag fra folk som deg.">
<!ENTITY aboutTor.donationBanner.buttonA "Donér nå">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Personvern er en menneskerettighet">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd
index ca46073b..9af03022 100644
--- a/chrome/locale/nl/aboutTor.dtd
+++ b/chrome/locale/nl/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor de Tor-nieuwsbrief.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor is gratis te gebruiken dankzij donaties van mensen zoals u.">
<!ENTITY aboutTor.donationBanner.buttonA "Doneer nu">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privacy is een mensenrecht">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Uw donatie wordt verdubbeld door Friends of Tor, tot een maximum van $150.000.">
diff --git a/chrome/locale/pl/aboutTor.dtd b/chrome/locale/pl/aboutTor.dtd
index f67d40b9..af33f2e0 100644
--- a/chrome/locale/pl/aboutTor.dtd
+++ b/chrome/locale/pl/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Zapisz się na newsletter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Z przeglądarki Tor można korzystać bezpłatnie dzięki darowiznom od osób takich jak Ty.">
<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Prawo do prywatności jest prawem człowieka. ">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Twoja darowizna zostanie wyrównana przez przyjaciół sieci Tor, aż do 150 000 dolarów.">
diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd
index 10cc06e9..0da300b7 100644
--- a/chrome/locale/pt-BR/aboutTor.dtd
+++ b/chrome/locale/pt-BR/aboutTor.dtd
@@ -30,3 +30,31 @@
<!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "O Tor é gratuito graças às doações de pessoas como você.">
<!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privacidade é um direito humano.">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Os Amigos do Tor farão uma doação do mesmo valor da sua, no limite de $150,000.00.">
diff --git a/chrome/locale/ro/aboutTor.dtd b/chrome/locale/ro/aboutTor.dtd
index 07488af9..fabbdbc3 100644
--- a/chrome/locale/ro/aboutTor.dtd
+++ b/chrome/locale/ro/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor poate fi folosit gratuit datorită donațiilor de la oameni ca tine.">
<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Confidențialitatea este un drept uman">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Donația dumneavoastră va fi potrivită de Prietenii lui Tor, până la 150.000 USD.">
diff --git a/chrome/locale/ru/aboutTor.dtd b/chrome/locale/ru/aboutTor.dtd
index 372bbcd5..72d3cbb8 100644
--- a/chrome/locale/ru/aboutTor.dtd
+++ b/chrome/locale/ru/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor бесплатен благодаря пожертвованиям таких людей, как вы.">
<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Приватность – право человека">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Ваше пожертвование (до $150000) будет удвоено Friends of Tor.">
diff --git a/chrome/locale/sv-SE/aboutTor.dtd b/chrome/locale/sv-SE/aboutTor.dtd
index e4071c29..edff847d 100644
--- a/chrome/locale/sv-SE/aboutTor.dtd
+++ b/chrome/locale/sv-SE/aboutTor.dtd
@@ -22,10 +22,38 @@
<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor Browser">
-<!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och integritetsteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse.">
+<!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och integritetsteknik med fri och öppen källkod, stöda deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse.">
<!ENTITY aboutTor.getInvolved.label "Engagera dig »">
<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt i din inkorg.">
<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor är gratis att använda på grund av donationer från personer som du.">
<!ENTITY aboutTor.donationBanner.buttonA "Donera nu">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Integritet är en mänsklig rättighet">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Din donation kommer att matchas av Friends of Tor, upp till $ 150 000.">
diff --git a/chrome/locale/th/aboutTor.dtd b/chrome/locale/th/aboutTor.dtd
index 96ebca5e..29531f5d 100644
--- a/chrome/locale/th/aboutTor.dtd
+++ b/chrome/locale/th/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "สมัครรับข่าวสารเกี่ยวกับ Tor">
<!ENTITY aboutTor.donationBanner.freeToUse "บริการ Tor นี้ฟรี ไม่มีค่าใช้จ่ายใดๆเพราะเงินบริจาคจากผู้มีน้ำใจอย่างคุณ">
<!ENTITY aboutTor.donationBanner.buttonA "ร่วมบริจาค">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "ความเป็นส่วนตัวคือสิทธิมนุษยชน">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "เงินบริจาคของคุณจะส่งมอบให้ Tor สูงสุดถึง 150,000 ดอลลาร์สหรัฐ">
diff --git a/chrome/locale/tr/aboutTor.dtd b/chrome/locale/tr/aboutTor.dtd
index fd8f84cf..7496155b 100644
--- a/chrome/locale/tr/aboutTor.dtd
+++ b/chrome/locale/tr/aboutTor.dtd
@@ -25,7 +25,35 @@
<!ENTITY aboutTor.tor_mission.label "Tor Projesi, Birleşik Devletler 501(c)(3) vergi muafiyeti maddesi kapsamında, özgür ve açık kaynaklı anonimlik ve kişisel gizlilik teknolojileri geliştirerek insan hakları ve özgürlüklerini ileriye götürmeyi, bu teknolojilerin bilimsel ve kültürel olarak bilinirliğini arttırmayı ve herkes tarafından erişebilmesini sağlamak amacıyla çalışan, kar amacı gütmeyen bir kuruluştur.">
<!ENTITY aboutTor.getInvolved.label "Katkıda bulunun »">
-<!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin.">
+<!ENTITY aboutTor.newsletter.tagline "Tor gelişmeleri ile ilgili e-posta almak ister misiniz?">
<!ENTITY aboutTor.newsletter.link_text "Tor duyurularına abone olun">
-<!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabilir.">
+<!ENTITY aboutTor.donationBanner.freeToUse "Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabiliyor.">
<!ENTITY aboutTor.donationBanner.buttonA "Bağış yapın">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Kişisel gizlilik bir insan hakkıdır">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Friends of Tor, $150.000 tutarını aşmayan bağışlarınız kadar katkıda bulunacak.">
diff --git a/chrome/locale/vi/aboutTor.dtd b/chrome/locale/vi/aboutTor.dtd
index b6bf4286..45d44a81 100644
--- a/chrome/locale/vi/aboutTor.dtd
+++ b/chrome/locale/vi/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor.">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor miễn phí là nhờ sự ủng hộ của những người như bạn.">
<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "Privacy is a human right">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
diff --git a/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd
index 5b4f5fa7..ed51009f 100644
--- a/chrome/locale/zh-CN/aboutTor.dtd
+++ b/chrome/locale/zh-CN/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态">
<!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的，因为有和您一样的人捐助。">
<!ENTITY aboutTor.donationBanner.buttonA "立即捐助">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "隐私是一项人权">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "您的捐款将由 Tor 的伙伴们配捐，最高15万美元。">
diff --git a/chrome/locale/zh-TW/aboutTor.dtd b/chrome/locale/zh-TW/aboutTor.dtd
index 9061dbce..494cdc50 100644
--- a/chrome/locale/zh-TW/aboutTor.dtd
+++ b/chrome/locale/zh-TW/aboutTor.dtd
@@ -29,3 +29,31 @@
<!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。">
<!ENTITY aboutTor.donationBanner.freeToUse "由於有像您這樣的人捐款，Tor 可以免費使用。">
<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">
+
+<!-- Year end campaign strings -->
+
+<!-- LOCALIZATION NOTE (aboutTor.yec.slogan): This string is written on a protest sign and the translated
+ phrase needs to be a short and concise slogan. We would like the phrase to fit on 3 to 5 lines. If a
+ translation of 'HANDS OFF MY DATA' cannot be made short, we have provided these alternative slogans
+ with a similar theme:
+
+ - DON'T TOUCH MY DATA
+ - DON'T SPY ON MY DATA
+ - MY DATA IS PRIVATE
+ - KEEP OFF MY DATA
+
+ Please place newline characters (\n) between words or phrases which can be placed in separate lines
+ so we can word-wrap our final assets correctly.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.slogan "HANDS\nOFF\nMY\nDATA">
+<!ENTITY aboutTor.yec.motto "隱私即人權">
+<!-- LOCALIZATION NOTE (aboutTor.yec.donationMatch): Please translate the 'Friends of Tor' phrase, but
+ also format it like the name of an organization in whichever way that is appropriate for your locale.
+
+ Please keep the currency in USD.
+
+ Thank you!
+-->
+<!ENTITY aboutTor.yec.donationMatch "Your donation will be matched by Friends of Tor, up to $150,000.">
1
0
[Git][tpo/applications/fenix] Pushed new tag tor-browser-91.2.0-10.5-2-build3
by Matthew Finkel (＠sysrqb) 21 Oct '21
by Matthew Finkel (＠sysrqb) 21 Oct '21
21 Oct '21
Matthew Finkel pushed new tag tor-browser-91.2.0-10.5-2-build3 at The Tor Project / Applications / fenix
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-91.…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
[Git][tpo/applications/fenix][tor-browser-91.2.0-10.5-2] fixup! Bug 40194 - Add 2021 YEC home screen
by Matthew Finkel (＠sysrqb) 21 Oct '21
by Matthew Finkel (＠sysrqb) 21 Oct '21
21 Oct '21
Matthew Finkel pushed to branch tor-browser-91.2.0-10.5-2 at The Tor Project / Applications / fenix
Commits:
93db039b by Matthew Finkel at 2021-10-21T13:49:25+00:00
fixup! Bug 40194 - Add 2021 YEC home screen
- - - - -
1 changed file:
- app/src/main/res/values/colors.xml
Changes:
=====================================
app/src/main/res/values/colors.xml
=====================================
@@ -191,7 +191,7 @@
<color name="mozac_widget_favicon_background_private_theme">@color/photonInk50</color>
<color name="mozac_widget_favicon_border_private_theme">@color/photonInk50</color>
- <color name="tor_yec_home_background">#2A1B51</color>
+ <color name="tor_yec_home_background">@android:color/black</color>
<!-- Tab Tray -->
<color name="tab_tray_item_text_private_theme">@color/photonLightGrey05</color>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/93db039bb6862…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/93db039bb6862…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
[torbutton/maint-10.5] Merge remote-tracking branch 'richardgl/40377_maint-10.5' into maint-10.5
by sysrqb＠torproject.org 21 Oct '21
by sysrqb＠torproject.org 21 Oct '21
21 Oct '21
commit 4b5a3bcb4f1fe7b55383c44adb2227745b55170a
Merge: 9dfac283 c5b54f86
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Oct 21 14:38:42 2021 +0000
Merge remote-tracking branch 'richardgl/40377_maint-10.5' into maint-10.5
LICENSE | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
1
0
[torbutton/maint-10.5] Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign
by sysrqb＠torproject.org 21 Oct '21
by sysrqb＠torproject.org 21 Oct '21
21 Oct '21
commit c5b54f86fce00fc3fb1188d70ac4cd99d6888086
Author: Richard Pospesel <richard(a)torproject.org>
Date: Wed Oct 20 17:07:54 2021 +0200
Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign
---
LICENSE | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
diff --git a/LICENSE b/LICENSE
index 783d6a47..a8e43ed8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,3 +27,200 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+
+===========================================================================
+
+"Corben" font embedded in chrome/skin/corben-font.css is licensed under:
+
+Copyright (c) 2010, 2011 by vernon adams (vern(a)newtypography.co.uk)
+with Reserved Font Name Corben.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+===========================================================================
+
+"Sniglet" font embedded in chrome/skin/yec-placard.svg is licensed under:
+
+Copyright (c) 2008, Haley Fiege (haley(a)kingdomofawesome.com)
+Copyright (c) 2012, Brenda Gallo (gbrenda1987(a)gmail.com)
+Copyright (c) 2013, Pablo Impallari (www.impallari.com|impallari@gmail.com)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
1
0
[torbutton/master] Merge remote-tracking branch 'richardgl/40377'
by sysrqb＠torproject.org 21 Oct '21
by sysrqb＠torproject.org 21 Oct '21
21 Oct '21
commit 448a4fd28f2535554883c5989b616c9849eb4eba
Merge: 71e835f0 91c82ca3
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Oct 21 14:37:10 2021 +0000
Merge remote-tracking branch 'richardgl/40377'
LICENSE | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
1
0
[torbutton/master] Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign
by sysrqb＠torproject.org 21 Oct '21
by sysrqb＠torproject.org 21 Oct '21
21 Oct '21
commit 91c82ca361d489dbf98cba3852dba6733effd6b9
Author: Richard Pospesel <richard(a)torproject.org>
Date: Wed Oct 20 17:07:54 2021 +0200
Bug 40055: Add licenses for Corben and Sniglet fonts used in YEC 2021 campaign
---
LICENSE | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 197 insertions(+)
diff --git a/LICENSE b/LICENSE
index 783d6a47..a8e43ed8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,3 +27,200 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+
+===========================================================================
+
+"Corben" font embedded in chrome/skin/corben-font.css is licensed under:
+
+Copyright (c) 2010, 2011 by vernon adams (vern(a)newtypography.co.uk)
+with Reserved Font Name Corben.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+===========================================================================
+
+"Sniglet" font embedded in chrome/skin/yec-placard.svg is licensed under:
+
+Copyright (c) 2008, Haley Fiege (haley(a)kingdomofawesome.com)
+Copyright (c) 2012, Brenda Gallo (gbrenda1987(a)gmail.com)
+Copyright (c) 2013, Pablo Impallari (www.impallari.com|impallari@gmail.com)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
1
0
[Git][tpo/applications/fenix][tor-browser-91.2.0-10.5-2] 2 commits: Revert "Bug 40193: Add banner for VPN survey to Android homepage"
by Matthew Finkel (＠sysrqb) 21 Oct '21
by Matthew Finkel (＠sysrqb) 21 Oct '21
21 Oct '21
Matthew Finkel pushed to branch tor-browser-91.2.0-10.5-2 at The Tor Project / Applications / fenix
Commits:
bd49ef24 by Matthew Finkel at 2021-10-20T18:46:13+00:00
Revert "Bug 40193: Add banner for VPN survey to Android homepage"
This reverts commit 0dffacd86eee81fe774e4c88dfc90d129440312e.
- - - - -
5228c8ee by Matthew Finkel at 2021-10-21T04:09:02+00:00
Bug 40194 - Add 2021 YEC home screen
- - - - -
20 changed files:
- LICENSE
- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
- app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
- app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
- app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
- app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
- − app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt
- app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
- app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt
- + app/src/main/res/drawable/ic_yec_activist_android.png
- − app/src/main/res/drawable/info_banner_padded_background.xml
- + app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml
- − app/src/main/res/drawable/vpn_survey_icon.png
- + app/src/main/res/font/corben_bold.ttf
- + app/src/main/res/font/corben_regular.ttf
- app/src/main/res/layout/fragment_home.xml
- − app/src/main/res/layout/tor_info_banner.xml
- app/src/main/res/values/colors.xml
- app/src/main/res/values/styles.xml
- app/src/main/res/values/torbrowser_strings.xml
Changes:
=====================================
LICENSE
=====================================
@@ -371,3 +371,102 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
+
+===============================================================================
+
+"Corben" font.
+
+Copyright (c) 2010, 2011 by vernon adams (vern(a)newtypography.co.uk)
+with Reserved Font Name Corben.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
=====================================
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
=====================================
@@ -50,6 +50,7 @@ import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_home.*
import kotlinx.android.synthetic.main.fragment_home.view.bottomBarShadow
import kotlinx.android.synthetic.main.fragment_home.view.bottom_bar
+import kotlinx.android.synthetic.main.fragment_home.view.donate_now_button
import kotlinx.android.synthetic.main.fragment_home.view.exploreprivately
import kotlinx.android.synthetic.main.fragment_home.view.homeAppBar
import kotlinx.android.synthetic.main.fragment_home.view.menuButton
@@ -59,6 +60,7 @@ import kotlinx.android.synthetic.main.fragment_home.view.tab_button
import kotlinx.android.synthetic.main.fragment_home.view.toolbar
import kotlinx.android.synthetic.main.fragment_home.view.toolbarLayout
import kotlinx.android.synthetic.main.fragment_home.view.toolbar_wrapper
+import kotlinx.android.synthetic.main.fragment_home.view.yec_activist_image
import kotlinx.android.synthetic.main.no_collections_message.view.add_tabs_to_collections_button
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
@@ -88,6 +90,7 @@ import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
import mozilla.components.support.ktx.android.content.res.resolveAttribute
import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
import mozilla.components.ui.tabcounter.TabCounterMenu
+import mozilla.components.support.locale.LocaleManager
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.Config
@@ -127,6 +130,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView
import org.mozilla.fenix.onboarding.FenixOnboarding
import org.mozilla.fenix.settings.SupportUtils
+import org.mozilla.fenix.settings.advanced.getSelectedLocale
import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
import org.mozilla.fenix.tor.bootstrap.TorQuickStart
import org.mozilla.fenix.theme.ThemeManager
@@ -333,6 +337,20 @@ class HomeFragment : Fragment() {
activity.themeManager.applyStatusBarTheme(activity)
adjustHomeFragmentView(currentMode.getCurrentMode(), view)
showSessionControlView(view)
+
+ view?.donate_now_button?.setOnClickListener {
+ val country = LocaleManager.getSelectedLocale(requireContext()).country
+ var locale = LocaleManager.getSelectedLocale(requireContext()).language
+ if (country != "") {
+ locale = "${locale}-${country}"
+ }
+ val localeUrl = "https://www.torproject.org/donate/donate-phr-bp1-mobile-${locale}"
+ activity.openToBrowserAndLoad(
+ searchTermOrURL = localeUrl,
+ newTab = true,
+ from = BrowserDirection.FromHome
+ )
+ }
view
}
@@ -340,6 +358,28 @@ class HomeFragment : Fragment() {
super.onConfigurationChanged(newConfig)
getMenuButton()?.dismissMenu()
+
+ //view.donationmatch.setOnClickListener {
+ // activity.openToBrowserAndLoad(
+ // searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020",
+ // newTab = true,
+ // from = BrowserDirection.FromHome
+ // )
+ //}
+
+ view?.donate_now_button?.setOnClickListener {
+ val country = LocaleManager.getSelectedLocale(requireContext()).country
+ var locale = LocaleManager.getSelectedLocale(requireContext()).language
+ if (country != "") {
+ locale = "${locale}-${country}"
+ }
+ val localeUrl = "https://www.torproject.org/donate/donate-phr-bp1-mobile-${locale}"
+ (activity as HomeActivity).openToBrowserAndLoad(
+ searchTermOrURL = localeUrl,
+ newTab = true,
+ from = BrowserDirection.FromHome
+ )
+ }
}
private fun dismissTip(tip: Tip) {
@@ -474,6 +514,14 @@ class HomeFragment : Fragment() {
toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
)
}
+ view.donate_now_button?.apply {
+ (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
+ 0,
+ 0,
+ 0,
+ toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING
+ )
+ }
}
} else {
view.sessionControlRecyclerView?.apply {
@@ -484,16 +532,41 @@ class HomeFragment : Fragment() {
height - SESSION_CONTROL_VIEW_PADDING
)
}
+ view.donate_now_button?.apply {
+ (layoutParams as ViewGroup.MarginLayoutParams).setMargins(
+ 0,
+ 0,
+ 0,
+ height - SESSION_CONTROL_VIEW_PADDING
+ )
+ }
}
}
- // Hide the onion pattern during Onboarding, too.
- view?.onion_pattern_image?.apply {
+
+ // Hide the EOY image during Onboarding, too.
+ view?.yec_activist_image?.apply {
+ visibility = if (onboarding.userHasBeenOnboarded()) {
+ View.VISIBLE
+ } else {
+ View.GONE
+ }
+ }
+ // Hide the EOY donate button during Onboarding, too.
+ view?.donate_now_button?.apply {
visibility = if (onboarding.userHasBeenOnboarded()) {
View.VISIBLE
} else {
View.GONE
}
}
+ // Hide the onion pattern during Onboarding, too.
+ //view?.onion_pattern_image?.apply {
+ // visibility = if (onboarding.userHasBeenOnboarded()) {
+ // View.VISIBLE
+ // } else {
+ // View.GONE
+ // }
+ //}
view?.homeAppBar?.apply {
visibility = View.VISIBLE
=====================================
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
=====================================
@@ -25,7 +25,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder
-import org.mozilla.fenix.home.sessioncontrol.viewholders.TorInfoBannerViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder
import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.ExperimentDefaultBrowserCardViewHolder
@@ -91,7 +90,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) {
}
object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID)
- object TorInfoBanner : AdapterItem(TorInfoBannerViewHolder.LAYOUT_ID)
object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID)
object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID)
@@ -231,10 +229,6 @@ class SessionControlAdapter(
view,
interactor
)
- TorInfoBannerViewHolder.LAYOUT_ID -> TorInfoBannerViewHolder(
- view,
- interactor
- )
TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder(
view,
components,
=====================================
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
=====================================
@@ -94,11 +94,6 @@ interface SessionControlController {
*/
fun handlePrivateBrowsingLearnMoreClicked()
- /**
- * @see [TabSessionInteractor.onTorInfoBannerLaunchClicked]
- */
- fun handleTorInfoBannerLaunchClicked()
-
/**
* @see [TopSiteInteractor.onRenameTopSiteClicked]
*/
@@ -652,12 +647,4 @@ class DefaultSessionControlController(
override fun handleTorNetworkSettingsClicked() {
openTorNetworkSettings()
}
-
- override fun handleTorInfoBannerLaunchClicked() {
- activity.openToBrowserAndLoad(
- searchTermOrURL = SupportUtils.TOR_INFO_BANNER_URL,
- newTab = true,
- from = BrowserDirection.FromHome
- )
- }
}
=====================================
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
=====================================
@@ -23,12 +23,6 @@ interface TabSessionInteractor {
* "Common myths about private browsing" link in private mode.
*/
fun onPrivateBrowsingLearnMoreClicked()
-
- /**
- * Shows the Info Banner web page in a new tab. Called when a user clicks on the
- * "Learn More" button.
- */
- fun onTorInfoBannerLaunchClicked()
}
/**
@@ -418,8 +412,4 @@ class SessionControlInteractor(
override fun onTorBootstrapNetworkSettingsClicked() {
controller.handleTorNetworkSettingsClicked()
}
-
- override fun onTorInfoBannerLaunchClicked() {
- controller.handleTorInfoBannerLaunchClicked()
- }
}
=====================================
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
=====================================
@@ -92,7 +92,7 @@ private fun showCollections(
}
}
-private fun privateModeAdapterItems() = listOf(AdapterItem.TorInfoBanner)
+private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription)
private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap)
=====================================
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt deleted
=====================================
@@ -1,33 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.home.sessioncontrol.viewholders
-
-import android.graphics.Typeface
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.style.StyleSpan
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.tor_info_banner.view.*
-import org.mozilla.fenix.R
-import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor
-
-class TorInfoBannerViewHolder(
- view: View,
- private val interactor: TabSessionInteractor
-) : RecyclerView.ViewHolder(view) {
-
- init {
- with(view.info_banner_launch_button) {
- setOnClickListener {
- interactor.onTorInfoBannerLaunchClicked()
- }
- }
- }
-
- companion object {
- const val LAYOUT_ID = R.layout.tor_info_banner
- }
-}
=====================================
app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
=====================================
@@ -40,7 +40,6 @@ object SupportUtils {
const val DONATE_URL = "https://donate.torproject.org/"
const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor"
const val TOR_RELEASES = "https://www.torproject.org/releases/"
- const val TOR_INFO_BANNER_URL = "http://eh5esdnd6fkbkapfc6nuyvkjgbtnzq2is72lmpwbdbxepd2z7zbgzsqd.onion/index…"
enum class SumoTopic(internal val topicStr: String) {
FENIX_MOVING("sync-delist"),
=====================================
app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt
=====================================
@@ -32,7 +32,7 @@ abstract class ThemeManager {
@get:StyleRes
val currentThemeResource get() = when (currentTheme) {
BrowsingMode.Normal -> R.style.NormalTheme
- BrowsingMode.Private -> R.style.PrivateTheme
+ BrowsingMode.Private -> R.style.PrivateEOYTheme
}
/**
=====================================
app/src/main/res/drawable/ic_yec_activist_android.png
=====================================
Binary files /dev/null and b/app/src/main/res/drawable/ic_yec_activist_android.png differ
=====================================
app/src/main/res/drawable/info_banner_padded_background.xml deleted
=====================================
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/info_banner_padded_background_color">
- <item
- android:bottom="6dp"
- android:top="6dp">
- <shape android:shape="rectangle">
- <corners android:radius="4dp" />
- </shape>
- </item>
-</ripple>
=====================================
app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml
=====================================
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- Used for rounding the corners of a button -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="#EFB149" />
+ <corners android:radius="10dp" />
+</shape>
=====================================
app/src/main/res/drawable/vpn_survey_icon.png deleted
=====================================
Binary files a/app/src/main/res/drawable/vpn_survey_icon.png and /dev/null differ
=====================================
app/src/main/res/font/corben_bold.ttf
=====================================
Binary files /dev/null and b/app/src/main/res/font/corben_bold.ttf differ
=====================================
app/src/main/res/font/corben_regular.ttf
=====================================
Binary files /dev/null and b/app/src/main/res/font/corben_regular.ttf differ
=====================================
app/src/main/res/layout/fragment_home.xml
=====================================
@@ -81,21 +81,79 @@
<TextView
android:id="@+id/exploreprivately"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center|center_vertical"
- android:gravity="center_horizontal"
+ android:layout_gravity="center_horizontal|center_vertical"
android:clickable="false"
- android:ellipsize="end"
android:focusable="false"
+ android:fontFamily="@font/corben_bold"
+ android:gravity="center"
android:importantForAccessibility="no"
- android:text="@string/tor_explore_privately"
- android:fontFamily="Roboto-Medium"
- android:textColor="#DEFFFFFF"
- android:textSize="40sp"
- android:lineSpacingMultiplier="1.1"
- app:layout_scrollFlags="scroll"
- android:visibility="gone" />
+ android:paddingStart="35dp"
+ android:paddingTop="20dp"
+ android:paddingEnd="35dp"
+ android:text="@string/tor_privacy_human_right"
+ android:textColor="#FAF5DF"
+ android:textSize="30sp"
+ app:layout_scrollFlags="scroll" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/yec_activist_image"
+ android:layout_width="wrap_content"
+ android:layout_height="200dp"
+ android:layout_weight="1"
+ android:paddingStart="35dp"
+ android:paddingEnd="35dp"
+ app:layout_scrollFlags="scroll"
+ app:srcCompat="@drawable/ic_yec_activist_android"
+ tools:ignore="ContentDescription" />
+
+ <Button
+ android:id="@+id/donate_now_button"
+ style="@style/TorDonateYecButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginStart="35dp"
+ android:layout_marginEnd="35dp"
+ android:background="@drawable/tor_yec_donate_rounded_corners"
+ android:fontFamily="Roboto-Medium"
+ android:gravity="center"
+ android:text="@string/tor_onboarding_donate_button"
+ android:textAllCaps="false"
+ android:textColor="#000000"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:visibility="visible"
+ tools:ignore="ButtonStyleXmlDetector" />
+
+ <TextView
+ android:id="@+id/donationmatch"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:clickable="false"
+ android:focusable="false"
+ android:fontFamily="@font/corben_regular"
+ android:gravity="center"
+ android:importantForAccessibility="no"
+ android:lineSpacingMultiplier="1.1"
+ android:paddingStart="35dp"
+ android:paddingTop="10dp"
+ android:paddingEnd="35dp"
+ android:paddingBottom="20dp"
+ android:text="@string/tor_donationmatch_202110"
+ android:textColor="#FAF5DF"
+ android:textSize="18sp"
+ android:visibility="visible"
+ app:layout_scrollFlags="scroll" />
+ </LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -121,11 +179,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- app:srcCompat="@drawable/ic_onion_pattern"
- tools:ignore="ContentDescription"
+ android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/toolbarLayout"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:srcCompat="@drawable/ic_onion_pattern"
+ tools:ignore="ContentDescription" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbarLayout"
=====================================
app/src/main/res/layout/tor_info_banner.xml deleted
=====================================
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/info_banner_wrapper"
- style="@style/OnboardingCardLightWithPadding"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipChildren="false"
- android:clipToPadding="false">
-
- <LinearLayout
- android:id="@+id/info_banner_header_wrapper"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- android:importantForAccessibility="no">
-
- <ImageView
- android:id="@+id/tor_info_banner_icon"
- android:layout_width="wrap_content"
- android:layout_height="32dp"
- android:layout_marginEnd="10dp"
- android:adjustViewBounds="true"
- android:clickable="false"
- android:focusable="false"
- android:importantForAccessibility="no"
- app:srcCompat="@drawable/vpn_survey_icon"/>
-
- <TextView
- android:id="@+id/info_banner_header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="none"
- android:lineSpacingExtra="6dp"
- android:paddingHorizontal="4dp"
- android:paddingTop="4dp"
- android:scrollHorizontally="false"
- android:textAlignment="viewStart"
- android:textColor="?primaryText"
- android:textSize="20sp"
- android:text="Do you use a VPN?" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/info_banner_description"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="none"
- android:lineSpacingExtra="6dp"
- android:paddingHorizontal="4dp"
- android:paddingTop="4dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/info_banner_header_wrapper"
- android:scrollHorizontally="false"
- android:textAlignment="viewStart"
- android:textColor="?primaryText"
- android:textSize="16sp"
- android:text="We’d like to learn more about how and why our users use VPNs. Complete this short ten-minute survey to tell us about your experience:" />
-
- <Button
- style="@style/PositiveButton"
- android:id="@+id/info_banner_launch_button"
- android:text="Learn More"
- android:layout_marginTop="16dp"
- android:textSize="18dp"
- android:textColor="@android:color/black"
- android:background="@drawable/info_banner_padded_background"
- android:fontFamily="Roboto-Medium"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/info_banner_description" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
=====================================
app/src/main/res/values/colors.xml
=====================================
@@ -191,6 +191,8 @@
<color name="mozac_widget_favicon_background_private_theme">@color/photonInk50</color>
<color name="mozac_widget_favicon_border_private_theme">@color/photonInk50</color>
+ <color name="tor_yec_home_background">#2A1B51</color>
+
<!-- Tab Tray -->
<color name="tab_tray_item_text_private_theme">@color/photonLightGrey05</color>
<color name="tab_tray_item_url_private_theme">@color/photonLightGrey60</color>
@@ -424,7 +426,4 @@
<!-- Toolbar menu icon colors -->
<color name="toolbar_menu_transparent">@android:color/transparent</color>
-
- <!-- Tor -->
- <color name="info_banner_padded_background_color">#A76FFA</color>
</resources>
=====================================
app/src/main/res/values/styles.xml
=====================================
@@ -284,6 +284,10 @@
<style name="PrivateTheme" parent="PrivateThemeBase" />
+ <style name="PrivateEOYTheme" parent="PrivateThemeBase" >
+ <item name="homeBackground">@color/tor_yec_home_background</item>
+ </style>
+
<!-- Fade animation for theme switching -->
<style name="WindowAnimationTransition">
<item name="android:windowEnterAnimation">@anim/fade_in</item>
@@ -322,6 +326,12 @@
<item name="android:textColor">#000000</item>
</style>
+ <style name="TorDonateYecButton" parent="NeutralButton">
+ <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item>
+ <item name="backgroundTint">#EFB149</item>
+ <item name="android:textColor">#000000</item>
+ </style>
+
<style name="DestructiveButton" parent="NeutralButton">
<item name="iconTint">@color/destructive_button_text_color</item>
<item name="android:textColor">@color/destructive_button_text_color</item>
=====================================
app/src/main/res/values/torbrowser_strings.xml
=====================================
@@ -72,4 +72,7 @@
<!-- Spoof locale to English -->
<string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string>
+
+ <string name="tor_privacy_human_right">Privacy is a human right</string>
+ <string name="tor_donationmatch_202110">Your donation will be matched by Friends of Tor, up to $150,000.</string>
</resources>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0dffacd86eee…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0dffacd86eee…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
20 Oct '21
commit 7d5802295c8686255edb64290bc86e5fdd68d979
Author: Richard Pospesel <richard(a)torproject.org>
Date: Mon Oct 11 15:55:10 2021 +0200
Bug 40054: Fix Circuit Display Spacing
---
chrome/skin/tor-circuit-display.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css
index 5f37bb71..ce58c12b 100644
--- a/chrome/skin/tor-circuit-display.css
+++ b/chrome/skin/tor-circuit-display.css
@@ -89,7 +89,8 @@ ul#circuit-display-nodes li {
background-position: left center;
background-repeat: no-repeat;
list-style: none;
- padding-inline-start: 1.5em;
+ /* tor circuit svg are 16px wide */
+ padding-inline-start: calc(16px + 0.5em);
white-space: nowrap;
max-height: 32px;
-moz-context-properties: stroke, stroke-opacity;
1
0