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

[tor-browser-bundle/master] remove ifconfigs
by mikeperry＠torproject.org 10 Jul '13

10 Jul '13

commit 5b26fdc56be5912380280f082cc3584e89d84de2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jun 22 09:00:31 2013 -0700 remove ifconfigs --- gitian/mkbundle-linux.sh | 2 -- gitian/mkbundle-mac.sh | 1 - gitian/mkbundle-windows.sh | 1 - 3 files changed, 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 461d95d..307b2c0 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -29,7 +29,6 @@ then if [ "z$USE_LXC" = "z1" ]; then ./bin/make-base-vm --lxc --arch i386 - sudo ifconfig lxcbr0 10.0.2.2 else ./bin/make-base-vm --arch i386 fi @@ -47,7 +46,6 @@ then if [ "z$USE_LXC" = "z1" ]; then ./bin/make-base-vm --lxc --arch amd64 - sudo ifconfig lxcbr0 10.0.2.2 else ./bin/make-base-vm --arch amd64 fi diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 307f7ff..7152d7c 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -29,7 +29,6 @@ then if [ "z$USE_LXC" = "z1" ]; then ./bin/make-base-vm --lxc --suite precise --arch i386 - sudo ifconfig lxcbr0 10.0.2.2 else ./bin/make-base-vm --suite precise --arch i386 fi diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 91708e1..1c4ac2d 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -29,7 +29,6 @@ then if [ "z$USE_LXC" = "z1" ]; then ./bin/make-base-vm --lxc --suite precise --arch i386 - sudo ifconfig lxcbr0 10.0.2.2 else ./bin/make-base-vm --suite precise --arch i386 fi

1 0

[tor-browser-bundle/master] Switch to freshly rebased tor-browser-builder-2 branch for gitian-builder.
by mikeperry＠torproject.org 10 Jul '13

10 Jul '13

commit ab2751680a6797fbadd68b63230c48eb56412f3c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jul 10 09:00:51 2013 -0700 Switch to freshly rebased tor-browser-builder-2 branch for gitian-builder. --- gitian/check-prerequisites.sh | 2 +- gitian/fetch-inputs.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 201b489..ed96c91 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -27,7 +27,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-1 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-2 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 8c9f6fa..21728e5 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -135,6 +135,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin +git checkout tor-browser-builder-2 cd inputs if [ -d tbb-windows-installer/.git ];

1 0

[tor-browser-bundle/master] Fix incorrect empty string tests.
by mikeperry＠torproject.org 10 Jul '13

10 Jul '13

commit 5d7b7732cebaef440dc10c739f0c0450bbdcf954 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Jul 10 08:56:41 2013 -0700 Fix incorrect empty string tests. --- gitian/fetch-inputs.sh | 2 +- gitian/record-inputs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f1bdc92..8c9f6fa 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -9,7 +9,7 @@ umask 0022 export WRAPPER_DIR=$PWD -if [ -n $1 ]; then +if [ -z "$1" ]; then INPUTS_DIR=$PWD/../../gitian-builder/inputs else INPUTS_DIR=$1 diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index fd67a4c..4e723b0 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -4,7 +4,7 @@ WRAPPER_DIR=$PWD -if [ -n $1 ]; then +if [ -z "$1" ]; then INPUTS_DIR=$PWD/../../gitian-builder/inputs else INPUTS_DIR=$1

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit 0d3d9570dd4a4c27aa25c98c06669fe6e4d7ddf7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 15:15:18 2013 +0000 Update translations for tsum --- hr_HR/short-user-manual_hr_HR_noimg.xhtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml index edf3a68..efd975c 100644 --- a/hr_HR/short-user-manual_hr_HR_noimg.xhtml +++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml @@ -80,10 +80,10 @@ sub 2048R/EB399FD7 2003-10-16 If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet. Sljedeći koraci pretpostavljaju da imate funkcinalnu Tor/Vidalia konfiguraciju, i da ste pronašli listu HTTPS, SOCKS4, ili SOCKS5 proxy-a. <ol style="list-style-type: decimal"> - <li>Open the Vidalia control panel, click on Settings.</li> - <li>Click Network. Select I use a proxy to access the Internet.</li> - <li>On the Address line, enter the open proxy address. This can be a hostname or an IP Address.</li> - <li>Enter the port for the proxy.</li> + <li>Otvorite Vidalia upravljačku ploču, kliknite na Postavke.</li> + <li>Kliknite na Mreža. Odaberite Koristim proxy za pristup Internetu.</li> + <li>Na liniji Adresa upišite adresu otvorenog proxyja. Možete upisati hostname ili IP adresu.</li> + <li>Unesite port za proxy.</li> <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit a1fd1d0e1cef2282c1425aad8bfdad592d11f4e8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 08:16:13 2013 +0000 Update translations for whisperback --- kn/kn.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kn/kn.po b/kn/kn.po index e8e728a..9cb36c8 100644 --- a/kn/kn.po +++ b/kn/kn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-07-10 07:45+0000\n" +"PO-Revision-Date: 2013-07-10 08:10+0000\n" "Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -84,7 +84,7 @@ msgstr "" #: ../whisperBack/gui.py:271 msgid "Your message has been sent." -msgstr "" +msgstr "ನಿಮ್ಮ ಸುದ್ದಿ ಕಳಿಸಿ ಆಯ್ತು." #: ../whisperBack/gui.py:278 msgid "An error occured during encryption." @@ -93,7 +93,7 @@ msgstr "" #: ../whisperBack/gui.py:298 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "%s ಅನ್ನು ಸೇವ್ ಮಾಡ್ಲಿಕ್ಕೆ ಆಗ್ತಿಲ್ಲ." #. XXX: fix string #: ../whisperBack/gui.py:322

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit 6248bedf1c57f424b131e3096d683e14c13b2c32 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 07:46:20 2013 +0000 Update translations for whisperback --- kn/kn.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/kn/kn.po b/kn/kn.po index 89d977c..e8e728a 100644 --- a/kn/kn.po +++ b/kn/kn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# msj2, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-06-18 22:31+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-10 07:45+0000\n" +"Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,16 +22,16 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "" +msgstr "ತಪ್ಪು ಮಿಂಚೆ: %s" #: ../whisperBack/whisperback.py:80 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "" +msgstr "ತಪ್ಪು ಸಂಪರ್ಕದ ಓಪನ್ ಪಿಜಿಪಿ ಕೀ: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" -msgstr "" +msgstr "ತಪ್ಪು ಸಂಪರ್ಕದ ಓಪನ್ ಪಿಜಿಪಿ ಸಾರ್ವಜನಿಕ ಕೀ ಗುಚ್ಛ" #: ../whisperBack/exceptions.py:41 #, python-format @@ -41,36 +42,36 @@ msgstr "" #: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." -msgstr "" +msgstr "ಸರಿಯಾದ ಶಿಖಿ ತೋರಿಸಲು ಆಗ್ತಿಲ್ಲ." #: ../whisperBack/gui.py:217 msgid "Sending mail..." -msgstr "" +msgstr "ಮಿಂಚೆ ಹೋಗ್ತಿದೆ...." #: ../whisperBack/gui.py:218 msgid "Sending mail" -msgstr "" +msgstr "ಮಿಂಚೆ ಹೋಗ್ತಿದೆ...." #. pylint: disable=C0301 #: ../whisperBack/gui.py:220 msgid "This could take a while..." -msgstr "" +msgstr "ಸ್ವಲ್ಪ ಟೈಮ್ ಹಿಡಿಯುತ್ತೆ ಸಾ...." #: ../whisperBack/gui.py:234 msgid "The contact email adress doesn't seem valid." -msgstr "" +msgstr "ಸಂಪರ್ಕದ ಮಿಂಚೆ ಸರಿಯಿಲ್ಲ ಅನ್ಸತ್ತೆ." #: ../whisperBack/gui.py:251 msgid "Unable to send the mail: SMTP error." -msgstr "" +msgstr "ಮಿಂಚೆ ಕಳಿಸೋಕೆ ಆಗ್ತಿಲ್ಲ: ಎಸ್. ಎಮ್. ಟಿ.ಪಿ ತೊಂದ್ರೆ." #: ../whisperBack/gui.py:253 msgid "Unable to connect to the server." -msgstr "" +msgstr "ಸರ್ವರ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡೊಕೆ ಆಗ್ತಿಲ್ಲ." #: ../whisperBack/gui.py:255 msgid "Unable to create or to send the mail." -msgstr "" +msgstr "ಮಿಂಚೆ ಬರೆಯೋಕೂ/ಕಳಿಸೋಕೂ ಆಗ್ತಿಲ್ಲ." #: ../whisperBack/gui.py:258 msgid ""

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit fc878fa212da59bc7a97c9fb3bcf65e05de9582a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 02:46:41 2013 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index dbb81c2..18a664d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-07-10 02:12+0000\n" +"PO-Revision-Date: 2013-07-10 02:20+0000\n" "Last-Translator: radamantys795 <radamantys158(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit 8eb63dc49b1eac481a7b05d068dd26ebc7e12462 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 02:46:37 2013 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index dbb81c2..18a664d 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-07-10 02:12+0000\n" +"PO-Revision-Date: 2013-07-10 02:20+0000\n" "Last-Translator: radamantys795 <radamantys158(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit 9c3d79c5d99862b923a1dc944ae2c64a88809b40 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 02:16:48 2013 +0000 Update translations for tails-persistence-setup_completed --- pt_BR/pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index ee64346..dbb81c2 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -5,14 +5,15 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 +# radamantys795 <radamantys158(a)gmail.com>, 2013 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-22 10:17+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-07-10 02:12+0000\n" +"Last-Translator: radamantys795 <radamantys158(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "Chaveiros e configurações GnuPG" +msgstr "Keyrings e confirguração do GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -50,7 +51,7 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Perfis do Pidgin e chaveiro OTR" +msgstr "Perfis do Pidgin e keyring OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Jul '13

10 Jul '13

commit 7a41cdb1a04ad36bfd68b5e3d9abdfeb49e94a33 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 10 02:16:42 2013 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index ee64346..dbb81c2 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -5,14 +5,15 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 +# radamantys795 <radamantys158(a)gmail.com>, 2013 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-22 10:17+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-07-10 02:12+0000\n" +"Last-Translator: radamantys795 <radamantys158(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "Chaveiros e configurações GnuPG" +msgstr "Keyrings e confirguração do GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -50,7 +51,7 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Perfis do Pidgin e chaveiro OTR" +msgstr "Perfis do Pidgin e keyring OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail"

1 0