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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 4da315301ef1e19337b4b227b03cd628a7dc79ee Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:47 2014 +0000 Update translations for tails-misc --- en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB.po b/en_GB.po index 16ca776..314f96c 100644 --- a/en_GB.po +++ b/en_GB.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-14 20:45+0000\n" +"PO-Revision-Date: 2014-11-14 22:23+0000\n" "Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 37fa9b98888dc6db9592571bc013247be21e5427 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:42 2014 +0000 Update translations for tor-launcher-network-settings --- hy_AM/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy_AM/network-settings.dtd b/hy_AM/network-settings.dtd index 572c45e..cfb3590 100644 --- a/hy_AM/network-settings.dtd +++ b/hy_AM/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "Ոչ"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied.">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit d33087feee3d94f5f4a918d6e897ac8aa7c74750 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:28 2014 +0000 Update translations for tails-greeter --- hy_AM/hy_AM.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hy_AM/hy_AM.po b/hy_AM/hy_AM.po index c34bebc..23ea02c 100644 --- a/hy_AM/hy_AM.po +++ b/hy_AM/hy_AM.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2014-11-14 22:40+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:7 msgid "No" -msgstr "" +msgstr "Ոչ" #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" @@ -196,7 +196,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit ac1a6ff51f09d9e604c8e1045a4e3fe641219319 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:18 2014 +0000 Update translations for https_everywhere --- hy_AM/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hy_AM/ssl-observatory.dtd b/hy_AM/ssl-observatory.dtd index ef2c74e..cc008db 100644 --- a/hy_AM/ssl-observatory.dtd +++ b/hy_AM/ssl-observatory.dtd @@ -1,7 +1,7 @@  <!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> <!ENTITY ssl-observatory.popup.later "Ask Me Later"> -<!ENTITY ssl-observatory.popup.no "No"> +<!ENTITY ssl-observatory.popup.no "Ոչ"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks against your browser by sending the certificates you receive to the

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 3d966f55b82ad393372a9c1d57086faa4604a02b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:07 2014 +0000 Update translations for gettor --- hy_AM/gettor.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hy_AM/gettor.po b/hy_AM/gettor.po index 578fd14..357653d 100644 --- a/hy_AM/gettor.po +++ b/hy_AM/gettor.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# mhrach87 <mhrach87(a)gmail.com>, 2014 msgid "" 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: 2013-11-01 15:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-14 22:30+0000\n" +"Last-Translator: mhrach87 <mhrach87(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -431,11 +432,11 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "ՀԱՃԱԽ ՏՐՎՈՂ ՀԱՐՑԵՐ\n==========================" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "Ի՞նչ է Tor-ը։" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." @@ -483,11 +484,11 @@ msgstr "" #: lib/gettor/i18n.py:301 msgid "QUESTION:" -msgstr "" +msgstr "ՀԱՐՑ․" #: lib/gettor/i18n.py:303 msgid "ANSWER:" -msgstr "" +msgstr "ՊԱՏԱՍԽԱՆ․" #: lib/gettor/i18n.py:305 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit a73d84ebcdb85996033a51acfe8e795dac58dd9b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 22:45:02 2014 +0000 Update translations for bridgedb --- hy_AM/LC_MESSAGES/bridgedb.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po index 38def8f..64917dd 100644 --- a/hy_AM/LC_MESSAGES/bridgedb.po +++ b/hy_AM/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# mhrach87 <mhrach87(a)gmail.com>, 2014 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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-11-14 22:40+0000\n" +"Last-Translator: mhrach87 <mhrach87(a)gmail.com>\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +57,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Բարի գալուստ BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -70,7 +71,7 @@ msgstr "" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Ողջույն ընկեր!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" @@ -291,17 +292,17 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Քայլ %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Ներբեռնել %s Tor Browser %s-ը" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Քայլ %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -311,7 +312,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Քայլ %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format @@ -333,11 +334,11 @@ msgstr "" #: lib/bridgedb/templates/options.html:88 msgid "No" -msgstr "" +msgstr "Ոչ" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "ոչինչ" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -345,7 +346,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sԱ%sյո!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 8bb0acabeb132c0cd7f2c495c31ea12de59ec601 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 20:45:41 2014 +0000 Update translations for tails-misc_completed --- en_GB.po | 178 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 79 deletions(-) diff --git a/en_GB.po b/en_GB.po index 4e8e125..16ca776 100644 --- a/en_GB.po +++ b/en_GB.po @@ -4,14 +4,15 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014 +# Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2014 # Richard Shaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-21 01:59+0200\n" -"PO-Revision-Date: 2014-09-02 09:52+0000\n" -"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-11-14 20:45+0000\n" +"Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,13 +20,13 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 msgid "Tor is ready" -msgstr "Tor is ready" +msgstr "Tor is ready." -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "You can now access the Internet." -msgstr "You can now access the Internet." +msgstr "You can now access the Internet" #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -43,7 +44,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers?</p>\n" +msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers? </p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -198,22 +199,6 @@ msgstr "Output of GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Other messages provided by GnuPG:" -#: config/chroot_local-includes/usr/local/bin/iceweasel:12 -msgid "Tor is not ready" -msgstr "Tor is not ready" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:13 -msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "Tor is not ready. Start Tor Browser anyway?" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:14 -msgid "Start Tor Browser" -msgstr "Start Tor Browser" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:15 -msgid "Cancel" -msgstr "Cancel" - #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" msgstr "Shutdown Immediately" @@ -318,38 +303,13 @@ msgid "" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\nYou might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 -msgid "Starting I2P..." -msgstr "Starting I2P..." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 -msgid "The I2P router console will be opened on start." -msgstr "The I2P router console will be opened on start." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 -msgid "I2P failed to start" -msgstr "I2P failed to start" - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 -msgid "" -"Make sure that you have a working Internet connection, then try to start I2P" -" again." -msgstr "Make sure that you have a working Internet connection, then try to start I2P again." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 -msgid "" -"Something went wrong when I2P was starting. Look in the logs in the " -"following directory for more information:" -msgstr "Something went wrong when I2P was starting. Look in the logs in the following directory for more information:" - #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "error:" msgstr "error:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Error" @@ -383,77 +343,133 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn more...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 +#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +msgid "Tor is not ready" +msgstr "Tor is not ready" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +msgid "Tor is not ready. Start Tor Browser anyway?" +msgstr "Tor is not ready. Start Tor Browser anyway?" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:20 +msgid "Start Tor Browser" +msgstr "Start Tor Browser" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +msgid "Cancel" +msgstr "Cancel" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Do you really want to launch the Unsafe Browser?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use the Unsafe Browser if necessary, for example if you have to login or register to activate your Internet connection." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "_Launch" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "_Exit" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "Starting the Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 msgid "This may take a while, so please be patient." msgstr "This may take a while, so please be patient." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "Failed to setup chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsafe Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." msgstr "Shutting down the Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "This may take a while, and you may not restart the Unsafe Browser until it is properly shut down." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "Failed to restart Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Another Unsafe Browser is currently running, or being cleaned up. Please retry in a while." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "No DNS server was obtained through DHCP or manually configured in NetworkManager." #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 -msgid "TrueCrypt will soon be removed from Tails" -msgstr "TrueCrypt will soon be removed from Tails" +msgid "TrueCrypt will be removed in Tails 1.2.1" +msgstr "TrueCrypt will be removed in Tails 1.2.1" #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 msgid "" -"TrueCrypt will soon be removed from Tails due to license and development " -"concerns." -msgstr "TrueCrypt will soon be removed from Tails due to license and development concerns." +"TrueCrypt is no longer maintained and is said to be insecure by its own " +"authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We " +"recommend that you learn how to <a " +"href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open" +" TrueCrypt volumes with cryptsetup</a> as soon as possible." +msgstr "TrueCrypt is no longer maintained and is said to be insecure by its own authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We recommend that you learn how to <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open TrueCrypt volumes with cryptsetup</a> as soon as possible." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 +msgid "I2P failed to start" +msgstr "I2P failed to start" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +msgid "" +"Something went wrong when I2P was starting. Check the logs in /var/log/i2p " +"for more information." +msgstr "Something went wrong when I2P was starting. Check the logs in /var/log/i2p for more information." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 +msgid "I2P's router console is ready" +msgstr "I2P's router console is ready" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +msgid "You can now access I2P's router console on http://127.0.0.1:7657." +msgstr "You can now access I2P's router console on http://127.0.0.1:7657." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 +msgid "I2P is not ready" +msgstr "I2P isn't ready." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +msgid "" +"Eepsite tunnel not built within six minutes. Check the router console at " +"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." +" Reconnect to the network to try again." +msgstr "Eepsite tunnel not built within six minutes. Check the router console at http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information. Reconnect to the network to try again." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +msgid "I2P is ready" +msgstr "I2P is now ready" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +msgid "You can now access services on I2P." +msgstr "You can now access services on I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -468,17 +484,13 @@ msgstr "Tails documentation" msgid "Learn how to use Tails" msgstr "Learn how to use Tails" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 -msgid "Anonymous overlay network " -msgstr "Anonymous overlay network " +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 +msgid "Anonymous overlay network browser" +msgstr "Anonymous overlay network browser." -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 -msgid "i2p" -msgstr "i2p" - -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 -msgid "Anonymous overlay network" -msgstr "Anonymous overlay network" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 +msgid "I2P Browser" +msgstr "I2P Browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" @@ -500,6 +512,14 @@ msgstr "Power Off" msgid "Immediately shut down computer" msgstr "Immediately shut down computer" +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 +msgid "Tor Browser" +msgstr "Tor Browser" + +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 +msgid "Anonymous Web Browser" +msgstr "Anonymous Browser" + #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" msgstr "Browse the World Wide Web without anonymity"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Nov '14

15 Nov '14

commit 25aa88acfecbd1702a8aab6491d3d573f0e26f06 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 14 20:45:36 2014 +0000 Update translations for tails-misc --- en_GB.po | 67 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/en_GB.po b/en_GB.po index 6ddbe30..16ca776 100644 --- a/en_GB.po +++ b/en_GB.po @@ -4,14 +4,15 @@ # # Translators: # Andi Chandler <andi(a)gowling.com>, 2014 +# Billy Humphreys <sysop(a)enderbbs.enderservices.tk>, 2014 # Richard Shaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-10 13:00+0200\n" -"PO-Revision-Date: 2014-10-15 17:12+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-11-14 20:45+0000\n" +"Last-Translator: Billy Humphreys <sysop(a)enderbbs.enderservices.tk>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,11 +22,11 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 msgid "Tor is ready" -msgstr "Tor is ready" +msgstr "Tor is ready." #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "You can now access the Internet." -msgstr "You can now access the Internet." +msgstr "You can now access the Internet" #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -43,7 +44,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers?</p>\n" +msgstr "<h1>Help us fix your bug!</h1>\n<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n<p><strong>Do not include more personal information than\nneeded!</strong></p>\n<h2>About giving us an email address</h2>\n<p>If you don't mind disclosing some bits of your identity\nto Tails developers, you can provide an email address to\nlet us ask more details about the bug. Additionally entering\na public PGP key enables us to encrypt such future\ncommunication.</p>\n<p>Anyone who can see this reply will probably infer you are\na Tails user. Time to wonder how much you trust your\nInternet and mailbox providers? </p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -303,12 +304,12 @@ msgid "" msgstr "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\nYou might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "error:" msgstr "error:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Error" @@ -358,63 +359,63 @@ msgstr "Start Tor Browser" msgid "Cancel" msgstr "Cancel" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Do you really want to launch the Unsafe Browser?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use the Unsafe Browser if necessary, for example if you have to login or register to activate your Internet connection." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "_Launch" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "_Exit" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "Starting the Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 msgid "This may take a while, so please be patient." msgstr "This may take a while, so please be patient." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "Failed to setup chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Unsafe Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:240 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." msgstr "Shutting down the Unsafe Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:241 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "This may take a while, and you may not restart the Unsafe Browser until it is properly shut down." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:253 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "Failed to restart Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:261 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Another Unsafe Browser is currently running, or being cleaned up. Please retry in a while." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:274 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." @@ -422,7 +423,7 @@ msgstr "No DNS server was obtained through DHCP or manually configured in Networ #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 msgid "TrueCrypt will be removed in Tails 1.2.1" -msgstr "" +msgstr "TrueCrypt will be removed in Tails 1.2.1" #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 msgid "" @@ -431,7 +432,7 @@ msgid "" "recommend that you learn how to <a " "href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open" " TrueCrypt volumes with cryptsetup</a> as soon as possible." -msgstr "" +msgstr "TrueCrypt is no longer maintained and is said to be insecure by its own authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We recommend that you learn how to <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open TrueCrypt volumes with cryptsetup</a> as soon as possible." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 msgid "I2P failed to start" @@ -441,34 +442,34 @@ msgstr "I2P failed to start" msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "" +msgstr "Something went wrong when I2P was starting. Check the logs in /var/log/i2p for more information." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 msgid "I2P's router console is ready" -msgstr "" +msgstr "I2P's router console is ready" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "" +msgstr "You can now access I2P's router console on http://127.0.0.1:7657." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 msgid "I2P is not ready" -msgstr "" +msgstr "I2P isn't ready." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "" "Eepsite tunnel not built within six minutes. Check the router console at " "http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." " Reconnect to the network to try again." -msgstr "" +msgstr "Eepsite tunnel not built within six minutes. Check the router console at http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information. Reconnect to the network to try again." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is ready" -msgstr "" +msgstr "I2P is now ready" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "You can now access services on I2P." -msgstr "" +msgstr "You can now access services on I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -485,11 +486,11 @@ msgstr "Learn how to use Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "Anonymous overlay network browser." #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "" +msgstr "I2P Browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" @@ -517,7 +518,7 @@ msgstr "Tor Browser" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser" -msgstr "" +msgstr "Anonymous Browser" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity"

1 0

[orbot/master] more fixes for VPN but not quite ready yet
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit 3ef94e009cc0764d53351d514beb887361b481c4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 13 13:40:50 2014 -0500 more fixes for VPN but not quite ready yet --- src/org/torproject/android/vpn/OrbotVpnService.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index b147e7d..39c9549 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -16,6 +16,7 @@ package org.torproject.android.vpn; +import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.Locale; @@ -98,6 +99,14 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { if (mProxyServer != null) mProxyServer.stop(); + + if (mInterface != null) + try { + mInterface.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } @Override @@ -136,7 +145,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { //builder.addRoute("192.168.43.0",8); builder.addDnsServer("8.8.8.8"); - // Create a new interface using the builder and save the parameters. + // Create a new interface using the builder and save the parameters. mInterface = builder.setSession(mSessionName) .setConfigureIntent(mConfigureIntent) .establish();

1 0

[orbot/master] updates for Android L and PIE binary support
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit 5917e63693141dc08a99f8670ff3e274306a8c05 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Nov 13 13:42:14 2014 -0500 updates for Android L and PIE binary support --- AndroidManifest.xml | 6 +++--- external/Makefile | 3 ++- external/tor | 2 +- project.properties | 2 +- res/menu/main.xml | 4 ++-- res/raw/geoip6.mp3 | Bin 81420 -> 93365 bytes res/raw/torrc | 7 ------- src/org/torproject/android/Orbot.java | 9 ++++++++- src/org/torproject/android/OrbotDiagnosticsActivity.java | 2 -- src/org/torproject/android/service/TorResourceInstaller.java | 5 ++++- src/org/torproject/android/service/TorService.java | 8 +++----- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f1d0d62..f8cd7ba 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.0.0-ALPHA-1" - android:versionCode="125" + android:versionName="14.1.0-PIE" + android:versionCode="126" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/> + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> <uses-permission android:name="android.permission.INTERNET" /> diff --git a/external/Makefile b/external/Makefile index dae5c33..4af1016 100644 --- a/external/Makefile +++ b/external/Makefile @@ -51,7 +51,8 @@ RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ --strip-unneeded -R .note -R .comment -PIEFLAGS? = -fPIE -pie +# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie +PIEFLAGS? = CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS) diff --git a/external/tor b/external/tor index a64f3ab..42b4260 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit a64f3ab3ee5c433cc1f046a7e26df7a49e308e4c +Subproject commit 42b42605f8d8eac25361be229354f6393967df4f diff --git a/project.properties b/project.properties index 27f6863..2abb592 100644 --- a/project.properties +++ b/project.properties @@ -9,6 +9,6 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt # Project target. -target=android-19 +target=android-21 android.library.reference.1=external/appcompat android.library.reference.2=external/superuser-commands/RootCommands-Library diff --git a/res/menu/main.xml b/res/menu/main.xml index 831897b..d453252 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -65,11 +65,11 @@ yourapp:showAsAction="ifRoom" /> - +  <item android:id="@+id/menu_exit" android:title="@string/menu_exit" diff --git a/res/raw/geoip6.mp3 b/res/raw/geoip6.mp3 index e5e5910..0e439b9 100644 Binary files a/res/raw/geoip6.mp3 and b/res/raw/geoip6.mp3 differ diff --git a/res/raw/torrc b/res/raw/torrc deleted file mode 100644 index e5a4c49..0000000 --- a/res/raw/torrc +++ /dev/null @@ -1,7 +0,0 @@ -RunAsDaemon 1 -AvoidDiskWrites 1 -ControlPort auto -SOCKSPort 0 -DNSPort 0 -TransPort 0 -CookieAuthentication 1 \ No newline at end of file diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e812fbe..d8e1f6b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -448,10 +448,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + /** + * remove for now... VPN is not ready yet else if (item.getItemId() == R.id.menu_vpn) { this.startVpnService(); - } + }*/ return true; } @@ -867,6 +869,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (intent != null) { startActivityForResult(intent,REQUEST_VPN); } + else + { + startService("vpn"); + + } } private boolean flushTransProxy () diff --git a/src/org/torproject/android/OrbotDiagnosticsActivity.java b/src/org/torproject/android/OrbotDiagnosticsActivity.java index 4cc8c6b..b639d82 100644 --- a/src/org/torproject/android/OrbotDiagnosticsActivity.java +++ b/src/org/torproject/android/OrbotDiagnosticsActivity.java @@ -8,11 +8,9 @@ import java.io.InputStreamReader; import java.util.ArrayList; import org.sufficientlysecure.rootcommands.Shell; -import org.sufficientlysecure.rootcommands.Toolbox; import org.sufficientlysecure.rootcommands.command.SimpleCommand; import org.torproject.android.service.TorResourceInstaller; import org.torproject.android.service.TorServiceConstants; -import org.torproject.android.service.TorServiceUtils; import android.app.Activity; import android.content.Context; diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 3c0563b..e4b0ba4 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -23,6 +23,7 @@ import org.torproject.android.R; import org.torproject.android.TorConstants; import android.content.Context; +import android.os.Build; import android.util.Log; public class TorResourceInstaller implements TorServiceConstants { @@ -83,7 +84,8 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, false); - is = context.getResources().openRawResource(R.raw.tor); + + is = context.getResources().openRawResource(R.raw.tor); outFile = new File(installFolder, TOR_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); @@ -102,6 +104,7 @@ public class TorResourceInstaller implements TorServiceConstants { outFile = new File(installFolder, IPTABLES_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, true); + return true; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index c7c8cf0..aeca556 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -342,20 +342,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - - //android.os.Debug.waitForDebugger(); new Thread (new TorStarter(intent)).start(); - return Service.START_STICKY; - } catch (Exception e) { logException ("Error starting service",e); - return Service.START_REDELIVER_INTENT; + return Service.START_NOT_STICKY; } + return Service.START_REDELIVER_INTENT; + } private class TorStarter implements Runnable diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 51cae41..c6c7031 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.5.8-openssl1.0.1i"; + public static final String BINARY_TOR_VERSION = "0.2.5.10-openssl1.0.1i"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0