January 2016 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 76503bb7d0bae80c1487b27712a19a285ce07a0f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 03:15:24 2016 +0000 Update translations for whisperback --- tzm/tzm.po | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/tzm/tzm.po b/tzm/tzm.po new file mode 100644 index 0000000..17f7159 --- /dev/null +++ b/tzm/tzm.po @@ -0,0 +1,198 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-16 19:54+0100\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tzm\n" +"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:56 +#, python-format +msgid "Invalid contact email: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:73 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:75 +msgid "Invalid contact OpenPGP public key block" +msgstr "" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "" + +#: ../whisperBack/gui.py:148 +msgid "Unable to load a valid configuration." +msgstr "" + +#: ../whisperBack/gui.py:214 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:215 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:217 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:232 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:249 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:251 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:253 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:256 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:269 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:276 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:296 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#: ../whisperBack/gui.py:319 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:383 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:384 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:385 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:412 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "Send" +msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 4138fc64efbf6bfe0fc26752edbaa0ac08d1c581 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 03:15:17 2016 +0000 Update translations for torcheck --- tzm/torcheck.po | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/tzm/torcheck.po b/tzm/torcheck.po new file mode 100644 index 0000000..bc9e415 --- /dev/null +++ b/tzm/torcheck.po @@ -0,0 +1,102 @@ +# TorCheck gettext template +# Copyright (C) 2008-2013 The Tor Project, Inc +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2010-11-30 04:59+0000\n" +"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: tzm\n" +"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n" + +msgid "Congratulations. This browser is configured to use Tor." +msgstr "" + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "" + +msgid "There is a security update available for Tor Browser." +msgstr "" + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "" + +msgid "Sorry. You are not using Tor." +msgstr "" + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "" + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "" + +msgid "Your IP address appears to be: " +msgstr "" + +msgid "Are you using Tor?" +msgstr "" + +msgid "This page is also available in the following languages:" +msgstr "" + +msgid "For more information about this exit relay, see:" +msgstr "" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "" + +msgid "Learn More »" +msgstr "" + +msgid "Go" +msgstr "" + +msgid "Short User Manual" +msgstr "" + +msgid "Donate to Support Tor" +msgstr "" + +msgid "Tor Q&A Site" +msgstr "" + +msgid "Volunteer" +msgstr "" + +msgid "JavaScript is enabled." +msgstr "" + +msgid "JavaScript is disabled." +msgstr "" + +msgid "However, it does not appear to be Tor Browser." +msgstr "" + +msgid "Run a Relay" +msgstr "" + +msgid "Stay Anonymous" +msgstr ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 52530ff780f5beafd871206eadc2d3978462e017 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 03:15:10 2016 +0000 Update translations for gettor --- tzm/gettor.po | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 502 insertions(+) diff --git a/tzm/gettor.po b/tzm/gettor.po new file mode 100644 index 0000000..c7c8c74 --- /dev/null +++ b/tzm/gettor.po @@ -0,0 +1,502 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +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: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tzm\n" +"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:61 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:64 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:72 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:76 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:78 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:80 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:94 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:97 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:101 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:107 +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 "" + +#: 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 "" + +#: lib/gettor/i18n.py:113 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:115 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:119 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:122 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:126 +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 "" + +#: lib/gettor/i18n.py:130 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:132 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:138 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:141 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:148 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:157 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:160 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"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 "" + +#: lib/gettor/i18n.py:167 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:172 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "" + +#: lib/gettor/i18n.py:179 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:188 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:191 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:194 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:197 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:211 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:214 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:219 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:227 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:231 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "" + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:266 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:269 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:274 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:276 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:286 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:288 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:292 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:294 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:299 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:301 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:303 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:305 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 4448bc41ec26cc6184cdd3078a5c4f01b30e85b9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 03:15:03 2016 +0000 Update translations for bridgedb --- tzm/LC_MESSAGES/bridgedb.po | 380 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) diff --git a/tzm/LC_MESSAGES/bridgedb.po b/tzm/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..4e50f02 --- /dev/null +++ b/tzm/LC_MESSAGES/bridgedb.po @@ -0,0 +1,380 @@ +# Translations template for BridgeDB. +# Copyright (C) 2015 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +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: 2011-02-19 16:53+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" +"Language: tzm\n" +"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: bridgedb/https/server.py:167 +msgid "Sorry! Something went wrong with your request." +msgstr "" + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: bridgedb/strings.py:45 +msgid "Here are your bridges:" +msgstr "" + +#: bridgedb/strings.py:47 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" + +#: bridgedb/strings.py:50 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: bridgedb/strings.py:53 +msgid "Welcome to BridgeDB!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: bridgedb/strings.py:55 +msgid "Currently supported transport TYPEs:" +msgstr "" + +#: bridgedb/strings.py:56 +#, python-format +msgid "Hey, %s!" +msgstr "" + +#: bridgedb/strings.py:57 +msgid "Hello, friend!" +msgstr "" + +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +msgid "Public Keys" +msgstr "" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: bridgedb/strings.py:62 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: bridgedb/strings.py:72 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: bridgedb/strings.py:79 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: bridgedb/strings.py:88 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" + +#: bridgedb/strings.py:101 +msgid "What are bridges?" +msgstr "" + +#: bridgedb/strings.py:102 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: bridgedb/strings.py:107 +msgid "I need an alternative way of getting bridges!" +msgstr "" + +#: bridgedb/strings.py:108 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "" + +#: bridgedb/strings.py:115 +msgid "My bridges don't work! I need help!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:117 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:121 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" + +#: bridgedb/strings.py:128 +msgid "Here are your bridge lines:" +msgstr "" + +#: bridgedb/strings.py:129 +msgid "Get Bridges!" +msgstr "" + +#: bridgedb/strings.py:133 +msgid "Please select options for bridge type:" +msgstr "" + +#: bridgedb/strings.py:134 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: bridgedb/strings.py:135 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: bridgedb/strings.py:139 +msgid "Your browser is not displaying images properly." +msgstr "" + +#: bridgedb/strings.py:140 +msgid "Enter the characters from the image above..." +msgstr "" + +#: bridgedb/strings.py:144 +msgid "How to start using your bridges" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: bridgedb/strings.py:146 +#, python-format +msgid "" +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:151 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:155 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: bridgedb/strings.py:159 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" + +#: bridgedb/strings.py:167 +msgid "Displays this message." +msgstr "" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: bridgedb/strings.py:171 +msgid "Request vanilla bridges." +msgstr "" + +#: bridgedb/strings.py:172 +msgid "Request IPv6 bridges." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: bridgedb/strings.py:174 +msgid "Request a Pluggable Transport by TYPE." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: bridgedb/strings.py:177 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr ""

1 0

[orbot/master] add support for loading default bridges from asset file
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit cf1a644c19292d0ab41e257c29ede2aa4d31851e Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 12:50:03 2016 -0500 add support for loading default bridges from asset file --- .gitignore | 1 - assets/bridges.txt | 14 +++ res/values/arrays.xml | 3 +- src/org/torproject/android/OrbotMainActivity.java | 96 +++++++++++++++++++-- 4 files changed, 104 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fddf841..53cc940 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -assets/ /external/appcompat/bin/ /external/appcompat/gen/ /external/bin/ diff --git a/assets/bridges.txt b/assets/bridges.txt new file mode 100644 index 0000000..06472cf --- /dev/null +++ b/assets/bridges.txt @@ -0,0 +1,14 @@ +obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239 +obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 +obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED +obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A +scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH +obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0 +obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 +obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0 +obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 +meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com +meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com +meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 09ed951..30d20c1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -3,12 +3,13 @@ <resources> <string-array name="bridge_options"> - <item>Obfs4 (Recommended)</item> + <item>Obfs4 (Best)</item> <item>Obfs3</item> <item>ScrambleSuit</item> <item>Tunnel through Azure</item> <item>Tunnel through Amazon</item> <item>Tunnel through Google</item> + <item>Get New Bridges</item> <item></item> </string-array> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e99a7a7..e020dc2 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -3,12 +3,15 @@ package org.torproject.android; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Locale; +import java.util.StringTokenizer; import org.json.JSONArray; import org.torproject.android.service.TorService; @@ -110,6 +113,15 @@ public class OrbotMainActivity extends AppCompatActivity public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT"; public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; + // for bridge loading from the assets default bridges.txt file + class Bridge + { + String type; + String config; + } + + private ArrayList<Bridge> alBridges = null; + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { @@ -635,6 +647,8 @@ public class OrbotMainActivity extends AppCompatActivity { String newBridgeValue = urlString.substring(9); //remove the bridge protocol piece newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here + + showAlert(getString(R.string.bridges_updated),getString(R.string.restart_orbot_to_use_this_bridge_) + newBridgeValue,false); setNewBridges(newBridgeValue); } @@ -651,8 +665,6 @@ public class OrbotMainActivity extends AppCompatActivity private void setNewBridges (String newBridgeValue) { - showAlert(getString(R.string.bridges_updated),getString(R.string.restart_orbot_to_use_this_bridge_) + newBridgeValue,false); - Prefs.setBridgesList(newBridgeValue); //set the string to a preference Prefs.putBridgesEnabled(true); @@ -812,6 +824,9 @@ public class OrbotMainActivity extends AppCompatActivity { results = URLDecoder.decode(results, "UTF-8"); results = results.substring(urlIdx+3); + + showAlert(getString(R.string.bridges_updated),getString(R.string.restart_orbot_to_use_this_bridge_) + results,false); + setNewBridges(results); } else @@ -840,6 +855,8 @@ public class OrbotMainActivity extends AppCompatActivity public void promptSetupBridges () { + loadBridgeDefaults(); + LayoutInflater li = LayoutInflater.from(this); View view = li.inflate(R.layout.layout_diag, null); @@ -859,16 +876,19 @@ public class OrbotMainActivity extends AppCompatActivity switch (which) { case 0: //obfs 4; - showGetBridgePrompt("obfs4"); - + setupBridgeType("obfs4"); + enableBridges(true); + break; case 1: //obfs3 - showGetBridgePrompt("obfs3"); - + setupBridgeType("obfs3"); + enableBridges(true); + break; case 2: //scramblesuit - showGetBridgePrompt("scramblesuit"); - + setupBridgeType("scramblesuit"); + enableBridges(true); + break; case 3: //azure Prefs.setBridgesList("2"); @@ -884,6 +904,9 @@ public class OrbotMainActivity extends AppCompatActivity Prefs.setBridgesList("0"); enableBridges(true); + case 6: + showGetBridgePrompt("obfs4"); + break; } @@ -1337,4 +1360,61 @@ public class OrbotMainActivity extends AppCompatActivity return false; } } + + private void loadBridgeDefaults () + { + if (alBridges == null) + { + alBridges = new ArrayList<Bridge>(); + + try + { + BufferedReader in= + new BufferedReader(new InputStreamReader(getAssets().open("bridges.txt"), "UTF-8")); + String str; + + while ((str=in.readLine()) != null) { + + StringTokenizer st = new StringTokenizer (str," "); + Bridge b = new Bridge(); + b.type = st.nextToken(); + + StringBuffer sbConfig = new StringBuffer(); + + while(st.hasMoreTokens()) + sbConfig.append(st.nextToken()).append(' '); + + b.config = sbConfig.toString(); + + alBridges.add(b); + + } + + in.close(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + } + + private void setupBridgeType (String type) + { + StringBuffer sbConfig = new StringBuffer (); + + for (Bridge b : alBridges) + { + if (b.type.equals(type)) + { + sbConfig.append(b.type); + sbConfig.append(' '); + sbConfig.append(b.config); + sbConfig.append('\n'); + } + } + + setNewBridges(sbConfig.toString()); + } }

1 0

[orbot/master] this should be kbps in fact
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit ba835599f7cfafae78663878217a1696d32b2500 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 15:45:29 2016 -0500 this should be kbps in fact --- src/org/torproject/android/service/TorService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 73f3f95..47add0e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1333,13 +1333,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private String formatCount(long count) { // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" if (mNumberFormat != null) if (count < 1e6) - return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "Kbps"; + return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "kbps"; else - return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "Mbps"; + return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "mbps"; else return "";

1 0

[orbot/master] tweak the string about bridges a little bit
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit c235e3ed6bcb7737839523cd75ec7a25acb1b53d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:12:31 2016 -0500 tweak the string about bridges a little bit --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7f1d349..9f6431d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -312,7 +312,7 @@ <string name="menu_qr">QR Codes</string> - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Tor Bridge to access the network.\n\nPlease select one of the bridge types above to enable this feature.</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string> <string name="bridge_mode">Bridge Mode</string>

1 0

[orbot/master] choose up to 2 bridges from default list randomly
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 2a728140b43bdf5ca8a19e6236f585741700d5bc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:09:26 2016 -0500 choose up to 2 bridges from default list randomly --- assets/bridges.txt | 2 +- src/org/torproject/android/OrbotMainActivity.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/assets/bridges.txt b/assets/bridges.txt index 06472cf..693c3be 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -11,4 +11,4 @@ obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfD obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com +meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com \ No newline at end of file diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index ae9a8dc..4165a21 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -1410,15 +1410,26 @@ public class OrbotMainActivity extends AppCompatActivity long seed = System.nanoTime(); Collections.shuffle(alBridges, new Random(seed)); + //let's just pull up to 2 bridges from the defaults at time + int maxBridges = 2; + int bridgeCount = 0; + //now go through the list to find the bridges we want for (Bridge b : alBridges) { if (b.type.equals(type)) { + sbConfig.append(b.type); sbConfig.append(' '); - sbConfig.append(b.config); - sbConfig.append('\n'); + sbConfig.append(b.config); + + bridgeCount++; + + if (bridgeCount == maxBridges) + break; + else + sbConfig.append("\n"); } }

1 0

[orbot/master] make bridge allocation shuffle randomly to distribute load
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 1dbe5eac55f79d48ed3a69c6d19d1962f5a764b3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 15:45:36 2016 -0500 make bridge allocation shuffle randomly to distribute load inspired by this work: https://trac.torproject.org/projects/tor/ticket/18113 we don't want all users to start with the same bridges in the same order --- src/org/torproject/android/OrbotMainActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e020dc2..ae9a8dc 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -10,7 +10,9 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Locale; +import java.util.Random; import java.util.StringTokenizer; import org.json.JSONArray; @@ -1384,7 +1386,7 @@ public class OrbotMainActivity extends AppCompatActivity while(st.hasMoreTokens()) sbConfig.append(st.nextToken()).append(' '); - b.config = sbConfig.toString(); + b.config = sbConfig.toString().trim(); alBridges.add(b); @@ -1404,6 +1406,11 @@ public class OrbotMainActivity extends AppCompatActivity { StringBuffer sbConfig = new StringBuffer (); + //we should randomly sort alBridges so we don't have the same bridge order each time + long seed = System.nanoTime(); + Collections.shuffle(alBridges, new Random(seed)); + + //now go through the list to find the bridges we want for (Bridge b : alBridges) { if (b.type.equals(type))

1 0

[orbot/master] 15.1.0-RC-4
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 80491ea95bd62346bf3f3a579d3302dbd84f4ca9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:13:12 2016 -0500 15.1.0-RC-4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 125af0d..d31c227 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-RC-3" - android:versionCode="15100023" + android:versionName="15.1.0-RC-4" + android:versionCode="15100024" android:installLocation="auto" >

1 0