- tor-commits - lists.torproject.org

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 26 Mar '19

26 Mar '19

commit a3c77a3a73080f97c7d3b716155f7d2417ba1830 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 26 15:15:44 2019 +0000 Update translations for donatepages-messagespot --- locale/is/LC_MESSAGES/messages.po | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/locale/is/LC_MESSAGES/messages.po b/locale/is/LC_MESSAGES/messages.po index 2b37cf5de..f7ab0bdfb 100644 --- a/locale/is/LC_MESSAGES/messages.po +++ b/locale/is/LC_MESSAGES/messages.po @@ -30,6 +30,9 @@ msgid "" "anonymity is by donating using a method that doesn't disclose your personal " "information." msgstr "" +"Ef það að gæta nafnleyndar á netinu er þér mikilvægt, þá er best fyrir þig " +"til að styrkja okkur að nota aðferð sem ekki gefur upp neinar persónulegar " +"upplýsingar." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65 msgid "" @@ -37,12 +40,17 @@ msgid "" "be collected and retained by third-party service providers and/or the Tor " "Project, as described below." msgstr "" +"Gefir þú upp einhverjar persónulegar upplýsingar í gjafaferlinu, er þeim " +"mögulega safnað og þær geymdar af utanaðkomandi þjónustuaðilum og/eða Tor-" +"verkefninu, eins og lýst er hér fyrir neðan." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:67 msgid "" "The Tor Project has very little influence over how third-party service " "providers, such as PayPal, may collect and use your information." msgstr "" +"Tor-verkefnið ræður litlu sem engu um það hvernig utanaðkomandi " +"þjónustuaðilar á borð við PayPal safna og notfæra śer upplýsingar um þig." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:69 msgid "" @@ -50,6 +58,10 @@ msgid "" "links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua" "/privacy-full\">policies</a>, especially if you have privacy concerns." msgstr "" +"Við mælum með að þú kynnir þér stefnu þeirra varðandi <a class=\"hyperlinks " +"links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua" +"/privacy-full\">meðferð persónuupplýsinga</a>, sér í lagi ef þú hefur " +"áhyggjur af gagnaleynd." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:74 msgid "" @@ -57,18 +69,27 @@ msgid "" " learn your name, the amount you donated, your email address, phone number " "and/or mailing address, as well as any other information you provide." msgstr "" +"Þegar þú gefur til Tor-verkefnisins, gætum við safnað upplýsingum á borð við" +" nafnið þitt, upphæðina sem þú gefur, símanúmerið þitt og/eða heimilisfang, " +"auk annarra upplýsinga sem þú gefur upp; fer það eftir hvaða aðferð þú notar" +" við ferlið." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76 msgid "" "We may also learn incidental data such as the date and time of your " "donation." msgstr "" +"Við gætum haldið eftir tilfallandi gögnum, eins og dagsetningu og tíma þegar" +" gjöfin frá þér berst." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:78 msgid "" "The Tor Project will never have access to your financial data, such as your " "credit card information.We aim to be careful with your information." msgstr "" +"Tor-verkefnið mun aldrei hafa neinn aðgang að fjárhagslegum upplýsingum um " +"þig, svo sem greiðslukortaupplýsingum. Við gerum allt til að fara varlega " +"með allar slíkar upplýsingar." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:83 msgid "" @@ -82,6 +103,8 @@ msgstr "" msgid "" "If you opt in during the donation process, we may email you again in future." msgstr "" +"Ef þú samþykkir það í gjafaferlinu, gætum við sent þér aftur tölvupóst í " +"framtíðinni." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:87 msgid "" @@ -90,12 +113,18 @@ msgid "" "target=\"_blank\" href=\"https://www.irs.gov/pub/irs-" "pdf/f990ezb.pdf\">Schedule B of the Form 990</a>." msgstr "" +"Ef þú gefur meira en 5.000 USD og við vitum nafn þitt og heimilisfang, þá " +"ber okkur skylda til að upplýsa IRS skattstofuna um þetta á <a " +"class=\"hyperlinks links\" target=\"_blank\" href=\"https://www.irs.gov/pub" +"/irs-pdf/f990ezb.pdf\">Schedule B á Form 990 eyðublaðinu</a>." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:89 msgid "" "But, that information is redacted from the publicly-available version of our" " Form 990." msgstr "" +"En þær upplýsingar verða aftur þurrkaðar út úr hinni opinberlega útgefnu " +"útgáfu af Form 990 eyðublaði framtalsupplýsinganna okkar." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:91 msgid "" @@ -114,6 +143,8 @@ msgid "" "For our records, we retain your name, the amount of your donation, the date " "of the donation, and your contact information." msgstr "" +"Fyrir bókhaldið okkar munum við halda eftir upplýsingum um nafnið þitt, " +"upphæð fjárframlags, dagsetningu færslunnar og hvernig við getum náð í þig." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:100 msgid "" @@ -121,6 +152,9 @@ msgid "" "who need it to do their work, for example by thanking you or mailing you a " "t-shirt." msgstr "" +"Aðgangur að þeim upplýsingum er takmarkaður innan Tor-verkefnisins við það " +"fólk sem nauðsynlega þarfnast þeirra vegna vinnu sinnar, til dæmis við að " +"þakka þér fyrir eða til að senda þér stuttermabol." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:105 msgid ""

1 0

[tpo/master] Delete tmp scripts files
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 768d450f23efdcca128dda4560718fdf9c3ea0db Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 16:10:47 2019 +0100 Delete tmp scripts files --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2c5c3c0..4659652 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ public *.po contents+*.lr -*.ipynb +*.ipynb* *.egg-info *.pyc

1 0

[tpo/staging] remove incomplete languages
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 92e0b1fac90fb1b22a1da7026ad2f87d446ab00b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:54:41 2019 +0100 remove incomplete languages --- configs/i18n.ini | 2 +- databags/alternatives.ini | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 533d593..04dbd31 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = bn-BD,de,es,fr,id,it,pt-BR,ru,tr,zh-CN +translations = de,es,fr,it,pt-BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = 'https://lektor-staging.torproject.org/tpo/staging/' diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 149d345..035c0c9 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,12 +4,6 @@ order = order-last url = / language = English (en) -[bn-BD] -direction = text-left -order = order-last -url = /bn-BD/ -language = বাংলা ভাষা (bn-BD) - [de] direction = text-left order = order-last @@ -28,12 +22,6 @@ order = order-last url = /fr/ language = Français (fr) -[id] -direction = text-left -order = order-last -url = /id/ -language = Indonesia (id) - [it] direction = text-left order = order-last @@ -51,15 +39,3 @@ direction = text-left order = order-last url = /ru/ language = Русский (ru) - -[tr] -direction = text-left -order = order-last -url = /tr/ -language = Türkçe (tr) - -[zh-CN] -direction = text-left -order = order-last -url = /zh-CN/ -language = 简体字 (zh-CN)

1 0

[tpo/staging] add more locales to alphas
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 838619bc239664d3434e6582979952f601f037ad Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:55:53 2019 +0100 add more locales to alphas --- databags/download-alternatives-alpha.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 2fdf984..16bc34d 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -10,6 +10,10 @@ language = عربية (ar) url = /ca/ language = Catalá (ca) +[cs] +url = /cs/ +language = Čeština (cs) + [da] url = /da/ language = Dansk (da) @@ -18,6 +22,10 @@ language = Dansk (da) url = /de/ language = Deutsch (de) +[el] +url = /el/ +language = ελληνικά (el) + [es-ES] url = /es/ language = Español (es) @@ -38,6 +46,10 @@ language = Gaeilge (ga) url = /he/ language = עברית (he) +[hu] +url = /hu/ +language = Magyar (hu) + [id] url = /id/ language = Indonesia (id) @@ -54,6 +66,10 @@ language = Italiano (it) url = /ja/ language = 日本語 (ja) +[ka] +url = /ka/ +language = ქართული ენა (ka) + [ko] url = /ko/ language = 한국어 (ko)

1 0

[tpo/staging] Updates to databags
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit a4d5bfa779e0e262bcccbbbd7d064a8b7b1d41c0 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 14:31:45 2019 +0100 Updates to databags --- databags/menu+bn-BD.ini | 2 +- databags/menu+de.ini | 2 +- databags/menu+en.ini | 2 +- databags/menu+es.ini | 2 +- databags/menu+fr.ini | 2 +- databags/menu+id.ini | 2 +- databags/menu+it.ini | 2 +- databags/menu+ko.ini | 2 +- databags/menu+pt-BR.ini | 2 +- databags/menu+ru.ini | 2 +- databags/menu+tr.ini | 2 +- databags/menu+zh-CN.ini | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini index 0ad1564..9f5fff0 100644 --- a/databags/menu+bn-BD.ini +++ b/databags/menu+bn-BD.ini @@ -3,7 +3,7 @@ path = /about/history label = ইতিহাস [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = ডকুমেন্টেশন [support] diff --git a/databags/menu+de.ini b/databags/menu+de.ini index 2edf503..463b5b2 100644 --- a/databags/menu+de.ini +++ b/databags/menu+de.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+en.ini b/databags/menu+en.ini index fd03492..d77e346 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 2ed6b2e..57b0146 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 0f45097..d078638 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+id.ini b/databags/menu+id.ini index 007f036..5c7d032 100644 --- a/databags/menu+id.ini +++ b/databags/menu+id.ini @@ -3,7 +3,7 @@ path = /about/history label = Tentang [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Dokumentasi [support] diff --git a/databags/menu+it.ini b/databags/menu+it.ini index 00a0575..9dcc41b 100644 --- a/databags/menu+it.ini +++ b/databags/menu+it.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini index fd03492..d77e346 100644 --- a/databags/menu+ko.ini +++ b/databags/menu+ko.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 2df06d7..89cf72f 100644 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini index fd03492..d77e346 100644 --- a/databags/menu+ru.ini +++ b/databags/menu+ru.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini index 26f3b8d..d14053f 100644 --- a/databags/menu+tr.ini +++ b/databags/menu+tr.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support] diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini index 1a622ff..a720d13 100644 --- a/databags/menu+zh-CN.ini +++ b/databags/menu+zh-CN.ini @@ -3,7 +3,7 @@ path = /about/history label = About [documentation] -path = https://www.torproject.org/docs/documentation.html.en +path = https://2019.www.torproject.org/docs/documentation.html.en label = Documentation [support]

1 0

[tpo/staging] Update Tor Browser versions
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 5a33f451fcad55505c6eea3746c3f72f93c78977 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 26 11:07:24 2019 +0100 Update Tor Browser versions --- .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++-------- databags/versions.ini | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 14834b2..0ab95b1 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,12 +5,12 @@ _template: empty.html body: [ -"8.0.6", -"8.0.6-MacOS", -"8.0.6-Linux", -"8.0.6-Windows", -"8.5a8", -"8.5a8-MacOS", -"8.5a8-Linux", -"8.5a8-Windows" +"8.0.8", +"8.0.8-MacOS", +"8.0.8-Linux", +"8.0.8-Windows", +"8.5a10", +"8.5a10-MacOS", +"8.5a10-Linux", +"8.5a10-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index ac3c02f..cbb9a5c 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,11 +1,11 @@ [torbrowser-stable] -version = 8.0.6 -release_date = 2019-02-12 -win32 = 0.3.5.7 +version = 8.0.8 +release_date = 2019-03-23 +win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a8 -release_date = 2019-02-15 +version = 8.5a10 +release_date = 2019-03-25 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/staging] typo
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit c1a4772794a757f85800c84b26c74bc51072fd42 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:56:12 2019 +0100 typo --- databags/download-alternatives-alpha.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 16bc34d..d13d584 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -94,9 +94,9 @@ language = Português Brasil(pt-BR) language = Русский (ru) url = /ru/ -[sv] -url = /sv/ -language = Svenska (sv) +[sv-SE] +url = /sv-SE/ +language = Svenska (sv-SE) [tr] url = /tr/

1 0

[tpo/staging] Merge branch 'staging'
by hiro＠torproject.org 26 Mar '19

26 Mar '19

1 0

[tpo/staging] Add htaccess
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 3571e2624d2945ce75b60ddc52d9029c02486e47 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 16:06:42 2019 +0100 Add htaccess --- .htaccess | 86 ++++++++++++++++++++++ .../contents.lr | 17 +++++ .../contents.lr | 17 +++++ 3 files changed, 120 insertions(+) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..f911c21 --- /dev/null +++ b/.htaccess @@ -0,0 +1,86 @@ +RewriteEngine On + +# moved to /docs/ +RewriteRule ^faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] +RewriteRule ^bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L] +RewriteRule ^abuse(.*) https://2019.www.torproject.org/docs/abuse$1 [R=302,L] +RewriteRule ^documentation(.*) https://2019.www.torproject.org/docs/documentation$1 [R=302,L] +RewriteRule ^verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L] +RewriteRule ^tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L] + +# Torbutton +RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L] +RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L] + +# Tor Browser +RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] +#RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L] +RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L] + +# tordnsel +RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L] + +# Overview +RewriteRule ^overview(.*) /about/overview$1 [R=301,L] + +# Press +RewriteRule ^press/$ /press/press [R=301,L] +RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] + +# Projects +RewriteRule ^projects/$ /projects/projects [R=301,L] + +#Pluggable Transports +RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L] +RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L] +RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L] +RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L] + +#Relays +RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=301,L] + +# GetInvolved +RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L] +RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L] +RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L] + +RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L] +RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] + +# Support +RewriteRule ^support(.*) https://support.torproject.org [R=301,L] + +# Newsletter +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] + +# other (feel free to categorize) +RewriteRule ^people(.*) /about/people$1 [R=301,L] +RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] +RewriteRule ^about/contact(.*) /contact$1 [R=301,L] + +# Download websites +RewriteRule ^download/download/$ /download [R=301,L] +RewriteRule ^download/download.html(.*) /download [R=301,L] +RewriteRule ^download/easy-download(.*) /download [R=301,L] + +# Relays +RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] + +# Index Pages +RewriteRule ^about/$ /about/history [R=301,L] + +# Donation campaign +# 2017 +# Special-case the donate-options and amazon page so it doesn't get redirected +RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] +RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] +RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] +RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] +RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] +RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] + +# The following redirect is necessary because we're using that URL on +# some external resources (the donate infrastructure in particular) and +# getting it changed there is apparently hard or something. +RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] diff --git a/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr new file mode 100644 index 0000000..b6885fc --- /dev/null +++ b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr @@ -0,0 +1,17 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: Forbes +--- +title: Cracks In the Wall. Discussion of Tor being used for evading censorship by repressive governments. +--- +link: http://members.forbes.com/global/2006/0227/018A_2.html +--- +pub_date: 2006-02-27 +--- +summary: +--- +body: diff --git a/content/press/oped-on-hidden-services-and-censorship/contents.lr b/content/press/oped-on-hidden-services-and-censorship/contents.lr new file mode 100644 index 0000000..d7a66a2 --- /dev/null +++ b/content/press/oped-on-hidden-services-and-censorship/contents.lr @@ -0,0 +1,17 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: The Independent +--- +title: OpEd on hidden services and censorship +--- +link: http://www.independent.co.uk/voices/comment/the-dark-web-is-not-just-for-pa… +--- +pub_date: 2014-12-12 +--- +summary: +--- +body:

1 0

[tpo/master] Add htaccess
by hiro＠torproject.org 26 Mar '19

26 Mar '19

commit 3571e2624d2945ce75b60ddc52d9029c02486e47 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 16:06:42 2019 +0100 Add htaccess --- .htaccess | 86 ++++++++++++++++++++++ .../contents.lr | 17 +++++ .../contents.lr | 17 +++++ 3 files changed, 120 insertions(+) diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..f911c21 --- /dev/null +++ b/.htaccess @@ -0,0 +1,86 @@ +RewriteEngine On + +# moved to /docs/ +RewriteRule ^faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] +RewriteRule ^bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L] +RewriteRule ^abuse(.*) https://2019.www.torproject.org/docs/abuse$1 [R=302,L] +RewriteRule ^documentation(.*) https://2019.www.torproject.org/docs/documentation$1 [R=302,L] +RewriteRule ^verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L] +RewriteRule ^tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L] + +# Torbutton +RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L] +RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L] + +# Tor Browser +RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] +#RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L] +RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L] + +# tordnsel +RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L] + +# Overview +RewriteRule ^overview(.*) /about/overview$1 [R=301,L] + +# Press +RewriteRule ^press/$ /press/press [R=301,L] +RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] + +# Projects +RewriteRule ^projects/$ /projects/projects [R=301,L] + +#Pluggable Transports +RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L] +RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L] +RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L] +RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L] + +#Relays +RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=301,L] + +# GetInvolved +RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L] +RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L] +RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L] + +RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L] +RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] + +# Support +RewriteRule ^support(.*) https://support.torproject.org [R=301,L] + +# Newsletter +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] + +# other (feel free to categorize) +RewriteRule ^people(.*) /about/people$1 [R=301,L] +RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] +RewriteRule ^about/contact(.*) /contact$1 [R=301,L] + +# Download websites +RewriteRule ^download/download/$ /download [R=301,L] +RewriteRule ^download/download.html(.*) /download [R=301,L] +RewriteRule ^download/easy-download(.*) /download [R=301,L] + +# Relays +RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] + +# Index Pages +RewriteRule ^about/$ /about/history [R=301,L] + +# Donation campaign +# 2017 +# Special-case the donate-options and amazon page so it doesn't get redirected +RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] +RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] +RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] +RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] +RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] +RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] + +# The following redirect is necessary because we're using that URL on +# some external resources (the donate infrastructure in particular) and +# getting it changed there is apparently hard or something. +RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] diff --git a/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr new file mode 100644 index 0000000..b6885fc --- /dev/null +++ b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr @@ -0,0 +1,17 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: Forbes +--- +title: Cracks In the Wall. Discussion of Tor being used for evading censorship by repressive governments. +--- +link: http://members.forbes.com/global/2006/0227/018A_2.html +--- +pub_date: 2006-02-27 +--- +summary: +--- +body: diff --git a/content/press/oped-on-hidden-services-and-censorship/contents.lr b/content/press/oped-on-hidden-services-and-censorship/contents.lr new file mode 100644 index 0000000..d7a66a2 --- /dev/null +++ b/content/press/oped-on-hidden-services-and-censorship/contents.lr @@ -0,0 +1,17 @@ +_model: post +--- +active: True +--- +type: snippet +--- +publisher: The Independent +--- +title: OpEd on hidden services and censorship +--- +link: http://www.independent.co.uk/voices/comment/the-dark-web-is-not-just-for-pa… +--- +pub_date: 2014-12-12 +--- +summary: +--- +body:

1 0