June 2012 - tor-commits - lists.torproject.org

[stem/master] Minor changes for windows test compatibility fixes
by atagar＠torproject.org 21 Jun '12

21 Jun '12

commit 6f626f3f1a43368f13b2679f3eab6322f26788c0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 08:35:32 2012 -0700 Minor changes for windows test compatibility fixes Just a few minor tweaks... * The 'path' and 'relative_path' were starting to get confused, so making the former the pristine input argument and having the later be what we modify. * A recent change removed direct usage of 'skipTest' since it breaks us on python 2.5 and 2.6... https://gitweb.torproject.org/stem.git/commitdiff/ed0db8f * Skipping the 'is multiple tor instances' check rather than always skipping the system integ tests. * run_tests.py somehow lost its executable permissions in 2b96648 (...?) --- run_tests.py | 1 - stem/util/system.py | 23 ++++++++++++----------- test/integ/descriptor/reader.py | 12 +++++------- test/integ/util/system.py | 7 ++++--- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/run_tests.py b/run_tests.py old mode 100644 new mode 100755 index 6ab6fae..bcd7e12 --- a/run_tests.py +++ b/run_tests.py @@ -11,7 +11,6 @@ import getopt import unittest import threading import StringIO -import platform import test.output import test.runner diff --git a/stem/util/system.py b/stem/util/system.py index 3db9cc0..d6a3ce2 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -501,31 +501,32 @@ def expand_path(path, cwd = None): :returns: str of the path expanded to be an absolute path """ - if platform.system() == "Windows": - path = path.replace("/", "\\").rstrip("\\") + if is_windows(): + relative_path = path.replace("/", "\\").rstrip("\\") else: - path = path.replace("\\", "/").rstrip("/") - relative_path = path + relative_path = path.rstrip("/") - if not path or os.path.isabs(path): + if not relative_path or os.path.isabs(relative_path): # empty or already absolute - nothing to do pass - elif path.startswith("~"): + elif not is_windows() and relative_path.startswith("~"): # prefixed with a ~ or ~user entry - relative_path = os.path.expanduser(path) + relative_path = os.path.expanduser(relative_path) else: # relative path, expand with the cwd if not cwd: cwd = os.getcwd() # we'll be dealing with both "my/path/" and "./my/path" entries, so # cropping the later - if path.startswith("./") or path.startswith(".\\"): path = path[2:] - elif path == ".": path = "" + if relative_path.startswith("./") or relative_path.startswith(".\\"): + relative_path = relative_path[2:] + elif relative_path == ".": + relative_path = "" - if path == "": + if relative_path == "": relative_path = cwd else: - relative_path = os.path.join(cwd, path) + relative_path = os.path.join(cwd, relative_path) return relative_path diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 9c793d3..27d096f 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -107,10 +107,11 @@ class TestDescriptorReader(unittest.TestCase): """ # Skip the test on windows, since you can only set the file's - # read-only flag with os.chmod(). See + # read-only flag with os.chmod(). For more information see... # http://docs.python.org/library/os.html#os.chmod + if system.is_windows(): - self.skipTest("(chmod not functional)") + test.runner.skip("(chmod not functional)") test_listing_path = _make_processed_files_listing(BASIC_LISTING) os.chmod(test_listing_path, 0077) # remove read permissions @@ -290,7 +291,7 @@ class TestDescriptorReader(unittest.TestCase): """ # Skip on windows since SIGALRM is unavailable - if system.is_windows(): self.skipTest("(SIGALRM unavailable)") + if system.is_windows(): test.runner.skip("(SIGALRM unavailable)") is_test_running = True reader = stem.descriptor.reader.DescriptorReader("/usr") @@ -413,11 +414,8 @@ class TestDescriptorReader(unittest.TestCase): Listens for a file that's skipped because we lack read permissions. """ - # Skip the test on windows, since you can only set the file's - # read-only flag with os.chmod(). See - # http://docs.python.org/library/os.html#os.chmod if system.is_windows(): - self.skipTest("(chmod not functional)") + test.runner.skip("(chmod not functional)") test_path = test.runner.get_runner().get_test_dir("secret_file") diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 58e0248..6cdf0ec 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -42,10 +42,11 @@ class TestSystem(unittest.TestCase): # legitemately fail. if self.is_extra_tor_running is None: - if not stem.util.system.is_bsd(): + if stem.util.system.is_windows(): + # TODO: not sure how to check for this on windows + self.is_extra_tor_running = False + elif not stem.util.system.is_bsd(): pgrep_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PGREP % "tor") - if pgrep_results is None: - self.skipTest("(pgrep unavailable)") self.is_extra_tor_running = len(pgrep_results) > 1 else: ps_results = stem.util.system.call(stem.util.system.GET_PID_BY_NAME_PS_BSD)

1 0

[stem/master] Merging Beck's windows test compatibility fixes
by atagar＠torproject.org 21 Jun '12

21 Jun '12

commit f724692fe512a2eaf2b2c4bfd491513f48bfca23 Merge: a4243fd 6f626f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 08:45:09 2012 -0700 Merging Beck's windows test compatibility fixes run_tests.py | 3 +- stem/util/system.py | 46 ++++++++++++++++++++++----------------- test/integ/descriptor/reader.py | 16 ++++++++++++- test/integ/util/system.py | 5 +++- 4 files changed, 47 insertions(+), 23 deletions(-)

1 0

[stem/master] Skip test_stop() in test.integ.descriptor.reader on Windows.
by atagar＠torproject.org 21 Jun '12

21 Jun '12

commit 67be8c6435e6d08b71327687ffa1097d01345bf2 Author: Beck Chen <csybeck(a)gmail.com> Date: Fri Jun 15 01:26:22 2012 +0800 Skip test_stop() in test.integ.descriptor.reader on Windows. --- test/integ/descriptor/reader.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index bebb917..308e9fe 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -12,6 +12,7 @@ import tarfile import unittest import stem.descriptor.reader +import stem.util.system as system import test.runner BASIC_LISTING = """ @@ -282,6 +283,9 @@ class TestDescriptorReader(unittest.TestCase): stop() makes it terminate in a timely fashion. """ + # Skip on windows since SIGALRM is unavailable + if system.is_windows(): self.skipTest("(SIGALRM unavailable)") + is_test_running = True reader = stem.descriptor.reader.DescriptorReader("/usr")

1 0

[stem/master] Implement stem.util.system.expand_path() on windows.
by atagar＠torproject.org 21 Jun '12

21 Jun '12

commit 232858d8607270e00d42316e8655c70e0221c87e Author: Beck Chen <csybeck(a)gmail.com> Date: Fri Jun 15 02:17:00 2012 +0800 Implement stem.util.system.expand_path() on windows. --- stem/util/system.py | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 3d1a26b..fb27b13 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -502,28 +502,29 @@ def expand_path(path, cwd = None): """ if platform.system() == "Windows": - return path # TODO: implement + path = path.replace("/", "\\").rstrip("\\") else: - relative_path = path + path = path.replace("\\", "/").rstrip("/") + relative_path = path + + if not path or os.path.isabs(path): + # empty or already absolute - nothing to do + pass + elif path.startswith("~"): + # prefixed with a ~ or ~user entry + relative_path = os.path.expanduser(path) + else: + # relative path, expand with the cwd + if not cwd: cwd = os.getcwd() - if not path or os.path.isabs(path): - # empty or already absolute - nothing to do - pass - elif path.startswith("~"): - # prefixed with a ~ or ~user entry - relative_path = os.path.expanduser(path) - else: - # relative path, expand with the cwd - if not cwd: cwd = os.getcwd() - - # we'll be dealing with both "my/path/" and "./my/path" entries, so - # cropping the later - if path.startswith("./"): path = path[2:] - elif path == ".": path = "" - - relative_path = os.path.join(cwd, path) + # we'll be dealing with both "my/path/" and "./my/path" entries, so + # cropping the later + if path.startswith("./") or path.startswith(".\\"): path = path[2:] + elif path == ".": path = "" - return relative_path.rstrip("/") + relative_path = os.path.join(cwd, path) + + return relative_path def call(command, suppress_exc = True): """

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 21 Jun '12

21 Jun '12

commit 7b1b61358ce75d02c3b1f4a5112ed333a45b10db Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 13:45:03 2012 +0000 Update translations for gettor --- es_AR/gettor.po | 453 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 453 insertions(+), 0 deletions(-) diff --git a/es_AR/gettor.po b/es_AR/gettor.po new file mode 100644 index 0000000..7b48097 --- /dev/null +++ b/es_AR/gettor.po @@ -0,0 +1,453 @@ +# 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: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_AR\n" +"Plural-Forms: nplurals=2; plural=(n != 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:130 +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" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +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:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +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:67 +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:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:75 +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:87 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +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:96 +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:102 +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:105 +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:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +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:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +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:121 +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:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +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:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +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:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +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:162 +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:167 +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:170 +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:176 +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:179 +#, 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:182 +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:185 +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:188 +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:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +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:202 +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:205 +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:210 +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:213 +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:218 +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:222 +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:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +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:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +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:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +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:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +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:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, 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/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 21 Jun '12

21 Jun '12

commit aeb067a4b292e06cfe425d09e58e957fc4ca9948 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 09:15:18 2012 +0000 Update translations for orbot_completed --- values/strings.xml | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/values/strings.xml b/values/strings.xml index 520215c..c2a5e2d 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Jun '12

21 Jun '12

commit 2c4450514476e7b4d568581a77e641df4fc8d37f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 09:15:14 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 5 +++-- values-bg/strings.xml | 5 +++-- values-ca/strings.xml | 19 ++++++++++--------- values-cs/strings.xml | 21 +++++++++++---------- values-de/strings.xml | 5 +++-- values-el/strings.xml | 21 +++++++++++---------- values-es/strings.xml | 5 +++-- values-es_AR/strings.xml | 21 +++++++++++---------- values-eu/strings.xml | 7 ++++--- values-fa/strings.xml | 5 +++-- values-fr/strings.xml | 5 +++-- values-hu/strings.xml | 5 +++-- values-it/strings.xml | 5 +++-- values-ja/strings.xml | 15 ++++++++------- values-mk/strings.xml | 19 ++++++++++--------- values-ms_MY/strings.xml | 5 +++-- values-nb/strings.xml | 21 +++++++++++---------- values-nl/strings.xml | 5 +++-- values-pl/strings.xml | 5 +++-- values-pt/strings.xml | 21 +++++++++++---------- values-pt_BR/strings.xml | 5 +++-- values-ru/strings.xml | 5 +++-- values-sv/strings.xml | 17 +++++++++-------- values-zh/strings.xml | 17 +++++++++-------- values/strings.xml | 21 +++++++++++---------- 25 files changed, 155 insertions(+), 130 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 0d6debe..3afb075 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">نقاط الدخول</string> <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string> <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string> - <string name="pref_use_whispercore">استخدم WhisperCore</string> - <string name="pref_use_whispercore_summary">استخدم مكتبة NetFilter مغلقة المصدر و المقدمة من WhisperSystems (تحتاج لتنزيل WhisperCore)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">نوع البروكسي</string> <string name="pref_proxy_type_summary">البروتوكول ليستخدم مع خادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string> diff --git a/values-bg/strings.xml b/values-bg/strings.xml index 2c46407..9d166d4 100644 --- a/values-bg/strings.xml +++ b/values-bg/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Входящи точки</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Въведи входящи точки</string> - <string name="pref_use_whispercore">Използвай WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Тип прокси</string> <string name="pref_proxy_type_summary">Протокол за прокси сървър: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Тип на входящо прокси</string> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index beb4b9b..e544868 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-cs/strings.xml b/values-cs/strings.xml index 96eb1ff..ed49628 100644 --- a/values-cs/strings.xml +++ b/values-cs/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-de/strings.xml b/values-de/strings.xml index cc0d990..f921c22 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Eingangs-Knoten</string> <string name="pref_entrance_node_summary">Fingerprints, Spitznamen, Land und Adressen für den ersten Punkt</string> <string name="pref_entrance_node_dialog">Eingangs-Knoten angeben</string> - <string name="pref_use_whispercore">Verwende WhisperCore</string> - <string name="pref_use_whispercore_summary">Verwende die proprietäre NetFilter-API von WhisperSystems (benötigt ein Gerät mit installiertem WhisperCore)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy-Typ</string> <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers:HTTP,HTTPS,Socks4,Socks5</string> <string name="pref_proxy_type_dialog">Proxy-Typ angeben</string> diff --git a/values-el/strings.xml b/values-el/strings.xml index 66020c7..4cfce23 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-es/strings.xml b/values-es/strings.xml index 98bc2cf..6d393bb 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Los nodos de entrada</string> <string name="pref_entrance_node_summary">Las llaves publicas, apodos, países y direcciones para el primer salto, o nodo (primer servidor que se conectara para acceder a la red Tor)</string> <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string> - <string name="pref_use_whispercore">Utilizar plataforma de seguridad WhisperCore</string> - <string name="pref_use_whispercore_summary">Utilizar las API de NetFilter proporcionada por WhisperSystems (es necesario que su dispositivo tenga WhisperCore instalado)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Tipo de proxy</string> <string name="pref_proxy_type_summary">Protocolo que se utilizará para la configuracion del servidor proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string> <string name="pref_proxy_type_dialog">Introduzca el Tipo de Proxy</string> diff --git a/values-es_AR/strings.xml b/values-es_AR/strings.xml index 3e07a6e..73c8867 100644 --- a/values-es_AR/strings.xml +++ b/values-es_AR/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index a1ba776..1e61b79 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Sarrera Nodoak</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string> - <string name="pref_use_whispercore">WhisperCore erabili</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy mota</string> <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string> @@ -176,7 +177,7 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Portuak sartu</string> <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string> <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index b4e6e11..1b768d5 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">گره های ورودی</string> <string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای هاپ اول</string> <string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string> - <string name="pref_use_whispercore">WhisperCore استفاده از </string> - <string name="pref_use_whispercore_summary">از NetFilter API های اختصاصی که توسط WhisperSystems فراهم شده اند استفاده کن(WhisperCore باید روی دستگاه نصب شده باشد)\n</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">نوع پروکسی</string> <string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 5610967..4bd7784 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Nœuds d\'entrée</string> <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string> <string name="pref_entrance_node_dialog">Entrez les nœuds d\'entrée</string> - <string name="pref_use_whispercore">Utilisez WhisperCore</string> - <string name="pref_use_whispercore_summary">Utilisez les API propriétaires fournis par Netfilter WhisperSystems (dispositif nécessaire avec WhisperCore installé)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Type de proxy</string> <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Entrez le type de proxy</string> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 37f9862..64112cb 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Belépő csomópontok</string> <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string> <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string> - <string name="pref_use_whispercore">WhisperCore használata</string> - <string name="pref_use_whispercore_summary">Az eredeti NetFilter API használata amit a WhisperSystems biztosít (olyan eszköz szükséges, amire WhisperCore van telepítve)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy típus</string> <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string> diff --git a/values-it/strings.xml b/values-it/strings.xml index 0932cde..5684001 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Nodi di entrata</string> <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string> <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string> - <string name="pref_use_whispercore">Usa WhisperCore</string> - <string name="pref_use_whispercore_summary">Utilizza le API proprietarie NetFilter fornite da WhisperSystems (è richiesto che sul dispositivo sia installato WhisperCore)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Tipo proxy</string> <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string> diff --git a/values-ja/strings.xml b/values-ja/strings.xml index 0b67ad6..5372e71 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 23bd508..e4dbb6c 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-ms_MY/strings.xml b/values-ms_MY/strings.xml index 14fef3c..70beb05 100644 --- a/values-ms_MY/strings.xml +++ b/values-ms_MY/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Nod Kemasukan</string> <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string> <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string> - <string name="pref_use_whispercore">Guna WhisperCore</string> - <string name="pref_use_whispercore_summary">Gunakan API NetFilter proprietari diperuntukkan oleh WhisperSystems (peranti yang dikehendaki dengan WhisperCore dipasang)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Jenis Proxy</string> <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string> <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 3fa640a..97024e9 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index a602bef..b94c9df 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Toegangsnodes.</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, landen en adressen voor de eerste hop</string> <string name="pref_entrance_node_dialog">Voer Toegangsnode in</string> - <string name="pref_use_whispercore">Gebruik WhisperCore</string> - <string name="pref_use_whispercore_summary">Gebruik de propriëtaire NetFilter APIs aangeboden door WhisperSystems (vereist een apparaat met WhisperCore geïnstaleerd)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy type</string> <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxy server: HTTP, HTTPS, SOCKS4, SOCKS5</string> <string name="pref_proxy_type_dialog">Voer proxy type in</string> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 8e303b2..a06a891 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Węzły wejściowe</string> <string name="pref_entrance_node_summary">Fingerprinty, nicki, państaw i adresy na ostatni skok</string> <string name="pref_entrance_node_dialog">Wpisz Węzły Wejściowe</string> - <string name="pref_use_whispercore">Użyj WhisperCore</string> - <string name="pref_use_whispercore_summary">Użyj odpowiedniego NetFilter APIs dostarczonego przez WhisperSystems (wymagane urządzenie z zainstalowanym WhisperCore)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Typ Proxy</string> <string name="pref_proxy_type_summary">Protokół używany dla serwera proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index 2e7a73d..3489432 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-pt_BR/strings.xml b/values-pt_BR/strings.xml index fca1502..336f32f 100644 --- a/values-pt_BR/strings.xml +++ b/values-pt_BR/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Nós de Entrada</string> <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string> <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string> - <string name="pref_use_whispercore">Usar WhisperCore</string> - <string name="pref_use_whispercore_summary">Usar as NetFilter APIs proprietárias providas por WhisperSystems (requerido dispositivo com WhisperCore instalado)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Tipo de Proxy</string> <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index 51f1dcc..4e2f443 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Входные узлы</string> <string name="pref_entrance_node_summary">Отпечатки, ники, страны и адреса для первого прыжка</string> <string name="pref_entrance_node_dialog">Введите входные узлы</string> - <string name="pref_use_whispercore">Использовать WhisperCore</string> - <string name="pref_use_whispercore_summary">Использовать проприетарный NetFilter APIs предоставленный WhisperSystems (требует устройство с установленным WhisperCore)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Тип Прокси</string> <string name="pref_proxy_type_summary">Протокол для использования прокси-сервером: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Введите Тип Прокси</string> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index b17efce..06292c4 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">Allmänt</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Ingångsnoder</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Proxy-typ</string> <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> <string name="pref_proxy_host_title">Proxy-värd</string> <string name="pref_proxy_host_summary">Proxy-servernamn</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">Tor-licensen</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">Tredjepartsprogramvara:</string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index edafc62..81bf156 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">状态</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -187,7 +188,7 @@ <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> diff --git a/values/strings.xml b/values/strings.xml index 520215c..c2a5e2d 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -79,7 +79,7 @@  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> @@ -119,15 +119,16 @@ <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_use_whispercore">Use WhisperCore</string> - <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> - <string name="pref_proxy_type_title">Proxy Type</string> +  + <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - <string name="pref_proxy_host_title">Proxy Host</string> + <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - <string name="pref_proxy_port_title">Proxy Port</string> + <string name="pref_proxy_port_title">Outbound Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> <string name="status">Status</string> @@ -175,8 +176,8 @@ <string name="reachable_ports">Reachable ports</string> <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> - <string name="enable_hidden_services">Enable Hidden Services</string> - <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> <string name="hidden_service_ports">Hidden Service Ports</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> @@ -186,8 +187,8 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>

1 0

[orbot/master] fixing libevent broken ssl building
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit aba382c581482e16c670cc564421691269b12573 Author: n8fr8 <nathan(a)freitas.net> Date: Wed May 9 00:43:33 2012 -0400 fixing libevent broken ssl building --- external/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/Makefile b/external/Makefile index 61742bf..1a7a3c5 100644 --- a/external/Makefile +++ b/external/Makefile @@ -93,7 +93,7 @@ libevent/Makefile: cp config.sub libevent cp config.guess libevent cd libevent && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto -lssl" \ + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ ./configure \ --host=$(HOST) \ --disable-shared

1 0

[orbot/master] updated makefile to fix issues resources
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit 0604eb2ba03c3f408027236e5cb42c65d7dd7ef8 Author: n8fr8 <nathan(a)freitas.net> Date: Sun May 6 22:47:34 2012 -0400 updated makefile to fix issues resources - moved jtorctrl.jar to jtorctl.jar for consistency with source library - make assets now zips up tor binary and renames to .mp3 extension to handle issues with older Android devices breaking when trying to decompress a large file. By naming mp3, there is no attempt to decompress. --- .classpath | 2 +- external/Makefile | 39 +++++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.classpath b/.classpath index 37d42de..d2c46be 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry kind="lib" path="libs/jtorctrl.jar"/> + <classpathentry kind="lib" path="libs/jtorctl.jar"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/external/Makefile b/external/Makefile index ff420c6..8639a08 100644 --- a/external/Makefile +++ b/external/Makefile @@ -187,7 +187,7 @@ obfsproxy-clean: # privoxy -privoxy/Makefile: +privoxy/config.log: cd privoxy && \ autoheader cd privoxy && \ @@ -199,7 +199,7 @@ privoxy/Makefile: ./configure \ --host=arm-linux-eabi --disable-pthread -privoxy-build-stamp: privoxy/Makefile +privoxy-build-stamp: privoxy/config.log $(MAKE) -C privoxy touch privoxy-build-stamp @@ -219,34 +219,45 @@ privoxy-clean: #------------------------------------------------------------------------------# # JTorControl library -jtorctrl: +jtorctl/bin/jtorctl.jar: test -d jtorctl/bin || mkdir jtorctl/bin cd jtorctl && \ javac net/freehaven/tor/control/TorControlConnection.java -d bin cd jtorctl/bin && \ - jar cvf jtorctrl.jar * - cp jtorctl/bin/jtorctrl.jar bin + jar cvf jtorctl.jar * -jtorctrl-clean: - -rm bin/jtorctrl.jar +jtorctl-build-stamp: jtorctl/bin/jtorctl.jar + touch jtorctl-build-stamp + +jtorctl: jtorctl-build-stamp + test -d bin || mkdir bin + cp jtorctl/bin/jtorctl.jar bin + +jtorctl-clean: + -rm -rf jtorctl/bin + -rm jtorctl-build-stamp #------------------------------------------------------------------------------# -# cleanup, cleanup, put the toys away -assets: tor privoxy jtorctrl obfsproxy +#create and clean assets: FYI - tor is stored as a ZIP file with an mp3 extension +#in order to stop Android OS (older devices) from trying to compress/decompress it +#this is related to a bug in compression of assets and resources > 1MB + +assets: tor privoxy jtorctl obfsproxy install -d ../res/raw install -d ../libs - install bin/tor ../res/raw install bin/privoxy ../res/raw install bin/obfsproxy ../res/raw - install bin/jtorctrl.jar ../libs + install bin/jtorctl.jar ../libs + cd bin && \ + zip ../../res/raw/tor.mp3 tor assets-clean: - -rm ../res/raw/tor + -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy - -rm ../libs/jtorctrl.jar + -rm ../libs/jtorctl.jar -rm ../res/raw/obfsproxy #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away -clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctrl-clean assets-clean +clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean

1 0

[orbot/master] clean out all jars from libs
by n8fr8＠torproject.org 21 Jun '12

21 Jun '12

commit b0bb72abfb719103d0dd5c508614706d662cbec7 Author: n8fr8 <nathan(a)freitas.net> Date: Mon May 7 22:07:44 2012 -0400 clean out all jars from libs --- external/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/Makefile b/external/Makefile index 63e02f1..b6ec36a 100644 --- a/external/Makefile +++ b/external/Makefile @@ -255,7 +255,7 @@ assets-clean: -rm ../res/raw/tor -rm ../res/raw/tor.mp3 -rm ../res/raw/privoxy - -rm ../libs/jtorctl.jar + -rm ../libs/* -rm ../res/raw/obfsproxy #------------------------------------------------------------------------------#

1 0