December 2013 - tor-commits - lists.torproject.org

[flashproxy/master] add a help2man man page for the nodejs browser proxy
by infinity0＠torproject.org 06 Dec '13

06 Dec '13

commit f2ef8d1080be67ea51488615336e8fe21df469fc Author: Ximin Luo <infinity0(a)gmx.com> Date: Mon Dec 2 16:04:03 2013 +0000 add a help2man man page for the nodejs browser proxy --- proxy/modules/nodejs/.gitignore | 1 + proxy/modules/nodejs/Makefile | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/proxy/modules/nodejs/.gitignore b/proxy/modules/nodejs/.gitignore index 72f73ff..ca29a34 100644 --- a/proxy/modules/nodejs/.gitignore +++ b/proxy/modules/nodejs/.gitignore @@ -1,3 +1,4 @@ /flashproxy.js +/flashproxy.1 /node_modules /npm-debug.log diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile index 9b1f8ce..4c93948 100644 --- a/proxy/modules/nodejs/Makefile +++ b/proxy/modules/nodejs/Makefile @@ -1,5 +1,19 @@ -.PHONY: prepublish +.PHONY: all prepublish +topsrcdir = ../../.. + +ALL_DST = flashproxy.js flashproxy.1 +VERSION = $(shell sed -nre 's/^\s*"version"\s*:\s*"([^"]+)".*/\1/gp' package.json) + +all: $(ALL_DST) prepublish: flashproxy.js -flashproxy.js: ../../flashproxy.js +flashproxy.js: $(topsrcdir)/proxy/flashproxy.js cp -f $< $@ + +flashproxy.1: main.js flashproxy.js $(topsrcdir)/mkman.sh $(topsrcdir)/mkman.inc Makefile + ./main.js --help \ + | sed -re 's,/\S+/nodejs ./main.js,flashproxy,g' \ + | $(topsrcdir)/mkman.sh flashproxy "$(VERSION)" "The flashproxy standalone nodejs proxy" "$(VERSION)" > "$@" + +clean: + rm -f $(ALL_DST)

1 0

[flashproxy/master] add help2man build scripts to generate manpages for the facilitator
by infinity0＠torproject.org 06 Dec '13

06 Dec '13

commit 25697fdc9756f9174aec91af0f238bcacbf48e34 Author: Ximin Luo <infinity0(a)gmx.com> Date: Mon Dec 2 16:02:36 2013 +0000 add help2man build scripts to generate manpages for the facilitator - wrapper script mkman.sh to work around help2man generating non-standard formatting in usage synopses - keep mkman.sh in top-level, for future use by other components - symlinks in facilitator/ are so `make distcheck` works. this could be cleaner, but for now I thought we'd keep up the charade of facilitator/ as a self-contained autotools package - remove -Werror from automake so we can use %-patterns --- facilitator/.gitignore | 1 + facilitator/HACKING | 2 +- facilitator/INSTALL | 2 +- facilitator/Makefile.am | 13 ++++++++--- facilitator/configure.ac | 2 +- facilitator/mkman.inc | 1 + facilitator/mkman.sh | 1 + mkman.inc | 9 ++++++++ mkman.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 80 insertions(+), 6 deletions(-) diff --git a/facilitator/.gitignore b/facilitator/.gitignore index cd4d36b..3c413c1 100644 --- a/facilitator/.gitignore +++ b/facilitator/.gitignore @@ -18,6 +18,7 @@ # files built by make /examples/fp-facilitator.conf +/doc/*.1 # files for binary-distribution /flashproxy-facilitator-*.tar.* diff --git a/facilitator/HACKING b/facilitator/HACKING index f102880..1bb9f77 100644 --- a/facilitator/HACKING +++ b/facilitator/HACKING @@ -19,7 +19,7 @@ than a more appropriate copy. 2. Export PYTHONPATH when you need to run $ export PYTHONPATH=.. - $ make check + $ make && make check The disadvantage is that you need to do this every shell session. diff --git a/facilitator/INSTALL b/facilitator/INSTALL index 7716ccc..a68bffa 100644 --- a/facilitator/INSTALL +++ b/facilitator/INSTALL @@ -1,6 +1,6 @@ Install the dependencies. - # apt-get install make openssl python-m2crypto + # apt-get install help2man make openssl python-m2crypto # apt-get install automake autoconf # if running from git # apt-get install apache2 diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 9e56a19..935a197 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -12,9 +12,12 @@ appenginedir = $(pkgdatadir)/appengine pkgconfdir = $(sysconfdir)/flashproxy appengineconfdir = $(pkgconfdir)/reg-appspot +PYENV = PYTHONPATH='$(srcdir):$(PYTHONPATH)'; export PYTHONPATH; + # automake PLVs dist_bin_SCRIPTS = facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg +man1_MANS = doc/facilitator.1 doc/facilitator-email-poller.1 doc/facilitator-reg-daemon.1 doc/facilitator-reg.1 dist_cgibin_SCRIPTS = facilitator.cgi if DO_INITSCRIPTS initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon @@ -26,14 +29,14 @@ dist_example_DATA = examples/fp-facilitator.conf examples/reg-email.pass example pkgconf_DATA = examples/facilitator-relays dist_appengine_DATA = appengine/app.yaml appengine/config.go appengine/fp-reg.go appengineconf_DATA = appengine/config.go -CLEANFILES = examples/fp-facilitator.conf -EXTRA_DIST = examples/fp-facilitator.conf.in HACKING $(TESTS) +CLEANFILES = examples/fp-facilitator.conf $(man1_MANS) +EXTRA_DIST = examples/fp-facilitator.conf.in mkman.sh mkman.inc HACKING $(TESTS) TESTS = facilitator-test.py # see http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness… TEST_EXTENSIONS = .py PY_LOG_COMPILER = $(PYTHON) -AM_TESTS_ENVIRONMENT = PYTHONPATH='$(srcdir):$(PYTHONPATH)'; export PYTHONPATH; +AM_TESTS_ENVIRONMENT = $(PYENV) AM_PY_LOG_FLAGS = # AC_CONFIG_FILES doesn't fully-expand directory variables @@ -42,6 +45,10 @@ subst_vars = sed -e 's,[@]cgibindir[@],$(cgibindir),g' # our own targets +doc/%.1: % mkman.sh mkman.inc Makefile + { $(PYENV) $(PYTHON) "$<" --help; } \ + | { $(PYENV) ./mkman.sh "$<" $(VERSION) > "$@"; } + examples/fp-facilitator.conf: examples/fp-facilitator.conf.in Makefile # mkdir needed for out-of-source build mkdir -p $$(dirname "$@") diff --git a/facilitator/configure.ac b/facilitator/configure.ac index e5184a2..cc41b8b 100644 --- a/facilitator/configure.ac +++ b/facilitator/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.68]) AC_INIT([flashproxy-facilitator], [1.4]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AM_INIT_AUTOMAKE([-Wall foreign]) AC_ARG_VAR(fpfacilitatoruser, [the user/group for the facilitator to run as]) fpfacilitatoruser="${fpfacilitatoruser:-fp-facilitator}" diff --git a/facilitator/mkman.inc b/facilitator/mkman.inc new file mode 120000 index 0000000..f10056c --- /dev/null +++ b/facilitator/mkman.inc @@ -0,0 +1 @@ +../mkman.inc \ No newline at end of file diff --git a/facilitator/mkman.sh b/facilitator/mkman.sh new file mode 120000 index 0000000..dcd1d5f --- /dev/null +++ b/facilitator/mkman.sh @@ -0,0 +1 @@ +../mkman.sh \ No newline at end of file diff --git a/mkman.inc b/mkman.inc new file mode 100644 index 0000000..6207f0b --- /dev/null +++ b/mkman.inc @@ -0,0 +1,9 @@ +[REPORTING BUGS] +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. + +[SEE ALSO] +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR diff --git a/mkman.sh b/mkman.sh new file mode 100755 index 0000000..1087e41 --- /dev/null +++ b/mkman.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Wrapper around help2man that takes input from stdin. + +set -o errexit + +# Read a python program's description from the first paragraph of its docstring. +get_description() { + PYTHONPATH=".:$PYTHONPATH" python - "./$1" <<EOF +import imp, sys +sys.dont_write_bytecode = True +mod = imp.load_source("mod", sys.argv[1]) +doclines = mod.__doc__.splitlines() +# skip to start of first paragraph +while not doclines[0]: + doclines.pop(0) +# find where the paragraph ends +try: + r = doclines.index("") +except ValueError: + r = len(doclines) +print " ".join(doclines[:r]).strip() +EOF +} + +# Fixes some help2man quirks, see `man man` +help2man_fixup() { + sed -re ' +# restricted to usage synopsis section +/^\.SH SYNOPSIS$/,/^\.SH \w+$/{ + # change hypenated parameters to bold, "type exactly as shown" + s/\\fI\-/\\fB\-/g; + # change ALL-CAPS parameters to italic, "replace with appropriate argument" + s/\b([A-Z]+)\b/\\fI\1\\fR/g; +}' +} + +prog="$1" +ver="$2" +name="${3:-$(get_description "$1")}" + +# Prepare a temporary executable file that just dumps its own contents. +trap 'rm -rf .tmp.$$' EXIT INT TERM +shebang="#!/usr/bin/tail -n+2" +mkdir -p ".tmp.$$" +{ +echo "$shebang" +cat +} > ".tmp.$$/$prog" +test $(stat -c "%s" ".tmp.$$/$prog") -gt $((${#shebang} + 1)) || { echo >&2 "no input received; abort"; exit 1; } +chmod +x ".tmp.$$/$prog" + +help2man ".tmp.$$/$prog" --help-option="-q" \ + --name="$name" --version-string="$ver" \ + --no-info --include "$(dirname "$0")/mkman.inc" \ + | help2man_fixup

1 0

r26456: {website} update the mirrors page, have the script update the csv list (in website/trunk: . include)
by Andrew Lewman 06 Dec '13

06 Dec '13

Author: phobos Date: 2013-12-06 15:54:04 +0000 (Fri, 06 Dec 2013) New Revision: 26456 Modified: website/trunk/include/mirrors-table.wmi website/trunk/include/tor-mirrors.csv website/trunk/update-mirrors.pl Log: update the mirrors page, have the script update the csv list with last status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-12-06 03:49:41 UTC (rev 26455) +++ website/trunk/include/mirrors-table.wmi 2013-12-06 15:54:04 UTC (rev 26456) @@ -18,23 +18,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NO</td> <td>MultiNet AS</td> @@ -358,25 +341,42 @@ <tr> - <td>MX</td> + <td>LT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> <td>US</td> + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + <td>hessmo</td> <td>Up to date</td> @@ -477,23 +477,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>HackThisSite.org</td> @@ -664,6 +647,23 @@ <tr> + <td>US</td> + + <td></td> + + <td>Up to date</td> + + <td><a href="ftp://mirrors.go-parts.com/tor/">ftp</a></td> + <td><a href="http://mirrors.go-parts.com/tor/dist/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="rsync://mirrors.go-parts.com/mirrors/tor/">rsync</a></td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>torservers</td> @@ -732,23 +732,6 @@ <tr> - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>myRL.net</td> @@ -766,15 +749,15 @@ <tr> - <td>ES</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.zilog.es/dist/">http</a></td> - <td><a href="http://tor.zilog.es/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -783,15 +766,15 @@ <tr> - <td>LT</td> + <td>NL</td> - <td></td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -800,15 +783,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td>AskApache</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -817,289 +800,17 @@ <tr> - <td>US</td> + <td>ES</td> <td></td> - <td>Unknown</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> + <td><a href="http://tor.zilog.es/dist/">http</a></td> + <td><a href="http://tor.zilog.es/">http</a></td> <td> - </td> <td> - </td> <td> - </td> <td> - </td> </tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.mirrors.whitedholdings.org/dist/">http</a></td> - <td><a href="http://tor.mirrors.whitedholdings.org/">http</a></td> - <td><a href="https://tor.mirrors.whitedholdings.org/dist/">https</a></td> - <td><a href="https://tor.mirrors.whitedholdings.org/">https</a></td> - <td><a href="rsync://tor.mirrors.whitedholdings.org/tor-dist">rsync</a></td> - <td><a href="rsync://mirrors.whitedholdings.org/tor">rsync</a></td> -</tr> - -<tr> - - <td>DE</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.taskserver.de/dist/">http</a></td> - <td><a href="http://tor.taskserver.de/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>LU</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.adamas.ai/dist/">http</a></td> - <td><a href="http://torproject.adamas.ai/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>UA</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>FR</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://37.187.0.127/tormirror/dist/">http</a></td> - <td><a href="http://37.187.0.127/tormirror/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.minibofh.org/dist/">http</a></td> - <td><a href="http://tor.minibofh.org/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>UK</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.mage.me.uk/dist/">http</a></td> - <td><a href="http://tor.mage.me.uk/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>tor-mirror.de</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor-mirror.de/dist/">http</a></td> - <td><a href="http://tor-mirror.de/">http</a></td> - <td><a href="https://tor-mirror.de/dist/">https</a></td> - <td><a href="https://tor-mirror.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>[[:bbs:]]</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.netgull.com/torproject/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>NW Linux</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-dist">rsync</a></td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - - <td>NL</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>FR</td> - - <td>LazyTiger</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Failed signature check</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Failed signature check</td> - - <td><a href="ftp://mirrors.go-parts.com/tor/">ftp</a></td> - <td><a href="http://mirrors.go-parts.com/tor/dist/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://mirrors.go-parts.com/mirrors/tor/">rsync</a></td> - <td> - </td> -</tr> Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2013-12-06 03:49:41 UTC (rev 26455) +++ website/trunk/include/tor-mirrors.csv 2013-12-06 15:54:04 UTC (rev 26456) @@ -1,9 +1,9 @@ adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, updateDate , , US, , US, True, False, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Dec 5 03:59:24 2013 -, , US, , US, True, True, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , +, , US, , US, True, True, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, , Europe, True, False, Unknown, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Wed Dec 4 07:16:29 2013 http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, True, True, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Thu Dec 5 03:59:24 2013 -, , US, , US, True, False, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , +, , US, , US, True, False, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , haskell at gmx.es, , ES, Spain, Europe, True, False, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Dec 4 07:16:29 2013 webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe, True, True, No, http://t02.nl/mirror/, , , , http://t02.nl/mirror/dist/, , , , Thu Dec 5 03:59:24 2013 , , US, , US, True, False, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Thu Dec 5 03:59:24 2013 @@ -17,26 +17,26 @@ webmaster AT ccc DOT de, CCC, NL, , Europe, True, False, Unknown, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Thu Dec 5 03:59:24 2013 , searchprivate, US, TX, US, True, False, No, http://tor.searchprivate.com/, , , , http://tor.searchprivate.com/dist/, , , , Sun Jul 29 23:49:26 2012 , , AT, , AT, True, True, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Thu Dec 5 03:59:24 2013 -marz.michael at gmail.com, , DE, , , True, False, No, http://tor.taskserver.de/, , , , http://tor.taskserver.de/dist/, , , , -, , LU, , LU, True, False, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , +marz.michael at gmail.com, , DE, , , True, False, No, http://tor.taskserver.de/, , , , http://tor.taskserver.de/dist/, , , , +, , LU, , LU, True, False, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, True, False, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Sun Dec 1 03:54:10 2013 -coralcdn.org, CoralCDN, INT, , INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , +coralcdn.org, CoralCDN, INT, , INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , , , US, , US, True, True, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Dec 5 03:59:24 2013 , , AT, , AT, True, False, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Thu Dec 5 03:59:24 2013 info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, True, False, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Thu Dec 5 03:59:24 2013 , , CH, , CH, True, False, No, http://torproject.pillo-srv.ch/, https://torproject.pillo-srv.ch/, , , http://torproject.pillo-srv.ch/dist/, https://torproject.pillo-srv.ch/dist/, , , Thu Dec 5 03:59:24 2013 neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe, True, False, No, http://tor.teambelgium.net:8082/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8082/dist/, , , , Thu Dec 5 03:59:24 2013 tormaster AT xpdm DOT us, Xpdm, US, , North America, True, False, Unknown, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Thu Dec 5 03:59:24 2013 -, , UA, , UA, True, False, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , +, , UA, , UA, True, False, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , mail AT benjamin-meier DOT info, beme it, DE, , DE, True, False, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Thu Dec 5 03:59:24 2013 wollomatic at posteo.eu, , DE, Germany, Europe, True, True, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Thu Dec 5 03:59:24 2013 , , LT, , LT, True, False, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Thu Dec 5 03:59:24 2013 , , MX, , MX, True, False, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject//dist/, , , Thu Dec 5 03:59:24 2013 -, , FR, , , True, False, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , -, , US, , US, True, False, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , -, , UK, , UK, True, False, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , +, , FR, , , True, False, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , +, , US, , US, True, False, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , +, , UK, , UK, True, False, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , webmaster AT askapache DOT com, AskApache, US, California, US, True, False, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Thu Dec 5 03:59:24 2013 -nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, True, False, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , +nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, True, False, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , , hessmo, US, , US, True, False, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Thu Dec 5 03:59:24 2013 , , DE, , DE, True, False, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Thu Dec 5 03:59:24 2013 , India Tor Fans, IN, , IN, True, False, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Mon Nov 25 18:31:18 2013 @@ -46,9 +46,9 @@ BarkerJr AT barkerjr DOT net, BarkerJr, FR, , FR, True, False, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Thu Dec 5 03:59:24 2013 root AT amorphis DOT eu, Amorphis, NL, , Europe, True, False, Unknown, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Wed Dec 4 22:13:02 2013 hackthissite.org, HackThisSite.org, US, , US, True, True, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Thu Dec 5 03:59:24 2013 -citizen428 AT gmail DOT com, [[:bbs:]], DE, , Europe, True, False, Unknown, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , -, , DE, , DE, True, False, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , -, , US, , US, True, False, No, , , , , http://www.netgull.com/torproject/, , , , +citizen428 AT gmail DOT com, [[:bbs:]], DE, , Europe, True, False, Unknown, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , +, , DE, , DE, True, False, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , +, , US, , US, True, False, No, , , , , http://www.netgull.com/torproject/, , , , paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, True, False, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Thu Dec 5 03:59:24 2013 , cyberarmy, AT, , AT, True, False, No, http://tor.cyberarmy.at/, , , , , , , , Thu Dec 5 03:59:24 2013 , , DE, , DE, True, False, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Thu Dec 5 03:59:24 2013 @@ -58,13 +58,13 @@ , chaos darmstadt, DE, Germany, Europe, True, False, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Thu Dec 5 03:59:24 2013 , Soviet Anonymous, RU, , RU, True, False, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Thu Dec 5 03:59:24 2013 , , US, , US, True, False, No, , , , ftp://mirrors.go-parts.com/tor/, http://mirrors.go-parts.com/tor/dist/, , rsync://mirrors.go-parts.com/mirrors/tor/, , Thu Dec 5 03:59:24 2013 -, NW Linux, US, WA, US, True, False, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , +, NW Linux, US, WA, US, True, False, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , , torservers, DE, , DE, True, False, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Thu Dec 5 03:59:24 2013 -, , NL, , NL, True, False, No, , , , , , https://www.coevoet.nl/tor/dist/, , , +, , NL, , NL, True, False, No, , , , , , https://www.coevoet.nl/tor/dist/, , , , torland, GB, , GB, True, False, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Thu Dec 5 03:59:24 2013 , , FR, , FR, True, False, No, http://torproject.c3l.lu/, , , , http://torproject.c3l.lu/dist/, , , , Thu Dec 5 03:59:24 2013 , Lightning-bolt.net, CZ, , CZ, True, False, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Thu Dec 5 03:59:24 2013 -, LazyTiger, FR, , FR, True, False, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , -, , EE, , EE, True, False, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , +, LazyTiger, FR, , FR, True, False, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , +, , EE, , EE, True, False, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , , homosu, SE, , SE, True, False, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Wed Dec 4 07:16:29 2013 IceBear, myRL.net, IS, , IS, True, False, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Thu Dec 5 03:59:24 2013 Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-12-06 03:49:41 UTC (rev 26455) +++ website/trunk/update-mirrors.pl 2013-12-06 15:54:04 UTC (rev 26456) @@ -121,7 +121,7 @@ sub DumpMirrors { my @m = @_; - open(CSV, ">", "tor-mirrors.csv") or die "Cannot open tor-mirrors.csv: $!"; + open(CSV, ">", "include/tor-mirrors.csv") or die "Cannot open tor-mirrors.csv: $!"; print CSV join(", ", @columns) . "\n"; foreach my $server(@m) { $server->{updateDate} = gmtime($server->{updateDate}) if ($server->{updateDate}); @@ -153,7 +153,7 @@ print join("\n", keys %randomtorfiles); print "\n"; -# Adjust offical Tor time by out-of-date offset: number of days * seconds per day +# Adjust official Tor time by out-of-date offset: number of days * seconds per day $tortime -= 1 * 172800; print "The official time for Tor is $tortime. \n"; @@ -184,15 +184,11 @@ sub PrintServer { my $server = shift; - my $time; - if ( $server->{updateDate} && $server->{sigMatched} ) { $time = "Up to date"; } - elsif (!$server->{updateDate}) { $time = "Unknown"; } - else { $time = "Failed signature check"; } print OUT <<"END"; \n<tr>\n <td>$server->{isoCC}</td>\n <td>$server->{orgName}</td>\n - <td>$time</td>\n + <td>Up to date</td>\n END my %prettyNames = ( @@ -224,13 +220,6 @@ foreach my $server ( sort { $b->{updateDate} <=> $a->{updateDate} } grep {$_->{updateDate} && $_->{updateDate} > $tortime && $_->{sigMatched}} @m ) { PrintServer($server); } -foreach my $server ( grep {!$_->{updateDate}} @m ) { - PrintServer($server); -} -foreach my $server ( grep {!$_->{sigMatched} && $_->{updateDate} && $_->{updateDate} > $tortime} @m ) { - PrintServer($server); -} -# That leaves those servers whose updateDate < torTime. Check the csv for those. DumpMirrors(@m);

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit 0882c64246a7eb72e506b566f1823a9f88c1579a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:46:14 2013 +0000 Update translations for tor-launcher-properties --- ne/torlauncher.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ne/torlauncher.properties b/ne/torlauncher.properties index 2988760..426af5b 100644 --- a/ne/torlauncher.properties +++ b/ne/torlauncher.properties @@ -15,17 +15,17 @@ torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो # torlauncher.datadir_missing=The Tor data directory does not exist. # torlauncher.password_hash_missing=Failed to get hashed password. -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.failed_to_get_settings=टोरको सेटिङ भेटिएन +torlauncher.failed_to_save_settings=टोरको सेटिङ सेब गर्न सकिएन| torlauncher.ensure_tor_is_running=कृपया टोर सन्चालन् भएको पुष्टि गर्नुहोस् | # torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. # torlauncher.error_proxy_type_missing=You must select the proxy type. -# torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_bridges_missing=एक वा एक भन्दा बढी पुल संकेत गर्नुहोस् | torlauncher.connect=जडान गर्नुहोस् torlauncher.quit=बन्द गर्नुहोस torlauncher.quit_win=बन्द torlauncher.done=भयो -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=जानकारीको लागि सम्पर्क गर्नुहोस

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit fd395bdf5f23956da89b42bf28c4cd726d5995b5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:45:17 2013 +0000 Update translations for vidalia_alpha --- ne/vidalia_ne.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ne/vidalia_ne.po b/ne/vidalia_ne.po index 5b4a608..20732bd 100644 --- a/ne/vidalia_ne.po +++ b/ne/vidalia_ne.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-12-06 13:10+0000\n" +"PO-Revision-Date: 2013-12-06 13:40+0000\n" "Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/torproject/language/ne/)\n" "MIME-Version: 1.0\n" @@ -2673,7 +2673,7 @@ msgstr "" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "एक वा एक भन्दा बढी पुल संकेत गर्नुहोस् |" msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit 1e5f44eb184ba358afa1b38a4062efd33560c461 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:45:12 2013 +0000 Update translations for vidalia --- ne/vidalia_ne.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ne/vidalia_ne.po b/ne/vidalia_ne.po index 3050df4..44cec69 100644 --- a/ne/vidalia_ne.po +++ b/ne/vidalia_ne.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-12-06 13:10+0000\n" +"PO-Revision-Date: 2013-12-06 13:40+0000\n" "Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/torproject/language/ne/)\n" "MIME-Version: 1.0\n" @@ -2688,7 +2688,7 @@ msgstr "" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "एक वा एक भन्दा बढी पुल संकेत गर्नुहोस् |" msgctxt "Policy" msgid "accept"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit 4b3b9cba9edd32347955a3d06145dbed0ec9e029 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:16:22 2013 +0000 Update translations for tails-misc --- ne.po | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ne.po b/ne.po index 4dbfc45..8dabe10 100644 --- a/ne.po +++ b/ne.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 09:01+0000\n" +"POT-Creation-Date: 2013-11-30 16:12+0100\n" +"PO-Revision-Date: 2013-12-06 13:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Nepali (http://www.transifex.com/projects/p/torproject/language/ne/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" -msgstr "" +msgstr "बन्द" #: config/chroot_local-includes/usr/local/bin/gpgApplet:141 msgid "About" @@ -224,21 +224,21 @@ msgstr "" msgid "About Tails" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "Your additional software" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 msgid "The upgrade was successful." msgstr "" @@ -315,79 +315,79 @@ msgid "" " more...</a>" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Error" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67 msgid "warning:" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Warning" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "Do you really want to launch the Unsafe Browser?" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:80 msgid "_Launch" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 msgid "_Exit" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91 msgid "Starting the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "This may take a while, so please be patient." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110 msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 msgid "Shutting down the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:234 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:242 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:255 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit 0127e12eb1fbdeb596969a90642d8a7ae32448f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:16:19 2013 +0000 Update translations for tor-launcher-network-settings --- ne/network-settings.dtd | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/ne/network-settings.dtd b/ne/network-settings.dtd index 723a055..31834cc 100644 --- a/ne/network-settings.dtd +++ b/ne/network-settings.dtd @@ -1,55 +1,55 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes ""> -<!ENTITY torSettings.no ""> +<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.no "No"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure network settings."> +<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt1 "This computer's Internet connection is clear of obstacles."> +<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> +<!ENTITY torSettings.connect "जडान गर्नुहोस् "> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> +<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">  -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.restart "Restart"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Optional"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> -<!ENTITY torsettings.useProxy.address ""> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> -<!ENTITY torsettings.firewall.checkbox ""> -<!ENTITY torsettings.firewall.allowedPorts ""> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> + +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp2 "To obtain some bridge relays, use a web browser to visit the following page: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit d21b6c6c058b6155a7e0ca810982edbe21d991ed Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:16:13 2013 +0000 Update translations for tor-launcher-properties --- ne/torlauncher.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ne/torlauncher.properties b/ne/torlauncher.properties index fcd4d83..2988760 100644 --- a/ne/torlauncher.properties +++ b/ne/torlauncher.properties @@ -1,12 +1,12 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=टोर सुरुवातकर्ता -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_exited=टोर अनपेक्षित रुपमा बन्द भयो| +torlauncher.please_restart_app=कृपया यो सफ्टओएर पुन: संचालन गर्नुहोस | +torlauncher.tor_controlconn_failed=टोरको नियेंत्रण पोर्टसंग जडान विफल भयो| +torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो | # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S @@ -17,15 +17,15 @@ # torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S # torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.ensure_tor_is_running=कृपया टोर सन्चालन् भएको पुष्टि गर्नुहोस् | # torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. # torlauncher.error_proxy_type_missing=You must select the proxy type. # torlauncher.error_bridges_missing=You must specify one or more bridges. -# torlauncher.connect=Connect -# torlauncher.quit=Quit -# torlauncher.quit_win=Exit -# torlauncher.done=Done +torlauncher.connect=जडान गर्नुहोस् +torlauncher.quit=बन्द गर्नुहोस +torlauncher.quit_win=बन्द +torlauncher.done=भयो # torlauncher.forAssistance=For assistance, contact %S

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 06 Dec '13

06 Dec '13

commit b1fa801b6df27c7bf2a6bba5ab2766bea1e15766 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 13:15:58 2013 +0000 Update translations for https_everywhere --- ne/ssl-observatory.dtd | 75 +++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/ne/ssl-observatory.dtd b/ne/ssl-observatory.dtd index d832b69..d3a4f80 100644 --- a/ne/ssl-observatory.dtd +++ b/ne/ssl-observatory.dtd @@ -1,9 +1,11 @@  -<!ENTITY ssl-observatory.popup.details ""> -<!ENTITY ssl-observatory.popup.later ""> -<!ENTITY ssl-observatory.popup.no ""> +<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> +<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.no "No"> -<!ENTITY ssl-observatory.popup.text ""> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks +against your browser by sending the certificates you receive to the +Observatory. Turn this on?">  <!ENTITY ssl-observatory.popup.title -""> +"Should HTTPS Everywhere use the SSL Observatory?"> -<!ENTITY ssl-observatory.popup.yes ""> +<!ENTITY ssl-observatory.popup.yes "Yes">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -""> +"It is safe to enable this, unless you use a very +intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -""> +"Safe, unless you use a corporate network with secret intranet server names:"> <!ENTITY ssl-observatory.prefs.alt_roots -""> +"Submit and check certificates signed by non-standard root CAs"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> -<!ENTITY ssl-observatory.prefs.anonymous ""> +<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -""> +"Check certificates using Tor for anonymity (requires Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -""> +"This option requires Tor to be installed and running"> <!ENTITY ssl-observatory.prefs.asn -""> +"When you see a new certificate, tell the Observatory which ISP you are connected to"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> -<!ENTITY ssl-observatory.prefs.done ""> +<!ENTITY ssl-observatory.prefs.done "भयो"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) +sends copies of HTTPS certificates to the Observatory, to help us +detect 'man in the middle' attacks and improve the Web's security; and (2) +lets us warn you about insecure connections or attacks on your browser.">  <!ENTITY ssl-observatory.prefs.explanation2 -""> +"For example, when you visit https://www.something.com, the certificate +received by the Observatory will indicate that somebody visited +www.something.com, but not who visited the site, or what specific page they +looked at. Mouseover the options for further details:"> -<!ENTITY ssl-observatory.prefs.hide ""> +<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> <!ENTITY ssl-observatory.prefs.nonanon -""> +"Check certificates even if Tor is not available"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"We will still try to keep the data anonymous, but this option is less secure"> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"Submit and check certificates for non-public DNS names"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> -<!ENTITY ssl-observatory.prefs.show ""> +<!ENTITY ssl-observatory.prefs.show "Show advanced options"> -<!ENTITY ssl-observatory.prefs.title ""> +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> -<!ENTITY ssl-observatory.prefs.use ""> -<!ENTITY ssl-observatory.warning.title ""> -<!ENTITY ssl-observatory.warning.showcert ""> -<!ENTITY ssl-observatory.warning.okay ""> -<!ENTITY ssl-observatory.warning.text ""> -<!ENTITY ssl-observatory.warning.defense ""> +<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> +<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> +<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> +<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"Submit and check self-signed certificates"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0