commit 397a8ddbfa9ad9cd5876ebc180b14016d233431f Author: emma peel emma.peel@riseup.net Date: Wed Mar 17 14:12:09 2021 +0100
adjust databags to master --- databags/alternatives.ini | 132 +----------------------------- databags/onion-tools.ini | 17 ++++ databags/onions.ini | 59 ++++++++++++-- databags/outreach-materials.ini | 89 +++++++++++++++++++++ databags/relay-associations.ini | 169 +++++++++++++++++++++++++++++++++++++++ databags/training-resources.json | 22 ++++- 6 files changed, 351 insertions(+), 137 deletions(-)
diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 07142f8..1bd9fd2 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,134 +4,8 @@ order = order-last url = / language = English (en)
-[ar] -direction = text-right -order = order-last -url = /ar/ -language = عربية (ar) - -[ca] -direction = text-left -order = order-last -url = /ca/ -language = Català (ca) - -[cs] -direction = text-left -order = order-last -url = /cs/ -language = Czech (cs) - -[de] -direction = text-left -order = order-last -url = /de/ -language = Deutsch (de) - -[es] -direction = text-left -order = order-last -url = /es/ -language = Español (es) - -[el] -direction = text-left -order = order-last -url = /el/ -language = Ελληνικά (el) - -[fa] -direction = text-right -order = order-last -url = /fa/ -language = ﻑﺍﺮﺳی (fa) - -[fr] -direction = text-left -order = order-last -url = /fr/ -language = Français (fr) - -[he] -direction = text-right -order = order-last -url = /he/ -language = עברית (he) - -[hi] -direction = text-left -order = order-last -url = /hi/ -language = Hindi (hi) - -[id] -direction = text-left -order = order-last -url = /id/ -language = Indonesia (id) - -[it] -direction = text-left -order = order-last -url = /it/ -language = Italiano (it) - -[is] -direction = text-left -order = order-last -url = /is/ -language = Icelandic (is) - -[ja] -direction = text-left -order = order-last -url = /ja/ -language = Japanese (ja) - -[ka] -direction = text-left -order = order-last -language = ქართული ენა (ka) -url = /ka/ - -[pt-BR] -direction = text-left -order = order-last -url = /pt-BR/ -language = Português Br. (pt-BR) - -[pt-PT] -direction = text-left -order = order-last -url = /pt-PT/ -language = Português Port. (pt-PT) - -[ro] -direction = text-left -order = order-last -url = /ro/ -language = Română (ro) - -[ru] -direction = text-left -order = order-last -url = /ru/ -language = Русский (ru) - -[sq] -direction = text-left -order = order-last -url = /sq/ -language = Albanian (sq) - -[tr] -direction = text-left -order = order-last -url = /tr/ -language = Türkçe (tr) - -[zh-CN] +[es-AR] direction = text-left order = order-last -url = /zh-CN/ -language = 简体中文 (zh-CN) +url = /es-AR/ +language = Español Arg. (es-AR) diff --git a/databags/onion-tools.ini b/databags/onion-tools.ini new file mode 100644 index 0000000..d37dc3b --- /dev/null +++ b/databags/onion-tools.ini @@ -0,0 +1,17 @@ +[onionshare] +link = https://onionshare.org/ +image = /static/images/onions/png/onionshare.png +label = OnionShare +active = True + +[securedrop] +link = https://securedrop.org +image = /static/images/onions/png/securedrop.png +label = SecureDrop +active = True + +[globaleaks] +link = https://www.globaleaks.org/ +image =/static/images/onions/png/globaleaks.png +label= GlobaLeaks +active = True diff --git a/databags/onions.ini b/databags/onions.ini index 64d9014..69f703e 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -1,14 +1,59 @@ [propublica] -link = http://www.propub3r6espa33w.onion/ +link = https://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion image = /static/images/onions/png/propublica.png label = ProPublica
-[tor] -link = http://krkzagd5yo4bvypt.onion/ -image = /static/images/onions/png/tor.png -label = The Tor Project - [nytimes] -link = http://www.nytimes3xbfgragh.onion/ +link = https://www.nytimes3xbfgragh.onion image = /static/images/onions/png/nytimes.png label = The New York Times + +[dw] +link = https://www.dwnewsvdyyiamwnp.onion +image = /static/images/onions/png/dw.png +label = Deutsche Welle + +[bbc] +link = https://www.bbcnewsv2vjtpsuy.onion +image = /static/images/onions/png/bbc.png +label = BBC + +[facebook] +link = https://facebookcorewwwi.onion +image = /static/images/onions/png/facebook.png +label = Facebook + +[frontlinedefenders] +link = http://3g2wfrenve2xcxiotthk4fcsnymzwfbttqbiwveoaox7wxkdh7voouqd.onion +image = /static/images/onions/png/frontlinedefenders.png +label = Frontline Defenders + +[fop] +link = http://fpfjxcrmw437h6z2xl3w4czl55kvkmxpapg37bbopsafdu7q454byxid.onion +image = /static/images/onions/png/fop.png +label = Freedom of Press Foundation + +[privacyinternational] +link = https://privacyintyqcroe.onion/ +image = /static/images/onions/png/privacyinternational.png +label = Privacy International + +[debian] +link = http://sejnfjrq6szgca7v.onion/ +image = /static/images/onions/png/debian.png +label = Debian + +[qubesos] +link = http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion +image = /static/images/onions/png/qubesos.png +label = Qubes OS + +[riseup] +link = http://vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd.onion +image = /static/images/onions/png/riseup.png +label = Riseup + +[brave] +link = https://brave5t5rjjg3s6k.onion +image = /static/images/onions/png/brave.png +label = Brave diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini new file mode 100644 index 0000000..80f2bed --- /dev/null +++ b/databags/outreach-materials.ini @@ -0,0 +1,89 @@ +[onion-guide-EN] +location = https://community.torproject.org/static/images/outreach/print/ +filename = onion-guide-fanzine-EN.pdf +label = Onion guide fanzine (English) +type = zine +year = 2021 + +[onion-guide-ES] +location = https://community.torproject.org/static/images/outreach/print/ +filename = onion-guide-fanzine-ES.pdf +label = Onion guide fanzine (Español) +type = zine +year = 2021 + +[onion-guide-PT_BR] +location = https://community.torproject.org/static/images/outreach/print/ +filename = onion-guide-fanzine-PT_BR.pdf +label = Onion guide fanzine (Português Brasil) +type = zine +year = 2021 + +[onion-service] +location = https://community.torproject.org/static/images/outreach/print/ +filename = minizine-onion-service-A4.jpg +label = Onion services explained in 7 steps +type = mini zine +year = 2020 + +[tor-routing] +location = https://community.torproject.org/static/images/outreach/print/ +filename = minizine-onion-routing-A4.jpg +label = Onion routing explained in 8 steps +type = mini zine +year = 2020 + +[anti-censorship] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pri... +filename_front = Front_anti-censorship_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Anti-censorship +type = handout +year = 2019 + +[feminists] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pri... +filename_front = Front_feminist_en_EN.pdf +filename_back = Back_feminist_en_EN.pdf +label = Tor for Feminists +type = handout +year = 2019 + +[human-rights] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pri... +filename_front = Front_humanrights_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Human Rights +type = handout +year = 2019 + +[privacy] +location = https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/pri... +filename_front = Front_privacy_en_EN.pdf +filename_back = Back_stencil_en_EN.pdf +label = Tor for Privacy +type = handout +year = 2019 + +[one-pager] +location = https://media.torproject.org/misc/ +filename_front = 2018-08-Tor-one-pager.pdf#page=1 +filename_back = 2018-08-Tor-one-pager.pdf#page=2 +label = Tor one pager +type = handout +year = 2018 + +[relay] +location = https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-mate... +filename_front = tor-relay_4.25x11_card_front.jpg +filename_back = tor-relay-4.25x11_card_back.jpg +label = Run a relay +type = handout +year = 2018 + +[brochure] +location = https://media.torproject.org/misc/2015-03-tor-brochure/ +filename = tor-brochure-en.pdf +label = Tor Brochure +type = brochure +year = 2015 diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini new file mode 100644 index 0000000..ec4a82e --- /dev/null +++ b/databags/relay-associations.ini @@ -0,0 +1,169 @@ +[zwiebelfreunde] +link = https://www.zwiebelfreunde.de/ +image = +label = Zwiebelfreunde e.V. +country = Germany +contact = +active = True +display = True +donate = + +[nosoignons] +link = https://nos-oignons.net/ +image = +label = Nos-oignons +country = France +contact = contact at nos-oignons.net +active = True +display = +donate = + +[enn] +link = https://enn.lu/ +image = +label = Frënn vun der Ënn A.S.B.L. +country = Luxembourg +contact = info@enn.lu +active = True +display = +donate = + +[emerald-onion] +link = https://emeraldonion.org/ +image = +label = Emerald Onion +country = US +contact = +active = True +display = +donate = https://emeraldonion.org/donate/ + +[hartvoorinternetvrijheid] +link = https://www.hartvoorinternetvrijheid.nl/ +image = +label = Hart voor Internetvrijheid +country = Netherlands +contact = bestuur@hartvoorinternetvrijheid.nl +active = True +display = +donate = + +[saveyourprivacy] +link = https://saveyourprivacy.net +image = +label = SaveYourPrivacy e.V. +country = Germany +contact = info@saveyourprivacy.net +active = True +display = +donate = + +[coldhak] +link = https://coldhak.ca/relays/ +image = +label = Coldhak +country = Canada +contact = https://coldhak.ca/about/ +active = True +display = +donate = + +[appliedprivacy] +link = https://appliedprivacy.net/ +image = +label = Foundation for Applied Privacy +country = Austria +contact = tor@appliedprivacy.net +active = True +display = +donate = + +[dfri] +link = https://www.dfri.se/ +image = +label = Föreningen för Digitala Fri- och Rättigheter +country = Sweden +contact = dfri@dfri.se +active = True +display = +donate = + +[calyxinstitute] +link = https://www.calyxinstitute.org +image = +label = The Calyx Institute +country = US +contact = nick@calyx.com +active = True +display = +donate = + +[noisetor] +link = https://noisetor.net +image = +label = NoiseTor +country = US +contact = +active = True +display = +donate = + +[icetor] +link = https://icetor.is/ +image = +label = Icetor +country = Iceland +contact = admin <AT> icetor <dot> is +active = +display = +donate = + +[privacyfoundation] +link = https://www.privacyfoundation.ch/ +image = +label = Swiss Privacy Foundation +country = Switzerland +contact = office@privacyfoundation.ch +active = +display = +donate = + +[digitalcourage] +link = https://digitalcourage.de/support/tor +image = +label = Digital Courage +country = Germany +contact = +active = True +display = +donate = + +[accessnow] +link = https://accessnow.net +image = +label = Access Now +country = US +contact = +active = True +display = +donate = + +[brasshorncommunications] +link = https://brasshorncommunications.uk/projects/tor/ +image = +label = BrassHorn Communications +country = UK +contact = hello@brasshorncommunications.uk +active = True +display = +donate = + +[artikel5ev] +link = https://www.artikel5ev.de/aktuelles/ +image = +label = Artikel 5 e.V. +country = Germany +contact = https://www.artikel5ev.de/kontakt/ +active = True +display = +donate = diff --git a/databags/training-resources.json b/databags/training-resources.json index b1fecd7..f1e8b10 100644 --- a/databags/training-resources.json +++ b/databags/training-resources.json @@ -7,5 +7,25 @@ "formats" : ["odp","md"], "description" : "Full set of slides for Tor Trainings", "date" : "2019" + }, + + "todo sobre tor" : + { + "label" : "Todo sobre Tor", + "name" : "all-about-tor", + "filename" : "all-about-tor-full-pack+es", + "formats" : ["odp"], + "description" : "Un conjunto completo de diapositivas para los entrenamientos de Tor", + "date" : "2019" + }, + + "tor network" : + { + "label" : "The Tor network", + "name" : "tor-network", + "filename" : "tor-network", + "formats" : ["odp","pdf"], + "description" : "Learn about the Tor network and how to run a relay", + "date" : "2019" } -} \ No newline at end of file +}
tor-commits@lists.torproject.org
-
emmapeel＠torproject.org