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

[onionperf/develop] Do some repository housekeeping.
by karsten＠torproject.org 24 Jul '20

24 Jul '20

commit 7576ce3ede211722db59bde3ccbc7e79ac4ac60c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 23 20:18:03 2020 +0200 Do some repository housekeeping. Fixes #40006. --- .gitignore | 4 ++-- .gitlab-ci.yml | 23 ----------------------- .gitmodules | 0 README.md | 6 ++++++ Vagrantfile | 35 ----------------------------------- debian/changelog | 5 ----- debian/compat | 1 - debian/control | 40 ---------------------------------------- debian/install | 1 - debian/rules | 15 --------------- debian/source/format | 1 - onionperf/__init__.py | 1 + onionperf/analysis.py | 1 + onionperf/measurement.py | 1 + onionperf/model.py | 1 + onionperf/monitor.py | 1 + onionperf/onionperf | 1 + onionperf/util.py | 1 + onionperf/visualization.py | 1 + run_tests.sh | 3 --- 20 files changed, 16 insertions(+), 126 deletions(-) diff --git a/.gitignore b/.gitignore index 5e79b0e..e3e7b28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ -/.onionperf/* onionperf-data +onionperf-private venv *.json.xz *.pdf +*.csv *.pyc -onionperf/docs/_build .coverage diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index aed7769..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,23 +0,0 @@ -variables: - GIT_STRATEGY: clone - -stages: - - test - -test: - stage: test - image: debian:buster - coverage: '/TOTAL.+ ([0-9]{1,3}%)/' - script: - - apt -y update - - apt -y install git cmake make build-essential gcc libigraph0-dev libglib2.0-dev python-dev libxml2-dev python-lxml python-networkx python-scipy python-matplotlib python-numpy libevent-dev libssl-dev python-stem tor python-nose python-cov-core - - git clone https://github.com/shadow/tgen.git - - mkdir -p tgen/build - - pushd tgen/build - - cmake .. - - make - - ln -s `pwd`/tgen /usr/bin/ - - popd - - python setup.py build - - python setup.py install - - ./run_tests.sh diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md index b9bf7e6..ad53a9e 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,12 @@ deactivate However, in order to perform measurements or analyses, the virtual environment needs to be activated first. This will ensure all the paths are found. +If needed, unit tests are run with the following command: + +```shell +cd ~/onionperf/ +python3 -m nose --with-coverage --cover-package=onionperf +``` ## Measurement diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 1fdd10f..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,35 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -$setup_onionperf = <<SCRIPT -export DEBIAN_FRONTEND=noninteractive -apt-get update -apt install -y build-essential autoconf cmake libglib2.0-dev libigraph0-dev libevent-dev libssl-dev python3 git python3-stem python3-lxml python3-networkx python3-matplotlib python3-numpy python3-scipy -cd ~ -git clone https://git.torproject.org/tor.git -cd tor -./autogen.sh -./configure --disable-asciidoc -make -mv src/app/tor /usr/local/bin/ -cd ~ -git clone https://github.com/shadow/shadow.git -cd shadow/src/plugin/shadow-plugin-tgen -mkdir build -cd build -cmake .. -DSKIP_SHADOW=ON -DCMAKE_MODULE_PATH=`pwd`/../../../../cmake/ -make -mv tgen /usr/local/bin/ -cd /vagrant -python3 setup.py build -python3 setup.py install -SCRIPT - -Vagrant.configure("2") do |config| - config.vm.box = "debian/stretch64" - - config.vm.define "oniondev" do |oniondev| - oniondev.vm.provision :shell, :inline => $setup_onionperf - end - -end diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 7671854..0000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -onionperf (2019052301) stretch-backports; urgency=medium - - * Initial release. - - -- Iain R. Learmonth <irl(a)debian.org> Thu, 23 May 2019 12:42:20 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control deleted file mode 100644 index c8ffa68..0000000 --- a/debian/control +++ /dev/null @@ -1,40 +0,0 @@ -Source: onionperf -Maintainer: Tor Metrics <metrics-team(a)lists.torproject.org> -Section: net -Priority: optional -Build-Depends: debhelper (>= 11), - dh-python, - cmake, - make, - build-essential, - gcc, - libigraph0-dev, - libglib2.0-dev, - python, - python-ipaddress, - python-lxml, - python-matplotlib, - python-netifaces, - python-networkx, - python-nose, - python-numpy, - python-scipy, - python-stem (>=1.7) -Standards-Version: 4.1.3 - -Package: onionperf -Architecture: any -Depends: ${python:Depends}, - ${shlibs:Depends}, - ${misc:Depends}, - python-ipaddress, - python-lxml, - python-matplotlib, - python-netifaces, - python-networkx, - python-nose, - python-numpy, - python-scipy, - python-stem (>=1.7) -Description: Tor Performance Measurement Tool - Tor Performance Measurement Tool diff --git a/debian/install b/debian/install deleted file mode 100644 index 6d40677..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -tgen/build/tgen usr/bin diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 64d85ba..0000000 --- a/debian/rules +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ --with python2 --buildsystem=pybuild - -override_dh_auto_test: - ./run_tests.sh - -override_dh_auto_build: - ( cd tgen; \ - mkdir build; \ - cd build; \ - cmake ..; \ - make ) - dh_auto_build diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/onionperf/__init__.py b/onionperf/__init__.py index 79e37c3..f323b49 100644 --- a/onionperf/__init__.py +++ b/onionperf/__init__.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/analysis.py b/onionperf/analysis.py index e269f6a..6325764 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 823f37a..af1fa0d 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/model.py b/onionperf/model.py index f06f8e0..cb45f51 100644 --- a/onionperf/model.py +++ b/onionperf/model.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/monitor.py b/onionperf/monitor.py index 5387bff..9bf9691 100644 --- a/onionperf/monitor.py +++ b/onionperf/monitor.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/onionperf b/onionperf/onionperf index 36520ad..e8024ce 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -3,6 +3,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/util.py b/onionperf/util.py index cb9f065..4eee911 100644 --- a/onionperf/util.py +++ b/onionperf/util.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/onionperf/visualization.py b/onionperf/visualization.py index 80c0781..f88c984 100644 --- a/onionperf/visualization.py +++ b/onionperf/visualization.py @@ -1,6 +1,7 @@ ''' OnionPerf Authored by Rob Jansen, 2015 + Copyright 2015-2020 The Tor Project See LICENSE for licensing information ''' diff --git a/run_tests.sh b/run_tests.sh deleted file mode 100755 index 7a30e61..0000000 --- a/run_tests.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -PYTHONPATH=. python3 -m nose --with-coverage --cover-package=onionperf

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 5de31d4647df0f9268dff8216b55af201652e7a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 09:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/contents+es.po b/contents+es.po index 3bbf34b8ef..8ba80880bb 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3828,6 +3828,8 @@ msgid "" "The `hostname` file in your hidden service configuration directory contains " "the hostname for your new onion v3 hidden service." msgstr "" +"El archivo `hostname` en tu directorio de configuración de tu servicio " +"oculto contiene el hostname para tu nuevo onion v3 servicio oculto." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3835,6 +3837,8 @@ msgid "" "The other files are your hidden service keys, so it is imperative that these" " are kept private." msgstr "" +"Los otros archivos son los servicios de llaves ocultas, así como es " +"imperativo que estas se mantengan privadas." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3842,6 +3846,8 @@ msgid "" "If your keys leak, other people can impersonate your onion service, deeming " "it compromised, useless, and dangerous to visit." msgstr "" +"Si tus llaves son filtradas, otras personas pueden inpersonar tu servicio " +"cebolla, considerando su compromiso, inútil o peligroso de visitar." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3849,6 +3855,8 @@ msgid "" "Now you can connect to your onion service using Tor Browser, and you should " "get the html page you setup back in step 1." msgstr "" +"Ahora que te puedes conectar a tu servicio cebolla usando el Navegador Tor, " +"y debes poder tener tu pagina html de tu configuración del paso 1." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3856,16 +3864,19 @@ msgid "" "If it doesn't work, look in your logs for some hints, and keep playing with " "it until it works." msgstr "" +"Si no funciona, mira en tus registros por algunas pistas, y sigue jugando " +"con eso hasta que funcione." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 5: More advanced tips" -msgstr "" +msgstr "## Paso 5: Consejos mas avanzados" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "The above guide is just a baseline to setup an onion service." msgstr "" +"La guía de arriba es solo una base para configurar tu servicio cebolla." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3873,11 +3884,13 @@ msgid "" "In this section we will offer more resources to better configure and protect" " your onion service:" msgstr "" +"En esta sección nosotros te ofreceremos mas recursos para una mejor " +"configuración y protección de tu servicio cebolla:" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "- Best practices for onion services" -msgstr "" +msgstr "-Mejores hábitos para un servicio cebolla" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3885,26 +3898,28 @@ msgid "" "https://riseup.net/el/security/network-security/tor/onionservices-best-" "practices" msgstr "" +"https://riseup.net/el/security/network-security/tor/onionservices-best-" +"practices" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "- More advanced tips for onion services" -msgstr "" +msgstr "- Consejos mas avanzados para los servicios cebolla" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "https://2019.www.torproject.org/docs/tor-onion-service.html.en#three" -msgstr "" +msgstr "https://2019.www.torproject.org/docs/tor-onion-service.html.en#three" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "- Advanced onion service security" -msgstr "" +msgstr "- Seguridad avanzada del servicio cebolla" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "https://blog.torproject.org/announcing-vanguards-add-onion-services" -msgstr "" +msgstr "https://blog.torproject.org/announcing-vanguards-add-onion-services" #: https//community.torproject.org/localization/current-status/ #: (content/localization/current-status/contents+en.lrpage.title)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 9ae11dc62b9cdecb3105a4f8e9180927ccd52e1a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 08:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 04d9204eae..3bbf34b8ef 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3762,16 +3762,22 @@ msgid "" "should be redirected to `127.0.0.1:8080` (which is where the web server from" " step 1 is listening)." msgstr "" +"La linea de `HiddenServiceDir` (Directorio de servicio oculto) especifica un" +" _puerto virtual_ (este es, el puerto que la gente que esta visitando tu " +"servicio cebolla esta usando), y en el caso de arriba dirá que cualquier " +"tráfico entrante al puerto 80 de tu servicio cebolla sera redirigido a " +"`127.0.0.1:8080` (el cual es donde el servidor web del paso 1 esta " +"escuchando)" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 3: Restart Tor and check that it worked" -msgstr "" +msgstr "## Paso 3: Reiniciar Tor y chequear que haya funcionado." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "Now save your `torrc` and restart Tor." -msgstr "" +msgstr "Ahora guarda tu `torrc` y reinicia Tor." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3779,6 +3785,8 @@ msgid "" "If Tor starts up again, great. Otherwise, something is wrong. First look at " "your logfiles for hints." msgstr "" +"Si Tor inicia nuevamente, bien. De otra forma, hubo un error. Primero " +"miremos a tus logfiles por pistas." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3786,6 +3794,8 @@ msgid "" "It will print some warnings or error messages. That should give you an idea " "what went wrong." msgstr "" +"Va a mostrar algunas alertas o mensajes de error. Eso debe darnos algunas " +"ideas de cual fue el error." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3793,11 +3803,14 @@ msgid "" "When Tor starts, it will automatically create the `HiddenServiceDir` that " "you specified (if necessary). Make sure this is the case." msgstr "" +"Cuando Tor inicie, a a crear automáticamente el `HiddenServiceDir` " +"(Directorio de servicios ocultos) que tu especificaste(si es necesario). " +"Asegúrate de que sea el caso." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 4: Test that your onion service works" -msgstr "" +msgstr "## Paso 4: Comprueba que tu servicio cebolla funcione" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3805,6 +3818,9 @@ msgid "" "Now to get your onion service address, go to your `HiddenServiceDir` " "directory, and find a file named `hostname`." msgstr "" +"Ahora que tienes una dirección de servicio cebolla, ve a tu directorio de " +"`HiddenServiceDir` (Directorio de servicio oculto), y encuentra un archivo " +"llamado `hostname`." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 0d912351fd686ccac93c693cdaf3e448bdf6b04c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 08:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+es.po b/contents+es.po index 9c30322bb2..04d9204eae 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3738,6 +3738,9 @@ msgid "" "The `HiddenServiceDir` line specifies the directory which should contain " "information and cryptographic keys for your onion service." msgstr "" +"La linea de `HiddenServiceDir` (Directorio de servicio oculto) especifica el" +" directorio en cual debería contener la información y las llaves encriptadas" +" de su servicio cebolla." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3746,6 +3749,9 @@ msgid "" " actual directory that is readable/writeable by the user that will be " "running Tor." msgstr "" +"Querrás cambiar la linea de la linea de `HiddenServiceDir` (Directorio de " +"servicio oculto), así dirige a un verdadero directorio que es " +"legible/modificable para el usuario que este usando Tor." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 175a191a9cbb40b0330f564b24d7e053a2a671b9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 05:45:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index a9c1d5c7f4..9c30322bb2 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3720,7 +3720,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "You will need to put the following two lines in your torrc:" -msgstr "" +msgstr "Tendrás que poner las siguientes dos lineas en tu torrc:" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit caa86cdcb853172e480a94c35268d5d2685c09e9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 04:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index 6eb0ced200..a9c1d5c7f4 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3690,11 +3690,13 @@ msgid "" "Then try putting a file in the main html directory, and make sure it shows " "up when you access the site." msgstr "" +"Entonces prueba poner un archivo en el principal directorio html, y " +"asegúrate que se muestre cuando acedas al sitio." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 2: Configure your Tor onion service" -msgstr "" +msgstr "## Paso 2: Configura tu servicio cebolla Tor" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3702,6 +3704,8 @@ msgid "" "The next step is opening the config file of Tor (torrc) and doing the " "appropriate configurations to setup an onion service." msgstr "" +"El próximo paso es abrir el archivo de configuración de Tor (torrc) y hacer " +"las configuraciones apropiadas para usar el servicio cebolla." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3709,6 +3713,9 @@ msgid "" "Depending on your operating system and setup, your Tor configuration file " "can be at a different location or look different." msgstr "" +"Dependiendo de tu sistema operativo y tu configuración, tu archivo de " +"configuración Tor puede variar en la ubicación del directorio o en su " +"apariencia." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

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

24 Jul '20

commit 28b1463169f8bd4cb1258c11a872b37e70908a5b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 04:15:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ja/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index e6cf4a6509..b1e3f5b506 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-06-26 09:34+0000\n" +"PO-Revision-Date: 2020-07-24 04:00+0000\n" "Last-Translator: Ito Takeshi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." -msgstr "申し訳ありません！リクエストに問題がありました。" +msgstr "申し訳ありません。リクエストに問題が発生しました。" #: bridgedb/distributors/https/templates/base.html:42 msgid "Language" @@ -91,7 +91,7 @@ msgstr "ブリッジのQRコード" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." -msgstr "QR コードを作成する際にエラーが発生しました。" +msgstr "QRコードを作成するときにエラーが発生しました。" #: bridgedb/distributors/https/templates/bridges.html:68 msgid "" @@ -154,7 +154,7 @@ msgstr "%s Tor Browser にブリッジを追加します %s" #: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%s設%s定なしのブリッジを入手する" +msgstr "設定なしのブリッジを入手 (%sJ%s)" #: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" @@ -182,7 +182,7 @@ msgstr "%sは%sい！" #: bridgedb/distributors/https/templates/options.html:154 #, python-format msgid "%sG%set Bridges" -msgstr "%sブ%sリッジを入手する" +msgstr "ブリッジを入手 (%sG%s)" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" @@ -190,14 +190,14 @@ msgstr "[これは自動送信された電子メールです。]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" -msgstr "あなたのブリッジ：" +msgstr "あなたのブリッジ:" #: bridgedb/strings.py:37 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "レート制限を超過しました。メール間の最小時間は %s 時間です。この期間中にさらに送信したメールは全て無視されます。" +msgstr "レート制限を超過しました。メール間の最小時間は%s時間です。この期間中にさらに送信したメールは全て無視されます。" #: bridgedb/strings.py:40 msgid "" @@ -262,7 +262,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "別の方法でブリッジを取得するには %s へ電子メールを送信してください。件名を空にして本文に「get transport obfs4」と書き込みます。次のうちどれかのメールアドレスを使用してメールを送信する必要があるのでご注意ください: %s または %s" #: bridgedb/strings.py:94 msgid "My bridges don't work! I need help!" @@ -275,11 +275,11 @@ msgstr "私のブリッジが動きません! 助けてください!" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "もしあなたの Tor Browser が接続できない場合は、%sや私達の%sをご覧ください。" +msgstr "もしあなたの Tor Browser が接続できない場合、%s または %s をご覧ください。" #: bridgedb/strings.py:102 msgid "Here are your bridge lines:" -msgstr "あなたのブリッジ：" +msgstr "あなたのブリッジ:" #: bridgedb/strings.py:103 msgid "Get Bridges!"

1 0

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

24 Jul '20

commit e06865d4118fc481f31ae0b2d5909c5eeeebe114 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 03:47:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ja/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/torbutton.properties b/ja/torbutton.properties index cc36ba782e..bd8f5f4179 100644 --- a/ja/torbutton.properties +++ b/ja/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=ネットワークの接続状態が不安定だっ onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%s はあなたの認証を要求しています。 onionServices.authPrompt.keyPlaceholder=この Onion サービスのあなたの秘密鍵を入力してください onionServices.authPrompt.done=完了 onionServices.authPrompt.doneAccessKey=d

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit def17cd7c93ee88546a54b1c44f1e487931245dc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 03:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index 5f434cf635..6eb0ced200 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3626,7 +3626,7 @@ msgstr "" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 1: Get a web server working" -msgstr "" +msgstr "## Paso 1: Consigue un servidor web funcionando" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3634,6 +3634,8 @@ msgid "" "As a first step you should setup a web server locally, like nginx or " "lighttpd. Setting up a web server can be complex." msgstr "" +"Como primer paso debes configurar un servidor web localmente, como nginx o " +"lighttpd. Configurar un servidor web puede ser complejo." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3641,12 +3643,16 @@ msgid "" "We're not going to cover how to set up a web server here. If you get stuck " "or want to do more, find a friend who can help you." msgstr "" +"Nosotros no vamos a cubrir la guía de como configurar un servidor web aquí. " +"Si estas estancado o quieres saber mas, busca un amigo que pueda ayudarte." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "" "We recommend you install a new separate web server for your onion service." msgstr "" +"Te recomendamos que instales un nuevo servidor web separado de tu servicio " +"cebolla." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3654,6 +3660,8 @@ msgid "" "You need to configure your web server so it doesn't give away any " "information about you, your computer, or your location." msgstr "" +"Necesitas configurar tu servidor web de forma que no entrega ninguna " +"información sobre vos, tu computadora o tu ubicación." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3661,6 +3669,8 @@ msgid "" "This is not an easy task and in the end of this document we will offer more " "resources on how to make this possible." msgstr "" +"Esto no es una tarea fácil y en el final de este documento vamos a ofrecerte" +" mas recursos sobre como hacer esto posible." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3669,6 +3679,10 @@ msgid "" " to http://localhost:8080/, where 8080 is the webserver port you chose " "during setup (you can choose any port, 8080 is just an example)." msgstr "" +"Una ves que tu servidor web esta configurado, asegúrate que funcione: abrí " +"tu explorador y ve a http://localhost:8080/, donde 8080 es el puerto del " +"servidor que elijas durante tu configuración (podes elegir cualquier puerto," +" 8080 es simplemente un ejemplo). " #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Jul '20

24 Jul '20

commit 2f7b85558db47a8d2bef0d6c3e4c4c8f0602bf4f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 24 02:45:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/contents+es.po b/contents+es.po index b53d2098ff..5f434cf635 100644 --- a/contents+es.po +++ b/contents+es.po @@ -3556,27 +3556,27 @@ msgstr "https://gitweb.torproject.org/torspec.git/tree/rend-spec-v3.txt" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "- Presentations about onion services" -msgstr "- Presentaciones sobre el servicios cebolla." +msgstr "- Presentaciones sobre el servicios cebolla" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "https://www.youtube.com/watch?v=VmsFxBEN3fc" -msgstr "" +msgstr "https://www.youtube.com/watch?v=VmsFxBEN3fc" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "https://www.youtube.com/watch?v=Di7qAVidy1Y" -msgstr "" +msgstr "https://www.youtube.com/watch?v=Di7qAVidy1Y" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.title) msgid "Set up Your Onion Service" -msgstr "" +msgstr "Configurar Tu Servicio Cebolla" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.subtitle) msgid "Learn how to set up a .onion site of your very own." -msgstr "" +msgstr "Aprende como configurar un sitio .onion (cebolla) hecho por ti." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.cta) @@ -3587,11 +3587,13 @@ msgstr "Comenzar" #: (content/onion-services/setup/contents+en.lrpage.body) msgid "This guide shows you how to set up an onion service for your website." msgstr "" +"Esta guía muestra como tu puedes configurar un servicio cebolla para tu " +"sitio web." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) msgid "## Step 0: Get a working Tor" -msgstr "" +msgstr "## Paso 0: Consigue un Tor funcionando" #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3600,6 +3602,10 @@ msgid "" "machine. Tor should be up and running correctly for this guide to work. You " "should also know where Tor's configuration files are." msgstr "" +"Como parte de esta guía, nosotros vamos a asumir que ya tienes un Tor " +"funcionando en tu maquina. Tor debe estar actualizado y funcionando " +"correctamente para que esta guía funcione. También debes saber donde están " +"los archivos de configuración de Tor. " #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body) @@ -3610,6 +3616,12 @@ msgid "" "/tor-doc-osx.html.en), and Linux/BSD/Unix users should follow the [Unix " "howto](https://2019.www.torproject.org/docs/tor-doc-unix.html.en)." msgstr "" +"Para instalar Tor, usuarios de Windows pueden usar [Windows " +"guía](https://2019.www.torproject.org/docs/tor-doc-windows.html.en), " +"usuarios de OS X deben seguir el [OS X guía " +"](https://2019.www.torproject.org/docs/tor-doc-osx.html.en), y usuarios de " +"Linux/BSD/Unix deben seguir la [Unix " +"guía](https://2019.www.torproject.org/docs/tor-doc-unix.html.en)." #: https//community.torproject.org/onion-services/setup/ #: (content/onion-services/setup/contents+en.lrpage.body)

1 0