March 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Adapted build files, generate javadoc for submodules,
by karsten＠torproject.org 30 Mar '17

30 Mar '17

commit 76064b08ab73f04ff9d59b293af65bc6ef33e428 Author: iwakeh <iwakeh(a)torproject.org> Date: Sun Mar 26 08:14:15 2017 +0000 Adapted build files, generate javadoc for submodules, add metrics-lib javadoc to war, adapt link. Implements task-21730 and prepares task-21551. --- shared/build-base.xml | 1 + website/build.xml | 91 ++++++++++++---------- .../src/main/resources/bootstrap-development.sh | 9 +++ website/src/main/resources/web-prepare.sh | 15 ++++ .../src/main/resources/web/WEB-INF/metrics-lib.jsp | 2 +- 5 files changed, 76 insertions(+), 42 deletions(-) diff --git a/shared/build-base.xml b/shared/build-base.xml index 35a8139..e9db803 100644 --- a/shared/build-base.xml +++ b/shared/build-base.xml @@ -1,6 +1,7 @@ <project basedir="."> <property name="sources" value="src/main/java"/> + <property name="resources" value="src/main/resources"/> <property name="testsources" value="src/test/java"/> <property name="libs" value="../../shared/lib"/> <property name="generated" value="generated"/> diff --git a/website/build.xml b/website/build.xml index 6204afe..8cd1060 100644 --- a/website/build.xml +++ b/website/build.xml @@ -2,63 +2,72 @@ <property name="libs" value="../shared/lib"/> -  - <target name="compile"> - <mkdir dir="classes"/> - <javac destdir="classes" - srcdir="src" - source="1.7" - target="1.7" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath> - <fileset dir="${libs}"> - <include name="commons-codec-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="postgresql-jdbc3-9.2.jar"/> - <include name="servlet-api-3.0.jar"/> - <include name="gson-2.2.4.jar"/> - <include name="REngine.jar"/> - <include name="Rserve.jar"/> - </fileset> - </classpath> - </javac> + <include file="../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + + <patternset id="compile.libs" > + <include name="postgresql-jdbc3-9.2.jar"/> + <include name="REngine.jar"/> + <include name="Rserve.jar"/> + </patternset> + + <patternset id="war.libs" > + <patternset refid="compile.libs" /> + <include name="jstl1.1-1.1.2.jar"/> + <include name="standard-1.1.2.jar"/> + <include name="commons-codec-1.9.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="gson-2.2.4.jar"/> + </patternset> + + <path id="classpath"> + <pathelement path="${classes}"/> + <path refid="base.classpath" /> + <fileset dir="${libs}"> + <patternset refid="compile.libs" /> + <include name="servlet-api-3.0.jar"/> + </fileset> + </path> + + <target name="submoduleupdate" > + <exec executable="git" failonerror="false"> + <arg value="submodule" /> + <arg value="update" /> + <arg value="--remote" /> + <arg value="--merge" /> + </exec> </target>  <target name="war" - depends="compile"> + depends="submoduleupdate,compile"> + <exec executable="src/main/resources/web-prepare.sh" > + <arg value="${basedir}/../submods" /> + </exec> <war destfile="metrics.war" - webxml="etc/web.xml"> - <fileset dir="web"/> + webxml="${resources}/etc/web.xml"> + <fileset dir="${resources}/web"/> <lib dir="${libs}"> - <include name="jstl1.1-1.1.2.jar"/> - <include name="REngine.jar"/> - <include name="Rserve.jar"/> - <include name="standard-1.1.2.jar"/> - <include name="commons-codec-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="postgresql-jdbc3-9.2.jar"/> - <include name="gson-2.2.4.jar"/> + <patternset refid="war.libs" /> </lib> - <classes dir="classes"/> - <zipfileset dir="etc" + <classes dir="${classes}"/> + <zipfileset dir="${resources}/etc" prefix="WEB-INF/classes" includes="logging.properties"/> - <zipfileset dir="etc" + <zipfileset dir="${resources}/etc" prefix="WEB-INF/classes" includes="metrics.json"/> - <zipfileset dir="etc" + <zipfileset dir="${resources}/etc" prefix="WEB-INF/classes" includes="categories.json"/> - <zipfileset dir="etc" + <zipfileset dir="${resources}/etc" prefix="WEB-INF/classes" includes="news.json"/> - <metainf dir="etc" + <metainf dir="${resources}/etc" includes="context.xml"/> + <zipfileset dir="${basedir}/../submods/metrics-lib/generated/javadoc" + prefix="metrics-lib" /> </war> </target> </project> diff --git a/website/src/main/resources/bootstrap-development.sh b/website/src/main/resources/bootstrap-development.sh new file mode 100755 index 0000000..a99ebf2 --- /dev/null +++ b/website/src/main/resources/bootstrap-development.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Copyright 2017 The Tor Project +# See LICENSE for licensing information +# +# Use for submodule initialization and checkout. +# Only necessary after very first checkout without recursion. +# +git submodule update --init --remote diff --git a/website/src/main/resources/web-prepare.sh b/website/src/main/resources/web-prepare.sh new file mode 100755 index 0000000..2da4c4e --- /dev/null +++ b/website/src/main/resources/web-prepare.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# +# Expecting the submodule path as argument +# + +cd $1 + +for x in metrics-lib collector onionoo ; do + cd $1/$x + src/main/resources/bootstrap-development.sh + if ! [ -d lib ] ; then + mkdir lib + fi; + ant clean docs +done; diff --git a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp index 0dac339..3c74c9a 100644 --- a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp +++ b/website/src/main/resources/web/WEB-INF/metrics-lib.jsp @@ -21,7 +21,7 @@ metrics-lib is a Java API that facilitates processing Tor network data from the <a href="https://collector.torproject.org/">CollecTor</a> service for statistical analysis and for building services and applications. <a class="btn btn-primary btn-lg" style="margin: 10px" href="https://dist.torproject.org/descriptor/?C=M;O=D"> Download Release</a> <a class="btn btn-primary btn-lg" style="margin: 10px" href="https://gitweb.torproject.org/metrics-lib.git/plain/CHANGELOG.md"> View Change Log</a> - + </div> </div>

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 830e41164482218d4c63aa5c89521940fefb10c2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:18:32 2017 +0000 Update translations for tor-browser-manual_completed --- nb/nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 359962b..f13997d 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -1698,8 +1698,8 @@ msgid "" "outdated version of the software, you may be vulnerable to serious security " "flaws that compromise your privacy and anonymity." msgstr "" -"Tor-nettleseren må alltid holdes oppdatert. Hvis du fortsetter å bruke en " -"utdatert versjon av programvaren, kan du være sårbar for alvorlige " +"Tor-nettleseren må alltid holdes oppdatert. Hvis du holder frem med å bruke " +"en utdatert versjon av programvaren, kan du være sårbar for alvorlige " "sikkerhetsfeil, som kan avsløre din identitet og være skadelig for ditt " "personvern."

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit d5b419a09347d3bba06badc5808185b060ed8cfe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:18:28 2017 +0000 Update translations for tor-browser-manual --- nb/nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 359962b..f13997d 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -1698,8 +1698,8 @@ msgid "" "outdated version of the software, you may be vulnerable to serious security " "flaws that compromise your privacy and anonymity." msgstr "" -"Tor-nettleseren må alltid holdes oppdatert. Hvis du fortsetter å bruke en " -"utdatert versjon av programvaren, kan du være sårbar for alvorlige " +"Tor-nettleseren må alltid holdes oppdatert. Hvis du holder frem med å bruke " +"en utdatert versjon av programvaren, kan du være sårbar for alvorlige " "sikkerhetsfeil, som kan avsløre din identitet og være skadelig for ditt " "personvern."

1 0

[translation/exoneratorproperties_completed] Update translations for exoneratorproperties_completed
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 31096387975646dc0ac06ff5fe5b44dfa6d2302b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:18:24 2017 +0000 Update translations for exoneratorproperties_completed --- nb/exonerator.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/exonerator.properties b/nb/exonerator.properties index 42d0777..577f78e 100644 --- a/nb/exonerator.properties +++ b/nb/exonerator.properties @@ -4,10 +4,10 @@ form.timestamp.label=Dato form.search.label=Søk summary.heading=Sammendrag summary.serverproblem.dbnoconnect.title=Tjener-problem -summary.serverproblem.dbnoconnect.body.text=Kunne ikke koble til databasen. Prøv igjen senere. Hvis problemet fortsetter, vennlight %s\! +summary.serverproblem.dbnoconnect.body.text=Kunne ikke koble til databasen. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.dbnoconnect.body.link=la det komme oss for øre summary.serverproblem.dbempty.title=Tjenerproblem -summary.serverproblem.dbempty.body.text=Databasen ser ut til å være tom. Prøv igjen senere. Hvis problemet fortsetter, %s\! +summary.serverproblem.dbempty.body.text=Databasen ser ut til å være tom. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.dbempty.body.link=la det komme oss for øre summary.invalidparams.notimestamp.title=Dato-parameter ikke angitt summary.invalidparams.notimestamp.body=Beklager, du må også inkludere et dato parameter. @@ -20,7 +20,7 @@ summary.invalidparams.invalidip.body=Beklager, %s er ikke en gyldig IP-adresse. summary.invalidparams.invalidtimestamp.title=Ugyldig dato-parameter summary.invalidparams.invalidtimestamp.body=Beklager, %s er ikke en valid dato. Det forventede dato formatet er %s. summary.serverproblem.nodata.title=Tjener-problem -summary.serverproblem.nodata.body.text=Databasen inneholder ingen data for den forespurte datoen. Vennligst prøv igjen senere. Hvis problemet fortsetter, %s\! +summary.serverproblem.nodata.body.text=Databasen inneholder ingen data for den forespurte datoen. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.nodata.body.link=la det komme oss for øre summary.negativesamenetwork.title=Resultatet er negativt. summary.negativesamenetwork.body=Fant ikke IP-adressen %s på eller innenfor én dags tidsforløp av %s. Fant dog andre IP-adresser til Tor-rutingsstafettoppsett i samme /%d nettverk omkring tiden\:

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit ee2739ec4c1b08615803bb6557a6a495c8c8c412 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:18:20 2017 +0000 Update translations for exoneratorproperties --- nb/exonerator.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/exonerator.properties b/nb/exonerator.properties index 42d0777..577f78e 100644 --- a/nb/exonerator.properties +++ b/nb/exonerator.properties @@ -4,10 +4,10 @@ form.timestamp.label=Dato form.search.label=Søk summary.heading=Sammendrag summary.serverproblem.dbnoconnect.title=Tjener-problem -summary.serverproblem.dbnoconnect.body.text=Kunne ikke koble til databasen. Prøv igjen senere. Hvis problemet fortsetter, vennlight %s\! +summary.serverproblem.dbnoconnect.body.text=Kunne ikke koble til databasen. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.dbnoconnect.body.link=la det komme oss for øre summary.serverproblem.dbempty.title=Tjenerproblem -summary.serverproblem.dbempty.body.text=Databasen ser ut til å være tom. Prøv igjen senere. Hvis problemet fortsetter, %s\! +summary.serverproblem.dbempty.body.text=Databasen ser ut til å være tom. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.dbempty.body.link=la det komme oss for øre summary.invalidparams.notimestamp.title=Dato-parameter ikke angitt summary.invalidparams.notimestamp.body=Beklager, du må også inkludere et dato parameter. @@ -20,7 +20,7 @@ summary.invalidparams.invalidip.body=Beklager, %s er ikke en gyldig IP-adresse. summary.invalidparams.invalidtimestamp.title=Ugyldig dato-parameter summary.invalidparams.invalidtimestamp.body=Beklager, %s er ikke en valid dato. Det forventede dato formatet er %s. summary.serverproblem.nodata.title=Tjener-problem -summary.serverproblem.nodata.body.text=Databasen inneholder ingen data for den forespurte datoen. Vennligst prøv igjen senere. Hvis problemet fortsetter, %s\! +summary.serverproblem.nodata.body.text=Databasen inneholder ingen data for den forespurte datoen. Prøv igjen senere. Hvis problemet vedvarer, %s\! summary.serverproblem.nodata.body.link=la det komme oss for øre summary.negativesamenetwork.title=Resultatet er negativt. summary.negativesamenetwork.body=Fant ikke IP-adressen %s på eller innenfor én dags tidsforløp av %s. Fant dog andre IP-adresser til Tor-rutingsstafettoppsett i samme /%d nettverk omkring tiden\:

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 20c96e12ddadd31fbdb7b9e7f340f844ebe2be99 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:16:22 2017 +0000 Update translations for tails-misc_completed --- nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb.po b/nb.po index 259acb0..92d406e 100644 --- a/nb.po +++ b/nb.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-16 07:26+0000\n" +"PO-Revision-Date: 2017-03-30 06:56+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -314,7 +314,7 @@ msgstr "Usikker Nettleser" msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. Vennligst prøv på nytt om en stund." +msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. Prøv på nytt om en stund." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit a7b8af809ce8f9c65891c2133ab320c9e62eede3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:16:19 2017 +0000 Update translations for tails-misc --- nb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb.po b/nb.po index 259acb0..92d406e 100644 --- a/nb.po +++ b/nb.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-16 07:26+0000\n" +"PO-Revision-Date: 2017-03-30 06:56+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -314,7 +314,7 @@ msgstr "Usikker Nettleser" msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. Vennligst prøv på nytt om en stund." +msgstr "En annen Usikker Nettleser kjører for øyeblikket, eller blir renset. Prøv på nytt om en stund." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid ""

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 258633acd1a7f944454c67d372092d75a11480fd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:15:36 2017 +0000 Update translations for liveusb-creator_completed --- nb/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 91b85da..fbcbcc3 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -4,7 +4,7 @@ # # Translators: # Allan Nordhøy <epost(a)anotheragency.no>, 2014 -# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2016 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2017 # John Henningsen <henningsen.teknikk(a)gmail.com>, 2015 # lateralus, 2013-2014 # trash <nicolaip(a)outlook.com>, 2013 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-04-02 13:47+0000\n" +"PO-Revision-Date: 2017-03-30 06:56+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -364,7 +364,7 @@ msgstr "Enheten \"%(pretty_name)s\" har for liten lagringsplass for å installer msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "Den valgte filen er uleselig. Vennligst sørg for at du har de nødvendige rettighetene eller velg en annen fil." +msgstr "Den valgte filen er uleselig. Sørg for at du har de nødvendige rettighetene eller velg en annen fil." #: ../liveusb/creator.py:354 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 720eb1ab46cd8ba7255b82748d6fda5a345b661f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:15:33 2017 +0000 Update translations for liveusb-creator --- nb/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 91b85da..fbcbcc3 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -4,7 +4,7 @@ # # Translators: # Allan Nordhøy <epost(a)anotheragency.no>, 2014 -# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2016 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015-2017 # John Henningsen <henningsen.teknikk(a)gmail.com>, 2015 # lateralus, 2013-2014 # trash <nicolaip(a)outlook.com>, 2013 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-04-02 13:47+0000\n" +"PO-Revision-Date: 2017-03-30 06:56+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -364,7 +364,7 @@ msgstr "Enheten \"%(pretty_name)s\" har for liten lagringsplass for å installer msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "Den valgte filen er uleselig. Vennligst sørg for at du har de nødvendige rettighetene eller velg en annen fil." +msgstr "Den valgte filen er uleselig. Sørg for at du har de nødvendige rettighetene eller velg en annen fil." #: ../liveusb/creator.py:354 #, python-format

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 30 Mar '17

30 Mar '17

commit 6b6730d781b9f4c10f4a9169329c41b888362063 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 30 07:15:16 2017 +0000 Update translations for torcheck_completed --- nb/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/torcheck.po b/nb/torcheck.po index 1bbb71c..156f71d 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-01-20 13:51+0000\n" +"PO-Revision-Date: 2017-03-30 06:59+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "En sikkerhetsoppdatering er tilgjengelig for Tor-nettleseren." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klikk her for å gå til nedlastningssiden.</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klikk her for å gå til nedlastningssiden</a>" msgid "Sorry. You are not using Tor." msgstr "Beklager. Du bruker ikke Tor."

1 0