February 2014 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 2d0cf076996399f7a246e5f34445ee8b2ef83cf6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 09:45:05 2014 +0000 Update translations for gettor --- nl/gettor.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 080346e..1942212 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-02-24 09:14+0000\n" +"PO-Revision-Date: 2014-02-24 09:17+0000\n" "Last-Translator: erwindelaat <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -249,7 +249,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Als uw internet verbinding toegang tot het Tor netwerk blokkeert, \nheeft u mogelijk een 'bridge relay' nodig. Bridge relays\nzijn Tor relays die niet vermeldt staan in de hoofd database. Omdat\ner geen complete lijst van alle bridges bestaat, is het onwaarschijnlijk\ndat uw provider alle tor bridges blokkeert.\n\n " +msgstr "Als uw internet verbinding toegang tot het Tor netwerk blokkeert, \nheeft u mogelijk een 'bridge relay' (of kortweg \"bridge\") nodig.\nBridge relays zijn Tor relays die niet vermeldt staan in de hoofd database.\nOmdat er geen complete lijst van alle bridges bestaat, is het onwaarschijnlijk\ndat uw provider alle tor bridges blokkeert.\n\n " #: lib/gettor/i18n.py:167 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 9256511485c240a25f6f202813fafcaf0f9da8f4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 09:15:09 2014 +0000 Update translations for gettor_completed --- nl/gettor.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 8c44003..080346e 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-02-19 19:40+0000\n" +"PO-Revision-Date: 2014-02-24 09:14+0000\n" "Last-Translator: erwindelaat <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -155,17 +155,17 @@ msgstr "Voeg simpelweg de keyword 'split' op een nieuwe, zelfstaande regel toe ( msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Het sturen van deze tekst in een email naar GetTor zal er voor zorgen dat de Tor Browser Bundle in een aantal 1,4MB bijlagen naar je gestuurd wordt." +msgstr "Wanneer u deze tekst in een e-mail naar GetTor zendt, zal de Browser Bundle naar u verzonden worden in meerdere bijlagen van elk 1,4MB." #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Nadat je de delen ontvangen hebt moet je ze samenvoegen tot één pakket. Dit gebeurt als volgt:" +msgstr "Nadat u alle onderdelen ontvangen heeft, moet u deze combineren tot \néén pakket. Dit kunt u als volgt doen: \n\n " #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1.) Bewaar alle bijlagen in één map op je schijf." +msgstr "1.) Sla alle bijlagen op in één en dezelfde map op uw harde schijf. \n\n " #: lib/gettor/i18n.py:115 msgid "" @@ -178,7 +178,7 @@ msgstr "2.) Unzip alle bestanden die eindigen met \".z\". Als je alle bijlagen e msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verifieer alle bestanden zoals beschreven in de mail die je ontvangen hebt met elk pakket. (gpg --verify)" +msgstr "3.) Controleer alle bestanden zoals beschreven in de e-mail die u ontvangen heeft in elk pakket. (gpg --verify)\n\n " #: lib/gettor/i18n.py:122 msgid "" @@ -192,11 +192,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Nadat het uitpakken is gelukt zou je een nieuw aangemaakt \".exe\" bestand in de doelfolder vinden. Dubbelklik dat en de Tor Browser Bundle zal binnen een paar seconden opstarten." +msgstr "5.) Zodra het uitpakken afgerond is, vindt u een nieuw \n\".exe\" bestand in de bestemmingsmap. Dubbelklik hierop\nen de Tor Browser Bundle start binnen enkele seconden.\n\n " #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) Dat is het. Je bent klaart. Bedankt voor het gebruiken van Tor en veel plezier!" +msgstr "6.) U bent klaar met installeren. Dank u voor het gebruik van Tor en veel plezier! \n\n " #: lib/gettor/i18n.py:132 msgid "" @@ -249,7 +249,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Als je internetverbinding toegang tot het Tor netwerk blokkeert heb je mogelijk een bridge relay nodig. Bridge relays (of \"bridges\") zijn Tor relays die niet vermeld in de hoofddirectory. Omdat er geen complete, openlijke lijst van ze is, zelfs als je ISP verbinding filtert naar alle bekende Tor relays, zullen ze waarschijnlijk niet alle bridges kunnen blokkeren." +msgstr "Als uw internet verbinding toegang tot het Tor netwerk blokkeert, \nheeft u mogelijk een 'bridge relay' nodig. Bridge relays\nzijn Tor relays die niet vermeldt staan in de hoofd database. Omdat\ner geen complete lijst van alle bridges bestaat, is het onwaarschijnlijk\ndat uw provider alle tor bridges blokkeert.\n\n " #: lib/gettor/i18n.py:167 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Feb '14

24 Feb '14

commit 9ef2981b657f7abe1bbb550e12b91f27fa36d31b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 24 09:15:05 2014 +0000 Update translations for gettor --- nl/gettor.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/gettor.po b/nl/gettor.po index 8c44003..080346e 100644 --- a/nl/gettor.po +++ b/nl/gettor.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-02-19 19:40+0000\n" +"PO-Revision-Date: 2014-02-24 09:14+0000\n" "Last-Translator: erwindelaat <erwin.de.laat(a)cleveridge.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -155,17 +155,17 @@ msgstr "Voeg simpelweg de keyword 'split' op een nieuwe, zelfstaande regel toe ( msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Het sturen van deze tekst in een email naar GetTor zal er voor zorgen dat de Tor Browser Bundle in een aantal 1,4MB bijlagen naar je gestuurd wordt." +msgstr "Wanneer u deze tekst in een e-mail naar GetTor zendt, zal de Browser Bundle naar u verzonden worden in meerdere bijlagen van elk 1,4MB." #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Nadat je de delen ontvangen hebt moet je ze samenvoegen tot één pakket. Dit gebeurt als volgt:" +msgstr "Nadat u alle onderdelen ontvangen heeft, moet u deze combineren tot \néén pakket. Dit kunt u als volgt doen: \n\n " #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1.) Bewaar alle bijlagen in één map op je schijf." +msgstr "1.) Sla alle bijlagen op in één en dezelfde map op uw harde schijf. \n\n " #: lib/gettor/i18n.py:115 msgid "" @@ -178,7 +178,7 @@ msgstr "2.) Unzip alle bestanden die eindigen met \".z\". Als je alle bijlagen e msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Verifieer alle bestanden zoals beschreven in de mail die je ontvangen hebt met elk pakket. (gpg --verify)" +msgstr "3.) Controleer alle bestanden zoals beschreven in de e-mail die u ontvangen heeft in elk pakket. (gpg --verify)\n\n " #: lib/gettor/i18n.py:122 msgid "" @@ -192,11 +192,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5.) Nadat het uitpakken is gelukt zou je een nieuw aangemaakt \".exe\" bestand in de doelfolder vinden. Dubbelklik dat en de Tor Browser Bundle zal binnen een paar seconden opstarten." +msgstr "5.) Zodra het uitpakken afgerond is, vindt u een nieuw \n\".exe\" bestand in de bestemmingsmap. Dubbelklik hierop\nen de Tor Browser Bundle start binnen enkele seconden.\n\n " #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) Dat is het. Je bent klaart. Bedankt voor het gebruiken van Tor en veel plezier!" +msgstr "6.) U bent klaar met installeren. Dank u voor het gebruik van Tor en veel plezier! \n\n " #: lib/gettor/i18n.py:132 msgid "" @@ -249,7 +249,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Als je internetverbinding toegang tot het Tor netwerk blokkeert heb je mogelijk een bridge relay nodig. Bridge relays (of \"bridges\") zijn Tor relays die niet vermeld in de hoofddirectory. Omdat er geen complete, openlijke lijst van ze is, zelfs als je ISP verbinding filtert naar alle bekende Tor relays, zullen ze waarschijnlijk niet alle bridges kunnen blokkeren." +msgstr "Als uw internet verbinding toegang tot het Tor netwerk blokkeert, \nheeft u mogelijk een 'bridge relay' nodig. Bridge relays\nzijn Tor relays die niet vermeldt staan in de hoofd database. Omdat\ner geen complete lijst van alle bridges bestaat, is het onwaarschijnlijk\ndat uw provider alle tor bridges blokkeert.\n\n " #: lib/gettor/i18n.py:167 msgid ""

1 0

[tor-browser-bundle/master] Bug 10992: Allow customization of VM RAM.
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit de213e51ef4c793a5561e3a14351108efe3a277e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 21 12:22:49 2014 +0000 Bug 10992: Allow customization of VM RAM. --- gitian/README.build | 6 +++++- gitian/mkbundle-linux.sh | 13 +++++++++---- gitian/mkbundle-mac.sh | 13 +++++++++---- gitian/mkbundle-windows.sh | 13 +++++++++---- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 157d948..f9672d8 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -31,9 +31,13 @@ QuickStart: To set the number of make processes and virtual CPUs to use inside the VMs to four (the default is two), use: - + $ export NUM_PROCS=4 + To set the amount of RAM to use inside the VMs to 4000 MiB (the default is + 2000 MiB), use: + + $ export VM_MEMORY=4000 Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 960d33c..c7e730a 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -32,6 +32,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -83,7 +88,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -107,7 +112,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (2/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -129,7 +134,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -153,7 +158,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 21e88d2..6c0fb52 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -32,6 +32,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -84,7 +89,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -105,7 +110,7 @@ then echo "****** Starting TorBrowser Component of Mac Bundle (2/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -126,7 +131,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -150,7 +155,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 3760b01..e6d2cf9 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -33,6 +33,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -85,7 +90,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -106,7 +111,7 @@ then echo "****** Starting Torbrowser Component of Windows Bundle (2/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -127,7 +132,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -151,7 +156,7 @@ then cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Use flashproxy 1.6 (master in nightly).
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit 594fd98fad931aee764aa9cdd991e2ff60f37d73 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 22 06:17:50 2014 +0000 Use flashproxy 1.6 (master in nightly). Since 1.4, common code was moved into a Python module, which now has to be copied along with the programs. The dist-exe target also changed it default output directory. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9aafc57..52f9af9 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -113,7 +113,7 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d44193c..6f758d8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -136,7 +136,7 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a8535c6..a453f14 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -182,10 +182,10 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip - cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/ + py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip + cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy - cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # # http://bugs.winehq.org/show_bug.cgi?id=3591 diff --git a/gitian/versions b/gitian/versions index 60d8b5a..21307e9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cc673e0..0c34485 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.beta b/gitian/versions.beta index b556ffe..3977261 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,7 +15,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6a604d2..e2ab7aa 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=1.4 # XXX: Archive and make targets changed in master... +FLASHPROXY_TAG=master GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Feb '14

23 Feb '14

commit 26bccac6f87936239620a862b71e19905dfcf81d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 23 23:15:19 2014 +0000 Update translations for liveusb-creator --- fa/fa.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 7526a6a..0cc4ed0 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-02-23 22:44+0000\n" +"PO-Revision-Date: 2014-02-23 22:47+0000\n" "Last-Translator: desmati <desmati(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -564,7 +564,7 @@ msgstr "نوشته شده بر روی دستگاه جانبی در %(speed)d م msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "شما قصد نصب تیلز روی این دستگاه را دارید: %(size)s %(vendor)s %(model)s :(%(device)s). همه ی اطلاعات موجود روی آن پاک خواهد شد. مطمئن هستید؟" #: ../liveusb/gui.py:719 #, python-format

1 0

r26623: {website} Last line of torbirdy idea was missing Oops, since the line (website/trunk/getinvolved/en)
by Damian Johnson 23 Feb '14

23 Feb '14

Author: atagar Date: 2014-02-23 23:00:22 +0000 (Sun, 23 Feb 2014) New Revision: 26623 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Last line of torbirdy idea was missing Oops, since the line started with a '#' the wml parser thought it was a comment. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2014-02-23 22:23:26 UTC (rev 26622) +++ website/trunk/getinvolved/en/volunteer.wml 2014-02-23 23:00:22 UTC (rev 26623) @@ -1276,8 +1276,7 @@ </p> <p> -You may contact the mentors on IRC for more information. (sukhe on #tor-dev, -#tor on irc.oftc.net) +You may contact the mentors on IRC for more information. (sukhe on #tor-dev, #tor on irc.oftc.net) </p> </li>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Feb '14

23 Feb '14

commit 9a59d65ac8e683c4188edbd0da9bc6924e2f922e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 23 22:45:20 2014 +0000 Update translations for liveusb-creator --- fa/fa.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index ebc62ed..7526a6a 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-02-23 22:13+0000\n" +"PO-Revision-Date: 2014-02-23 22:44+0000\n" "Last-Translator: desmati <desmati(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -208,7 +208,7 @@ msgstr "اگر یک Live ISO موجود را انتخاب نکنید، نسخه #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "نصب تیلز" #: ../liveusb/gui.py:630 msgid "Installation complete!" @@ -323,7 +323,7 @@ msgstr "تنظیم فایل راه‌اندازی OLPC..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "بعضی از پارتیشن های موجود بر روی دستگاه %(device)s فعال و راه اندازی شدند. آن ها قبل از شروع مراحل نصب غیر فعال می شوند." #: ../liveusb/creator.py:131 msgid "" @@ -342,7 +342,7 @@ msgstr "دستگاه هدف" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "بر روی دستگاه شما Master Boot Record خالی است. کلیک مجدد روی «نصب تیلز» آن را تنظیم مجدد خواهد کرد." #: ../liveusb/gui.py:796 msgid "" @@ -390,7 +390,7 @@ msgstr "اینجا کنسول وضعیت است. جایی که تمام پیغا #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "تلاش برای ادامه دادن در هر صورت." #: ../liveusb/creator.py:911 #, python-format @@ -413,7 +413,7 @@ msgstr "قادر به یافتن هیچ درایو یو اس بی نیست" #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" -msgstr "" +msgstr "هیچ دستگاهی که پشتیبانی شود یافت نشد" #: ../liveusb/creator.py:1040 msgid "Unable to find partition"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Feb '14

23 Feb '14

commit 5e654877e18798e155d1b070ed1240571e8fdaaa Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 23 22:45:18 2014 +0000 Update translations for https_everywhere_completed --- fa/https-everywhere.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fa/https-everywhere.properties b/fa/https-everywhere.properties index 35ab544..d4dd502 100644 --- a/fa/https-everywhere.properties +++ b/fa/https-everywhere.properties @@ -3,4 +3,6 @@ https-everywhere.menu.globalDisable = HTTPS همه‌جا را غیرفعال ک https-everywhere.menu.enableDisable = فعال/غیر فعال کردن قوانین https-everywhere.menu.noRules = (هیچ قانونی برای این صفحه وجود ندارد) https-everywhere.menu.unknownRules = (قوانین مربوط به این صفحه ناشناخته است) -https-everywhere.toolbar.hint = HTTPS همه‌جا فعال شد. می‌توانید آن را برای هر سایتی که خواستید فعال یا غیرفعال کنید. کافیست روی نمایه آن در نوار آدرس کلیک کنید. +https-everywhere.toolbar.hint = ‫HTTPS همه‌جا فعال شد. می‌توانید آن را برای هر سایتی که خواستید فعال یا غیرفعال کنید. کافیست روی نمایه آن در نوار آدرس کلیک کنید. +https-everywhere.migration.notification0 = برای این که این بسته به روز رسانی حیاتی عملیاتی شود، تنظیماتی که برای HTTPS Everywhere انجام داده اید به پیش فرض خود بر می گردند. +https-everywhere.menu.ruleset-tests = قوائد نوشته شده برای HTTPS Everywhere را تست کن

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Feb '14

23 Feb '14

commit 30cb9a2dc4a902f719e7fc225caf0c373fb05015 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 23 22:45:14 2014 +0000 Update translations for https_everywhere --- fa/https-everywhere.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/https-everywhere.properties b/fa/https-everywhere.properties index fc5c1f7..d4dd502 100644 --- a/fa/https-everywhere.properties +++ b/fa/https-everywhere.properties @@ -5,4 +5,4 @@ https-everywhere.menu.noRules = (هیچ قانونی برای این صفحه و https-everywhere.menu.unknownRules = (قوانین مربوط به این صفحه ناشناخته است) https-everywhere.toolbar.hint = ‫HTTPS همه‌جا فعال شد. می‌توانید آن را برای هر سایتی که خواستید فعال یا غیرفعال کنید. کافیست روی نمایه آن در نوار آدرس کلیک کنید. https-everywhere.migration.notification0 = برای این که این بسته به روز رسانی حیاتی عملیاتی شود، تنظیماتی که برای HTTPS Everywhere انجام داده اید به پیش فرض خود بر می گردند. -# https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.ruleset-tests = قوائد نوشته شده برای HTTPS Everywhere را تست کن

1 0