- tor-commits - lists.torproject.org

[collector/master] implements tasks 18794 and 18792; java7, test task, coverage, and some jars.
by karsten＠torproject.org 28 Apr '16

28 Apr '16

commit e3a2d947bec18b9e8b9b7f1eb61c5be49f1cce29 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Apr 21 13:25:25 2016 +0000 implements tasks 18794 and 18792; java7, test task, coverage, and some jars. --- build.xml | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 155 insertions(+), 14 deletions(-) diff --git a/build.xml b/build.xml index 8e21a9b..e2ced4b 100644 --- a/build.xml +++ b/build.xml @@ -1,35 +1,100 @@ -<project default="compile" name="ERNIE" basedir="."> +<project default="compile" name="CollecTor" basedir="."> + <property name="release.version" value="0.9.0-dev" /> + <property name="name" value="CollecTor"/> + <property name="descriptorversion" value="1.1.0-dev" /> + <property name="source-and-target-java-version" value="1.7" /> <property name="sources" value="src/"/> - <property name="classes" value="classes/"/> - <property name="docs" value="javadoc/"/> - <property name="name" value="ERNIE"/> + <property name="generated" value="generated/"/> + <property name="testresult" value="${generated}/test-results"/> + <property name="testsources" value="test"/> + <property name="coverageresult" value="${generated}/coverage-report/"/> + <property name="instrument" value="${generated}/instrument/"/> + <property name="classes" value="${generated}/classes/"/> + <property name="testclasses" value="${generated}/testclasses/"/> + <property name="docs" value="${generated}/javadoc/"/> + <property name="libs" value="lib"/> + <property name="cobertura.ser.file" value="cobertura.ser" /> + <property name="jarfile" value="collector-${release.version}.jar" /> + <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" /> + <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" /> <path id="classpath"> <pathelement path="${classes}"/> - <fileset dir="/usr/share/java"> - <include name="commons-codec.jar"/> - <include name="commons-compress.jar"/> - <include name="gson.jar"/> - <include name="xz.jar"/> + <fileset dir="${libs}"> + <include name="commons-codec-1.9.jar"/> + <include name="commons-compress-1.9.jar"/> + <include name="gson-2.2.4.jar"/> + <include name="xz-1.5.jar"/> + <include name="descriptor-${descriptorversion}.jar"/> </fileset> - <fileset dir="deps/metrics-lib"> - <include name="descriptor.jar"/> + </path> + <path id="cobertura.classpath"> + <fileset dir="${libs}"> + <include name="descriptor-${descriptorversion}.jar"/> + <include name="cobertura-2.1.1.jar" /> + <include name="slf4j-api-1.7.7.jar" /> + <include name="commons-lang3-3.3.2.jar" /> + <include name="asm4-5.0.3.jar" /> + <include name="asm4-util-5.0.3.jar" /> + <include name="asm4-tree-5.0.3.jar" /> + <include name="asm4-commons-5.0.3.jar" /> + <include name="asm4-analysis-5.0.3.jar" /> + <include name="oro-2.0.8.jar" /> + <include name="logback-core-1.1.2.jar" /> + <include name="logback-classic-1.1.2.jar" /> + </fileset> + </path> + <path id="test.classpath"> + <pathelement path="${testclasses}"/> + <fileset dir="${libs}"> + <include name="junit4-4.11.jar"/> </fileset> </path> <target name="init"> <mkdir dir="${classes}"/> + <mkdir dir="${testclasses}"/> + <mkdir dir="${generated}"/> + <mkdir dir="${docs}"/> + <mkdir dir="${testresult}"/> + <mkdir dir="${instrument}"/> <copy file="config.template" tofile="config"/> </target> - <target name="metrics-lib"> - <ant dir="deps/metrics-lib"/> + <target name="clean"> + <delete includeEmptyDirs="true" quiet="true"> + <fileset dir="${classes}" defaultexcludes="false" includes="**" /> + <fileset dir="${generated}" defaultexcludes="false" includes="**" /> + </delete> + <delete file="${cobertura.ser.file}" quiet="true"/> + <delete file="${jarfile}" quiet="true"/> + <delete file="${jarsourcesfile}" quiet="true"/> + <delete file="${jarjavadocfile}" quiet="true"/> </target> - <target name="compile" depends="metrics-lib,init"> + <target name="compile" depends="init"> <javac srcdir="${sources}" destdir="${classes}" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" debug="true" debuglevel="lines,source" + deprecation="true" + optimize="false" + failonerror="true" includeantruntime="false"> <classpath refid="classpath"/> </javac> </target> + <target name="compile-tests" depends="compile"> + <javac destdir="${testclasses}" + srcdir="${testsources}" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" + debug="true" debuglevel="lines,source" + deprecation="true" + optimize="false" + failonerror="true" + includeantruntime="false"> + <classpath refid="classpath"/> + <classpath refid="test.classpath"/> + </javac> + </target> <target name="docs"> <mkdir dir="${docs}"/> <javadoc destdir="${docs}"> @@ -37,6 +102,82 @@ <fileset dir="${sources}/" includes="**/*.java" /> </javadoc> </target> + <target name="jar" depends="compile,docs"> + <exec executable="git" outputproperty="git.revision"> + <arg value="rev-parse" /> + <arg value="--short" /> + <arg value="HEAD" /> + </exec> + <jar destfile="${jarfile}" + basedir="${classes}"> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="${name}"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + </manifest> + </jar> + <jar destfile="${jarsourcesfile}"> + <fileset dir="${sources}" /> + <fileset dir="${testsources}" /> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="${name}"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + </manifest> + </jar> + <jar destfile="${jarjavadocfile}"> + <fileset dir="${docs}" /> + <manifest> + <attribute name="Created-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="${name}"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + </manifest> + </jar> + </target> + <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> + <target name="coverage" depends="compile,compile-tests"> + <copy todir="${instrument}" > + <fileset dir="${classes}" > + <include name="**/*"/> + </fileset> + </copy> + <cobertura-instrument ignoreTrivial="true"> + <fileset dir="${instrument}"> + <include name="**/**/*.class" /> + </fileset> + </cobertura-instrument> + <junit fork="true" haltonfailure="false" printsummary="on"> + <sysproperty key="net.sourceforge.cobertura.datafile" + file="${basedir}/${cobertura.ser.file}" /> + <classpath location="${instrument}" /> + <classpath refid="classpath" /> + <classpath refid="test.classpath" /> + <classpath refid="cobertura.classpath" /> + <formatter type="xml" /> + <batchtest toDir="${testresult}" > + <fileset dir="${testclasses}" /> + </batchtest> + </junit> + <cobertura-report format="html" destdir="${coverageresult}" > + <fileset dir="${sources}"> + <include name="**/*.java" /> + </fileset> + </cobertura-report> + <cobertura-check branchrate="0" totallinerate="0" /> + </target> + <target name="test" depends="compile,compile-tests"> + <junit fork="true" haltonfailure="true" printsummary="off"> + <classpath refid="classpath"/> + <classpath refid="test.classpath"/> + <formatter type="plain" usefile="false"/> + <batchtest> + <fileset dir="${testclasses}" /> + </batchtest> + </junit> + </target> <target name="bridgedescs" depends="compile"> <java fork="true" maxmemory="2048m"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 82ae49842ac1c0e45b1c8cdc64280cea7d39f799 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 10:15:49 2016 +0000 Update translations for tails-misc_completed --- hr_HR.po | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 4ec2e36..63f583b 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-04-07 12:26+0000\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-28 10:11+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -63,13 +63,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Želite li svejedno pokrenuti Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Pokreni" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Izlaz" @@ -234,17 +234,24 @@ msgstr "GnuPG učinak:" msgid "Other messages provided by GnuPG:" msgstr "Druge poruke pružene od strane GnuPG-a:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "Claws Mail-ova značajka trajnosti je aktivirana." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Ako imate email-ove pohranjene u Claws Mail-u, trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja Icedove-a." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Ako ste već migrirali svoje email-ove na Icedove trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'> izbrisati sve Claws Mail podatke</a> kako bi uklonili ovo upozorenje." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Ponovno pokreni"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 57c2bf10ca14712b8705ab35a6fe25934782f165 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 10:15:43 2016 +0000 Update translations for tails-misc --- hr_HR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 9f19106..63f583b 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-28 10:11+0000\n" +"Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -250,7 +250,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Ako ste već migrirali svoje email-ove na Icedove trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'> izbrisati sve Claws Mail podatke</a> kako bi uklonili ovo upozorenje." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[user-manual/master] Add note about removing Tor Browser on Linux
by colin＠torproject.org 28 Apr '16

28 Apr '16

commit bcb75e8bfad2d9c64655a6064ca5c5e15d03a3d7 Author: Colin Childs <colin(a)torproject.org> Date: Thu Apr 28 00:42:08 2016 -0500 Add note about removing Tor Browser on Linux --- C/uninstalling.page | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/C/uninstalling.page b/C/uninstalling.page index eab010e..fbb8fa7 100644 --- a/C/uninstalling.page +++ b/C/uninstalling.page @@ -23,7 +23,9 @@ Removing Tor Browser from your system is simple: <item> Locate your Tor Browser folder. The default location on Windows is the Desktop; - on Mac OS X it is the Applications folder. + on Mac OS X it is the Applications folder. On Linux, there is no default location, + however the folder will be named "tor-browser_en-US" if you are running the English + Tor Browser. </item> <item>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit 9d0db6e56f7b1620bdca1913edc84870b51a7b31 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 00:45:07 2016 +0000 Update translations for bridgedb_completed --- id/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index b98eeaf..5a96fc3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ # L1Nus <multazam_ali(a)me.com>, 2014 # Ngalim Siregar <ngalim.siregar(a)gmail.com>, 2015 # km242saya <pencurimangga(a)gmail.com>, 2014 +# Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>, 2016 # zk <zamani.karmana(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Ferriandy Chianiago <gpl4all(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-28 00:33+0000\n" +"Last-Translator: Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda." +msgstr "Maaf! Ada yang salah dengan permintaan Anda." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Apr '16

28 Apr '16

commit d533d6874e63b808e31c9168cb12239cb239ba94 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 28 00:45:03 2016 +0000 Update translations for bridgedb --- id/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index b98eeaf..5a96fc3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ # L1Nus <multazam_ali(a)me.com>, 2014 # Ngalim Siregar <ngalim.siregar(a)gmail.com>, 2015 # km242saya <pencurimangga(a)gmail.com>, 2014 +# Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>, 2016 # zk <zamani.karmana(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Ferriandy Chianiago <gpl4all(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-28 00:33+0000\n" +"Last-Translator: Wahyu Utomo Nurindrayanto <wahyutomo66(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda." +msgstr "Maaf! Ada yang salah dengan permintaan Anda." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[webwml/master] remove distracting lines about obsolete packages
by arma＠torproject.org 27 Apr '16

27 Apr '16

commit 4d64c10b63d403223e08fffcc3bdbcc299802f3d Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 17:42:16 2016 -0400 remove distracting lines about obsolete packages also find the new tails key and put it back on the page --- docs/en/signing-keys.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index a1ab724..f169d36 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -21,19 +21,13 @@ <li>Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson (0x165733EA, or its subkey 0x8D29319A) sign the Tor source code tarballs.</li> - <li>Erinn Clark (0x63FEE659) signed earlier Tor Browser Bundles - and many other packages, and used to sign RPMs with her other key - (0xF1F5C9B5). Andrew Lewman (0x31B0974B, 0x6B4D6475) used to sign - packages for RPMs, Windows, and OS X.</li> <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives.</li> <li>Damian Johnson (0x9ABBEEC6) signs Arm releases.</li> - <li>Sebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor Browser Bundles.</li> - <li>The Tails team (0xBE2CD9C1) signs the Tails live system - releases.</li> - <li>David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.</li> + <li>The Tails team (0x58ACD84F) signs the Tails live system releases.</li> + <li>David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.</li> <li>Other developers include Peter Palfrader (0xC82E0039, or its - subkey 0xE1DEC577) and Jacob Appelbaum (0xD255D3F5C868227F).</li> + subkey 0xE1DEC577) and Jacob Appelbaum (0xFA7F0E44D487F03F).</li> </ul> The fingerprints for the keys should be: @@ -132,6 +126,12 @@ uid David Goulet <dgoulet(a)torproject.org> sub 4096g/FE9D6620 2011-05-11 [expires: 2016-05-09] sub 4096R/93CC198D 2013-09-10 [expires: 2016-09-10] + + pub 4096R/58ACD84F 2015-01-18 [expires: 2017-01-11] + Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F + uid Tails developers <tails(a)boum.org> + sub 4096R/752A3DB6 2015-01-18 [expires: 2017-01-11] + sub 4096R/2F699C56 2015-01-18 [expires: 2017-01-11] </pre> </div>

1 0

[webwml/master] update keys for active signers
by arma＠torproject.org 27 Apr '16

27 Apr '16

commit 9cfda38b58a8c4d4f983ac221990057dd21f67f6 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 17:17:24 2016 -0400 update keys for active signers --- docs/en/signing-keys.wml | 119 ++++++++++------------------------------------- 1 file changed, 25 insertions(+), 94 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 91b3448..a1ab724 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -45,25 +45,20 @@ pub 4096R/19F78451 2010-05-07 Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 - uid Roger Dingledine <arma(a)mit.edu> - uid Roger Dingledine <arma(a)freehaven.net> uid Roger Dingledine <arma(a)torproject.org> - sub 4096R/0DCC0FE1 2013-05-09 [expires: 2014-05-09] + sub 4096R/B0E5067D 2015-06-10 [expires: 2016-06-09] pub 3072R/165733EA 2004-07-03 Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA uid Nick Mathewson <nickm(a)alum.mit.edu> uid Nick Mathewson <nickm(a)wangafu.net> uid Nick Mathewson <nickm(a)freehaven.net> - uid [jpeg image of size 3369] sub 3072R/8D29319A 2004-07-03 sub 3072R/F25B8E5E 2004-07-03 pub 2048R/63FEE659 2003-10-16 Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 uid Erinn Clark <erinn(a)torproject.org> - uid Erinn Clark <erinn(a)debian.org> - uid Erinn Clark <erinn(a)double-helix.org> sub 2048R/EB399FD7 2003-10-16 pub 1024D/F1F5C9B5 2010-02-03 @@ -71,38 +66,13 @@ uid Erinn Clark <erinn(a)torproject.org> sub 1024g/7828F26A 2010-02-03 - pub 1024D/31B0974B 2003-07-17 - Key fingerprint = 0295 9AA7 190A B9E9 027E 0736 3B9D 093F 31B0 974B - uid Andrew Lewman <andrew(a)lewman.com> - uid Andrew Lewman <andrew(a)torproject.org> - sub 4096g/B77F95F7 2003-07-17 - - pub 4096R/6B4D6475 2012-02-29 - Key fingerprint = 0291 ECCB E42B 2206 8E68 5545 627D EE28 6B4D 6475 - uid Andrew Lewman <andrew(a)torproject.org> - uid Andrew Lewman <andrew(a)torproject.is> - sub 4096R/BE713AC6 2012-02-29 - - pub 2048R/886DDD89 2009-09-04 [expires: 2014-09-03] + pub 2048R/886DDD89 2009-09-04 [expires: 2020-08-29] Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 uid deb.torproject.org archive signing key - sub 2048R/219EC810 2009-09-04 [expires: 2014-08-29] - - pub 1024D/9A753A6B 2009-09-11 - Key fingerprint = 553D 7C2C 626E F16F 27F3 30BC 95E3 881D 9A75 3A6B - uid Tomás Touceda <chiiph(a)gmail.com> - sub 1024g/33BE0E5B 2009-09-11 - - pub 1024D/5FA14861 2005-08-17 - Key fingerprint = 9467 294A 9985 3C9C 65CB 141D AF7E 0E43 5FA1 4861 - uid Matt Edman <edmanm(a)rpi.edu> - uid Matt Edman <Matt_Edman(a)baylor.edu> - uid Matt Edman <edmanm2(a)cs.rpi.edu> - sub 4096g/EA654E59 2005-08-17 + sub 2048R/219EC810 2009-09-04 [expires: 2018-08-30] pub 1024D/9ABBEEC6 2009-06-17 Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6 - uid Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> uid Damian Johnson <atagar(a)torproject.org> sub 2048g/146276B2 2009-06-17 sub 2048R/87F30690 2010-08-07 @@ -110,18 +80,8 @@ pub 8192R/683686CC 2013-09-11 Key fingerprint = C963 C21D 6356 4E2B 10BB 335B 2984 6B3C 6836 86CC uid Mike Perry (Regular use key) <mikeperry(a)torproject.org> - sub 4096R/0E3A92E4 2013-09-11 [expires: 2014-09-11] - sub 4096R/BC40FFA0 2013-09-11 [expires: 2014-09-11] - - pub 1024D/22F6856F 2006-08-19 - Key fingerprint = DDB4 6B5B 7950 CD47 E59B 5189 4C09 25CF 22F6 856F - uid Robert Hogan <robert(a)roberthogan.net> - sub 1024g/FC4A9460 2006-08-19 - - pub 2048R/4279F297 2013-01-02 - Key fingerprint = 97BB 9413 1873 FFD3 1331 64CC 7EB4 5C0A 4279 F297 - uid Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> - sub 2048R/76D943F1 2013-01-02 + sub 4096R/0F129402 2015-09-07 [expires: 2016-09-11] + sub 4096R/ACC0A961 2015-09-07 [expires: 2016-09-11] pub 4096R/C5AA446D 2010-07-14 Key fingerprint = 261C 5FBE 7728 5F88 FB0C 3432 66C8 C2D7 C5AA 446D @@ -131,15 +91,9 @@ pub 4096R/C82E0039 2003-03-24 Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 - uid Peter Palfrader uid Peter Palfrader <peter(a)palfrader.org> uid Peter Palfrader <weasel(a)debian.org> - pub 4096R/BE2CD9C1 2010-10-07 [expires: 2015-02-05] - Key fingerprint = 0D24 B36A A9A2 A651 7878 7645 1202 821C BE2C D9C1 - uid Tails developers (signing key) <tails(a)boum.org> - uid T(A)ILS developers (signing key) <amnesia(a)boum.org> - pub 8192R/C11F6276 2012-07-21 Key fingerprint = AD1A B35C 674D F572 FBCE 8B0A 6BC7 58CB C11F 6276 uid David Fifield <david(a)bamsoftware.com> @@ -148,59 +102,36 @@ pub 4096R/23291265 2010-05-07 Key fingerprint = 8C4C D511 095E 982E B0EF BFA2 1E8B F349 2329 1265 - uid Linus Nordberg <linus(a)nordberg.se> - uid Linus Nordberg <linus(a)nordu.net> uid Linus Nordberg <linus(a)torproject.org> - uid [jpeg image of size 2906] - sub 4096R/153E576C 2013-04-23 [expires: 2014-04-23] + sub 4096R/B5F7D1B1 2016-04-14 [expires: 2017-04-14] pub 4096R/4B7C3223 2013-07-30 Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 uid Georg Koppen <gk(a)torproject.org> - uid Georg Koppen <groeg(a)vfemail.net> - uid Georg Koppen <georg(a)getfoxyproxy.org> - sub 4096R/97955E07 2013-07-30 [expires: 2014-07-30] - sub 4096R/AC3A821D 2013-07-30 [expires: 2014-07-30] - sub 4096R/A97A53DC 2014-07-08 [expires: 2015-07-08] - sub 4096R/E5AE3C98 2014-07-08 [expires: 2015-07-08] sub 4096R/24690903 2015-07-20 [expires: 2016-07-19] sub 4096R/631602F4 2015-07-20 [expires: 2016-07-19] pub 4096R/D0220E4B 2014-03-19 Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B -uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> - - pub 4096R/D255D3F5C868227F 2014-06-27 [expires: 2024-06-24] - Key fingerprint = D2C6 7D20 E9C3 6C2A C5FE 74A2 D255 D3F5 C868 227F - uid Jacob Appelbaum <jacob(a)appelbaum.net> - sub 3072R/02636620744301A2 2014-06-27 [expires: 2015-06-27] - sub 3072R/1A055A481801A819 2014-06-27 [expires: 2015-06-27] - - pub 4096R/90BC9192B06291B2 2014-06-27 [expires: 2024-06-24] - Key fingerprint = 043E 0E69 DD56 BA59 5905 8756 90BC 9192 B062 91B2 - uid Jacob Appelbaum <error(a)debian.org> - sub 3072R/F78ED60FFE4F141F 2014-06-27 [expires: 2015-06-27] - sub 3072R/986D6BCEF02A9C9C 2014-06-27 [expires: 2015-06-27] - sub 2048R/89AA6E5D2C6A7F40 2014-10-22 [expires: 2016-10-21] - - pub 4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24] - Key fingerprint = D6A9 48CF 297F 7539 30B4 756A FA7F 0E44 D487 F03F - uid Jacob Appelbaum <jacob(a)torproject.org> - sub 3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27] - sub 3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27] - - pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] - Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 - uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> - sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] - sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] - - pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09] - uid David Goulet <dgoulet(a)ev0ke.net> - uid David Goulet <dgoulet(a)riseup.net> - uid David Goulet <dgoulet(a)torproject.org> - sub 4096g/0xCD885877FE9D6620 2011-05-11 [expires: 2016-05-09] - sub 4096R/0x2AC6036C93CC198D 2013-09-10 [expires: 2015-09-10] + uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> + + pub 4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24] + Key fingerprint = D6A9 48CF 297F 7539 30B4 756A FA7F 0E44 D487 F03F + uid Jacob Appelbaum <jacob(a)torproject.org> + sub 3072R/36A3F38A 2015-07-01 [expires: 2016-06-30] + sub 3072R/45EDE84B 2015-07-01 [expires: 2016-06-30] + + pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] + Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 + uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> + sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] + sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] + + pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09] + Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 + uid David Goulet <dgoulet(a)torproject.org> + sub 4096g/FE9D6620 2011-05-11 [expires: 2016-05-09] + sub 4096R/93CC198D 2013-09-10 [expires: 2016-09-10] </pre> </div>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 27 Apr '16

27 Apr '16

commit c93bfa0a9b2cb65b791485f8494ee1d03b375f83 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 27 14:15:47 2016 +0000 Update translations for tails-misc_completed --- nb.po | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nb.po b/nb.po index 28a8300..133851e 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-04-02 13:50+0000\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-27 13:48+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" @@ -68,13 +68,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Vil du starte Electrum uansett?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Start" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Avslutt" @@ -236,17 +236,24 @@ msgstr "Ytelse av GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Andre meldinger gitt av GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "Vedvarende Claws e-post har blitt påskrudd." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Hvis du har e-poster lagret i Claws e-post, burde du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>flytte over dataen din</a> før du starter Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Hvis du allerede har flyttet dine e-poster til Icedove, burde du først <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>slette all din e-post Claws Mail-data</a> for å fjerne denne advarselen." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Start på nytt"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Apr '16

27 Apr '16

commit 66056a99726bba923e55801a0e087fc94abd5df9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 27 14:15:43 2016 +0000 Update translations for tails-misc --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 8ce2caa..133851e 100644 --- a/nb.po +++ b/nb.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-27 13:48+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,7 +252,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Hvis du allerede har flyttet dine e-poster til Icedove, burde du først <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>slette all din e-post Claws Mail-data</a> for å fjerne denne advarselen." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0