April 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1855'
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit 0b0b8a5b6db5d5609d0c2530c18fb67e0950f9d1 Merge: 1720a2191 6fbf624b5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 8 16:31:37 2020 +0300 Merge branch 'tor-github/pr/1855' changes/ticket33779 | 3 +++ src/feature/hs/hs_service.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] hs-v3: Fix typo in log info when PublishHidServDescriptors is set to 0
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit 6fbf624b50415371061f04e41b993a051c98fc37 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 7 13:17:21 2020 -0400 hs-v3: Fix typo in log info when PublishHidServDescriptors is set to 0 Fixes #33779 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33779 | 3 +++ src/feature/hs/hs_service.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket33779 b/changes/ticket33779 new file mode 100644 index 000000000..d4bc769eb --- /dev/null +++ b/changes/ticket33779 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion service, logging): + - Typo in a log info level when PublishHidServDescriptors is set to 0. + Fixes bug 33779; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 53e33f80e..5b8f66183 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2846,7 +2846,7 @@ upload_descriptor_to_hsdir(const hs_service_t *service, /* Let's avoid doing that if tor is configured to not publish. */ if (!get_options()->PublishHidServDescriptors) { log_info(LD_REND, "Service %s not publishing descriptor. " - "PublishHidServDescriptors is set to 1.", + "PublishHidServDescriptors is set to 0.", safe_str_client(service->onion_address)); goto end; }

1 0

[tor/master] Added tests for tor_addr_is_null/valid()
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit cbd3f88831f4a0f6cd9450621e50d8ba062f76ef Author: MrSquanchee <usuraj35(a)gmail.com> Date: Fri Mar 20 23:57:40 2020 +0530 Added tests for tor_addr_is_null/valid() Added tests for tor_addr_is_valid(), and added tests for tor_addr_is_null(), which is not modfied. Ticket 33679 --- changes/ticket33679 | 4 ++ src/lib/net/address.c | 7 ++- src/test/test_addr.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 1 deletion(-) diff --git a/changes/ticket33679 b/changes/ticket33679 new file mode 100644 index 000000000..d37842d06 --- /dev/null +++ b/changes/ticket33679 @@ -0,0 +1,4 @@ + o Minor features (IPv6 Support, address.c): + - Adds IPv6 support to tor_addr_is_valid(). Adds tests for the + above changes and tor_addr_is_null(). Closes ticket 33679. + Patch by MrSquanchee. diff --git a/src/lib/net/address.c b/src/lib/net/address.c index e968d8a7f..7b24e406a 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -817,7 +817,8 @@ tor_addr_is_loopback(const tor_addr_t *addr) /* Is addr valid? * Checks that addr is non-NULL and not tor_addr_is_null(). - * If for_listening is true, IPv4 addr 0.0.0.0 is allowed. + * If for_listening is true, addr is allowed in either case if + * addr is 0.0.0.0 (for IPv4) or :: (for IPv6). * It means "bind to all addresses on the local machine". */ int tor_addr_is_valid(const tor_addr_t *addr, int for_listening) @@ -833,6 +834,10 @@ tor_addr_is_valid(const tor_addr_t *addr, int for_listening) return 1; } + if (for_listening && addr->family == AF_INET6) { + return 1; + } + /* Otherwise, the address is valid if it's not tor_addr_is_null() */ return !tor_addr_is_null(addr); } diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 1a19e405e..7e8ef72a5 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -1671,6 +1671,138 @@ test_addr_octal(void *arg) ; } +#define get_ipv4(test_addr, str, iprv) STMT_BEGIN \ + test_addr = tor_malloc(sizeof(tor_addr_t)); \ + test_addr->family = AF_INET; \ + iprv = tor_inet_aton(str, &test_addr->addr.in_addr); \ + tor_assert(iprv); \ + STMT_END; + +#define get_ipv6(test_addr, str, iprv) STMT_BEGIN \ + test_addr = tor_malloc(sizeof(tor_addr_t)); \ + test_addr->family = AF_INET6; \ + iprv = tor_inet_pton(AF_INET6, str, &test_addr->addr.in6_addr); \ + tor_assert(iprv); \ + STMT_END; + +#define get_af_unix(test_addr) STMT_BEGIN \ + test_addr = tor_malloc_zero(sizeof(tor_addr_t)); \ + test_addr->family = AF_UNIX; \ + STMT_END; + +#define get_af_unspec(test_addr) STMT_BEGIN \ + test_addr = tor_malloc_zero(sizeof(tor_addr_t)); \ + test_addr->family = AF_UNSPEC; \ + STMT_END; + +#define TEST_ADDR_VALIDITY(a, lis, rv) STMT_BEGIN \ + tor_assert(a); \ + tt_int_op(tor_addr_is_valid(a, lis), OP_EQ, rv); \ + STMT_END; + +/* Here we can change the addresses we are testing for. */ +#define IP4_TEST_ADDR "123.98.45.1" +#define IP6_TEST_ADDR "2001:0DB8:AC10:FE01::" + +static void +test_addr_is_valid(void *arg) +{ + (void)arg; + tor_addr_t *test_addr; + int iprv; + + /* Tests for IPv4 addresses. */ + + /* Test for null IPv4 address. */ + get_ipv4(test_addr, "0.0.0.0", iprv); + TEST_ADDR_VALIDITY(test_addr, 0, 0); + TEST_ADDR_VALIDITY(test_addr, 1, 1); + tor_free(test_addr); + + /* Test for non-null IPv4 address. */ + get_ipv4(test_addr, IP4_TEST_ADDR, iprv); + TEST_ADDR_VALIDITY(test_addr, 0, 1); + TEST_ADDR_VALIDITY(test_addr, 1, 1); + tor_free(test_addr); + + /* Tests for IPv6 addresses. */ + + /* Test for null IPv6 address. */ + get_ipv6(test_addr, "::", iprv); + TEST_ADDR_VALIDITY(test_addr, 0, 0); + TEST_ADDR_VALIDITY(test_addr, 1, 1); + tor_free(test_addr); + + /* Test for non-null IPv6 address. */ + get_ipv6(test_addr, IP6_TEST_ADDR, iprv); + TEST_ADDR_VALIDITY(test_addr, 0, 1); + TEST_ADDR_VALIDITY(test_addr, 1, 1); + tor_free(test_addr); + + /* Test for address of type AF_UNIX. */ + + get_af_unix(test_addr); + TEST_ADDR_VALIDITY(test_addr, 0, 0); + TEST_ADDR_VALIDITY(test_addr, 1, 0); + tor_free(test_addr); + + /* Test for address of type AF_UNSPEC. */ + + get_af_unspec(test_addr); + TEST_ADDR_VALIDITY(test_addr, 0, 0); + TEST_ADDR_VALIDITY(test_addr, 1, 0); + tor_free(test_addr); + + done: + ; +} + +#define TEST_ADDR_IS_NULL(a, rv) STMT_BEGIN \ + tor_assert(a); \ + tt_int_op(tor_addr_is_null(a), OP_EQ, rv); \ + STMT_END; + +static void +test_addr_is_null(void *arg) +{ + (void)arg; + tor_addr_t *test_addr; + int iprv; + + /* Test for null IPv4. */ + get_ipv4(test_addr, "0.0.0.0", iprv); + TEST_ADDR_IS_NULL(test_addr, 1); + tor_free(test_addr); + + /* Test for non-null IPv4. */ + get_ipv4(test_addr, IP4_TEST_ADDR, iprv); + TEST_ADDR_IS_NULL(test_addr, 0); + tor_free(test_addr); + + /* Test for null IPv6. */ + get_ipv6(test_addr, "::", iprv); + TEST_ADDR_IS_NULL(test_addr, 1); + tor_free(test_addr); + + /* Test for non-null IPv6. */ + get_ipv6(test_addr, IP6_TEST_ADDR, iprv); + TEST_ADDR_IS_NULL(test_addr, 0); + tor_free(test_addr); + + /* Test for address family AF_UNIX. */ + get_af_unix(test_addr); + TEST_ADDR_IS_NULL(test_addr, 1); + tor_free(test_addr); + + /* Test for address family AF_UNSPEC. */ + get_af_unspec(test_addr); + TEST_ADDR_IS_NULL(test_addr, 1); + tor_free(test_addr); + + done: + ; +} + #ifndef COCCI #define ADDR_LEGACY(name) \ { #name, test_addr_ ## name , 0, NULL, NULL } @@ -1690,5 +1822,7 @@ struct testcase_t addr_tests[] = { { "make_null", test_addr_make_null, 0, NULL, NULL }, { "rfc6598", test_addr_rfc6598, 0, NULL, NULL }, { "octal", test_addr_octal, 0, NULL, NULL }, + { "address_validity", test_addr_is_valid, 0, NULL, NULL }, + { "address_is_null", test_addr_is_null, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] address: Simplify tor_addr_is_valid()
by dgoulet＠torproject.org 08 Apr '20

08 Apr '20

commit 1720a2191d6b94e1847a2ad3a2c45c5e8de53bcd Author: teor <teor(a)torproject.org> Date: Wed Apr 1 09:56:00 2020 +1000 address: Simplify tor_addr_is_valid() And rewrite the function comment. Part of 33679. --- src/lib/net/address.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 7b24e406a..5dbef6a79 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -817,9 +817,12 @@ tor_addr_is_loopback(const tor_addr_t *addr) /* Is addr valid? * Checks that addr is non-NULL and not tor_addr_is_null(). - * If for_listening is true, addr is allowed in either case if - * addr is 0.0.0.0 (for IPv4) or :: (for IPv6). - * It means "bind to all addresses on the local machine". */ + * If for_listening is true, all IPv4 and IPv6 addresses are valid, including + * 0.0.0.0 (for IPv4) and :: (for IPv6). When listening, these addresses mean + * "bind to all addresses on the local machine". + * Otherwise, 0.0.0.0 and :: are invalid, because they are null addresses. + * All unspecified and unix addresses are invalid, regardless of for_listening. + */ int tor_addr_is_valid(const tor_addr_t *addr, int for_listening) { @@ -828,14 +831,11 @@ tor_addr_is_valid(const tor_addr_t *addr, int for_listening) return 0; } - /* Only allow IPv4 0.0.0.0 for_listening. */ - if (for_listening && addr->family == AF_INET - && tor_addr_to_ipv4h(addr) == 0) { - return 1; - } - - if (for_listening && addr->family == AF_INET6) { - return 1; + /* Allow all IPv4 and IPv6 addresses, when for_listening is true */ + if (for_listening) { + if (addr->family == AF_INET || addr->family == AF_INET6) { + return 1; + } } /* Otherwise, the address is valid if it's not tor_addr_is_null() */

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit cbd5b37de8b7820eef59b9970a71f26b8237bef3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:52:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- he/torbutton.properties | 65 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/he/torbutton.properties b/he/torbutton.properties index 0b58d9fb76..52bf42a281 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -8,6 +8,8 @@ torbutton.circuit_display.unknown_country = מדינה לא ידועה torbutton.circuit_display.guard = מישמר torbutton.circuit_display.guard_note = צומת [המישמר] שלך עשוי לא להשתנות. torbutton.circuit_display.learn_more = למד עוד +# torbutton.circuit_display.click_to_copy = Click to Copy +# torbutton.circuit_display.copied = Copied! torbutton.content_sizer.margin_tooltip = דפדפן Tor מוסיף שול זה כדי להפוך את הגובה והרוחב של חלונך ליחודיים פחות, ובכך להפחית את היכולת של אנשים לעקוב אחריך באופן מקוון. torbutton.panel.tooltip.disabled = לחץ כדי לאפשר את Tor torbutton.panel.tooltip.enabled = לחץ כדי להשבית את Tor @@ -60,9 +62,54 @@ pageInfo_OnionEncryptionWithBitsAndProtocol=חיבור הוצפן (שירות ב pageInfo_OnionEncryption=חיבור הוצפן (שירות בצל) # Onion services strings. Strings are kept here for ease of translation. -# LOCALIZATION NOTE: %S will be replaced with the .onion address. # onionServices.learnMore=Learn more -# onionServices.clientAuthMissing=Tor onion service missing client authorization +# onionServices.errorPage.browser=Browser +# onionServices.errorPage.network=Network +# onionServices.errorPage.onionSite=Onionsite +# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with +# an error code, e.g., 0xF3. +# Tor SOCKS error 0xF0: +# onionServices.descNotFound.pageTitle=Problem Loading Onionsite +# onionServices.descNotFound.header=Onionsite Not Found +# onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +# Tor SOCKS error 0xF1: +# onionServices.descInvalid.pageTitle=Problem Loading Onionsite +# onionServices.descInvalid.header=Onionsite Cannot Be Reached +# onionServices.descInvalid=The onionsite is unreachable due an internal error. +# onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +# Tor SOCKS error 0xF2: +# onionServices.introFailed.pageTitle=Problem Loading Onionsite +# onionServices.introFailed.header=Onionsite Has Disconnected +# onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +# onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +# Tor SOCKS error 0xF3: +# onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +# onionServices.rendezvousFailed.header=Unable to Connect to Onionsite +# onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +# onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +# Tor SOCKS error 0xF4: +# onionServices.clientAuthMissing.pageTitle=Authorization Required +# onionServices.clientAuthMissing.header=Onionsite Requires Authentication +# onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +# onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +# Tor SOCKS error 0xF5: +# onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +# onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed +# onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +# onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +# Tor SOCKS error 0xF6: +# onionServices.badAddress.pageTitle=Problem Loading Onionsite +# onionServices.badAddress.header=Invalid Onionsite Address +# onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +# onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +# Tor SOCKS error 0xF7: +# onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +# onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out +# onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +# onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +# +# LOCALIZATION NOTE: %S will be replaced with the .onion address. # onionServices.authPrompt.description=%S is requesting your private key. # onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service # onionServices.authPrompt.done=Done @@ -80,3 +127,17 @@ pageInfo_OnionEncryption=חיבור הוצפן (שירות בצל) # onionServices.authPreferences.removeAll=Remove All # onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor # onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion-Location strings. +# onionLocation.alwaysPrioritize=Always Prioritize Onions +# onionLocation.alwaysPrioritizeAccessKey=a +# onionLocation.notNow=Not Now +# onionLocation.notNowAccessKey=n +# onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +# onionLocation.tryThis=Try Onion Services +# onionLocation.onionAvailable=.onion available +# onionLocation.learnMore=Learn more… +# onionLocation.always=Always +# onionLocation.askEverytime=Ask every time +# onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +# onionLocation.onionServicesTitle=Onion Services

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 9e4ede87bfe8c83b1a09e22f2a0f73d1af1ff27d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:51:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- he/torbutton.properties | 14 +++++++------- zh-CN/torbutton.properties | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/he/torbutton.properties b/he/torbutton.properties index c2279f1279..4d97f742dd 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -72,7 +72,7 @@ onionServices.errorPage.onionSite=אתר בצל onionServices.descNotFound.pageTitle=בעיה בטעינת אתר בצל onionServices.descNotFound.header=אתר בצל לא נמצא onionServices.descNotFound=הגורם הסביר הוא שאתר הבצל לא מקוון. צור קשר עם מינהלן אתר הבצל. -onionServices.descNotFound.longDescription=פרטים: %S — המתאר המבוקש של שירות הבצל לא ניתן להימצא על ה־HashRing ולכן השירות בלתי נגיש ע״י הלקוח. +onionServices.descNotFound.longDescription=פרטים: %S — המתאר של שירות הבצל המבוקש לא ניתן להימצא על ה־HashRing ולכן השירות בלתי נגיש ע״י הלקוח. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=בעיה בטעינת אתר בצל onionServices.descInvalid.header=אתר בצל בלתי ניתן להשגה @@ -82,17 +82,17 @@ onionServices.descInvalid.longDescription=Details: %S — The requested onion se onionServices.introFailed.pageTitle=בעיה בטעינת אתר בצל onionServices.introFailed.header=אתר בצל נותק onionServices.introFailed=הגורם הסביר הוא שאתר הבצל לא מקוון. צור קשר עם מינהלן אתר הבצל. -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=פרטים: %S — ההיכרות נכשלה, מה שאומר שהמתאר נמצא אבל השירות אינו מחובר יותר אל נקודת ההיכרות. ככל הנראה שהשירות שינה את המתאר שלו או שהשירות אינו רץ. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=בעיה בטעינת אתר בצל onionServices.rendezvousFailed.header=לא היה ניתן להתחבר אל אתר בצל onionServices.rendezvousFailed=אתר הבצל עסוק או שרשת Tor עמוסה. נסה שוב מאוחר יותר. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed.longDescription=פרטים: %S — הלקוח נכשל להיפגש עם השירות, מה שאומר שהלקוח לא היה יכול להשלים את החיבור. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=אימות נדרש onionServices.clientAuthMissing.header=אתר בצל דורש אימות onionServices.clientAuthMissing=גישה אל אתר הבצל דורשת מפתח אבל אף מפתח לא סופק. -onionServices.clientAuthMissing.longDescription=פרטים: %S — הלקוח הוריד את המתאר המבוקש של שירות הבצל אבל לא הצליח לפענח את תוכנו מאחר שמידע אימות הלקוח חסר. +onionServices.clientAuthMissing.longDescription=פרטים: %S — הלקוח הוריד את המתאר של שירות הבצל המבוקש אבל לא הצליח לפענח את תוכנו מאחר שמידע אימות הלקוח חסר. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=אימות נכשל onionServices.clientAuthIncorrect.header=אימות אתר בצל נכשל @@ -102,12 +102,12 @@ onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was onionServices.badAddress.pageTitle=בעיה בטעינת אתר בצל onionServices.badAddress.header=כתובת אתר בצל בלתי תקפה onionServices.badAddress=כתובת אתר הבצל המסופקת בלתי תקפה. אנא בדוק שהכנסת אותה כראוי. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.longDescription=פרטים: %S — כתובת .onion המסופקת בלתי תקפה. שגיאה זאת מוחזרת עקב אחת מהסיבות הבאות: סיכום הביקורת של הכתובת אינו תואם, המפתח הציבורי ed25519 בלתי תקף, או שהקידוד בלתי תקף. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=בעיה בטעינת אתר בצל onionServices.introTimedOut.header=יצירה של מעגל אתר בצל לקחה פסק זמן onionServices.introTimedOut=חיבור אל אתר הבצל נכשל, כנראה עקב חיבור רשת ירוד. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.longDescription=פרטים: %S — החיבור אל שירות הבצל המבוקש לקח פסק זמן בעת ניסיון לבנות את מעגל המפגש. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description=%S מבקש את המפתח הפרטי שלך. @@ -133,7 +133,7 @@ onionLocation.alwaysPrioritize=תעדף תמיד בצלים onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=לא עכשיו onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.description=יש גרסה פרטית יותר ומאובטחת יותר של אתר זה שזמינה על גבי רשת Tor באמצעות שירותי בצל. שירותי בצל עוזרים למפרסמי אתרים ולמבקרים שלהם להביס ציתות וצנזורה. onionLocation.tryThis=נסה שירותי בצל onionLocation.onionAvailable=.onion זמין onionLocation.learnMore=למד עוד… diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties index f4770a48e7..1e81ba951b 100644 --- a/zh-CN/torbutton.properties +++ b/zh-CN/torbutton.properties @@ -65,7 +65,7 @@ pageInfo_OnionEncryption=连接已经被加密（洋葱服务） onionServices.learnMore=更多详情 onionServices.errorPage.browser=浏览器 onionServices.errorPage.network=网络 -onionServices.errorPage.onionSite=洋葱站 +onionServices.errorPage.onionSite=洋葱站点 # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0:

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit ff7d7ce1c20588faa18f67e7c6d05fa17fce7c16 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:46:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- zh_CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 35630f6d5d..8c0220af65 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -50,7 +50,7 @@ <!ENTITY https-everywhere.cancel.http_once "仅打开该会话的不安全页面"> <!ENTITY https-everywhere.onboarding.intro "加密网络浏览，自动使用 HTTPS 连接访问站点，更加安全。"> -<!ENTITY https-everywhere.onboarding.header ""> +<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere 已更新！"> <!ENTITY https-everywhere.onboarding.details_one "优化 EASE 模式"> <!ENTITY https-everywhere.onboarding.details_two "你可以将站点加入白名单，使它们不使用 HTTPS Everywhere"> <!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere 是一个 EFF 的项目">

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 3c9f1902cf511f8e30bdd7675acae133b9189a40 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:45:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- nl/LC_MESSAGES/bridgedb.po | 238 ++++++++++++++++++++++++--------------------- 1 file changed, 127 insertions(+), 111 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index 53ed665dcf..5f402de89a 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -27,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 09:16+0000\n" +"POT-Creation-Date: 2020-04-07 10:14-0700\n" +"PO-Revision-Date: 2020-04-08 10:23+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -57,18 +57,16 @@ msgstr "" #. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." +#. Convert all key/value pairs from bytes to str. #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr "Sorry! Er is iets misgegaan met uw aanvraag." @@ -76,18 +74,22 @@ msgstr "Sorry! Er is iets misgegaan met uw aanvraag." msgid "Language" msgstr "Taal" -#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr "Een bug melden" -#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr "Broncode" -#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr "Lijst van wijzigingen" +#: bridgedb/distributors/https/templates/base.html:102 +msgid "Public Keys" +msgstr "Publieke sleutels" + #: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" msgstr "Alles selecteren" @@ -105,7 +107,7 @@ msgstr "QRCode voor uw bridge regels" #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) #: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:119 msgid "Uh oh, spaghettios!" msgstr "Helaas pindakaas!" @@ -119,12 +121,12 @@ msgid "" " your bridge lines onto mobile and other devices." msgstr "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiëren naar mobiele of andere apparaten." -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "There currently aren't any bridges available..." msgstr "Er zijn momenteel geen bridges beschikbaar..." -#: bridgedb/distributors/https/templates/bridges.html:133 -#: bridgedb/distributors/https/templates/bridges.html:137 +#: bridgedb/distributors/https/templates/bridges.html:127 +#: bridgedb/distributors/https/templates/bridges.html:131 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -200,64 +202,32 @@ msgstr "%sJ%sa!" msgid "%sG%set Bridges" msgstr "%sK%srijg Bridges" -#: bridgedb/strings.py:43 -msgid "[This is an automated message; please do not reply.]" -msgstr "[Dit is een automatisch bericht, gelieve niet te beantwoorden.]" +#: bridgedb/strings.py:42 +msgid "[This is an automated email.]" +msgstr "" -#: bridgedb/strings.py:45 +#: bridgedb/strings.py:44 msgid "Here are your bridges:" msgstr "Hier zijn je bridges:" -#: bridgedb/strings.py:47 +#: bridgedb/strings.py:46 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "U hebt de snelheidslimiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails tijdens deze periode worden genegeerd." -#: bridgedb/strings.py:50 +#: bridgedb/strings.py:49 msgid "" -"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" - -#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: bridgedb/strings.py:53 -msgid "Welcome to BridgeDB!" -msgstr "" - -#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: bridgedb/strings.py:55 -msgid "Currently supported transport TYPEs:" -msgstr "" - -#: bridgedb/strings.py:56 -#, python-format -msgid "Hey, %s!" -msgstr "Hoi, %s!" - -#: bridgedb/strings.py:57 -msgid "Hello, friend!" -msgstr "Hallo, vriend!" - -#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 -msgid "Public Keys" -msgstr "Publieke sleutels" - -#. TRANSLATORS: This string will end up saying something like: -#. "This email was generated with rainbows, unicorns, and sparkles -#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: bridgedb/strings.py:62 -#, python-format -msgid "" -"This email was generated with rainbows, unicorns, and sparkles\n" -"for %s on %s at %s." +"If these bridges are not what you need, reply to this email with one of\n" +"the following commands in the message body:" msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: bridgedb/strings.py:72 +#: bridgedb/strings.py:59 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -268,7 +238,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: bridgedb/strings.py:79 +#: bridgedb/strings.py:66 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -280,7 +250,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: bridgedb/strings.py:88 +#: bridgedb/strings.py:75 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -289,21 +259,21 @@ msgid "" "\n" msgstr "" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:87 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "" -#: bridgedb/strings.py:102 +#: bridgedb/strings.py:88 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: bridgedb/strings.py:107 +#: bridgedb/strings.py:93 msgid "I need an alternative way of getting bridges!" msgstr "" #. TRANSLATORS: Please DO NOT translate "get transport obfs4". -#: bridgedb/strings.py:109 +#: bridgedb/strings.py:95 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Leave the email subject\n" @@ -312,106 +282,152 @@ msgid "" "providers: %s or %s." msgstr "" -#: bridgedb/strings.py:117 +#: bridgedb/strings.py:103 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and #. "Support Portal", respectively. -#: bridgedb/strings.py:121 +#: bridgedb/strings.py:107 #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:125 +#: bridgedb/strings.py:111 msgid "Here are your bridge lines:" msgstr "" -#: bridgedb/strings.py:126 +#: bridgedb/strings.py:112 msgid "Get Bridges!" msgstr "" -#: bridgedb/strings.py:130 -msgid "Please select options for bridge type:" +#: bridgedb/strings.py:116 +msgid "Bridge distribution mechanisms" msgstr "" -#: bridgedb/strings.py:131 -msgid "Do you need IPv6 addresses?" +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:118 +#, python-format +msgid "" +"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n" +"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n" +"the pseudo-mechanism \"None\". The following list briefly explains how these\n" +"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" +"mechanisms is." msgstr "" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:124 #, python-format -msgid "Do you need a %s?" +msgid "" +"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" +"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" +"solve the subsequent CAPTCHA." msgstr "" -#: bridgedb/strings.py:136 -msgid "Your browser is not displaying images properly." +#: bridgedb/strings.py:128 +#, python-format +msgid "" +"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n" +"request bridges from inside their Tor Browser settings. To get bridges, go to\n" +"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" +"subsequent CAPTCHA, and Tor Browser will automatically add your new\n" +"bridges." msgstr "" -#: bridgedb/strings.py:137 -msgid "Enter the characters from the image above..." +#: bridgedb/strings.py:134 +#, python-format +msgid "" +"Users can request bridges from the \"Email\" distribution mechanism by sending an\n" +"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" +"email body." msgstr "" -#: bridgedb/strings.py:141 -msgid "How to start using your bridges" +#: bridgedb/strings.py:138 +msgid "Reserved" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:139 #, python-format msgid "" -"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" -"page %s and then follow the instructions there for downloading and starting\n" -"Tor Browser." +"BridgeDB maintains a small number of bridges that are not distributed\n" +"automatically. Instead, we reserve these bridges for manual distribution and\n" +"hand them out to NGOs and other organizations and individuals that need\n" +"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" +"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" +"called \"Unallocated\" in %sbridge pool assignment%s files." msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 -msgid "" -"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" -"the wizard until it asks:" +#: bridgedb/strings.py:146 +msgid "None" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:147 msgid "" -"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" -"to the Tor network?" +"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n" +"It is the bridge operator's responsibility to distribute their bridges to\n" +"users. Note that on Relay Search, a freshly set up bridge's distribution\n" +"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" +"it will then change to the bridge's actual distribution mechanism.\n" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:156 -msgid "" -"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" -"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" -"you should be good to go! If you experience trouble, try clicking the 'Help'\n" -"button in the 'Tor Network Settings' wizard for further assistance." +#: bridgedb/strings.py:157 +msgid "Please select options for bridge type:" +msgstr "" + +#: bridgedb/strings.py:158 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: bridgedb/strings.py:159 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: bridgedb/strings.py:163 +msgid "Your browser is not displaying images properly." msgstr "" #: bridgedb/strings.py:164 -msgid "Displays this message." +msgid "Enter the characters from the image above..." msgstr "" -#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the -#. same non-Pluggable Transport bridges described above as being -#. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:168 -msgid "Request vanilla bridges." +msgid "How to start using your bridges" msgstr "" -#: bridgedb/strings.py:169 -msgid "Request IPv6 bridges." -msgstr "IPv6-bridges aanvragen." +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: bridgedb/strings.py:170 +#, python-format +msgid "" +" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n" +" Manual explains how you can add your bridges to Tor Browser. If you are\n" +" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" +" are using Android, %sclick here%s." +msgstr "" + +#: bridgedb/strings.py:175 +msgid "" +"Add these bridges to your Tor Browser by opening your browser\n" +"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" +"bridge\" field." +msgstr "" + +#: bridgedb/strings.py:182 +msgid "(Request unobfuscated Tor bridges.)" +msgstr "" + +#: bridgedb/strings.py:183 +msgid "(Request IPv6 bridges.)" +msgstr "" -#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 -msgid "Request a Pluggable Transport by TYPE." +#: bridgedb/strings.py:184 +msgid "(Request obfs4 obfuscated bridges.)" msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:174 -msgid "Get a copy of BridgeDB's public GnuPG key." +#: bridgedb/strings.py:187 +msgid "(Get a copy of BridgeDB's public GnuPG key.)" msgstr ""

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit f5f3673135a1df38e1d278d09235bf4e8f3f49af Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- nl/LC_MESSAGES/bridgedb.po | 12 ++++++------ zh_CN/LC_MESSAGES/bridgedb.po | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index 849b623f9c..ac3e09e4be 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-07 10:14-0700\n" -"PO-Revision-Date: 2020-04-08 10:10+0000\n" +"PO-Revision-Date: 2020-04-08 10:23+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -412,22 +412,22 @@ msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "Voeg deze bridges toe aan uw Tor Browser door uw browservoorkeuren\nte openen, op 'Tor' te klikken, en ze dan aan het veld 'Een bridge opgeven' toe\nte voegen." #: bridgedb/strings.py:182 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(Niet-verdoezelde Tor-bridges aanvragen.)" #: bridgedb/strings.py:183 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "(IPv6-bridges aanvragen.)" #: bridgedb/strings.py:184 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(obfs4-verdoezelde bridges aanvragen.)" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:187 msgid "(Get a copy of BridgeDB's public GnuPG key.)" -msgstr "" +msgstr "(Een kopie van BridgeDB's publieke GnuPG-sleutel verkrijgen.)" diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index ec1b854865..60f47feb39 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -23,8 +23,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-07 10:14-0700\n" -"PO-Revision-Date: 2020-04-07 19:47+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-08 10:33+0000\n" +"Last-Translator: ff98sha\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -300,7 +300,7 @@ msgstr "获得网桥！" #: bridgedb/strings.py:116 msgid "Bridge distribution mechanisms" -msgstr "网桥分配机制" +msgstr "网桥分发机制" #. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". #: bridgedb/strings.py:118 @@ -400,7 +400,7 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "首先，您需要%s下载Tor Browser%s。我们的Tor Browser用户手册解答了如何为Tor Browser添加您的网桥。如果您正在使用Windows，Linux，或者OS X，%s点击这里%s以详细了解。如果您正在使用安卓系统，%s点击这里%s。" +msgstr "首先，您需要%s下载 Tor Browser%s。我们的 Tor Browser 用户手册解答了如何为 Tor Browser 添加您的网桥。如果您正在使用 Windows，Linux 或者 OS X，%s点击这里%s以详细了解。如果您正在使用安卓系统，%s点击这里%s。" #: bridgedb/strings.py:175 msgid ""

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit e8c6be1da027dedd7579cf631c49c4d680685836 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 10:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- zh-CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/aboutTor.dtd b/zh-CN/aboutTor.dtd index 1bb307ee8f..5b4f5fa793 100644 --- a/zh-CN/aboutTor.dtd +++ b/zh-CN/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "订阅 Tor 的最新动态"> -<!ENTITY aboutTor.donationBanner.freeToUse ""> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor 是免费使用的，因为有和您一样的人捐助。"> <!ENTITY aboutTor.donationBanner.buttonA "立即捐助">

1 0