November 2018 - tor-commits - lists.torproject.org

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 10 Nov '18

10 Nov '18

commit 7ce8fc1a139039e7dfa4091aa2e1b1fc376ac81c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 09:17:19 2018 +0000 Update translations for donatepages-messagespot_completed --- messages.pot | 761 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 368 insertions(+), 393 deletions(-) diff --git a/messages.pot b/messages.pot index 5e8a614a5..31baf9093 100644 --- a/messages.pot +++ b/messages.pot @@ -150,8 +150,8 @@ msgstr "" "The Tor Project very much appreciates all its donors. " "Thank you for supporting Tor." -#: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:114 -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:655 +#: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:113 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:658 msgid "Back to Donate Page" msgstr "Back to Donate Page" @@ -179,35 +179,35 @@ msgstr "Slim" msgid "Classic" msgstr "Classic" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:55 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:56 msgid "European" msgstr "European" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:65 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:66 msgid "Size" msgstr "Size" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:69 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:70 msgid "Select Size" msgstr "Select Size" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:73 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:74 msgid "S" msgstr "S" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:77 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:78 msgid "M" msgstr "M" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:81 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:82 msgid "L" msgstr "L" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:85 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:86 msgid "XL" msgstr "XL" -#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:89 +#: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:90 msgid "XXL" msgstr "XXL" @@ -215,33 +215,31 @@ msgstr "XXL" msgid "Support the Tor Project Today!" msgstr "Support the Tor Project Today!" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:43 -msgid "https://donate.torproject.org/pdr" -msgstr "https://donate.torproject.org/pdr" - #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:48 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:66 -msgid "Powering Digital Resistance with Tor" -msgstr "Powering Digital Resistance with Tor" +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:71 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:621 +msgid "Tor: Strength in Numbers" +msgstr "Tor: Strength in Numbers" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:52 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:70 -msgid "" -"Donate to the Tor Project today! Take a stand against surveillance and " -"censorship. Protect activists worldwide." -msgstr "" -"Donate to the Tor Project today! Take a stand against surveillance and " -"censorship. Protect activists worldwide." +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:75 +msgid "Donate to the Tor Project and protect the privacy of millions." +msgstr "Donate to the Tor Project and protect the privacy of millions." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:58 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:54 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:77 +msgid "Anonymity loves company." +msgstr "Anonymity loves company." + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:63 msgid "summary_large_image" msgstr "summary_large_image" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:62 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:67 msgid "@torproject" msgstr "@torproject" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:92 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:102 msgid "" "This page requires Javascript to do PayPal or credit card\n" " donations, but it appears you have Javascript disabled." @@ -249,7 +247,7 @@ msgstr "" "This page requires Javascript to do PayPal or credit card\n" " donations, but it appears you have Javascript disabled." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:96 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:106 msgid "" "If you wish to donate without enabling Javascript, please take a look at our" " <a href=\"https://www.torproject.org/donate/donate-options.html.en\">other " @@ -259,53 +257,66 @@ msgstr "" " <a href=\"https://www.torproject.org/donate/donate-options.html.en\">other " "donations options page</a>." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:103 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:109 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:123 +msgid "Number of Donations" +msgstr "Number of Donations" + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:139 +msgid "Total Donated" +msgstr "Total Donated" + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 +msgid "Total Raised with Mozilla's Match" +msgstr "Total Raised with Mozilla's Match" + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169 msgid "donate" msgstr "donate" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:105 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:165 msgid "once" msgstr "once" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:111 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:171 msgid "monthly" msgstr "monthly" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:118 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:178 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:331 msgid "Want to donate Bitcoin, Stock, or via snail mail?" msgstr "Want to donate Bitcoin, Stock, or via snail mail?" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:133 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:193 msgid "invalid amount" msgstr "invalid amount" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:137 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:197 msgid "$2 minimum donation" msgstr "$2 minimum donation" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:141 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:201 msgid "$ other" msgstr "$ other" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:148 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:208 msgid "Choose your gift as a token of our thanks." msgstr "Choose your gift as a token of our thanks." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:215 +msgid "No thanks, I don't want a gift." +msgstr "No thanks, I don't want a gift." + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:217 #, php-format -msgid "" -"No thanks, I don't want a gift. I would prefer 100% of my donation to go to " -"the Tor Project's work." -msgstr "" -"No thanks, I don't want a gift. I would prefer 100% of my donation to go to " -"the Tor Project's work." +msgid "I would prefer 100% of my donation to go to the Tor Project's work." +msgstr "I would prefer 100% of my donation to go to the Tor Project's work." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:166 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:228 msgid "sticker Pack" msgstr "sticker Pack" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:173 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:235 msgid "" "A collection of our favorite logo stickers for decorating your stuff and " "covering your cams." @@ -313,281 +324,213 @@ msgstr "" "A collection of our favorite logo stickers for decorating your stuff and " "covering your cams." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:183 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:245 msgid "t-shirt" msgstr "t-shirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:192 -msgid "" -"Get our limited edition Tor: Powering Digital Resistance or Open Observatory" -" of Network Interference (OONI) t-shirt." -msgstr "" -"Get our limited edition Tor: Powering Digital Resistance or Open Observatory" -" of Network Interference (OONI) t-shirt." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:198 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:228 -msgid "Powering Digital Resistance" -msgstr "Powering Digital Resistance" +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:253 +msgid "Get our limited edition Tor: Strength in Numbers shirt." +msgstr "Get our limited edition Tor: Strength in Numbers shirt." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:202 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:232 -msgid "Open Observatory of Network Interference" -msgstr "Open Observatory of Network Interference" - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:213 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:264 msgid "t-shirt pack" msgstr "t-shirt pack" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:222 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:274 msgid "" -"Our Tor: Powering Digital Resistance or Open Observatory of Network " -"Interference (OONI) t-shirt, plus our Tor at the Heart of Internet Freedom " -"t-shirt." +"Our Tor: Strength in Numbers t-shirt, plus one of either our Tor: Powering " +"the Digital Resistance, Open Observatory of Network Interference (OONI), or " +"Tor at the Heart of Internet Freedom t-shirts." msgstr "" -"Our Tor: Powering Digital Resistance or Open Observatory of Network " -"Interference (OONI) t-shirt, plus our Tor at the Heart of Internet Freedom " -"t-shirt." +"Our Tor: Strength in Numbers t-shirt, plus one of either our Tor: Powering " +"the Digital Resistance, Open Observatory of Network Interference (OONI), or " +"Tor at the Heart of Internet Freedom t-shirts." + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:280 +msgid "Tor at the Heart of Internet Freedom" +msgstr "Tor at the Heart of Internet Freedom" + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:284 +msgid "Powering the Digital Resistance" +msgstr "Powering the Digital Resistance" + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:288 +msgid "Open Observatory of Network Interference" +msgstr "Open Observatory of Network Interference" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:243 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:299 msgid "sweatshirt" msgstr "sweatshirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:250 -msgid "" -"Your strong support of Tor gets you this high-quality American Apparel zip " -"hoodie." -msgstr "" -"Your strong support of Tor gets you this high-quality American Apparel zip " -"hoodie." +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:306 +msgid "Your generous support of Tor gets you this high-quality zip hoodie." +msgstr "Your generous support of Tor gets you this high-quality zip hoodie." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:262 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:316 msgid "how do you want to DONATE?" msgstr "how do you want to DONATE?" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:268 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:322 msgid "Credit Card" msgstr "Credit Card" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:278 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:338 msgid "Your Info" msgstr "Your Info" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:282 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:342 msgid "* required fields" msgstr "* required fields" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:287 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:347 msgid "First Name" msgstr "First Name" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:291 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351 msgid "Last Name" msgstr "Last Name" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:297 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:357 msgid "Street Address" msgstr "Street Address" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:301 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:361 msgid "Apt." msgstr "Apt." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:311 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:371 msgid "City" msgstr "City" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315 -msgid "region" -msgstr "region" +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:375 +msgid "State" +msgstr "State" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:320 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380 msgid "Zip" msgstr "Zip" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:326 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:386 msgid "Enter email" msgstr "Enter email" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390 msgid "We‘ll email you your receipt" msgstr "We‘ll email you your receipt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:337 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:397 msgid "Start sending me email updates about the Tor Project!" msgstr "Start sending me email updates about the Tor Project!" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:344 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:404 msgid "Card Number" msgstr "Card Number" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:351 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:411 msgid "MM" msgstr "MM" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:355 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:415 msgid "YY" msgstr "YY" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:359 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:419 msgid "CVC" msgstr "CVC" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:367 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:441 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:427 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:472 msgid "Choose your size and fit." msgstr "Choose your size and fit." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:372 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:380 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:432 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:440 msgid "T-shirt:" msgstr "T-shirt:" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:390 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:394 -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:396 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:450 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:454 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:456 msgid "Comments" msgstr "Comments" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:402 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:462 msgid "Donate" msgstr "Donate" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:415 -msgid "" -"With Your Contributions, the Tor " -"Project" -msgstr "" -"With Your Contributions, the Tor " -"Project" - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:420 -msgid "" -"Responds quickly to changing events and continues to provide a usable " -"anonymizing network that meets users' needs." -msgstr "" -"Responds quickly to changing events and continues to provide a usable " -"anonymizing network that meets users' needs." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:424 -msgid "" -"Keeps the Tor network up and running in a way that handles as many users as " -"possible." -msgstr "" -"Keeps the Tor network up and running in a way that handles as many users as " -"possible." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:428 -msgid "" -"Educates the public and attracts more users, which will increase the " -"possible sources and destinations of each communication, thus increasing " -"security for everyone." -msgstr "" -"Educates the public and attracts more users, which will increase the " -"possible sources and destinations of each communication, thus increasing " -"security for everyone." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:432 -msgid "Puts control over security and privacy back into your hands." -msgstr "Puts control over security and privacy back into your hands." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:445 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:476 msgid "T-Shirt" msgstr "T-Shirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:449 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:480 msgid "Choose your size and fit for each shirt." msgstr "Choose your size and fit for each shirt." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:484 msgid "" -"Powering Digital Resistance or Open Observvatory of Network Interference " -"(OONI) T-Shirt" +"Tor at the Heart of Internet, Powering Digital Resistance or Open " +"Observvatory of Network Interference (OONI) T-Shirt" msgstr "" -"Powering Digital Resistance or Open Observvatory of Network Interference " -"(OONI) T-Shirt" +"Tor at the Heart of Internet, Powering Digital Resistance or Open " +"Observvatory of Network Interference (OONI) T-Shirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:457 -msgid "Heart of Internet Freedom T-Shirt" -msgstr "Heart of Internet Freedom T-Shirt" +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 +msgid "Strength in Numbers T-Shirt" +msgstr "Strength in Numbers T-Shirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:461 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492 msgid "Choose your size." msgstr "Choose your size." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:465 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:496 msgid "Sweatshirt" msgstr "Sweatshirt" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:469 -msgid "" -"A required field is missing from the form. Please reload the page and try " -"again." -msgstr "" -"A required field is missing from the form. Please reload the page and try " -"again." +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:500 +msgid "A required field is missing from the form." +msgstr "A required field is missing from the form." + +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:502 +msgid "Please reload the page and try again." +msgstr "Please reload the page and try again." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:506 msgid "There was a problem submitting your request to the server: " msgstr "There was a problem submitting your request to the server: " -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:477 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:510 msgid "validation failed" msgstr "validation failed" #. notes: __field_name__ will be replaced with the field name in the #. javascript. -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:483 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:516 msgid "__field_name__ must be filled out." msgstr "__field_name__ must be filled out." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:521 msgid "This field is required" msgstr "This field is required" -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:525 msgid "Invalid email address." msgstr "Invalid email address." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:505 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:538 msgid "One moment while we shovel coal into our servers." msgstr "One moment while we shovel coal into our servers." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:588 -msgid "TOR SAVES LIVES" -msgstr "TOR SAVES LIVES" - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:592 +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:625 msgid "" -"Activists and journalists use the Tor network and software to alert the " -"world to human rights abuses." +"Stand up for the universal human rights to privacy and freedom and help keep" +" Tor independent, robust, and secure." msgstr "" -"Activists and journalists use the Tor network and software to alert the " -"world to human rights abuses." +"Stand up for the universal human rights to privacy and freedom and help keep" +" Tor independent, robust, and secure." -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:596 -msgid "" -"In countries that censor the internet, people use Tor to access critical " -"resources." -msgstr "" -"In countries that censor the internet, people use Tor to access critical " -"resources." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:600 -msgid "" -"Millions of people rely on Tor every day for a safer, more secure way to " -"access the internet." -msgstr "" -"Millions of people rely on Tor every day for a safer, more secure way to " -"access the internet." - -#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:605 -msgid "" -"Your support today will help ensure Tor remains independent, robust, and " -"secure." -msgstr "" -"Your support today will help ensure Tor remains independent, robust, and " -"secure." +#: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:627 +msgid "Mozilla will match your gift and double your impact." +msgstr "Mozilla will match your gift and double your impact." #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34 msgid "Tor Thanks You" @@ -598,50 +541,66 @@ msgid "Thank you!" msgstr "Thank you!" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:48 +msgid "Thank you for supporting Tor's Strength in Numbers campaign." +msgstr "Thank you for supporting Tor's Strength in Numbers campaign." + +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50 +msgid "You should receive an email receipt shortly." +msgstr "You should receive an email receipt shortly." + +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52 msgid "" -"Thank you for supporting Tor in Powering Digital Resistance. You should " -"receive an email receipt shortly. With your support, we'll be able to tackle" -" ambitious projects, such as developing a more secure, privacy-enhancing " -"browser for mobile devices and making it easier for third-party developers " -"to integrate Tor into their applications." +"With your support and the generous matching funds from Mozilla, we'll be " +"able to tackle ambitious projects, such as developing a more secure, " +"privacy-enhancing browser for mobile devices and making it easier for third-" +"party developers to integrate Tor into their applications." msgstr "" -"Thank you for supporting Tor in Powering Digital Resistance. You should " -"receive an email receipt shortly. With your support, we'll be able to tackle" -" ambitious projects, such as developing a more secure, privacy-enhancing " -"browser for mobile devices and making it easier for third-party developers " -"to integrate Tor into their applications." +"With your support and the generous matching funds from Mozilla, we'll be " +"able to tackle ambitious projects, such as developing a more secure, " +"privacy-enhancing browser for mobile devices and making it easier for third-" +"party developers to integrate Tor into their applications." -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:56 msgid "" "It's an incredible time to stand up for world-leading security and privacy " -"software. Tell family, friends, and colleagues that you're supporting " -"privacy and security with Tor!" +"software." msgstr "" "It's an incredible time to stand up for world-leading security and privacy " -"software. Tell family, friends, and colleagues that you're supporting " -"privacy and security with Tor!" +"software." -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:56 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:58 +msgid "" +"Tell family, friends, and colleagues that you're supporting privacy and " +"security with Tor!" +msgstr "" +"Tell family, friends, and colleagues that you're supporting privacy and " +"security with Tor!" + +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:62 msgid "SHARE THE TOR PROJECT" msgstr "SHARE THE TOR PROJECT" -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:79 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:88 msgid "Got Skills?" msgstr "Got Skills?" -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:85 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:94 msgid "The Tor network depends on volunteers." msgstr "The Tor network depends on volunteers." -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:91 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:100 msgid "" "We need people to run relays, write code, organize the community and spread " -"the word about our good work. Learn how you can help." +"the word about our good work." msgstr "" "We need people to run relays, write code, organize the community and spread " -"the word about our good work. Learn how you can help." +"the word about our good work." -#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:99 +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:102 +msgid "Learn how you can help." +msgstr "Learn how you can help." + +#: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:110 msgid "I Want To Volunteer" msgstr "I Want To Volunteer" @@ -653,7 +612,7 @@ msgstr "Processing Donation - Tor" msgid "Processing Donation. Please Wait..." msgstr "Processing Donation. Please Wait..." -#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:24 +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:25 msgid "" "The Tor Project is a US 501(c)(3) non-profit organization advancing human " "rights and freedoms by creating and deploying free and open source anonymity" @@ -666,14 +625,26 @@ msgstr "" "use, and furthering their scientific and popular understanding." #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 -msgid "privacy policy" -msgstr "privacy policy" +msgid "Subscribe to Our Newsletter" +msgstr "Subscribe to Our Newsletter" + +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35 +msgid "Get monthly updates and opportunities from the Tor Project." +msgstr "Get monthly updates and opportunities from the Tor Project." + +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 +msgid "Sign Up" +msgstr "Sign Up" -#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:36 -msgid "donor faq" -msgstr "donor faq" +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47 +msgid "Donate FAQs" +msgstr "Donate FAQs" -#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:44 +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:51 +msgid "Privacy Policy" +msgstr "Privacy Policy" + +#: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:67 msgid "" "Designed and built by <a " "href=\"https://www.giantrabbit.com/\" class=\"stamp-bold\" " @@ -687,7 +658,11 @@ msgstr "" msgid "Tor Donor FAQ" msgstr "Tor Donor FAQ" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:58 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:46 +msgid "Questions?" +msgstr "Questions?" + +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:61 msgid "" "If your question isn’t answered below, email frontdesk(at)rt.torproject.org with general Tor " @@ -699,11 +674,11 @@ msgstr "" "inquiries, or giving(at)torproject.org with " "donor-specific questions." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:65 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:68 msgid "What is the Tor Project and what does it do?" msgstr "What is the Tor Project and what does it do?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:69 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:72 msgid "" "The Tor Project’s mission is to advance human rights and freedoms by " "creating and deploying free and open anonymity and privacy technologies, " @@ -715,7 +690,7 @@ msgstr "" "supporting their unrestricted availability and use, and furthering their " "scientific and popular understanding." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:71 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:74 msgid "" "The main product of the Tor Project is <a " "href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " @@ -725,7 +700,7 @@ msgstr "" "href=\"https://www.torproject.org/download/download-easy.html.en\">Tor " "Browser</a>, which enables people to browse the internet anonymously." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:73 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:76 msgid "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." @@ -733,15 +708,15 @@ msgstr "" "The Tor Project is a 501(c)3 tax-exempt non-profit organization based in " "Boston, Massachusetts." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:75 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:78 msgid "It was founded in 2006." msgstr "It was founded in 2006." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:81 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:84 msgid "Who works for the Tor Project, and what do they do?" msgstr "Who works for the Tor Project, and what do they do?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:85 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:88 msgid "" "Thousands of people around the world actively support the work of the Tor " "Project, including developers, designers, relay operators, researchers, " @@ -753,13 +728,13 @@ msgstr "" "cryptographers, computer scientists, and privacy advocates, and most are not" " paid by the Tor Project." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:87 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:90 msgid "" "The paid staff of the Tor Project is very small: about 20 people in total." msgstr "" "The paid staff of the Tor Project is very small: about 20 people in total." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:89 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:92 msgid "" "You can read about the core contributors to the Tor Project on our <a " "class=\"hyperlinks\" target=\"_blank\" " @@ -771,11 +746,11 @@ msgstr "" "href=\"https://www.torproject.org/about/corepeople.html.en\">Core People page</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:94 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:97 msgid "Who uses Tor?" msgstr "Who uses Tor?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:98 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:101 msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." @@ -783,7 +758,7 @@ msgstr "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:100 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:103 msgid "" "Other Tor users are journalists, human rights defenders, domestic violence " "survivors, policymakers, diplomats, and academic and research institutions." @@ -791,15 +766,15 @@ msgstr "" "Other Tor users are journalists, human rights defenders, domestic violence " "survivors, policymakers, diplomats, and academic and research institutions." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:106 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:109 msgid "Can anyone use Tor?" msgstr "Can anyone use Tor?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:110 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:113 msgid "Yes! Tor is free, and anyone can use it." msgstr "Yes! Tor is free, and anyone can use it." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:112 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:115 msgid "" "To get started, you will need to <a class=\"hyperlinks\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en\">download Tor Browser</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:114 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:117 msgid "" "We offer instructions on how to download for <a class=\"hyperlinks links\" " "target=\"_blank\" " @@ -827,15 +802,15 @@ msgstr "" "OS X</a> and <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:120 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:123 msgid "What kinds of people support Tor?" msgstr "What kinds of people support Tor?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:124 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:127 msgid "All kinds of people." msgstr "All kinds of people." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:126 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:129 msgid "" "Thousands of individuals have donated to support the Tor Project, and we " "have also received funding from a wide range of organizations including " @@ -853,7 +828,7 @@ msgstr "" "Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, " "Omidyar Network, SRI International, and Radio Free Asia." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:128 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:131 msgid "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." @@ -861,7 +836,7 @@ msgstr "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:130 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:133 msgid "" "In addition, everybody who uses Tor is helping to keep other users safe and " "anonymous, because the more people using Tor, the harder it is to identify " @@ -871,11 +846,11 @@ msgstr "" "anonymous, because the more people using Tor, the harder it is to identify " "any single individual." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:136 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:139 msgid "How does the Tor software work to protect people's anonymity?" msgstr "How does the Tor software work to protect people's anonymity?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:140 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:143 msgid "" "Tor protects you by bouncing your communications around the Tor network, " "which is a distributed network of relays run by volunteers all around the " @@ -885,7 +860,7 @@ msgstr "" "which is a distributed network of relays run by volunteers all around the " "world." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:142 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:145 msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." @@ -893,13 +868,13 @@ msgstr "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:144 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:147 msgid "" "It also prevents sites you visit from finding out where you're located." msgstr "" "It also prevents sites you visit from finding out where you're located." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:146 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:149 msgid "" "You can read more about how Tor works on our <a class=\"hyperlinks links\" " "target=\"_blank\" " @@ -909,7 +884,7 @@ msgstr "" "target=\"_blank\" " "href=\"https://www.torproject.org/about/overview.html.en\">overview page." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:153 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:156 msgid "" "I would like to know more about how Tor works, what hidden services are, or " "how to run a relay." @@ -917,7 +892,7 @@ msgstr "" "I would like to know more about how Tor works, what hidden services are, or " "how to run a relay." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:157 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:160 msgid "" "<a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/docs/faq.html.en\">This Tor Project " @@ -927,11 +902,11 @@ msgstr "" "href=\"https://www.torproject.org/docs/faq.html.en\">This Tor Project " "FAQ</a> has answers to all those questions, and more." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:163 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:166 msgid "Does the Tor software work?" msgstr "Does the Tor software work?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:167 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:170 msgid "" "We believe Tor is the best solution available today, and we know that it " "does a better job of keeping you safely anonymous than other options such as" @@ -941,7 +916,7 @@ msgstr "" "does a better job of keeping you safely anonymous than other options such as" " VPNs, proxychains, or browser \"private browsing\" modes." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:169 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:172 msgid "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." @@ -949,7 +924,7 @@ msgstr "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:171 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:174 msgid "" "The Electronic Frontier Foundation says that Tor offers <a " "class=\"hyperlinks links\" target=\"_blank\" " @@ -965,11 +940,11 @@ msgstr "" "book Data and Goliath, security expert Bruce Schneier wrote \"The current " "best tool to protect your anonymity when browsing the web is Tor.\"" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:177 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:180 msgid "Is what Tor does legal? Can I get in trouble for using it?" msgstr "Is what Tor does legal? Can I get in trouble for using it?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:181 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:184 msgid "" "Downloading Tor Browser or using the Tor network is legal in nearly every " "country." @@ -977,7 +952,7 @@ msgstr "" "Downloading Tor Browser or using the Tor network is legal in nearly every " "country." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:183 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:186 msgid "" "A few web sites occasionally block Tor, but that doesn't mean you're doing " "anything wrong." @@ -985,7 +960,7 @@ msgstr "" "A few web sites occasionally block Tor, but that doesn't mean you're doing " "anything wrong." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:185 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:188 msgid "" "Usually it means that site has had difficulties with visitors who've been " "using Tor in the past, or that they misunderstand what Tor is and how it " @@ -995,7 +970,7 @@ msgstr "" "using Tor in the past, or that they misunderstand what Tor is and how it " "works (we’re working to change this)." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:187 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:190 msgid "" "But it is not illegal to use Tor, and you shouldn't get in trouble for doing" " it." @@ -1003,7 +978,7 @@ msgstr "" "But it is not illegal to use Tor, and you shouldn't get in trouble for doing" " it." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:189 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:192 msgid "" "You can find more information about Tor's legal status on the <a " "class=\"hyperlinks links\" target=\"_blank\" " @@ -1013,7 +988,7 @@ msgstr "" "class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">EFF site</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:195 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:198 msgid "" "Where can I find out more about the Tor Project, especially financial " "information?" @@ -1021,7 +996,7 @@ msgstr "" "Where can I find out more about the Tor Project, especially financial " "information?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:199 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:202 msgid "" "Here are the Tor Project's <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/about/financials.html.en\">financial " @@ -1031,11 +1006,11 @@ msgstr "" "href=\"https://www.torproject.org/about/financials.html.en\">financial " "statements, and its Form 990</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:205 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:208 msgid "Where does the Tor Project's money come from?" msgstr "Where does the Tor Project's money come from?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:209 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:212 msgid "" "Tor is supported by United States government funding agencies, NGOs, private" " foundations, research institutions, private companies, and nearly 8,000 " @@ -1045,7 +1020,7 @@ msgstr "" " foundations, research institutions, private companies, and nearly 8,000 " "personal donations from people like you." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:211 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:214 msgid "" "(See <a class=\"hyperlinks links single-link\" target=\"_blank\" " "href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" @@ -1055,7 +1030,7 @@ msgstr "" "href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" " for more.)" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:213 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:216 msgid "" "While we are grateful for this funding, we don't want the Tor Project to " "become too dependent on any single source." @@ -1063,7 +1038,7 @@ msgstr "" "While we are grateful for this funding, we don't want the Tor Project to " "become too dependent on any single source." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:215 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:218 msgid "" "Crowdfunding allows us to diversify our donor base and is unrestricted -- it" " allows us to spend the money on the projects we think are most important " @@ -1073,7 +1048,7 @@ msgstr "" " allows us to spend the money on the projects we think are most important " "and respond quickly to changing events." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:217 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:220 msgid "" "And so, we are asking you to help financially support us, to increase the " "Tor Project's independence and ensure the sustainability of the products and" @@ -1083,17 +1058,17 @@ msgstr "" "Tor Project's independence and ensure the sustainability of the products and" " services we provide." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:223 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:226 msgid "" "How much money does the Tor Project spend annually, and what is it used for?" msgstr "" "How much money does the Tor Project spend annually, and what is it used for?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:227 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:230 msgid "The Tor Project spends about $2.5 million annually." msgstr "The Tor Project spends about $2.5 million annually." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:229 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:232 #, php-format msgid "" "About 80% of the Tor Project's spending goes to staffing, mostly software " @@ -1102,7 +1077,7 @@ msgstr "" "About 80% of the Tor Project's spending goes to staffing, mostly software " "engineers." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:231 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:234 msgid "" "About 10% goes towards administrative costs such as accounting and legal " "costs and bank fees." @@ -1110,7 +1085,7 @@ msgstr "" "About 10% goes towards administrative costs such as accounting and legal " "costs and bank fees." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:233 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:236 msgid "" "The remaining 10% is spent on travel, meetings and conferences, which are " "important for Tor because the Tor community is global." @@ -1118,11 +1093,11 @@ msgstr "" "The remaining 10% is spent on travel, meetings and conferences, which are " "important for Tor because the Tor community is global." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:239 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:242 msgid "Is my donation tax-deductible?" msgstr "Is my donation tax-deductible?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:243 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:246 msgid "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." @@ -1130,11 +1105,11 @@ msgstr "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:245 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:248 msgid "Following is information you may need for reporting purposes:" msgstr "Following is information you may need for reporting purposes:" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:250 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:253 msgid "" "Tor Project Tax ID Number (EIN #): 20-8096820 \n" " Address: \n" @@ -1152,15 +1127,15 @@ msgstr "" " Phone number: 206-420-3136 \n" " Contact person: Shari Steele, Executive Director " -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:263 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:266 msgid "If I am not in the United States, can I still donate?" msgstr "If I am not in the United States, can I still donate?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:267 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:270 msgid "Yes, definitely." msgstr "Yes, definitely." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:269 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:272 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." @@ -1168,7 +1143,7 @@ msgstr "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:275 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:278 msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" @@ -1176,12 +1151,12 @@ msgstr "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:279 -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:559 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:282 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:562 msgid "No, sorry." msgstr "No, sorry." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:281 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:284 msgid "" "If we accept a donation from someone who has specified how they want it " "used, we're required by the IRS to track and report separately on that " @@ -1191,7 +1166,7 @@ msgstr "" "used, we're required by the IRS to track and report separately on that " "money." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:283 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:286 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." @@ -1199,7 +1174,7 @@ msgstr "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:285 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:288 msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." @@ -1207,7 +1182,7 @@ msgstr "" "However, we would be very happy to hear your ideas and feedback about our " "work." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:287 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:290 msgid "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." @@ -1215,15 +1190,15 @@ msgstr "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:293 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:296 msgid "Can I donate while using Tor Browser?" msgstr "Can I donate while using Tor Browser?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:297 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:300 msgid "Yes! In our testing, donation works via Tor Browser." msgstr "Yes! In our testing, donation works via Tor Browser." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:299 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:302 msgid "" "If you run into problems, please contact giving(at)torproject.org." @@ -1231,7 +1206,7 @@ msgstr "" "If you run into problems, please contact giving(at)torproject.org." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:303 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:306 msgid "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." @@ -1239,7 +1214,7 @@ msgstr "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:305 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:308 msgid "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." @@ -1247,15 +1222,15 @@ msgstr "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:307 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:310 msgid "If you run into any problems donating via PayPal, please let us know." msgstr "If you run into any problems donating via PayPal, please let us know." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:313 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:316 msgid "How can I donate via debit or credit card?" msgstr "How can I donate via debit or credit card?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:317 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:320 msgid "" "To donate using a major credit card or debit card (VISA, MasterCard, " "Discover or American Express) or via PayPal, please visit our <a " @@ -1265,11 +1240,11 @@ msgstr "" "Discover or American Express) or via PayPal, please visit our <a " "href=\"https://donate.torproject.org\">donate page</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:323 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:326 msgid "Why do you ask for my address and similar information?" msgstr "Why do you ask for my address and similar information?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:327 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:330 msgid "" "If you donate by credit card, you will be asked for some information that's " "required to process your credit card payment, including your billing " @@ -1279,7 +1254,7 @@ msgstr "" "required to process your credit card payment, including your billing " "address." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:329 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:332 msgid "" "This allows our payment processor to verify your identity, process your " "payment, and prevent fraudulent charges to your credit card." @@ -1287,7 +1262,7 @@ msgstr "" "This allows our payment processor to verify your identity, process your " "payment, and prevent fraudulent charges to your credit card." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:331 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:334 msgid "" "We don't ask for information beyond what's required by the payment " "processor." @@ -1295,11 +1270,11 @@ msgstr "" "We don't ask for information beyond what's required by the payment " "processor." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:337 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:340 msgid "Why is there a minimum donation?" msgstr "Why is there a minimum donation?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:341 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:344 msgid "" "People who have stolen credit card information often donate to nonprofits as" " a way of testing whether the card works." @@ -1307,7 +1282,7 @@ msgstr "" "People who have stolen credit card information often donate to nonprofits as" " a way of testing whether the card works." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:343 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:346 msgid "" "These people typically use a very small amount for their testing, and we've " "found that setting a $1 minimum donation seems to deter them." @@ -1315,11 +1290,11 @@ msgstr "" "These people typically use a very small amount for their testing, and we've " "found that setting a $1 minimum donation seems to deter them." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:349 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:352 msgid "Is there a maximum donation?" msgstr "Is there a maximum donation?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:353 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:356 msgid "" "No, no, no! More funding from you means we can do more things we are excited" " to do, like hire a person to monitor the Tor network full time, or " @@ -1331,11 +1306,11 @@ msgstr "" "research, test, and implement ideas we have for making the Tor network even " "stronger." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:359 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:362 msgid "Can I donate via bitcoin?" msgstr "Can I donate via bitcoin?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:363 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:366 msgid "" "Yes! We accept <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/donate/donate-options.html.en\">bitcoin " @@ -1345,7 +1320,7 @@ msgstr "" "href=\"https://www.torproject.org/donate/donate-options.html.en\">bitcoin " "via BitPay</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:369 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:372 msgid "" "If I want my donation to be anonymous, what is the best way for me to " "donate?" @@ -1353,7 +1328,7 @@ msgstr "" "If I want my donation to be anonymous, what is the best way for me to " "donate?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:373 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:376 msgid "" "You can donate by <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/donate/donate-" @@ -1363,7 +1338,7 @@ msgstr "" "href=\"https://www.torproject.org/donate/donate-" "options.html.en#cash\">sending us a postal money order</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:375 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:378 msgid "" "You can donate via bitcoin if you have bitcoin set up in a way that " "preserves your anonymity." @@ -1371,11 +1346,11 @@ msgstr "" "You can donate via bitcoin if you have bitcoin set up in a way that " "preserves your anonymity." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:377 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:380 msgid "You can buy cash gift cards and mail them to us." msgstr "You can buy cash gift cards and mail them to us." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:379 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:382 msgid "" "There are probably other ways to donate anonymously that we haven't thought " "of-- maybe you will :)" @@ -1383,7 +1358,7 @@ msgstr "" "There are probably other ways to donate anonymously that we haven't thought " "of-- maybe you will :)" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:386 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:389 msgid "" "Is the Tor Project required to identify me as a donor to the United States " "government, or to any other authority?" @@ -1391,7 +1366,7 @@ msgstr "" "Is the Tor Project required to identify me as a donor to the United States " "government, or to any other authority?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:390 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:393 msgid "" "If you donate $5,000 or more to the Tor Project in a single year, we are " "required to report the donation amount and your name and address (if we have" @@ -1401,7 +1376,7 @@ msgstr "" "required to report the donation amount and your name and address (if we have" " it) to the IRS, on Schedule B of the Form 990, which is filed annually." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:392 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:395 msgid "" "However, it's normal for nonprofits to redact individual donor information " "from the copy of the 990 that's made publicly-available, and that's what we " @@ -1411,7 +1386,7 @@ msgstr "" "from the copy of the 990 that's made publicly-available, and that's what we " "do." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:394 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:397 msgid "" "We are not required to identify donors to any other organization or " "authority, and we do not." @@ -1419,7 +1394,7 @@ msgstr "" "We are not required to identify donors to any other organization or " "authority, and we do not." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:396 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:399 msgid "" "(Also, if you wanted, you could give us $4,999 in late 2016 and $4,999 in " "early 2017 ;)" @@ -1427,7 +1402,7 @@ msgstr "" "(Also, if you wanted, you could give us $4,999 in late 2016 and $4,999 in " "early 2017 ;)" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:402 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:405 msgid "" "In your privacy policy, you say you will never publicly identify me as a " "donor without my permission." @@ -1435,15 +1410,15 @@ msgstr "" "In your privacy policy, you say you will never publicly identify me as a " "donor without my permission." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:404 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:407 msgid "What does that mean?" msgstr "What does that mean?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:408 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:411 msgid "Yes, that's right." msgstr "Yes, that's right." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:410 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:413 msgid "" "If you donate to the Tor Project, there will be some people at the Tor " "Project who know about your donation." @@ -1451,7 +1426,7 @@ msgstr "" "If you donate to the Tor Project, there will be some people at the Tor " "Project who know about your donation." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:412 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:415 msgid "" "However, we will never publicly identify you as a donor, unless you have " "given us permission to do so." @@ -1459,7 +1434,7 @@ msgstr "" "However, we will never publicly identify you as a donor, unless you have " "given us permission to do so." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:414 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:417 msgid "" "That means we won't post your name on our website, thank you on Twitter, or " "do anything else that would publicly identify you as someone who has " @@ -1469,7 +1444,7 @@ msgstr "" "do anything else that would publicly identify you as someone who has " "donated." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:416 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:419 msgid "" "If we decide we would like to publicly name you as a donor, we will ask you " "first, and will not do it until and unless you say it's okay." @@ -1477,7 +1452,7 @@ msgstr "" "If we decide we would like to publicly name you as a donor, we will ask you " "first, and will not do it until and unless you say it's okay." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:422 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:425 msgid "" "It's important to me that my donation be tax-deductible, but I don't pay " "taxes in the United States." @@ -1485,7 +1460,7 @@ msgstr "" "It's important to me that my donation be tax-deductible, but I don't pay " "taxes in the United States." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:426 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:429 msgid "" "Right now, we can only offer tax-deductibility to donors who pay taxes in " "the United States." @@ -1493,7 +1468,7 @@ msgstr "" "Right now, we can only offer tax-deductibility to donors who pay taxes in " "the United States." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:428 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:431 msgid "" "If it's important to you that your donations be tax-deductible in a " "different country, let us know and we will try to offer tax-deductibility in" @@ -1503,7 +1478,7 @@ msgstr "" "different country, let us know and we will try to offer tax-deductibility in" " your country in future." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:430 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:433 msgid "" "Or, if you are in Germany, France or Sweden, <a class=\"hyperlinks links\" " "target=\"_blank\" " @@ -1517,7 +1492,7 @@ msgstr "" "organizations support the Tor network</a> and may be able to offer you tax-" "deductibility for your donation." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:436 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:439 msgid "" "What if I don't want to use credit card or PayPal? Is there another way I " "can donate?" @@ -1525,7 +1500,7 @@ msgstr "" "What if I don't want to use credit card or PayPal? Is there another way I " "can donate?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:440 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:443 msgid "" "Yes! Here is a list of <a href=\"https://www.torproject.org/donate/donate-" "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways " @@ -1535,11 +1510,11 @@ msgstr "" "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways " "you can donate.</a>" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:447 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:450 msgid "What is your donor privacy policy?" msgstr "What is your donor privacy policy?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:451 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:454 msgid "" "Here is the Tor Project <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"/%langcode%/privacy-policy\">donor privacy policy</a>." @@ -1547,11 +1522,11 @@ msgstr "" "Here is the Tor Project <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"/%langcode%/privacy-policy\">donor privacy policy</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:457 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:460 msgid "What is your refund policy?" msgstr "What is your refund policy?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:461 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:464 msgid "" "If you want your donation refunded, please tell us by emailing giving(at)torproject.org." @@ -1559,7 +1534,7 @@ msgstr "" "If you want your donation refunded, please tell us by emailing giving(at)torproject.org." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:463 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:466 msgid "" "To process your refund we'll need to know the date of your donation, the " "amount you donated, your full name, the payment method you used and your " @@ -1569,11 +1544,11 @@ msgstr "" "amount you donated, your full name, the payment method you used and your " "country of origin." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:465 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:468 msgid "Please also tell us why you're asking for a refund." msgstr "Please also tell us why you're asking for a refund." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:467 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:470 msgid "" "Please note that some payment methods won't support refunds, or require them" " to be made in a specific way, so we may need additional information from " @@ -1583,34 +1558,34 @@ msgstr "" " to be made in a specific way, so we may need additional information from " "you in order to process yours." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:473 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:476 msgid "Can I donate by mail?" msgstr "Can I donate by mail?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:477 -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:583 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:480 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:586 msgid "Yes." msgstr "Yes." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:479 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:482 msgid "" "Our mailing address is The Tor Project, P.O. Box 4903, Seattle WA 98194, USA" msgstr "" "Our mailing address is The Tor Project, P.O. Box 4903, Seattle WA 98194, USA" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:485 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:488 msgid "Do you accept cash donations?" msgstr "Do you accept cash donations?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:489 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:492 msgid "Yes" msgstr "Yes" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:495 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:498 msgid "Does Tor Project accept matching donations?" msgstr "Does Tor Project accept matching donations?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:499 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:502 msgid "" "Yes! Many companies --such as Google, Microsoft, eBay, PayPal, Apple, " "Verizon, Red Hat, many universities, and others-- will match donations made " @@ -1620,7 +1595,7 @@ msgstr "" "Verizon, Red Hat, many universities, and others-- will match donations made " "by their employees." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:501 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:504 msgid "" "The fastest way to find out if your company matches donations is usually by " "checking with your HR department, or you can search for your company name at" @@ -1632,7 +1607,7 @@ msgstr "" " <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.matchinggifts.com/rit/\">https://www.matchinggifts.com/rit/</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:503 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:506 msgid "" "If your company isn't currently set up to match donations to the Tor " "Project, we would be happy to help with the paperwork." @@ -1640,7 +1615,7 @@ msgstr "" "If your company isn't currently set up to match donations to the Tor " "Project, we would be happy to help with the paperwork." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:505 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:508 msgid "" "If you want help figuring out the process, write us at giving(at)torproject.org</a>." @@ -1648,11 +1623,11 @@ msgstr "" "If you want help figuring out the process, write us at giving(at)torproject.org</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:511 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:514 msgid "Can I become a Tor Project member?" msgstr "Can I become a Tor Project member?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:515 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:518 msgid "" "Right now, we don't have a membership program, but we may set one up in the " "future." @@ -1660,7 +1635,7 @@ msgstr "" "Right now, we don't have a membership program, but we may set one up in the " "future." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:517 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:520 msgid "" "If you want to get involved with the Tor Project, <a class=\"hyperlinks " "links\" target=\"_blank\" " @@ -1672,11 +1647,11 @@ msgstr "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">this is a " "good place to start</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:523 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:526 msgid "How can I get a Tor t-shirt or stickers?" msgstr "How can I get a Tor t-shirt or stickers?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:527 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:530 msgid "" "A variety of thank-you gifts for donors, including t-shirts, hoodies and " "stickers, are presented on our main <a " @@ -1686,7 +1661,7 @@ msgstr "" "stickers, are presented on our main <a " "href=\"https://donate.torproject.org\">donation page</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:533 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:536 msgid "" "If I want to stay in touch with the Tor Project, what's the best way for me " "to do that?" @@ -1694,7 +1669,7 @@ msgstr "" "If I want to stay in touch with the Tor Project, what's the best way for me " "to do that?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:537 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:540 msgid "" "You can sign up to receive <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://newsletter.torproject.org/\">Tor News</a>, read the <a " @@ -1710,17 +1685,17 @@ msgstr "" " links\" target=\"_blank\" href=\"https://twitter.com/torproject\">follow us" " on Twitter</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:543 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:546 msgid "" "Does the Tor Project participate in the Combined Federal Campaign program?" msgstr "" "Does the Tor Project participate in the Combined Federal Campaign program?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:547 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:550 msgid "No, Tor doesn't currently participate in the CFC program." msgstr "No, Tor doesn't currently participate in the CFC program." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:549 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:552 msgid "" "If you'd like to get Tor added to the CFC program in your location, that " "would be great: please let us know if you need any help." @@ -1728,11 +1703,11 @@ msgstr "" "If you'd like to get Tor added to the CFC program in your location, that " "would be great: please let us know if you need any help." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:555 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:558 msgid "Can I donate my airline miles, flight vouchers, or hotel points?" msgstr "Can I donate my airline miles, flight vouchers, or hotel points?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:561 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:564 msgid "" "We would like to accept your miles, vouchers and hotel points, and in the " "future we may be able to." @@ -1740,15 +1715,15 @@ msgstr "" "We would like to accept your miles, vouchers and hotel points, and in the " "future we may be able to." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:567 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:570 msgid "Can I donate hardware?" msgstr "Can I donate hardware?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:571 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:574 msgid "Typically no, we don't encourage people to donate hardware." msgstr "Typically no, we don't encourage people to donate hardware." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:573 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:576 msgid "" "But if you want to make a hardware donation that you think might be " "especially useful for us, please mail giving(at)torproject.org." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:579 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:582 msgid "Can I donate my time?" msgstr "Can I donate my time?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:585 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:588 msgid "" "Here's a <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">list of " @@ -1772,15 +1747,15 @@ msgstr "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">list of " "areas where we would love your help</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:591 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:594 msgid "I would like my company to support Tor." msgstr "I would like my company to support Tor." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:593 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:596 msgid "What can we do to help?" msgstr "What can we do to help?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:597 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:600 msgid "" "Your company could match donations made by its employees to the Tor Project" "--that would be wonderful." @@ -1788,7 +1763,7 @@ msgstr "" "Your company could match donations made by its employees to the Tor Project" "--that would be wonderful." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:599 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:602 msgid "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." @@ -1796,7 +1771,7 @@ msgstr "" "Your company may operate a corporate foundation that gives out grants, and " "if so, you should encourage it to fund us." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:601 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:604 msgid "" "Maybe your company would be willing to <a class=\"hyperlinks links\" " "target=\"_blank\" " @@ -1808,7 +1783,7 @@ msgstr "" "href=\"https://www.torproject.org/docs/faq.html.en#HowDoIDecide\">operate a " "Tor relay</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:603 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:606 msgid "" "If your company sells cloud services, perhaps it could donate these to Tor: " "We use them in some anti-censorship projects." @@ -1816,24 +1791,24 @@ msgstr "" "If your company sells cloud services, perhaps it could donate these to Tor: " "We use them in some anti-censorship projects." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:609 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:612 msgid "You don't support my preferred way to donate." msgstr "You don't support my preferred way to donate." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:611 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:614 msgid "Can I recommend a new donation method to you?" msgstr "Can I recommend a new donation method to you?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:615 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:618 msgid "Sure." msgstr "Sure." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:617 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:620 msgid "Just mail us at giving(at)torproject.org</a>." msgstr "" "Just mail us at giving(at)torproject.org</a>." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:623 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:626 msgid "" "Will the Tor Project accept donations from anybody, or do you reserve the " "right to reject support from specific organizations or individuals?" @@ -1841,27 +1816,27 @@ msgstr "" "Will the Tor Project accept donations from anybody, or do you reserve the " "right to reject support from specific organizations or individuals?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:627 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:630 msgid "We do reserve the right to reject a donation." msgstr "We do reserve the right to reject a donation." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:629 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:632 msgid "To date though, we haven't exercised that right." msgstr "To date though, we haven't exercised that right." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:631 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:634 msgid "We are happy that a broad range of people use and support Tor." msgstr "We are happy that a broad range of people use and support Tor." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:637 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:640 msgid "I have more questions." msgstr "I have more questions." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:639 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:642 msgid "How can I get answers?" msgstr "How can I get answers?" -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:643 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:646 msgid "" "Feel free to send questions to frontdesk(at)rt.torproject.org." @@ -1869,7 +1844,7 @@ msgstr "" "Feel free to send questions to frontdesk(at)rt.torproject.org." -#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:645 +#: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:648 msgid "" "We will try to answer you, and we'll also post your question (and the " "answer) here."

1 0

[tor/master] Annotate subsystem list with their levels.
by nickm＠torproject.org 10 Nov '18

10 Nov '18

commit 91355c0fac0f90ba286edb3d3f12d71d250be16d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 22:17:18 2018 -0500 Annotate subsystem list with their levels. --- src/app/main/subsystem_list.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 190e6579d..8640329e9 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -26,15 +26,15 @@ **/ const subsys_fns_t *tor_subsystems[] = { &sys_winprocess, /* -100 */ - &sys_torerr, - &sys_wallclock, - &sys_threads, - &sys_logging, - &sys_time, - &sys_network, - &sys_compress, - &sys_crypto, - &sys_tortls, + &sys_torerr, /* -100 */ + &sys_wallclock, /* -99 */ + &sys_threads, /* -95 */ + &sys_logging, /* -90 */ + &sys_time, /* -90 */ + &sys_network, /* -90 */ + &sys_compress, /* -70 */ + &sys_crypto, /* -60 */ + &sys_tortls, /* -50 */ }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems);

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit a69cfd7f24c60e851bba3437214560b33475c578 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:14 2018 +0000 Update translations for support-portal --- contents+fr.po | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 67e041f50..c64baf973 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1592,9 +1592,8 @@ msgid "" "That said, Tor is much faster than it used to be and you may not actually " "notice any change in speed from other browsers." msgstr "" -"Cela dit, Tor est beaucoup plus rapide qu’auparavant, et en pratique, vous " -"ne remarquerez peut-être aucun ralentissement par rapport aux autres " -"navigateurs." +"Cela dit, Tor est beaucoup plus rapide qu’auparavant et vous ne remarquerez " +"peut-être aucun ralentissement par rapport aux autres navigateurs." #: http//localhost/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -1637,8 +1636,7 @@ msgstr "" "lanceurs d’alerte, des représentants des forces de l’ordre et bien d’autres." " Malheureusement, la protection que nos logiciels peut fournir à ces groupes" " de personnes peut aussi être détournée par des criminels et des auteurs de " -"programmes malveillants. Le Projet Tor n’appuie ni ne cautionne " -"l’utilisation de nos logiciels à des fins malveillantes." +"programmes malveillants." #: http//localhost/misc/misc-8/ #: (content/misc/misc-8/contents+en.lrquestion.seo_slug) @@ -1657,8 +1655,8 @@ msgid "" "together these relays provide the full privacy protections of Tor." msgstr "" "Le reste de votre circuit change pour chaque nouveau site Web que vous " -"visitez. Ensemble, ces relais fournissent la protection complète de la " -"confidentialité offerte par Tor." +"visitez. Ensemble, ces relais fournissent la protection complète des données" +" personnelles offerte par Tor." #: http//localhost/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.seo_slug) @@ -1697,8 +1695,8 @@ msgid "" msgstr "" "Le Navigateur Tor est développé à partir de <a " "href=\"https://www.mozilla.org/en-US/firefox/organizations/\">Firefox " -"ESR</a> (en anglais), et il est donc possible que des erreurs " -"concernant Firefox surviennent." +"ESR</a> et il est donc possible que des erreurs concernant Firefox " +"surviennent." #: http//localhost/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.description) @@ -1709,7 +1707,7 @@ msgid "" msgstr "" "Si vous souhaitez devenir un relais, veuillez consulter notre <a " "href=\"https://trac.torproject.org/projects/tor/wiki/TorRelayGuide\">guide " -"sur les relais Tor</a> (en anglais)." +"sur les relais Tor</a>." #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.seo_slug) @@ -1746,7 +1744,7 @@ msgid "" " experiencing." msgstr "" "Si votre problème n’est pas listé, veuillez remplir un <a " -"href=\"https://trac.torproject.org\">rapport de bogue</a> sur le " +"href=\"https://trac.torproject.org\">relevé de bogue</a> sur le " "problème que vous rencontrez." #: http//localhost/misc/misc-5/ @@ -2068,7 +2066,7 @@ msgstr "* Pour Windows" #: http//localhost/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.title) msgid "I'm having a problem with HTTPS Everywhere." -msgstr "J’ai un problème avec HTTPS partout." +msgstr "Je rencontre un problème avec HTTPS partout." #: http//localhost/tbb/tbb-39/ #: (content/tbb/tbb-39/contents+en.lrquestion.seo_slug) @@ -2186,9 +2184,9 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">volunteer " "page</a> for how to get involved!" msgstr "" -"Notre page <a " -"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">Devenir " -"bénévole</a> (en anglais) explique comment s’impliquer." +"Notre <a " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">page sur " +"le bénévolat</a> explique comment s’impliquer." #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.title) @@ -2287,7 +2285,7 @@ msgid "" msgstr "" "De plus amples renseignements sur les dons se trouvent dans notre <a " "href=\"https://donate.torproject.org/donor-faq\">FAQ pour les " -"donateurs</a> (en anglais)." +"donateurs</a>." #: http//localhost/tbb/tbb-40/ #: (content/tbb/tbb-40/contents+en.lrquestion.seo_slug) @@ -3555,10 +3553,10 @@ msgid "" msgstr "" "Pour de plus amples renseignements sur le fonctionnement des relais de " "garde, consultez cet <a href=\"https://blog.torproject.org/improving-" -"tors-anonymity-changing-guard-parameters\">article de blogue</a> (en " -"anglais) et cet <a href=\"https://www-" -"users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a>(en anglais)" -" sur les gardes d’entrée." +"tors-anonymity-changing-guard-parameters\">article de blogue</a> et " +"cet <a href=\"https://www-" +"users.cs.umn.edu/~hoppernj/single_guard.pdf\">article</a> sur les " +"gardes d’entrée." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -3808,9 +3806,9 @@ msgid "" "href=\"https://www.torproject.org/projects/projects.html.en\">projects " "page</a>." msgstr "" -"Une liste (en anglais) de tous nos projets de logiciels se trouve sur notre " -"<a href=\"https://www.torproject.org/projects/projects.html.en\">page " -"de projets</a>." +"Une liste de tous nos projets de logiciels se trouve sur notre <a " +"href=\"https://www.torproject.org/projects/projects.html.en\">page de " +"projets</a>." #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -4378,10 +4376,10 @@ msgid "" "Browser</a> document further explains the thinking behind this " "design." msgstr "" -"Vous trouverez de plus amples renseignements à ce sujet dans le document " +"Les réflexions liées à cette conception sont expliquées dans le document " "<a href=\"https://www.torproject.org/projects/torbrowser/design" -"/#identifier-linkability\">La conception et la mise en œuvre du " -"Navigateur</a> Tor (en anglais)." +"/#identifier-linkability\">La conception et la mise en œuvre du Navigateur " +"Tor</a>." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description)

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit 754ae4e98b9a729550a8a07f9b6075203f8ac10c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:08 2018 +0000 Update translations for whisperback_completed --- fr/fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index af47eb2c4..47729531f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # arpalord <inactive+arpalord(a)transifex.com>, 2012 # Brendan Abolivier <transifex(a)brendanabolivier.com>, 2018 -# AO French coordinator <ao(a)localizationlab.org>, 2017-2018 -# AO French coordinator <ao(a)localizationlab.org>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # MaK <>, 2012 # Onizuka, 2013 # Onizuka, 2013 # Tails developpers <amnesia(a)boum.org>, 2011 -# AO French coordinator <ao(a)localizationlab.org>, 2015 +# AO <ao(a)localizationlab.org>, 2015 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 12:34+0000\n" -"Last-Translator: AO French coordinator <ao(a)localizationlab.org>\n" +"PO-Revision-Date: 2018-11-09 20:09+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +105,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nLe rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le rapport de bogue." +msgstr "\n\nLe relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le relevé de bogue." #: ../whisperBack/gui.py:222 msgid "Your message has been sent." @@ -127,7 +128,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Le rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le rapport de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre rapport de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le rapport de bogue dans un fichier ?" +msgstr "Le relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le relevé de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre relevé de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le relevé de bogue dans un fichier ?" #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -200,7 +201,7 @@ msgstr "Aide :" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "Lire nos directives concernant les rapports de bogue." +msgstr "Lire nos directives concernant les relevés de bogue." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit c569e63a776adace737c67f21f87cb3a0e11a078 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:19:03 2018 +0000 Update translations for whisperback --- fr/fr.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index af47eb2c4..47729531f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# AO <ao(a)localizationlab.org>, 2018 # arpalord <inactive+arpalord(a)transifex.com>, 2012 # Brendan Abolivier <transifex(a)brendanabolivier.com>, 2018 -# AO French coordinator <ao(a)localizationlab.org>, 2017-2018 -# AO French coordinator <ao(a)localizationlab.org>, 2016-2017 +# AO <ao(a)localizationlab.org>, 2017-2018 +# AO <ao(a)localizationlab.org>, 2016-2017 # MaK <>, 2012 # Onizuka, 2013 # Onizuka, 2013 # Tails developpers <amnesia(a)boum.org>, 2011 -# AO French coordinator <ao(a)localizationlab.org>, 2015 +# AO <ao(a)localizationlab.org>, 2015 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 12:34+0000\n" -"Last-Translator: AO French coordinator <ao(a)localizationlab.org>\n" +"PO-Revision-Date: 2018-11-09 20:09+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +105,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nLe rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le rapport de bogue." +msgstr "\n\nLe relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau. Veuillez essayer de vous reconnecter au réseau et recliquer sur envoyer.\n\nSi cela ne fonctionne pas, l’on vous proposera d’enregistrer le relevé de bogue." #: ../whisperBack/gui.py:222 msgid "Your message has been sent." @@ -127,7 +128,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Le rapport de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le rapport de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre rapport de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le rapport de bogue dans un fichier ?" +msgstr "Le relevé de bogue n’a pas pu être envoyé, probablement à cause de problèmes de réseau.\n\nPour contourner le problème, vous pouvez enregistrer le relevé de bogue sous forme de fichier sur une clé USB et essayer de nous l’envoyer à %s à partir de votre compte de courriel en utilisant un autre système. Prenez note que votre relevé de bogue ne sera pas anonyme de cette façon, à moins que vous ne preniez des précautions supplémentaires (p. ex. en utilisant Tor avec un compte de courriel jetable).\n\nVoulez-vous enregistrer le relevé de bogue dans un fichier ?" #: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -200,7 +201,7 @@ msgstr "Aide :" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "Lire nos directives concernant les rapports de bogue." +msgstr "Lire nos directives concernant les relevés de bogue." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit b80d6216284ff2871f96e8eac51442b0f5fa4752 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:16:09 2018 +0000 Update translations for tails-misc_completed --- fr.po | 90 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/fr.po b/fr.po index 849df3399..de916f2ef 100644 --- a/fr.po +++ b/fr.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-25 16:58+0000\n" +"POT-Creation-Date: 2018-10-31 16:04+0100\n" +"PO-Revision-Date: 2018-11-09 20:08+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de rapport de bogue</a>.\nN’incluez pas plus d’informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" +msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de relevé de bogue</a>.\nN’incluez pas plus d’informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid "" @@ -166,91 +166,91 @@ msgstr "Informations de version :\n%s" msgid "not available" msgstr "non disponible" -#. Translators: Don't translate {details}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144 +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Show Log" msgstr "Afficher le journal" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Configure" msgstr "Configurer" -#. Translators: Don't translate {beginning} or {last}, they are placeholders -#. and will be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218 +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} et {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 msgid ", " msgstr ", " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313 +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Ajouter {packages} à vos logiciels supplémentaire ?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Pour l’installer automatiquement à partir de votre espace de stockage persistant lors du démarrage de Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 msgid "Install Every Time" msgstr "Installer toutes les fois" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Install Only Once" msgstr "Installer une seul fois seulement" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." msgstr "Échec de configuration de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." msgstr "Pour l’installer automatiquement lors du démarrage de Tails, vous pouvez créer un espace de stockage persistant et activer la fonction Logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:318 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "Create Persistent Storage" msgstr "Créer un espace de stockage persistant" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "Creating your persistent storage failed." msgstr "Échec de création de votre espace de stockage persistant. " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334 +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:341 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:337 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 msgid "" "To do so, you need to run Tails from a USB stick installed using Tails " "Installer." @@ -258,56 +258,56 @@ msgstr "Pour ce faire, vous devez exécuter Tails à partir d’une clé USB ins #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Supprimer {packages} de vos logiciels supplémentaires ?" -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354 +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Cela arrêtera l’installation automatique de {packages}." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:356 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 msgid "Remove" msgstr "Supprimer" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:357 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:531 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." msgstr "Installation de vos logiciels supplémentaires à partir de votre espace de stockage persistant…" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:533 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." msgstr "Cela peut prendre plusieurs minutes." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" msgstr "Échec d’installation de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" msgstr "Les logiciels supplémentaires ont été installés avec succès" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:580 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" msgstr "Échec de recherche de mises à niveau de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:590 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Veuillez vérifier votre connexion réseau, redémarrer Tails, ou consulter le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" msgstr "Échec de mise à niveau de vos logiciels supplémentaires."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit 0f65a3f9c3bd0efcbaec58bdaba2a0d66ad26ac4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 20:16:04 2018 +0000 Update translations for tails-misc --- fr.po | 90 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/fr.po b/fr.po index 849df3399..de916f2ef 100644 --- a/fr.po +++ b/fr.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-25 16:58+0000\n" +"POT-Creation-Date: 2018-10-31 16:04+0100\n" +"PO-Revision-Date: 2018-11-09 20:08+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de rapport de bogue</a>.\nN’incluez pas plus d’informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" +msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de relevé de bogue</a>.\nN’incluez pas plus d’informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nEn nous donnant une adresse courriel, vous nous permettez de vous contacter pour clarifier le problème. Cela est nécessaire pour la vaste majorité des rapports que nous recevons, car la plupart des rapports sans information de contact sont inutiles. D’un autre côté, cela donne une occasion aux oreilles électroniques indiscrètes, comme votre fournisseur de service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51 msgid "" @@ -166,91 +166,91 @@ msgstr "Informations de version :\n%s" msgid "not available" msgstr "non disponible" -#. Translators: Don't translate {details}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:144 +#. Translators: Don't translate {details}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 #, python-brace-format msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." msgstr "{details} Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:149 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:152 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." msgstr "Veuillez consulter votre liste de logiciels supplémentaires ou lire le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Show Log" msgstr "Afficher le journal" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:156 msgid "Configure" msgstr "Configurer" -#. Translators: Don't translate {beginning} or {last}, they are placeholders -#. and will be replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218 +#. Translators: Don't translate {beginning} or {last}, they are +#. placeholders and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:222 #, python-brace-format msgid "{beginning} and {last}" msgstr "{beginning} et {last}" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:219 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223 msgid ", " msgstr ", " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313 +#. Translators: Don't translate {packages}, it's a placeholder and will +#. be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 #, python-brace-format msgid "Add {packages} to your additional software?" msgstr "Ajouter {packages} à vos logiciels supplémentaire ?" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291 msgid "" "To install it automatically from your persistent storage when starting " "Tails." msgstr "Pour l’installer automatiquement à partir de votre espace de stockage persistant lors du démarrage de Tails." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:293 msgid "Install Every Time" msgstr "Installer toutes les fois" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:289 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325 msgid "Install Only Once" msgstr "Installer une seul fois seulement" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:300 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:330 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:371 msgid "The configuration of your additional software failed." msgstr "Échec de configuration de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the Additional Software feature." msgstr "Pour l’installer automatiquement lors du démarrage de Tails, vous pouvez créer un espace de stockage persistant et activer la fonction Logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:318 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324 msgid "Create Persistent Storage" msgstr "Créer un espace de stockage persistant" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332 msgid "Creating your persistent storage failed." msgstr "Échec de création de votre espace de stockage persistant. " -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334 +#. Translators: Don't translate {packages}, it's a placeholder and +#. will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:341 #, python-brace-format msgid "You could install {packages} automatically when starting Tails" msgstr "Vous pourriez installer {packages} automatiquement lors du démarrage de Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:337 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344 msgid "" "To do so, you need to run Tails from a USB stick installed using Tails " "Installer." @@ -258,56 +258,56 @@ msgstr "Pour ce faire, vous devez exécuter Tails à partir d’une clé USB ins #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359 #, python-brace-format msgid "Remove {packages} from your additional software?" msgstr "Supprimer {packages} de vos logiciels supplémentaires ?" -#. Translators: Don't translate {packages}, it's a placeholder and will be -#. replaced. -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354 +#. Translators: Don't translate {packages}, it's a placeholder +#. and will be replaced. +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:363 #, python-brace-format msgid "This will stop installing {packages} automatically." msgstr "Cela arrêtera l’installation automatique de {packages}." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:356 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:365 msgid "Remove" msgstr "Supprimer" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:357 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:531 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:544 msgid "Installing your additional software from persistent storage..." msgstr "Installation de vos logiciels supplémentaires à partir de votre espace de stockage persistant…" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:533 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:546 msgid "This can take several minutes." msgstr "Cela peut prendre plusieurs minutes." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:559 msgid "The installation of your additional software failed" msgstr "Échec d’installation de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:574 msgid "Additional software installed successfully" msgstr "Les logiciels supplémentaires ont été installés avec succès" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:580 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:594 msgid "The check for upgrades of your additional software failed" msgstr "Échec de recherche de mises à niveau de vos logiciels supplémentaires." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:590 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:596 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604 msgid "" "Please check your network connection, restart Tails, or read the system log " "to understand the problem." msgstr "Veuillez vérifier votre connexion réseau, redémarrer Tails, ou consulter le journal du système pour comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:589 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:603 msgid "The upgrade of your additional software failed" msgstr "Échec de mise à niveau de vos logiciels supplémentaires."

1 0

[tor/master] Move the code that knows our tor version into a lowest-level lib
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 6e7ff8cba0efaf803e3ef5b5aba4123633fe0658 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:33:22 2018 -0400 Move the code that knows our tor version into a lowest-level lib --- .gitignore | 2 ++ Makefile.am | 2 ++ src/app/config/config.c | 41 +------------------------ src/app/config/config.h | 2 -- src/app/config/statefile.c | 1 + src/app/main/main.c | 1 + src/feature/control/control.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/feature/relay/router.c | 1 + src/include.am | 1 + src/lib/log/.may_include | 3 +- src/lib/log/include.am | 8 ----- src/lib/log/log.c | 2 +- src/lib/version/.may_include | 3 ++ src/lib/{log => version}/git_revision.c | 2 +- src/lib/{log => version}/git_revision.h | 0 src/lib/version/include.am | 25 ++++++++++++++++ src/lib/version/torversion.h | 12 ++++++++ src/lib/version/version.c | 50 +++++++++++++++++++++++++++++++ src/rust/build.rs | 1 + src/test/fuzz/fuzzing_common.c | 1 + src/test/testing_common.c | 1 + 22 files changed, 107 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index cedff8fb3..ee2de376a 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,8 @@ uptime-*.json /src/lib/libtor-tls.a /src/lib/libtor-tls-testing.a /src/lib/libtor-trace.a +/src/lib/libtor-version.a +/src/lib/libtor-version-testing.a /src/lib/libtor-wallclock.a /src/lib/libtor-wallclock-testing.a diff --git a/Makefile.am b/Makefile.am index e5c1be31b..cb76edfa2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ TOR_UTIL_LIBS = \ src/lib/libtor-malloc.a \ src/lib/libtor-wallclock.a \ src/lib/libtor-err.a \ + src/lib/libtor-version.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime.a @@ -91,6 +92,7 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-malloc-testing.a \ src/lib/libtor-wallclock-testing.a \ src/lib/libtor-err-testing.a \ + src/lib/libtor-version-testing.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime-testing.a endif diff --git a/src/app/config/config.c b/src/app/config/config.c index 6e7e13105..7b49387bc 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -112,9 +112,9 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" -#include "lib/log/git_revision.h" #include "lib/net/resolve.h" #include "lib/sandbox/sandbox.h" +#include "lib/version/torversion.h" #ifdef ENABLE_NSS #include "lib/crypt_ops/crypto_nss_mgt.h" @@ -972,42 +972,6 @@ set_options(or_options_t *new_val, char **msg) return 0; } -/** The version of this Tor process, as parsed. */ -static char *the_tor_version = NULL; -/** A shorter version of this Tor process's version, for export in our router - * descriptor. (Does not include the git version, if any.) */ -static char *the_short_tor_version = NULL; - -/** Return the current Tor version. */ -const char * -get_version(void) -{ - if (the_tor_version == NULL) { - if (strlen(tor_git_revision)) { - tor_asprintf(&the_tor_version, "%s (git-%s)", get_short_version(), - tor_git_revision); - } else { - the_tor_version = tor_strdup(get_short_version()); - } - } - return the_tor_version; -} - -/** Return the current Tor version, without any git tag. */ -const char * -get_short_version(void) -{ - - if (the_short_tor_version == NULL) { -#ifdef TOR_BUILD_TAG - tor_asprintf(&the_short_tor_version, "%s (%s)", VERSION, TOR_BUILD_TAG); -#else - the_short_tor_version = tor_strdup(VERSION); -#endif - } - return the_short_tor_version; -} - /** Release additional memory allocated in options */ STATIC void @@ -1067,9 +1031,6 @@ config_free_all(void) tor_free(torrc_defaults_fname); tor_free(global_dirfrontpagecontents); - tor_free(the_short_tor_version); - tor_free(the_tor_version); - cleanup_protocol_warning_severity_level(); have_parsed_cmdline = 0; diff --git a/src/app/config/config.h b/src/app/config/config.h index a169cfd45..4c497b83a 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -41,8 +41,6 @@ const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); void init_protocol_warning_severity_level(void); int get_protocol_warning_severity_level(void); -const char *get_version(void); -const char *get_short_version(void); /** An error from options_trial_assign() or options_init_from_string(). */ typedef enum setopt_err_t { diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 8a8b7ced0..4ba7be151 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -45,6 +45,7 @@ #include "app/config/statefile.h" #include "lib/encoding/confline.h" #include "lib/net/resolve.h" +#include "lib/version/torversion.h" #include "app/config/or_state_st.h" diff --git a/src/app/main/main.c b/src/app/main/main.c index 444d6ea7e..031f57009 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -84,6 +84,7 @@ #include "lib/encoding/confline.h" #include "lib/evloop/timers.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" #include <event2/event.h> diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 3fa47747e..b31b448e9 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -92,6 +92,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" #include "lib/evloop/compat_libevent.h" +#include "lib/version/torversion.h" #include "feature/dircache/cached_dir_st.h" #include "feature/control/control_connection_st.h" diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 38c7fd76d..1ce06744d 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -22,6 +22,7 @@ #include "feature/dirauth/shared_random_state.h" #include "feature/dircommon/voting_schedule.h" #include "lib/encoding/confline.h" +#include "lib/version/torversion.h" #include "app/config/or_state_st.h" diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 3a819f592..9d61ced11 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -49,6 +49,7 @@ #include "lib/encoding/confline.h" #include "lib/osinfo/uname.h" #include "lib/tls/tortls.h" +#include "lib/version/torversion.h" #include "feature/dirauth/authmode.h" diff --git a/src/include.am b/src/include.am index 247b0db8d..827949993 100644 --- a/src/include.am +++ b/src/include.am @@ -33,6 +33,7 @@ include src/lib/thread/include.am include src/lib/time/include.am include src/lib/tls/include.am include src/lib/trace/include.am +include src/lib/version/include.am include src/lib/wallclock/include.am include src/trunnel/include.am diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include index 852173aab..7ca1863a5 100644 --- a/src/lib/log/.may_include +++ b/src/lib/log/.may_include @@ -10,6 +10,5 @@ lib/log/*.h lib/malloc/*.h lib/string/*.h lib/testsupport/*.h +lib/version/*.h lib/wallclock/*.h - -micro-revision.i \ No newline at end of file diff --git a/src/lib/log/include.am b/src/lib/log/include.am index 4a6c9b368..c6f404e26 100644 --- a/src/lib/log/include.am +++ b/src/lib/log/include.am @@ -7,7 +7,6 @@ endif src_lib_libtor_log_a_SOURCES = \ src/lib/log/escape.c \ - src/lib/log/git_revision.c \ src/lib/log/ratelim.c \ src/lib/log/log.c \ src/lib/log/util_bug.c @@ -21,15 +20,8 @@ src_lib_libtor_log_testing_a_SOURCES = \ src_lib_libtor_log_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -# Declare that these object files depend on micro-revision.i. Without this -# rule, we could try to build them before micro-revision.i was created. -src/lib/log/git_revision.$(OBJEXT) \ - src/lib/log/src_lib_libtor_log_testing_a-git_revision.$(OBJEXT): \ - micro-revision.i - noinst_HEADERS += \ src/lib/log/escape.h \ - src/lib/log/git_revision.h \ src/lib/log/ratelim.h \ src/lib/log/log.h \ src/lib/log/util_bug.h \ diff --git a/src/lib/log/log.c b/src/lib/log/log.c index d60ce6308..bc7b36dcb 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -32,7 +32,7 @@ #define LOG_PRIVATE #include "lib/log/log.h" -#include "lib/log/git_revision.h" +#include "lib/version/git_revision.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/version/.may_include b/src/lib/version/.may_include new file mode 100644 index 000000000..d159ceb41 --- /dev/null +++ b/src/lib/version/.may_include @@ -0,0 +1,3 @@ +orconfig.h +micro-revision.i +lib/version/*.h \ No newline at end of file diff --git a/src/lib/log/git_revision.c b/src/lib/version/git_revision.c similarity index 94% rename from src/lib/log/git_revision.c rename to src/lib/version/git_revision.c index 9d29ecd2a..e5b2ff534 100644 --- a/src/lib/log/git_revision.c +++ b/src/lib/version/git_revision.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#include "lib/log/git_revision.h" +#include "lib/version/git_revision.h" /** String describing which Tor Git repository version the source was * built from. This string is generated by a bit of shell kludging in diff --git a/src/lib/log/git_revision.h b/src/lib/version/git_revision.h similarity index 100% rename from src/lib/log/git_revision.h rename to src/lib/version/git_revision.h diff --git a/src/lib/version/include.am b/src/lib/version/include.am new file mode 100644 index 000000000..6944eb05e --- /dev/null +++ b/src/lib/version/include.am @@ -0,0 +1,25 @@ + +noinst_LIBRARIES += src/lib/libtor-version.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-version-testing.a +endif + +src_lib_libtor_version_a_SOURCES = \ + src/lib/version/git_revision.c \ + src/lib/version/version.c + +src_lib_libtor_version_testing_a_SOURCES = \ + $(src_lib_libtor_version_a_SOURCES) +src_lib_libtor_version_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_version_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +# Declare that these object files depend on micro-revision.i. Without this +# rule, we could try to build them before micro-revision.i was created. +src/lib/version/git_revision.$(OBJEXT) \ + src/lib/version/src_lib_libtor_version_testing_a-git_revision.$(OBJEXT): \ + micro-revision.i + +noinst_HEADERS += \ + src/lib/version/git_revision.h \ + src/lib/version/torversion.h diff --git a/src/lib/version/torversion.h b/src/lib/version/torversion.h new file mode 100644 index 000000000..761d6f25a --- /dev/null +++ b/src/lib/version/torversion.h @@ -0,0 +1,12 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_VERSION_H +#define TOR_VERSION_H + +const char *get_version(void); +const char *get_short_version(void); + +#endif /* !defined(TOR_VERSION_H) */ diff --git a/src/lib/version/version.c b/src/lib/version/version.c new file mode 100644 index 000000000..29ada39c9 --- /dev/null +++ b/src/lib/version/version.c @@ -0,0 +1,50 @@ +/* Copyright 2001-2004 Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "lib/version/torversion.h" +#include "lib/version/git_revision.h" + +#include <stdio.h> +#include <string.h> + +/** A shorter version of this Tor process's version, for export in our router + * descriptor. (Does not include the git version, if any.) */ +static const char the_short_tor_version[] = + VERSION +#ifdef TOR_BUILD_TAG + " ("TOR_BUILD_TAG")" +#endif + ""; + +#define MAX_VERSION_LEN 128 + +/** The version of this Tor process, possibly including git version */ +static char the_tor_version[MAX_VERSION_LEN] = ""; + +/** Return the current Tor version. */ +const char * +get_version(void) +{ + if (the_tor_version[0] == 0) { + if (strlen(tor_git_revision)) { + snprintf(the_tor_version, sizeof(the_tor_version), + "%s (git-%s)", the_short_tor_version, tor_git_revision); + } else { + snprintf(the_tor_version, sizeof(the_tor_version), + "%s", the_short_tor_version); + } + the_tor_version[sizeof(the_tor_version)-1] = 0; + } + + return the_tor_version; +} + +/** Return the current Tor version, without any git tag. */ +const char * +get_short_version(void) +{ + return the_short_tor_version; +} diff --git a/src/rust/build.rs b/src/rust/build.rs index 123d5c068..bf566c56b 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -162,6 +162,7 @@ pub fn main() { cfg.component("tor-malloc"); cfg.component("tor-wallclock"); cfg.component("tor-err-testing"); + cfg.component("tor-version-testing"); cfg.component("tor-intmath-testing"); cfg.component("tor-ctime-testing"); cfg.component("curve25519_donna"); diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 1401e4c28..879f9e74d 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -9,6 +9,7 @@ #include "lib/compress/compress.h" #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" static or_options_t *mock_options = NULL; static const or_options_t * diff --git a/src/test/testing_common.c b/src/test/testing_common.c index c52683afc..8d648ee17 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -25,6 +25,7 @@ #include "lib/compress/compress.h" #include "lib/evloop/compat_libevent.h" #include "lib/crypt_ops/crypto_init.h" +#include "lib/version/torversion.h" #include <stdio.h> #ifdef HAVE_FCNTL_H

1 0

[tor/master] Make initialization for the "err" library into a subsystem.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 175153a3290b3987faacac9d5390e87e1ad4a457 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:40:55 2018 -0400 Make initialization for the "err" library into a subsystem. --- src/app/main/main.c | 10 ---------- src/app/main/subsystem_list.c | 4 +++- src/lib/err/.may_include | 2 ++ src/lib/err/include.am | 8 +++++--- src/lib/err/torerr.c | 10 ++++++++++ src/lib/err/torerr.h | 1 + src/lib/err/torerr_sys.c | 39 +++++++++++++++++++++++++++++++++++++++ src/lib/err/torerr_sys.h | 14 ++++++++++++++ 8 files changed, 74 insertions(+), 14 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 031f57009..e3d7610c8 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -69,7 +69,6 @@ #include "lib/container/buffers.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" -#include "lib/err/backtrace.h" #include "lib/geoip/geoip.h" #include "lib/process/waitpid.h" @@ -822,7 +821,6 @@ tor_free_all(int postfork) if (!postfork) { escaped(NULL); esc_router_info(NULL); - clean_up_backtrace_handler(); logs_free_all(); /* free log strings. do this last so logs keep working. */ } } @@ -1419,14 +1417,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* !defined(_WIN64) */ #endif /* defined(_WIN32) */ - { - int bt_err = configure_backtrace_handler(get_version()); - if (bt_err < 0) { - log_warn(LD_BUG, "Unable to install backtrace handler: %s", - strerror(-bt_err)); - } - } - #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED event_set_mem_functions(tor_malloc_, tor_realloc_, tor_free_); #endif diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index fc1249e1c..244dbadbd 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -8,13 +8,15 @@ #include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" +#include "lib/err/torerr_sys.h" + #include <stddef.h> /** * Global list of the subsystems in Tor, in the order of their initialization. **/ const subsys_fns_t *tor_subsystems[] = { - NULL // placeholder. + &sys_torerr, }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems); diff --git a/src/lib/err/.may_include b/src/lib/err/.may_include index 48cc0ef08..daa1b6e4c 100644 --- a/src/lib/err/.may_include +++ b/src/lib/err/.may_include @@ -1,3 +1,5 @@ orconfig.h lib/cc/*.h lib/err/*.h +lib/subsys/*.h +lib/version/*.h \ No newline at end of file diff --git a/src/lib/err/include.am b/src/lib/err/include.am index f2a409c51..43adcd269 100644 --- a/src/lib/err/include.am +++ b/src/lib/err/include.am @@ -6,8 +6,9 @@ noinst_LIBRARIES += src/lib/libtor-err-testing.a endif src_lib_libtor_err_a_SOURCES = \ - src/lib/err/backtrace.c \ - src/lib/err/torerr.c + src/lib/err/backtrace.c \ + src/lib/err/torerr.c \ + src/lib/err/torerr_sys.c src_lib_libtor_err_testing_a_SOURCES = \ $(src_lib_libtor_err_a_SOURCES) @@ -16,4 +17,5 @@ src_lib_libtor_err_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/err/backtrace.h \ - src/lib/err/torerr.h + src/lib/err/torerr.h \ + src/lib/err/torerr_sys.h diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index f9e139f96..e9de86837 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -123,6 +123,16 @@ tor_log_set_sigsafe_err_fds(const int *fds, int n) } /** + * Reset the list of emergency error fds to its default. + */ +void +tor_log_reset_sigsafe_err_fds(void) +{ + int fds[] = { STDERR_FILENO }; + tor_log_set_sigsafe_err_fds(fds, 1); +} + +/** * Set the granularity (in ms) to use when reporting fatal errors outside * the logging system. */ diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h index d4bba6916..b415ef73e 100644 --- a/src/lib/err/torerr.h +++ b/src/lib/err/torerr.h @@ -39,6 +39,7 @@ void tor_raw_assertion_failed_msg_(const char *file, int line, void tor_log_err_sigsafe(const char *m, ...); int tor_log_get_sigsafe_err_fds(const int **out); void tor_log_set_sigsafe_err_fds(const int *fds, int n); +void tor_log_reset_sigsafe_err_fds(void); void tor_log_sigsafe_err_set_granularity(int ms); int format_hex_number_sigsafe(unsigned long x, char *buf, int max_len); diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c new file mode 100644 index 000000000..54666f410 --- /dev/null +++ b/src/lib/err/torerr_sys.c @@ -0,0 +1,39 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file torerr_sys.c + * \brief Subsystem object for the error handling subsystem. + **/ + +#include "orconfig.h" +#include "lib/err/backtrace.h" +#include "lib/err/torerr.h" +#include "lib/err/torerr_sys.h" +#include "lib/subsys/subsys.h" +#include "lib/version/torversion.h" + +#include <stddef.h> + +static int +torerr_subsys_init(void) +{ + configure_backtrace_handler(get_version()); + tor_log_reset_sigsafe_err_fds(); + + return 0; +} +static void +torerr_subsys_shutdown(void) +{ + tor_log_reset_sigsafe_err_fds(); + clean_up_backtrace_handler(); +} + +const subsys_fns_t sys_torerr = { + .name = "err", + .level = -100, + .supported = true, + .initialize = torerr_subsys_init, + .shutdown = torerr_subsys_shutdown +}; diff --git a/src/lib/err/torerr_sys.h b/src/lib/err/torerr_sys.h new file mode 100644 index 000000000..b56270d53 --- /dev/null +++ b/src/lib/err/torerr_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file torerr_sys.h + * \brief Declare subsystem object for torerr.c + **/ + +#ifndef TOR_TORERR_SYS_H +#define TOR_TORERR_SYS_H + +extern const struct subsys_fns_t sys_torerr; + +#endif /* !defined(TOR_TORERR_SYS_H) */

1 0

[tor/master] Make the windows process parameter initialization a subsystem
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 178c1821b2115972ce3c3f194d1fcbd0d75ca364 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 1 12:55:10 2018 -0400 Make the windows process parameter initialization a subsystem Also, move it from "main" into lib/process --- src/app/main/main.c | 29 ------------------ src/app/main/subsystem_list.c | 2 ++ src/lib/process/.may_include | 1 + src/lib/process/include.am | 6 ++-- src/lib/process/winprocess_sys.c | 64 ++++++++++++++++++++++++++++++++++++++++ src/lib/process/winprocess_sys.h | 14 +++++++++ 6 files changed, 85 insertions(+), 31 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index e3d7610c8..1e4cd37fe 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1388,35 +1388,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) { int result = 0; -#ifdef _WIN32 -#ifndef HeapEnableTerminationOnCorruption -#define HeapEnableTerminationOnCorruption 1 -#endif - /* On heap corruption, just give up; don't try to play along. */ - HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); - - /* SetProcessDEPPolicy is only supported on 32-bit Windows. - * (On 64-bit Windows it always fails, and some compilers don't like the - * PSETDEP cast.) - * 32-bit Windows defines _WIN32. - * 64-bit Windows defines _WIN32 and _WIN64. */ -#ifndef _WIN64 - /* Call SetProcessDEPPolicy to permanently enable DEP. - The function will not resolve on earlier versions of Windows, - and failure is not dangerous. */ - HMODULE hMod = GetModuleHandleA("Kernel32.dll"); - if (hMod) { - typedef BOOL (WINAPI *PSETDEP)(DWORD); - PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod, - "SetProcessDEPPolicy"); - if (setdeppolicy) { - /* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */ - setdeppolicy(3); - } - } -#endif /* !defined(_WIN64) */ -#endif /* defined(_WIN32) */ - #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED event_set_mem_functions(tor_malloc_, tor_realloc_, tor_free_); #endif diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 244dbadbd..0f7d5d2cc 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -9,6 +9,7 @@ #include "lib/cc/torint.h" #include "lib/err/torerr_sys.h" +#include "lib/process/winprocess_sys.h" #include <stddef.h> @@ -16,6 +17,7 @@ * Global list of the subsystems in Tor, in the order of their initialization. **/ const subsys_fns_t *tor_subsystems[] = { + &sys_winprocess, &sys_torerr, }; diff --git a/src/lib/process/.may_include b/src/lib/process/.may_include index 05414d2a9..a2d57a52f 100644 --- a/src/lib/process/.may_include +++ b/src/lib/process/.may_include @@ -11,6 +11,7 @@ lib/malloc/*.h lib/net/*.h lib/process/*.h lib/string/*.h +lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h diff --git a/src/lib/process/include.am b/src/lib/process/include.am index c6cc3a669..2aa30cc3c 100644 --- a/src/lib/process/include.am +++ b/src/lib/process/include.am @@ -12,7 +12,8 @@ src_lib_libtor_process_a_SOURCES = \ src/lib/process/restrict.c \ src/lib/process/setuid.c \ src/lib/process/subprocess.c \ - src/lib/process/waitpid.c + src/lib/process/waitpid.c \ + src/lib/process/winprocess_sys.c src_lib_libtor_process_testing_a_SOURCES = \ $(src_lib_libtor_process_a_SOURCES) @@ -26,4 +27,5 @@ noinst_HEADERS += \ src/lib/process/restrict.h \ src/lib/process/setuid.h \ src/lib/process/subprocess.h \ - src/lib/process/waitpid.h + src/lib/process/waitpid.h \ + src/lib/process/winprocess_sys.h diff --git a/src/lib/process/winprocess_sys.c b/src/lib/process/winprocess_sys.c new file mode 100644 index 000000000..e00f94c91 --- /dev/null +++ b/src/lib/process/winprocess_sys.c @@ -0,0 +1,64 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file winprocess_sys.c + * \brief Subsystem object for windows process setup. + **/ + +#include "orconfig.h" +#include "lib/subsys/subsys.h" +#include "lib/process/winprocess_sys.h" + +#include <stdbool.h> +#include <stddef.h> + +#ifdef _WIN32 +#include <windows.h> + +#define WINPROCESS_SYS_ENABLED true + +static int +init_windows_process_params(void) +{ +#ifndef HeapEnableTerminationOnCorruption +#define HeapEnableTerminationOnCorruption 1 +#endif + + /* On heap corruption, just give up; don't try to play along. */ + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); + + /* SetProcessDEPPolicy is only supported on 32-bit Windows. + * (On 64-bit Windows it always fails, and some compilers don't like the + * PSETDEP cast.) + * 32-bit Windows defines _WIN32. + * 64-bit Windows defines _WIN32 and _WIN64. */ +#ifndef _WIN64 + /* Call SetProcessDEPPolicy to permanently enable DEP. + The function will not resolve on earlier versions of Windows, + and failure is not dangerous. */ + HMODULE hMod = GetModuleHandleA("Kernel32.dll"); + if (hMod) { + typedef BOOL (WINAPI *PSETDEP)(DWORD); + PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod, + "SetProcessDEPPolicy"); + if (setdeppolicy) { + /* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */ + setdeppolicy(3); + } + } +#endif /* !defined(_WIN64) */ + + return 0; +} +#else /* !defined(_WIN32) */ +#define WINPROCESS_SYS_ENABLED false +#define init_windows_process_params NULL +#endif /* defined(_WIN32) */ + +const subsys_fns_t sys_winprocess = { + .name = "winprocess", + .level = -100, + .supported = WINPROCESS_SYS_ENABLED, + .initialize = init_windows_process_params, +}; diff --git a/src/lib/process/winprocess_sys.h b/src/lib/process/winprocess_sys.h new file mode 100644 index 000000000..cb096e0c9 --- /dev/null +++ b/src/lib/process/winprocess_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file winprocess_sys.h + * \brief Declare subsystem object for winprocess.c + **/ + +#ifndef TOR_WINPROCESS_SYS_H +#define TOR_WINPROCESS_SYS_H + +extern const struct subsys_fns_t sys_winprocess; + +#endif /* !defined(TOR_WINPROCESS_SYS_H) */

1 0