January 2019 - tor-commits - lists.torproject.org

[tor/master] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>src</b> @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/release-0.3.5] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>src</b> @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/release-0.3.5] Merge branch 'bug29042_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 4159d103d644101ab616973c9f7742821132ecbd Merge: 9ce1978b5 0981ac4c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:53 2019 -0500 Merge branch 'bug29042_035' into maint-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 8c6fcf864b8c1e8fb7022bc8d91598ca0659afab Merge: 5dc6d2318 4159d103d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:56 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.3.5] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the <b>len</b>-byte string <b>src</b> @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/maint-0.3.5] Merge branch 'bug29042_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 4159d103d644101ab616973c9f7742821132ecbd Merge: 9ce1978b5 0981ac4c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:53 2019 -0500 Merge branch 'bug29042_035' into maint-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[webwml/master] press.pl: catch \r in csv, add debugging option
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit 35de594a7ff2a72f213ff22ce3fed92cac67eb0f Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:26:14 2018 -0500 press.pl: catch \r in csv, add debugging option --- press/press.pl | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/press/press.pl b/press/press.pl index 914edcee..e1e329db 100755 --- a/press/press.pl +++ b/press/press.pl @@ -6,38 +6,53 @@ use Time::Piece; #use HTML::Escape qw/escape_html/; my %pub; # save all publications +my $debug = 0; +sub debug { + my $msg = shift; + print "$msg\n" if $debug; +} sub parse_line { my $str = shift; + debug "Parsing:\n$str"; if ($str =~ /(\d+\/\d+\/\d+),([^,]+),(.+),(.+)/) { # magic regex :) my $time = Time::Piece->strptime($1, "%m/%d/%y"); # given format: MM/DD/YY my $date = $time->strftime("%Y %b %d"); chomp(my $source = $2); - $pub{$time->epoch} = "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + $pub{$time->epoch} .= "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + # TODO use uniqe keys to avoid .= + debug "Added: $pub{$time->epoch}" } } -unless (@ARGV) { print "Usage: $0 /path/to/csv/file > file\n"; exit 1; } +unless (@ARGV) { print "Usage: $0 [-d] /path/to/csv/file > file\n"; exit 1; } # parse all arguments (hopefully existing files) foreach my $arg (@ARGV) { chomp($arg); - if (-f $arg) { - # we are lucky, this looks like a file + debug "arg: $arg"; + if ($arg eq '-d') { + $debug++; + debug "Enabling debug output on request." + } elsif (-f "$arg") { + debug 'argument looks like a file.'; open my $fh, '<', $arg - or warn "Can't open '$arg': $!\n" and next; + or die "Can't open '$arg': $!\n"; + debug "Reading $arg."; foreach (<$fh>) { - parse_line $_; + # https://stackoverflow.com/questions/6373888/converting-newline-formatting-f… + foreach my $line (split '\r', $_) { + parse_line $line; + } } - close $fh; + close $fh; debug "Finished reading $arg." } else { - # this is no file, let's assume we got piped a string to parse + debug 'argument is no file, assuming piped string.'; parse_line $arg; } } -# share our treasure with the world my $str = join '', map { $pub{$_} } reverse sort keys %pub; -if ($str) { print $str; } +debug "Generated final html string (". (scalar keys %pub) ." entries):"; +if ($str) { print "$str\nAdd above to press/en/press.wml.\n"; } else { print "Nothing found.\n"; exit 1; } -# TODO one day i want to able to update press/en/press.wml directly

1 0

[webwml/master] add press clips (#28900)
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit 02c1fc41c8cc220a3ff557e5e19ebdddda142492 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:24:51 2018 -0500 add press clips (#28900) --- press/en/press.wml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 717e0a8f..4a042c45 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,27 @@ some of the significant Tor-related stories that have popped up.</p> </thead> <tr> +<td>2018 Dec 18</td> +<td>BoingBoing</td> +<td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'> +Charitable Giving Guide 2018</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>ZDNet</td> +<td><a href='https://www.zdnet.com/article/half-of-the-tor-projects-funding-now-comes-fr…'> +Half of the Tor Project's funding now comes from the private sector</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>CyberScoop</td> +<td><a href='https://www.cyberscoop.com/tor-funding-isabela-bagueros-december-2018/'> +"With new director, Tor seeks new funding sources and international growth"</a></td> +</tr> + +<tr> <td>2018 Nov 02</td> <td>Motherboard</td> <td><a href='https://motherboard.vice.com/en_us/article/zm9jd4/old-school-sniffing-attac…'>

1 0

[webwml/master] Add newest press clips (#28900)
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit d4634a9e4404cf97bdb1e4f7622f5e1c58d03567 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Tue Jan 15 11:02:34 2019 -0500 Add newest press clips (#28900) --- press/en/press.wml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 4a042c45..8463a550 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,20 @@ some of the significant Tor-related stories that have popped up.</p> </thead> <tr> +<td>2019 Jan 11</td> +<td>TechCrunch</td> +<td><a href='https://techcrunch.com/2019/01/11/tor-lessens-reliance-us-grants/'> +Tor pulls in record donations as it lessens reliance on US government grants</a></td> +</tr> + +<tr> +<td>2019 Jan 01</td> +<td>Wired</td> +<td><a href='https://www.wired.com/story/tor-anonymity-easier-than-ever/'> +Tor Is Easier Than Ever. Time to Give It a Try</a></td> +</tr> + +<tr> <td>2018 Dec 18</td> <td>BoingBoing</td> <td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'>

1 0

[torbutton/maint-2.0] Bug 29035: Post-YE campaign clean-up 2018
by gk＠torproject.org 22 Jan '19

22 Jan '19

commit fcbc57dc246ff38d7b04618ccab589c6cf33bad3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 18 09:14:52 2019 +0000 Bug 29035: Post-YE campaign clean-up 2018 Removing the donation banner. --- src/chrome/content/aboutTor/aboutTor-content.js | 30 ++----- src/chrome/content/aboutTor/aboutTor.xhtml | 55 +++--------- src/chrome/content/torbutton.js | 18 ++-- src/chrome/locale/ar/aboutTor.dtd | 19 ---- src/chrome/locale/bn-BD/aboutTor.dtd | 19 ---- src/chrome/locale/ca/aboutTor.dtd | 19 ---- src/chrome/locale/cs/aboutTor.dtd | 19 ---- src/chrome/locale/da/aboutTor.dtd | 19 ---- src/chrome/locale/de/aboutTor.dtd | 19 ---- src/chrome/locale/el/aboutTor.dtd | 19 ---- src/chrome/locale/en-US/aboutTor.dtd | 19 ---- src/chrome/locale/es-AR/aboutTor.dtd | 14 --- src/chrome/locale/es/aboutTor.dtd | 19 ---- src/chrome/locale/eu/aboutTor.dtd | 19 ---- src/chrome/locale/fa/aboutTor.dtd | 19 ---- src/chrome/locale/fr/aboutTor.dtd | 19 ---- src/chrome/locale/ga/aboutTor.dtd | 19 ---- src/chrome/locale/he/aboutTor.dtd | 19 ---- src/chrome/locale/hu/aboutTor.dtd | 19 ---- src/chrome/locale/id/aboutTor.dtd | 19 ---- src/chrome/locale/is/aboutTor.dtd | 19 ---- src/chrome/locale/it/aboutTor.dtd | 19 ---- src/chrome/locale/ja/aboutTor.dtd | 19 ---- src/chrome/locale/ka/aboutTor.dtd | 19 ---- src/chrome/locale/ko/aboutTor.dtd | 19 ---- src/chrome/locale/nb/aboutTor.dtd | 19 ---- src/chrome/locale/nl/aboutTor.dtd | 19 ---- src/chrome/locale/pl/aboutTor.dtd | 19 ---- src/chrome/locale/pt-BR/aboutTor.dtd | 19 ---- src/chrome/locale/ru/aboutTor.dtd | 19 ---- src/chrome/locale/sv/aboutTor.dtd | 19 ---- src/chrome/locale/tr/aboutTor.dtd | 19 ---- src/chrome/locale/vi/aboutTor.dtd | 19 ---- src/chrome/locale/zh-CN/aboutTor.dtd | 19 ---- src/chrome/locale/zh-TW/aboutTor.dtd | 19 ---- src/chrome/skin/aboutTor.css | 114 +++++++----------------- src/chrome/skin/donation_banner_image_3x.png | Bin 71927 -> 0 bytes src/chrome/skin/newsletter_3x.png | Bin 0 -> 6735 bytes src/defaults/preferences/preferences.js | 2 +- 39 files changed, 61 insertions(+), 761 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ccb9139d..ff5a970b 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,7 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", - kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", + kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -61,24 +61,20 @@ var AboutTorListener = { setupBannerClosing: function () { let that = this; - let closer = content.document.getElementById("donation-banner-closer"); + let closer = content.document.getElementById("tornews-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(that.kAboutTorHideDonationBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); - let button = content.document.getElementById("donation-banner-button"); - button.addEventListener("click", function () { + let link = content.document.querySelector("#tornews-banner-message a"); + link.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(that.kAboutTorHideDonationBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); }); - bindPrefAndInit("extensions.torbutton.donation_banner_countdown2", - countdown => { - if (content.document && content.document.body) { - content.document.body.setAttribute( - "show-donation-banner", countdown > 0); - } - }); + bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", + countdown => content.document.body.setAttribute( + "show-tornews-banner", countdown > 0)); }, onPageLoad: function() { @@ -128,14 +124,6 @@ var AboutTorListener = { content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; - // Don't use "Count Me In" phrase in non-en-US locales - if (!aLocale.startsWith("en")) { - let button = content.document.getElementById("donation-banner-button"); - button.innerHTML = button.getAttribute("data-0"); - let theURL = button.getAttribute("href"); - button.setAttribute("href", theURL.slice(0,-2)); - } - // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 52fab695..87fe8307 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,54 +31,21 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="donation-banner"> - <div id="donation-banner-image"></div> - <div id="donation-banner-lines"> - <div id="donation-banner-line1">&aboutTor.donationBanner.line1;</div> - <div id="donation-banner-line2" - data-6="&aboutTor.donationBanner.line2e;" - data-7="&aboutTor.donationBanner.line2f;" - data-8="&aboutTor.donationBanner.line2g;" - data-9="&aboutTor.donationBanner.line2h;" - data-10="&aboutTor.donationBanner.line2i;" - data-11="&aboutTor.donationBanner.line2j;"> - &aboutTor.donationBanner.line2e; + <div id="tornews-banner"> + <div></div> + <div id="tornews-banner-message"> + <div id="tornews-banner-icon"></div> + <div>&aboutTor.newsletter.tagline; + <a href="https://newsletter.torproject.org"> + &aboutTor.newsletter.link_text; + </a> </div> - <div id="donation-banner-line3" - data-b="&aboutTor.donationBanner.line3b;"> - &aboutTor.donationBanner.line3;</div> - <a id="donation-banner-button" - href="https://www.torproject.org/donate/donate-sin-tbd0-0" - type="button" - data-0="&aboutTor.donationBanner.buttonA;" - data-1="&aboutTor.donationBanner.buttonB;"> - &aboutTor.donationBanner.buttonA; - </a> </div> - <div id="donation-banner-closer">×</div> + <div id="tornews-banner-closer">×</div> </div> -<script type="text/javascript"> - <![CDATA[ - let lineChoice = 6 + Math.floor(Math.random() * 6); - let line2 = document.getElementById("donation-banner-line2"); - let line2text = line2.getAttribute(`data-${lineChoice}`); - let line2pieces = line2text.split(" "); - let line2end = '<span>' + line2pieces.pop() + '</span>'; - line2pieces.push(line2end); - line2.innerHTML = line2pieces.join(" "); - line3 = document.getElementById("donation-banner-line3"); - if (lineChoice === 11) { - line3.innerHTML = line3.getAttribute("data-b"); - } - let buttonChoice = Math.floor(Math.random() * 2); - let button = document.getElementById("donation-banner-button"); - button.innerHTML = button.getAttribute(`data-${buttonChoice}`); - button.setAttribute("href", - `https://www.torproject.org/donate/donate-sin-tbd${lineChoice}-${buttonChoice}`); -]]> -</script> - <div id="torstatus-version"/> + <div class="torcontent-container"> + <div id="torstatus-version"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 864d1d2e..03dc3563 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,7 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown2"; +const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -233,10 +233,10 @@ function torbutton_init_toolbutton() } // Show the Sign Up for Tor News banner a finite number of times. -function torbutton_donation_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); +function torbutton_tornews_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); if (count > 0) { - m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); } } @@ -348,10 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideDonationBanner", + window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", torbutton_abouttor_message_handler); - torbutton_donation_banner_countdown(); + torbutton_tornews_banner_countdown(); setupPreferencesForMobile(); @@ -431,9 +431,9 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:HideDonationBanner": - torbutton_log(5, "message AboutTor:HideDonationBanner received"); - m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); + case "AboutTor:HideTorNewsBanner": + torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); break; } }, diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 7fda4740..878d860e 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> - -<!ENTITY aboutTor.donationBanner.line1 "تور: نقاط القوة"> - -<!ENTITY aboutTor.donationBanner.line2a "المجهولية تحتاج لصحبة."> -<!ENTITY aboutTor.donationBanner.line2b "ساعد في تقدم حقوق الإنسان."> -<!ENTITY aboutTor.donationBanner.line2c "انتصر للحرية."> -<!ENTITY aboutTor.donationBanner.line2d "احم خصوصية الملايين."> -<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> -<!ENTITY aboutTor.donationBanner.line2f "نحتاج دعمك."> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "تبرع اليوم، وستجاريك موزيلا وتبرع بنفس المبلغ."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> -<!ENTITY aboutTor.donationBanner.buttonB "سأشارك"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index fdac71be..0896f075 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে সর্বশেষ খবর নিন সোজা আপনার ইনবক্সে ।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> - -<!ENTITY aboutTor.donationBanner.line1 "টর: সংখ্যাই শক্তি"> - -<!ENTITY aboutTor.donationBanner.line2a "ছদ্মনাম বেশী ব্যবহারকারীর মধ্যে কার্যকরী।"> -<!ENTITY aboutTor.donationBanner.line2b "সার্বজনীন মানবাধিকারকে এগিয়ে নিন। "> -<!ENTITY aboutTor.donationBanner.line2c "স্বাধীনতার জন্য এগিয়ে আসুন "> -<!ENTITY aboutTor.donationBanner.line2d "লাখো লোকের ব্যক্তিগত গোপনীয়তা রক্ষা করুন। "> -<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> -<!ENTITY aboutTor.donationBanner.line2f "আপনাদের সাহায্য দরকার! "> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "অর্থ সাহায্য করুন, এবং মজিলা সমপরিমাণ সাহায্য করবে। "> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> -<!ENTITY aboutTor.donationBanner.buttonB "আমাকেও সাথে নিন"> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 878ce7ad..ca8aee1c 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Avançats drets humans universals."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protegeix la privacitat de milions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "Necessitem el teu suport!"> -<!ENTITY aboutTor.donationBanner.line2g "Recolça la llibertat a internet."> -<!ENTITY aboutTor.donationBanner.line2h "Defensa la web oberta."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Compta amb mi"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 31ccf6bd..2c29d50d 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Síla je v počtu"> - -<!ENTITY aboutTor.donationBanner.line2a "Společnost se zálibou v anonymitě."> -<!ENTITY aboutTor.donationBanner.line2b "Posílení všeobecných lidských práv."> -<!ENTITY aboutTor.donationBanner.line2c "Postavte se za svobodu."> -<!ENTITY aboutTor.donationBanner.line2d "Chráníme soukromí milionů lidí."> -<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit."> -<!ENTITY aboutTor.donationBanner.line2f "Potřebujeme vaši podporu!"> -<!ENTITY aboutTor.donationBanner.line2g "Podpořte svobodu internetu."> -<!ENTITY aboutTor.donationBanner.line2h "Braňte otevřený web."> -<!ENTITY aboutTor.donationBanner.line2i "Podpořte online soukromí a svobodu."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla dorovná každý příspěvek až do začátku roku 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Přispějte hned a Mozilla vás dar zdvojnásobí."> -<!ENTITY aboutTor.donationBanner.line3b "Pošlete příspěvek a ten se zdvojnásobí."> - -<!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> -<!ENTITY aboutTor.donationBanner.buttonB "Jdu do toho"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index bc06d980..902a84fa 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrke i antal"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymitet elsker selskab."> -<!ENTITY aboutTor.donationBanner.line2b "Avancerede universelle menneskerettigheder."> -<!ENTITY aboutTor.donationBanner.line2c "Slå et slag for frihed."> -<!ENTITY aboutTor.donationBanner.line2d "Beskyt privatlivet af millioner."> -<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> -<!ENTITY aboutTor.donationBanner.line2f "Vi har brug for din støtte!"> -<!ENTITY aboutTor.donationBanner.line2g "Støt internetfrihed."> -<!ENTITY aboutTor.donationBanner.line2h "Forsvar det åbne web."> -<!ENTITY aboutTor.donationBanner.line2i "Støt privatliv og frihed online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla matcher hver donation frem til 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Giv i dag, og Mozilla vil matche din donation."> -<!ENTITY aboutTor.donationBanner.line3b "Giv nu og din gave bliver dobbelt så stærk."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> -<!ENTITY aboutTor.donationBanner.buttonB "Jeg er med"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 0ffc979f..6bd2e164 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Stärke in Zahlen"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymität liebt Gemeinschaft"> -<!ENTITY aboutTor.donationBanner.line2b "Verbessere die Menschenrechte"> -<!ENTITY aboutTor.donationBanner.line2c "Setz dich ein für Freiheit."> -<!ENTITY aboutTor.donationBanner.line2d "Schütze die Privatsphäre von Millionen Menschen."> -<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> -<!ENTITY aboutTor.donationBanner.line2f "Wir brauchen deine Unterstützung."> -<!ENTITY aboutTor.donationBanner.line2g "Unterstütze Internetfreiheit."> -<!ENTITY aboutTor.donationBanner.line2h "Verteidige das offene Netz."> -<!ENTITY aboutTor.donationBanner.line2i "Unterstütze Datenschutz und Freiheit im Internet."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla unterstützt jede Spende bis 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Gib noch heute, und Mozilla wird deiner Spende entsprechen."> -<!ENTITY aboutTor.donationBanner.line3b "Spende jetzt, und dein Geschenk wird doppelt so stark."> - -<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> -<!ENTITY aboutTor.donationBanner.buttonB "Zähl mich mit"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index d93a5a5a..dbddba88 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Ισχύς εν τη ενώσει."> - -<!ENTITY aboutTor.donationBanner.line2a "Η ανωνυμία αγαπά την παρέα."> -<!ENTITY aboutTor.donationBanner.line2b "Προωθήστε τα ανθρώπινα δικαιώματα παγκοσμίως."> -<!ENTITY aboutTor.donationBanner.line2c "Υπερασπιστείτε την ελευθερία "> -<!ENTITY aboutTor.donationBanner.line2d "Προστατέψτε την ιδιωτικότητα εκατομμυρίων."> -<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό."> -<!ENTITY aboutTor.donationBanner.line2f "Χρειαζόμαστε την υποστήριξη σας!"> -<!ENTITY aboutTor.donationBanner.line2g "Στηρίξτε την ελευθερία στο διαδίκτυο."> -<!ENTITY aboutTor.donationBanner.line2h "Υπερασπιστείτε τον ανοιχτό ιστό."> -<!ENTITY aboutTor.donationBanner.line2i "Στηρίξτε την ιδιωτικότητα και την ελευθερία στο διαδίκτυο."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Δωρίστε σήμερα και το Mozilla θα δωρίσει το ίδιο ποσό!"> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> -<!ENTITY aboutTor.donationBanner.buttonB "Υπολογίστε με"> diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index a36d812c..1400d7b5 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd index fcb78004..1bb03e95 100644 --- a/src/chrome/locale/es-AR/aboutTor.dtd +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -26,17 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Fortaleza en Canidad"> - -<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compañía."> -<!ENTITY aboutTor.donationBanner.line2b "Avanzar los derechos humanos universales."> -<!ENTITY aboutTor.donationBanner.line2c "Plantarse por la libertad."> -<!ENTITY aboutTor.donationBanner.line2d "Proteger la privacidad de millones."> -<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> -<!ENTITY aboutTor.donationBanner.line2f "¡Necesitamos tu apoyo!"> - -<!ENTITY aboutTor.donationBanner.line3 "Dá hoy, y Mozilla emparejará tu donación."> - -<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> -<!ENTITY aboutTor.donationBanner.buttonB "Contá conmigo"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 2bb31865..c0934bde 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: La fuerza en la cantidad"> - -<!ENTITY aboutTor.donationBanner.line2a "El anonimato ama la compañía."> -<!ENTITY aboutTor.donationBanner.line2b "Promover los derechos humanos universales."> -<!ENTITY aboutTor.donationBanner.line2c "Defiende la libertad."> -<!ENTITY aboutTor.donationBanner.line2d "Protege la privacidad de millones de personas."> -<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> -<!ENTITY aboutTor.donationBanner.line2f "Necesitamos tu apoyo."> -<!ENTITY aboutTor.donationBanner.line2g "Apoya la libertad en internet"> -<!ENTITY aboutTor.donationBanner.line2h "Defiende la web abierta"> -<!ENTITY aboutTor.donationBanner.line2i "Apoya la privacidad y la libertad en línea."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla donará una cantidad idéntica a cada donación hasta 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Dona hoy, y Mozilla igualará tu donación."> -<!ENTITY aboutTor.donationBanner.line3b "Dona ahora, y tu donación se duplicará."> - -<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> -<!ENTITY aboutTor.donationBanner.buttonB "Cuenta conmigo."> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 9f1224bb..123091e5 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 2f572883..a4908b04 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> - -<!ENTITY aboutTor.donationBanner.line1 "تور: قدرت در اعداد"> - -<!ENTITY aboutTor.donationBanner.line2a "شرکت گمنامیت را دوست دارد."> -<!ENTITY aboutTor.donationBanner.line2b "حمایت از حقوق بشر جهانی."> -<!ENTITY aboutTor.donationBanner.line2c "برای آزادی ایستادگی کنید."> -<!ENTITY aboutTor.donationBanner.line2d "از حریم خصوصی میلیون‌ها محافظت کنید"> -<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> -<!ENTITY aboutTor.donationBanner.line2f "ما به حمایت شما نیاز داریم!"> -<!ENTITY aboutTor.donationBanner.line2g "از آزادی اینترنت پشتیبانی کنید."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "از حریم شخصی و آزادی برخط دفاع کنید."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> -<!ENTITY aboutTor.donationBanner.buttonB "روی من حساب کن"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 0df6622d..6ae2392d 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> - -<!ENTITY aboutTor.donationBanner.line1 "Tor : l’union fait la force"> - -<!ENTITY aboutTor.donationBanner.line2a "L’anonymat est contagieux."> -<!ENTITY aboutTor.donationBanner.line2b "Promouvez les droits universels de la personne."> -<!ENTITY aboutTor.donationBanner.line2c "Défendez la liberté."> -<!ENTITY aboutTor.donationBanner.line2d "Protégez la vie privée de millions de personnes."> -<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor."> -<!ENTITY aboutTor.donationBanner.line2f "Nous avons besoin de votre soutien !"> -<!ENTITY aboutTor.donationBanner.line2g "Soutenez la liberté sur Internet."> -<!ENTITY aboutTor.donationBanner.line2h "Défendez le Web ouvert."> -<!ENTITY aboutTor.donationBanner.line2i "Soutenez la vie privé et la liberté en ligne."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla versera un montant équivalent à chaque don jusqu’en 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Faites un don aujourd’hui et Mozilla fera un don équivalent."> -<!ENTITY aboutTor.donationBanner.line3b "Faites un don maintenant et sa force en sera doublée."> - -<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> -<!ENTITY aboutTor.donationBanner.buttonB "Comptez sur moi"> diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index 1978847e..ce6fe3f5 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Ní neart go cur le chéile"> - -<!ENTITY aboutTor.donationBanner.line2a "Dul i bhfolach sa slua."> -<!ENTITY aboutTor.donationBanner.line2b "Cuir cearta daonna chun cinn."> -<!ENTITY aboutTor.donationBanner.line2c "Seas an fód ar son na saoirse."> -<!ENTITY aboutTor.donationBanner.line2d "Cosain príobháideachas na milliún duine."> -<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> -<!ENTITY aboutTor.donationBanner.line2f "Tá do chúnamh de dhíth orainn!"> -<!ENTITY aboutTor.donationBanner.line2g "Tacaigh le saoirse ar an idirlíon."> -<!ENTITY aboutTor.donationBanner.line2h "Seas an fód ar son an Ghréasáin oscailte"> -<!ENTITY aboutTor.donationBanner.line2i "Tacaigh le príobháideachas agus le saoirse ar líne."> -<!ENTITY aboutTor.donationBanner.line2j "Tá Mozilla ag meaitseáil gach euro a bhronntar orainn go dtí 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Tabhair síntiús airgid inniu agus tabharfaidh Mozilla an méid céanna arís dúinn."> -<!ENTITY aboutTor.donationBanner.line3b "Beidh do bhronntanas airgid dhá uair níos láidre."> - -<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> -<!ENTITY aboutTor.donationBanner.buttonB "Cuir mise san áireamh"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 81a4386f..6d988035 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: חוזק במספרים"> - -<!ENTITY aboutTor.donationBanner.line2a "אלמוניות אוהבת חברה."> -<!ENTITY aboutTor.donationBanner.line2b "זכויות אדם קדומות יקומיות."> -<!ENTITY aboutTor.donationBanner.line2c "סנגר על חירות."> -<!ENTITY aboutTor.donationBanner.line2d "הגן על פרטיותם של מיליונים."> -<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> -<!ENTITY aboutTor.donationBanner.line2f "אנחנו צריכים את תמיכתך!"> -<!ENTITY aboutTor.donationBanner.line2g "תמוך בחירות אינטרנט."> -<!ENTITY aboutTor.donationBanner.line2h "הגן על הרשת הפתוחה."> -<!ENTITY aboutTor.donationBanner.line2i "תמוך בפרטיות ובחירות באופן מקוון."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla משווה כל תרומה עד 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "תן היום, ו־Mozilla תשווה את תרומתך."> -<!ENTITY aboutTor.donationBanner.line3b "תן עכשיו, והמתנה שלך הופכת לחזקה פי שניים."> - -<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> -<!ENTITY aboutTor.donationBanner.buttonB "החשב אותי"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index cbc0c571..b5dd867d 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor híreket közvetlenül email fiókjába."> <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Erősség a számokban"> - -<!ENTITY aboutTor.donationBanner.line2a "Az anonimitás szereti a cégeket."> -<!ENTITY aboutTor.donationBanner.line2b "Általánosan növeli az emberi jogokat."> -<!ENTITY aboutTor.donationBanner.line2c "Kiáll a szabadságért."> -<!ENTITY aboutTor.donationBanner.line2d "Védi milliók magánéletét."> -<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek."> -<!ENTITY aboutTor.donationBanner.line2f "Szükségünk van a támogatására!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Adjon ma és a Mozilla is annyival támogat."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> -<!ENTITY aboutTor.donationBanner.buttonB "Számítsatok bele"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 9370e3ad..3a4e3a27 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 0fd4f643..0a259108 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrkur í fjöldanum"> - -<!ENTITY aboutTor.donationBanner.line2a "Nafnleysi krefst félagsskapar."> -<!ENTITY aboutTor.donationBanner.line2b "Setjum mannréttindi á oddinn."> -<!ENTITY aboutTor.donationBanner.line2c "Stöndum saman með frelsinu."> -<!ENTITY aboutTor.donationBanner.line2d "Verndum friðhelgi milljóna manna."> -<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> -<!ENTITY aboutTor.donationBanner.line2f "Við þörfnumst stuðnings þíns!"> -<!ENTITY aboutTor.donationBanner.line2g "Stattu með frelsi á netinu."> -<!ENTITY aboutTor.donationBanner.line2h "Verðu hinn opna vef."> -<!ENTITY aboutTor.donationBanner.line2i "Verðu rétt þinn til einkalífs og frelsis á netinu."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla jafnar upp hvert fjárframlag allt til 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Gefðu í dag - og Mozilla mun jafna framlag þitt."> -<!ENTITY aboutTor.donationBanner.line3b "Gefðu upphæð núna - og gjöfin þín mun tvöfaldast."> - -<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> -<!ENTITY aboutTor.donationBanner.buttonB "Reiknið með mér"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index daad7130..b9687c45 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: la Forza in Numeri"> - -<!ENTITY aboutTor.donationBanner.line2a "L'anonimato ama l'azienda."> -<!ENTITY aboutTor.donationBanner.line2b "Migliora i diritti universali dell'uomo."> -<!ENTITY aboutTor.donationBanner.line2c "Difendi la libertà."> -<!ENTITY aboutTor.donationBanner.line2d "Protegge la privacy di milioni."> -<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> -<!ENTITY aboutTor.donationBanner.line2f "Abbiamo bisogno del tuo supporto!"> -<!ENTITY aboutTor.donationBanner.line2g "Supporta la libertà di internet."> -<!ENTITY aboutTor.donationBanner.line2h "Difendi il web aperto."> -<!ENTITY aboutTor.donationBanner.line2i "Sostieni la privacy e la libertà online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla corrisponderà tutte le donazioni fino al 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Dai oggi, e Mozilla ricambierà la tua donazione."> -<!ENTITY aboutTor.donationBanner.line3b "Dona ora e il tuo regalo diventerà due volte più valoroso."> - -<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> -<!ENTITY aboutTor.donationBanner.buttonB "Contami"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index e5c0d7ea..c8963418 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "自由のために立ち上がる。"> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "我々にはあなたのサポートが必要です!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index 3b5bdad3..ec34af9e 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "მიიღეთ სიახლეები Tor-ისგან, პირდაპირ თქვენს საფოსტო ყუთში."> <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: სიძლიერე ციფრებში"> - -<!ENTITY aboutTor.donationBanner.line2a "ვინაობის გამჟღავნებისგან დაცვა საჭიროებს ხალხის სიმრავლეს."> -<!ENTITY aboutTor.donationBanner.line2b "გააუმჯობესეთ ადამიანის უფლებების დაცვა."> -<!ENTITY aboutTor.donationBanner.line2c "მხარი დაუჭირეთ თავისუფლებას."> -<!ENTITY aboutTor.donationBanner.line2d "დაიცავით მილიონობით ადამიანის პირადი მონაცემები."> -<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> -<!ENTITY aboutTor.donationBanner.line2f "ჩვენ გვესაჭიროება თქვენი გვერდში დგომა!"> -<!ENTITY aboutTor.donationBanner.line2g "მხარი დაუჭირეთ თავისუფალ ინტერნეტს."> -<!ENTITY aboutTor.donationBanner.line2h "დაიცავით ინტერნეტის ღიაობა."> -<!ENTITY aboutTor.donationBanner.line2i "მხარი დაუჭირეთ პირადი მონაცემების ხელშეუხებლობისა და თავისუფლების უზრუნველყოფას ინტერნეტსივრცეში."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla გააორმაგებს თითოეულ შემოწირულ შენატანს 2019 წლამდე."> - -<!ENTITY aboutTor.donationBanner.line3 "გაეცით დღესვე და Mozilla გააორმაგებს თქვენს შემოწირულობას."> -<!ENTITY aboutTor.donationBanner.line3b "გაეცით თანხა ახლავე და თქვენი შემოწირულობა ორჯერ მეტად მძლავრი იქნება."> - -<!ENTITY aboutTor.donationBanner.buttonA "თანხის გაღება ახლავე"> -<!ENTITY aboutTor.donationBanner.buttonB "ჩემი წვლილის აღნიშვნა"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index cf8143ab..984b53af 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd index a5e61845..89bd5a7f 100644 --- a/src/chrome/locale/nb/aboutTor.dtd +++ b/src/chrome/locale/nb/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index 8929fc65..822c3548 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht in jouw inbox."> <!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Kracht in Nummers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Universele rechten van de mens bevorderen."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Bescherm de privacy van miljoenen."> -<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> -<!ENTITY aboutTor.donationBanner.line2f "We hebben jouw ondersteuning nodig!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Geef vandaag, en Mozilla geeft hetzelfde bedrag."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> -<!ENTITY aboutTor.donationBanner.buttonB "Ik Doe Mee"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index b523d30d..fe79cc3d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 02a848a7..130f2b13 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -27,22 +27,3 @@ <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Nossa Força em Números"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonimidade adora companhia "> -<!ENTITY aboutTor.donationBanner.line2b "Avançar os direitos humanos universais."> -<!ENTITY aboutTor.donationBanner.line2c "Defender a liberdade."> -<!ENTITY aboutTor.donationBanner.line2d "Proteger a privacidade de milhões de pessoas."> -<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> -<!ENTITY aboutTor.donationBanner.line2f "Precisamos do seu apoio!"> -<!ENTITY aboutTor.donationBanner.line2g "Apóie a liberdade na internet."> -<!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta."> -<!ENTITY aboutTor.donationBanner.line2i "Apóie a privacidade e liberdade online."> -<!ENTITY aboutTor.donationBanner.line2j "A Mozilla está combinando cada doação até 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> -<!ENTITY aboutTor.donationBanner.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> - -<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> -<!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 1bc187b8..b3d2f631 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Сила в цифрах"> - -<!ENTITY aboutTor.donationBanner.line2a "Анонимность уважает компании."> -<!ENTITY aboutTor.donationBanner.line2b "Продвижение всеобщих прав человека."> -<!ENTITY aboutTor.donationBanner.line2c "Встаньте на свободу."> -<!ENTITY aboutTor.donationBanner.line2d "Обеспечиваем конфиденциальность миллионам людей."> -<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> -<!ENTITY aboutTor.donationBanner.line2f "Нам нужна твоя поддержка!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Пожертвуйте сегодня и Mozilla удвоит Ваше пожертвование."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> -<!ENTITY aboutTor.donationBanner.buttonB "Посчитайте"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index f2938e54..423d6e96 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrka i antal"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymitet älskar sällskap."> -<!ENTITY aboutTor.donationBanner.line2b "Främja universella mänskliga rättigheter."> -<!ENTITY aboutTor.donationBanner.line2c "Stå upp för frihet."> -<!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv."> -<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> -<!ENTITY aboutTor.donationBanner.line2f "Vi behöver ert stöd!"> -<!ENTITY aboutTor.donationBanner.line2g "Stöd internetfrihet."> -<!ENTITY aboutTor.donationBanner.line2h "Försvara den öppna webben."> -<!ENTITY aboutTor.donationBanner.line2i "Stöd integritet och frihet på nätet."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla matchar varje donation fram till 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation."> -<!ENTITY aboutTor.donationBanner.line3b "Ge nu, och din gåva blir dubbelt så stark."> - -<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> -<!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 789e3d81..ce8761f2 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Birlikten Kuvvet Doğar"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonimlik birlikteliği sever."> -<!ENTITY aboutTor.donationBanner.line2b "Evrensel insan haklarını geliştir."> -<!ENTITY aboutTor.donationBanner.line2c "Özgürlüğü savun."> -<!ENTITY aboutTor.donationBanner.line2d "Milyonların gizliliğini koru."> -<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koru."> -<!ENTITY aboutTor.donationBanner.line2f "Desteğinize ihtiyacımız var!"> -<!ENTITY aboutTor.donationBanner.line2g "İnternet özgürlüğünü destekleyin"> -<!ENTITY aboutTor.donationBanner.line2h "Açık web düşüncesini savunun."> -<!ENTITY aboutTor.donationBanner.line2i "Kişisel gizliliği ve çevrimiçi özgürlüğü destekleyin."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla 2019 yılına kadar yapılan her bağışa karşılık veriyor."> - -<!ENTITY aboutTor.donationBanner.line3 "Bugün yaptığınız her bağış kadar Mozilla da bağış yapacak."> -<!ENTITY aboutTor.donationBanner.line3b "Bağış yapın ve hediyeniz iki kat güzel olsun."> - -<!ENTITY aboutTor.donationBanner.buttonA "Şimdi Bağış Yapın"> -<!ENTITY aboutTor.donationBanner.buttonB "Ben de Varım"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 09c26101..f8bc3896 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Sức mạnh nằm ở Số lượng người tham gia mạng lưới"> - -<!ENTITY aboutTor.donationBanner.line2a "Việc ẩn danh cần sự đồng hành của cộng đồng"> -<!ENTITY aboutTor.donationBanner.line2b "Nâng cao phổ biến nhân quyền."> -<!ENTITY aboutTor.donationBanner.line2c "Đứng lên vì tự do."> -<!ENTITY aboutTor.donationBanner.line2d "Bảo vệ sự riêng tư của hàng triệu người."> -<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> -<!ENTITY aboutTor.donationBanner.line2f "Chúng tôi cần sự hỗ trợ của bạn!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "Hãy đóng góp ngay hôm nay, và Mozilla sẽ đóng góp tương ứng với phần của bạn."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> -<!ENTITY aboutTor.donationBanner.buttonB "Hãy cho tôi tham gia"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 2707eb0a..36e9b9a5 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> - -<!ENTITY aboutTor.donationBanner.line1 "Tor：众人拾柴火焰高"> - -<!ENTITY aboutTor.donationBanner.line2a "匿名的表示对公司的爱意。"> -<!ENTITY aboutTor.donationBanner.line2b "推进基本人权。"> -<!ENTITY aboutTor.donationBanner.line2c "为自由呐喊。"> -<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。"> -<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> -<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！"> -<!ENTITY aboutTor.donationBanner.line2g "支持互联网自由。"> -<!ENTITY aboutTor.donationBanner.line2h "捍卫互联网的开放。"> -<!ENTITY aboutTor.donationBanner.line2i "保障隐私和网络自由。"> -<!ENTITY aboutTor.donationBanner.line2j "直到2019年，Mozilla 将匹配所有捐赠。"> - -<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。"> -<!ENTITY aboutTor.donationBanner.line3b "现在捐赠，您的支持将化作双倍的力量。"> - -<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> -<!ENTITY aboutTor.donationBanner.buttonB "算我一个"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index bcbec612..bd5fa14d 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -26,22 +26,3 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> - -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> - -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "我們需要您的支援！"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> - -<!ENTITY aboutTor.donationBanner.line3 "今日您捐款，Mozilla 也會捐出相同數額。"> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> - -<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款"> -<!ENTITY aboutTor.donationBanner.buttonB "我也要加入！"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 9f195cfd..ce0a2f29 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -272,126 +272,74 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } -/* Donation Banner +/* Tor News Signup Banner * While this banner is present, we need to * offset the elements normally at the top of * the window. */ -#donation-banner { +#tornews-banner { display: flex; - align-items: stretch; + align-items: center; background-color: white; color: var(--abouttor-bg-toron-color); font-size: 16px; - height: 200px; - justify-content: center; + height: 60px; + justify-content: space-between; left: 0px; right: 0px; top: 0px; - position: absolute; - transform: translateY(-200px); + transform: translateY(-60px); transition: transform 200ms; - z-index: 1; } -body[show-donation-banner="true"] #donation-banner { +body[show-tornews-banner="true"] #tornews-banner { transform: translateY(0px); transition: transform 0ms; } -#donation-banner-image { - background: url('chrome://torbutton/skin/donation_banner_image_3x.png') no-repeat center center; - background-size: contain; - height: 190px; - margin: 10px 10px 0px 0px; - width: 400px; +#tornews-banner-message { + align-items: center; + display: flex; + justify-content: center; +} + +#tornews-banner-message a { + color: var(--abouttor-bg-toron-color); +} + +#tornews-banner-icon { + background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; + background-size: cover; + height: 32px; + margin: 0px 16px; + width: 32px; } -#donation-banner-closer { +#tornews-banner-closer { display: flex; align-items: center; font-size: 20px; height: 22px; justify-content: center; - margin: 4px; + margin: 4px 20px; padding: 4px; - position: absolute; - offset-inline-end: 0px; - top: 0px; width: 22px; -moz-user-select: none; } -#donation-banner-closer:hover { +#tornews-banner-closer:hover { background-color: gray; cursor: pointer; } -#donation-banner-lines { - align-items: start; - display: flex; - flex-direction: column; - justify-content: space-around; - padding: 20px 0px; -} - -#donation-banner-line1 { - font-size: 11px; - font-weight: bold; - text-transform: uppercase; -} - -#donation-banner-line2 { - font-size: 20px; - font-weight: bold; -} - -#donation-banner-line2 span { - background-color: #a9fef8; -} - -#donation-banner-line3 { - font-size: 14px; -} - -#donation-banner-button { - background-color: var(--abouttor-bg-toron-color); - border-radius: 3px; - border: 0px; - color: white; - font-size: 14px; - font-weight: bold; - margin: 10px 0px; - padding: 10px 24px; - text-decoration: none; -} - -#donation-banner-button:hover { - background-color: #683d7d; - cursor: pointer; -} - -body[show-donation-banner="false"] .torcontent-container, -body[show-donation-banner="false"] .onion-pattern-container, -body[show-donation-banner="false"] #torstatus-version, -body[show-donation-banner="false"] #onboarding-overlay-button { +body[show-tornews-banner="false"] #torstatus-version, +body[show-tornews-banner="false"] #onboarding-overlay-button { transition: transform 200ms; } -body[show-donation-banner="true"] .torcontent-container, -body[show-donation-banner="true"] .onion-pattern-container { - transform: translateY(80px); +body[show-tornews-banner="true"] #torstatus-version, +body[show-tornews-banner="true"] #onboarding-overlay-button { + transform: translateY(60px); transition: transform 0ms; } - -body[show-donation-banner="true"] .onion-pattern-container { - position: fixed; -} - -body[show-donation-banner="true"] #torstatus-version, -body[show-donation-banner="true"] #onboarding-overlay-button { - transform: translateY(200px); - transition: transform 0ms; - position: absolute; -} diff --git a/src/chrome/skin/donation_banner_image_3x.png b/src/chrome/skin/donation_banner_image_3x.png deleted file mode 100644 index 6eb7fbbb..00000000 Binary files a/src/chrome/skin/donation_banner_image_3x.png and /dev/null differ diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png new file mode 100644 index 00000000..821572fa Binary files /dev/null and b/src/chrome/skin/newsletter_3x.png differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index eb055a65..45b60ce8 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown2", 12); +pref("extensions.torbutton.tornews_banner_countdown", 4); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0